From owner-p4-projects@FreeBSD.ORG Sun Apr 1 04:43:32 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AD9E216A405; Sun, 1 Apr 2007 04:43:31 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id E44ED16A406 for ; Sun, 1 Apr 2007 04:43:28 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 7D3DA13C45D for ; Sun, 1 Apr 2007 04:43:28 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l314hSDM077285 for ; Sun, 1 Apr 2007 04:43:28 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l314hS82077282 for perforce@freebsd.org; Sun, 1 Apr 2007 04:43:28 GMT (envelope-from kmacy@freebsd.org) Date: Sun, 1 Apr 2007 04:43:28 GMT Message-Id: <200704010443.l314hS82077282@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 117052 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 01 Apr 2007 04:43:32 -0000 http://perforce.freebsd.org/chv.cgi?CH=117052 Change 117052 by kmacy@kmacy_vt-x:opentoe_init on 2007/04/01 04:43:00 mb_ctor_clust should not assume that all clusters come from the 2k cluster zone MFP4 after: 2 weeks Affected files ... .. //depot/projects/opentoe/sys/kern/kern_mbuf.c#2 edit Differences ... ==== //depot/projects/opentoe/sys/kern/kern_mbuf.c#2 (text+ko) ==== @@ -396,31 +396,36 @@ struct mbuf *m; u_int *refcnt; int type = 0; - + uma_zone_t zone; + #ifdef INVARIANTS trash_ctor(mem, size, arg, how); #endif + switch (size) { + case MCLBYTES: + type = EXT_CLUSTER; + zone = zone_clust; + break; +#if MJUMPAGESIZE != MCLBYTES + case MJUMPAGESIZE: + type = EXT_JUMBOP; + zone = zone_jumbop; + break; +#endif + case MJUM9BYTES: + type = EXT_JUMBO9; + zone = zone_jumbo9; + break; + case MJUM16BYTES: + type = EXT_JUMBO16; + zone = zone_jumbo16; + break; + default: + panic("unknown cluster size"); + break; + } m = (struct mbuf *)arg; if (m != NULL) { - switch (size) { - case MCLBYTES: - type = EXT_CLUSTER; - break; -#if MJUMPAGESIZE != MCLBYTES - case MJUMPAGESIZE: - type = EXT_JUMBOP; - break; -#endif - case MJUM9BYTES: - type = EXT_JUMBO9; - break; - case MJUM16BYTES: - type = EXT_JUMBO16; - break; - default: - panic("unknown cluster size"); - break; - } m->m_ext.ext_buf = (caddr_t)mem; m->m_data = m->m_ext.ext_buf; m->m_flags |= M_EXT; @@ -428,10 +433,10 @@ m->m_ext.ext_args = NULL; m->m_ext.ext_size = size; m->m_ext.ext_type = type; - m->m_ext.ref_cnt = uma_find_refcnt(zone_clust, mem); + m->m_ext.ref_cnt = uma_find_refcnt(zone, mem); *m->m_ext.ref_cnt = 1; } else { - refcnt = uma_find_refcnt(zone_clust, mem); + refcnt = uma_find_refcnt(zone, mem); *refcnt = 1; } return (0); From owner-p4-projects@FreeBSD.ORG Sun Apr 1 06:37:51 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8DBCB16A406; Sun, 1 Apr 2007 06:37:51 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 6483916A404 for ; Sun, 1 Apr 2007 06:37:51 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 5490113C448 for ; Sun, 1 Apr 2007 06:37:51 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l316bpQC005442 for ; Sun, 1 Apr 2007 06:37:51 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l316bp88005439 for perforce@freebsd.org; Sun, 1 Apr 2007 06:37:51 GMT (envelope-from hselasky@FreeBSD.org) Date: Sun, 1 Apr 2007 06:37:51 GMT Message-Id: <200704010637.l316bp88005439@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 117055 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 01 Apr 2007 06:37:51 -0000 http://perforce.freebsd.org/chv.cgi?CH=117055 Change 117055 by hselasky@hselasky_mini_itx on 2007/04/01 06:36:56 Bugfix: Check if ucom_pre_param is non-NULL before calling it. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/ucom.c#15 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/ucom.c#15 (text+ko) ==== @@ -961,11 +961,13 @@ tp->t_ospeed = t->c_ospeed; tp->t_cflag = t->c_cflag; - /* Let the lower layer verify the parameters */ - error = (sc->sc_callback->ucom_pre_param)(sc, t); - if (error) { - DPRINTF(0, "callback error = %d\n", error); - goto done; + if (sc->sc_callback->ucom_pre_param) { + /* Let the lower layer verify the parameters */ + error = (sc->sc_callback->ucom_pre_param)(sc, t); + if (error) { + DPRINTF(0, "callback error = %d\n", error); + goto done; + } } /* Make a copy of the termios parameters */ From owner-p4-projects@FreeBSD.ORG Sun Apr 1 06:38:53 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6475216A405; Sun, 1 Apr 2007 06:38:53 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 2A56116A403 for ; Sun, 1 Apr 2007 06:38:53 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 1A81713C44B for ; Sun, 1 Apr 2007 06:38:53 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l316cqmv005532 for ; Sun, 1 Apr 2007 06:38:52 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l316cqTg005529 for perforce@freebsd.org; Sun, 1 Apr 2007 06:38:52 GMT (envelope-from marcel@freebsd.org) Date: Sun, 1 Apr 2007 06:38:52 GMT Message-Id: <200704010638.l316cqTg005529@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Cc: Subject: PERFORCE change 117056 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 01 Apr 2007 06:38:53 -0000 http://perforce.freebsd.org/chv.cgi?CH=117056 Change 117056 by marcel@marcel_xcllnt on 2007/04/01 06:38:21 s/GEOM_GPT/GEOM_PART_GPT/ Affected files ... .. //depot/projects/powerpc/sys/powerpc/conf/XSERVE#2 edit Differences ... ==== //depot/projects/powerpc/sys/powerpc/conf/XSERVE#2 (text+ko) ==== @@ -20,7 +20,7 @@ options CD9660 #ISO 9660 Filesystem options PROCFS #Process filesystem (requires PSEUDOFS) options PSEUDOFS #Pseudo-filesystem framework -options GEOM_GPT #GUID Partition Tables. +options GEOM_PART_GPT #GUID Partition Tables. options COMPAT_43TTY #BSD 4.3 TTY compat [KEEP THIS!] options SCSI_DELAY=5000 #Delay (in ms) before probing SCSI options KTRACE #ktrace(1) syscall trace support From owner-p4-projects@FreeBSD.ORG Sun Apr 1 06:52:10 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B843D16A403; Sun, 1 Apr 2007 06:52:10 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 6DD1216A401 for ; Sun, 1 Apr 2007 06:52:10 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 497A213C469 for ; Sun, 1 Apr 2007 06:52:10 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l316q923007843 for ; Sun, 1 Apr 2007 06:52:09 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l316q9ra007840 for perforce@freebsd.org; Sun, 1 Apr 2007 06:52:09 GMT (envelope-from marcel@freebsd.org) Date: Sun, 1 Apr 2007 06:52:09 GMT Message-Id: <200704010652.l316q9ra007840@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Cc: Subject: PERFORCE change 117057 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 01 Apr 2007 06:52:11 -0000 http://perforce.freebsd.org/chv.cgi?CH=117057 Change 117057 by marcel@marcel_xcllnt on 2007/04/01 06:51:08 Catch up with interrupt filtering. Affected files ... .. //depot/projects/powerpc/sys/powerpc/powermac/viapmu.c#2 edit Differences ... ==== //depot/projects/powerpc/sys/powerpc/powermac/viapmu.c#2 (text+ko) ==== @@ -72,12 +72,13 @@ static int viapmu_server_mode(struct viapmu_softc *); -static void +static int viapmu_intr(void *arg) { struct viapmu_softc *sc = (struct viapmu_softc *)arg; if (sc); + return (FILTER_STRAY); } static int @@ -120,8 +121,8 @@ return (ENXIO); } - error = bus_setup_intr(dev, sc->sc_ires, INTR_TYPE_MISC | INTR_FAST, - viapmu_intr, sc, &sc->sc_icookie); + error = bus_setup_intr(dev, sc->sc_ires, INTR_TYPE_MISC, viapmu_intr, + NULL, sc, &sc->sc_icookie); if (error != 0) { device_printf(dev, "could not setup interrupt\n"); bus_release_resource(dev, SYS_RES_IRQ, sc->sc_irid, From owner-p4-projects@FreeBSD.ORG Sun Apr 1 17:36:14 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5F60016A404; Sun, 1 Apr 2007 17:36:14 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 1723016A401 for ; Sun, 1 Apr 2007 17:36:14 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id F1A3E13C459 for ; Sun, 1 Apr 2007 17:36:13 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l31HaDRN068627 for ; Sun, 1 Apr 2007 17:36:13 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l31HaDhx068622 for perforce@freebsd.org; Sun, 1 Apr 2007 17:36:13 GMT (envelope-from rdivacky@FreeBSD.org) Date: Sun, 1 Apr 2007 17:36:13 GMT Message-Id: <200704011736.l31HaDhx068622@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 117109 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 01 Apr 2007 17:36:14 -0000 http://perforce.freebsd.org/chv.cgi?CH=117109 Change 117109 by rdivacky@rdivacky_witten on 2007/04/01 17:35:45 Semi-implement fstatat64() - only compile tested. Check for fp being a vnode before referencing fp->f_vnode [1] Pointed out by: rwatson I commit this because my harddisk is likely to die in a few hours. Affected files ... .. //depot/projects/linuxolator/src/sys/compat/linux/linux_file.c#20 edit .. //depot/projects/linuxolator/src/sys/compat/linux/linux_stats.c#8 edit .. //depot/projects/linuxolator/src/sys/compat/linux/linux_util.h#5 edit Differences ... ==== //depot/projects/linuxolator/src/sys/compat/linux/linux_file.c#20 (text+ko) ==== @@ -105,6 +105,10 @@ error = fget(td, dirfd, &fp); if (error) return (error); + if (fp->f_type != DTYPE_VNODE) { + fdrop(fp, td); + return (EBADF); + } dvp = fp->f_vnode; /* only a dir can be dfd */ if (dvp->v_type != VDIR) { @@ -144,7 +148,7 @@ } -static int +int linux_common_open(struct thread *td, char *path, int l_flags, int mode, int openat) { struct proc *p = td->td_proc; @@ -1387,12 +1391,6 @@ } int -linux_fstatat64(struct thread *td, struct linux_fstatat64_args *args) -{ - return (ENOSYS); -} - -int linux_fchownat(struct thread *td, struct linux_fchownat_args *args) { return (ENOSYS); ==== //depot/projects/linuxolator/src/sys/compat/linux/linux_stats.c#8 (text+ko) ==== @@ -43,6 +43,7 @@ #include #include #include +#include #include #include #include @@ -593,4 +594,52 @@ return (error); } +/* XXX: racy? */ +int +linux_fstatat64(struct thread *td, struct linux_fstatat64_args *args) +{ + int error; + char *newpath, *oldpath, *freebuf = NULL, *path; + int fd; + struct close_args cargs; + struct stat buf; + + /* open the file */ + oldpath = malloc(MAXPATHLEN, M_TEMP, M_WAITOK); + error = copyinstr(args->pathname, oldpath, MAXPATHLEN, NULL); +#ifdef DEBUG + if (ldebug(fstatat64)) + printf(ARGS(fstatat64, "%i, %s, %i"), args->dfd, args->pathname, args->flag); +#endif + + error = linux_at(td, args->dfd, oldpath, &newpath, &freebuf); + if (error) + return (error); + LCONVPATH_SEG(td, newpath, &path, 0, UIO_SYSSPACE); + if (freebuf) + free(freebuf, M_TEMP); + if (*oldpath != '/') + free(newpath, M_TEMP); + + error = linux_common_open(td, path, O_RDONLY, 0, 1); + free(oldpath, M_TEMP); + if (error) + return (error); + /* file opened */ + fd = td->td_retval[0]; + td->td_retval[0] = 0; + + /* do the actual fstat */ + + error = kern_fstat(td, fd, &buf); + translate_fd_major_minor(td, fd, &buf); + if (!error) + error = stat64_copyout(&buf, args->statbuf); + + /* close the opened file */ + cargs.fd = fd; + close(td, &cargs); + return (0); +} + #endif /* __i386__ || (__amd64__ && COMPAT_LINUX32) */ ==== //depot/projects/linuxolator/src/sys/compat/linux/linux_util.h#5 (text+ko) ==== @@ -106,5 +106,6 @@ /* XXX: doesnt belong here */ int linux_at(struct thread *td, int dirfd, char *filename, char **newpath, char **freebuf); +int linux_common_open(struct thread *td, char *path, int l_flags, int mode, int openat); #endif /* !_LINUX_UTIL_H_ */ From owner-p4-projects@FreeBSD.ORG Sun Apr 1 18:15:11 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C14A016A404; Sun, 1 Apr 2007 18:15:10 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 7ADFD16A402 for ; Sun, 1 Apr 2007 18:15:10 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 6B24113C44C for ; Sun, 1 Apr 2007 18:15:10 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l31IFAFp075991 for ; Sun, 1 Apr 2007 18:15:10 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l31IF6ao075987 for perforce@freebsd.org; Sun, 1 Apr 2007 18:15:06 GMT (envelope-from marcel@freebsd.org) Date: Sun, 1 Apr 2007 18:15:06 GMT Message-Id: <200704011815.l31IF6ao075987@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Cc: Subject: PERFORCE change 117114 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 01 Apr 2007 18:15:11 -0000 http://perforce.freebsd.org/chv.cgi?CH=117114 Change 117114 by marcel@marcel_xcllnt on 2007/04/01 18:15:04 IFC @117112 Affected files ... .. //depot/projects/powerpc/etc/rc.d/ppp#2 integrate .. //depot/projects/powerpc/lib/libarchive/archive_read.c#5 integrate .. //depot/projects/powerpc/lib/libarchive/archive_read_support_format_iso9660.c#4 integrate .. //depot/projects/powerpc/lib/libarchive/archive_read_support_format_tar.c#4 integrate .. //depot/projects/powerpc/share/man/man4/man4.i386/Makefile#2 integrate .. //depot/projects/powerpc/share/man/man4/man4.i386/acpi_aiboost.4#1 branch .. //depot/projects/powerpc/share/man/man9/Makefile#6 integrate .. //depot/projects/powerpc/share/man/man9/sx.9#3 integrate .. //depot/projects/powerpc/share/man/man9/vhold.9#2 integrate .. //depot/projects/powerpc/share/misc/Makefile#3 integrate .. //depot/projects/powerpc/share/misc/committers-doc.dot#2 integrate .. //depot/projects/powerpc/share/misc/committers-ports.dot#2 integrate .. //depot/projects/powerpc/share/misc/committers-src.dot#2 integrate .. //depot/projects/powerpc/sys/conf/NOTES#8 integrate .. //depot/projects/powerpc/sys/conf/options#10 integrate .. //depot/projects/powerpc/sys/dev/acpica/acpi_ec.c#6 integrate .. //depot/projects/powerpc/sys/dev/ahb/ahb.c#6 integrate .. //depot/projects/powerpc/sys/dev/ed/if_ed_pccard.c#6 integrate .. //depot/projects/powerpc/sys/dev/ipmi/ipmi_pci.c#2 integrate .. //depot/projects/powerpc/sys/dev/isp/isp_freebsd.h#8 integrate .. //depot/projects/powerpc/sys/dev/mxge/if_mxge.c#4 integrate .. //depot/projects/powerpc/sys/dev/pci/pci.c#10 integrate .. //depot/projects/powerpc/sys/dev/pci/pci_pci.c#7 integrate .. //depot/projects/powerpc/sys/dev/pci/pcireg.h#9 integrate .. //depot/projects/powerpc/sys/dev/sound/usb/uaudio.c#5 integrate .. //depot/projects/powerpc/sys/dev/usb/if_aue.c#9 integrate .. //depot/projects/powerpc/sys/dev/usb/if_axe.c#2 integrate .. //depot/projects/powerpc/sys/dev/usb/ubser.c#2 integrate .. //depot/projects/powerpc/sys/gnu/fs/xfs/FreeBSD/support/mrlock.c#2 integrate .. //depot/projects/powerpc/sys/gnu/fs/xfs/FreeBSD/support/mrlock.h#2 integrate .. //depot/projects/powerpc/sys/i386/acpica/acpi_machdep.c#4 integrate .. //depot/projects/powerpc/sys/i4b/layer1/ifpnp/i4b_ifpnp_avm.c#5 integrate .. //depot/projects/powerpc/sys/i4b/layer1/ihfc/i4b_ihfc_pnp.c#5 integrate .. //depot/projects/powerpc/sys/i4b/layer1/isic/i4b_avm_a1.c#5 integrate .. //depot/projects/powerpc/sys/i4b/layer1/isic/i4b_isic_pnp.c#5 integrate .. //depot/projects/powerpc/sys/i4b/layer1/isic/i4b_itk_ix1.c#5 integrate .. //depot/projects/powerpc/sys/i4b/layer1/isic/i4b_tel_s016.c#5 integrate .. //depot/projects/powerpc/sys/i4b/layer1/isic/i4b_tel_s0163.c#5 integrate .. //depot/projects/powerpc/sys/kern/kern_sx.c#6 integrate .. //depot/projects/powerpc/sys/kern/subr_witness.c#8 integrate .. //depot/projects/powerpc/sys/kern/vfs_lookup.c#6 integrate .. //depot/projects/powerpc/sys/kern/vfs_mount.c#5 integrate .. //depot/projects/powerpc/sys/kern/vfs_subr.c#6 integrate .. //depot/projects/powerpc/sys/modules/cryptodev/Makefile#2 integrate .. //depot/projects/powerpc/sys/netgraph/ng_base.c#5 integrate .. //depot/projects/powerpc/sys/netinet/sctp_auth.c#5 integrate .. //depot/projects/powerpc/sys/netinet/sctp_constants.h#6 integrate .. //depot/projects/powerpc/sys/netinet/sctp_indata.c#6 integrate .. //depot/projects/powerpc/sys/netinet/sctp_input.c#6 integrate .. //depot/projects/powerpc/sys/netinet/sctp_os_bsd.h#6 integrate .. //depot/projects/powerpc/sys/netinet/sctp_output.c#6 integrate .. //depot/projects/powerpc/sys/netinet/sctp_pcb.c#6 integrate .. //depot/projects/powerpc/sys/netinet/sctp_pcb.h#5 integrate .. //depot/projects/powerpc/sys/netinet/sctp_structs.h#6 integrate .. //depot/projects/powerpc/sys/netinet/sctp_sysctl.c#2 integrate .. //depot/projects/powerpc/sys/netinet/sctp_sysctl.h#2 integrate .. //depot/projects/powerpc/sys/netinet/sctp_uio.h#6 integrate .. //depot/projects/powerpc/sys/netinet/sctp_usrreq.c#6 integrate .. //depot/projects/powerpc/sys/netinet/sctputil.c#7 integrate .. //depot/projects/powerpc/sys/netinet6/in6_src.c#6 integrate .. //depot/projects/powerpc/sys/netinet6/sctp6_usrreq.c#6 integrate .. //depot/projects/powerpc/sys/powerpc/conf/GENERIC#7 integrate .. //depot/projects/powerpc/sys/powerpc/conf/NOTES#4 integrate .. //depot/projects/powerpc/sys/powerpc/powermac/uninorth.c#2 integrate .. //depot/projects/powerpc/sys/powerpc/powerpc/extintr.c#5 delete .. //depot/projects/powerpc/sys/sys/_sx.h#1 branch .. //depot/projects/powerpc/sys/sys/mount.h#8 integrate .. //depot/projects/powerpc/sys/sys/sleepqueue.h#4 integrate .. //depot/projects/powerpc/sys/sys/sx.h#6 integrate .. //depot/projects/powerpc/sys/sys/vnode.h#8 integrate .. //depot/projects/powerpc/usr.bin/sed/process.c#2 integrate .. //depot/projects/powerpc/usr.bin/tar/test/test-basic.sh#2 integrate .. //depot/projects/powerpc/usr.bin/tar/write.c#5 integrate Differences ... ==== //depot/projects/powerpc/etc/rc.d/ppp#2 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/ppp,v 1.12 2006/10/26 00:29:43 avatar Exp $ +# $FreeBSD: src/etc/rc.d/ppp,v 1.13 2007/03/31 09:03:38 mtm Exp $ # # PROVIDE: ppp @@ -12,10 +12,10 @@ name="ppp" rcvar=`set_rcvar` command="/usr/sbin/${name}" -start_precmd="ppp_precmd" -start_postcmd="ppp_postcmd" +start_precmd="ppp_prestart" +start_postcmd="ppp_poststart" -ppp_precmd() +ppp_prestart() { # Establish ppp mode. # @@ -38,7 +38,7 @@ rc_flags="$rc_flags ${ppp_profile}" } -ppp_postcmd() +ppp_poststart() { # Re-Sync ipfilter and pf so they pick up any new network interfaces # ==== //depot/projects/powerpc/lib/libarchive/archive_read.c#5 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_read.c,v 1.30 2007/03/03 07:37:36 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_read.c,v 1.31 2007/03/31 22:59:43 cperciva Exp $"); #ifdef HAVE_ERRNO_H #include @@ -55,6 +55,7 @@ static int choose_decompressor(struct archive_read *, const void*, size_t); static int choose_format(struct archive_read *); +static off_t dummy_skip(struct archive_read *, off_t); /* * Allocate, initialize and return a struct archive object. @@ -191,6 +192,13 @@ if (e == ARCHIVE_OK) a->archive.state = ARCHIVE_STATE_HEADER; + /* + * If the decompressor didn't register a skip function, provide a + * dummy compression-layer skip function. + */ + if (a->compression_skip == NULL) + a->compression_skip = dummy_skip; + return (e); } @@ -244,6 +252,38 @@ } /* + * Dummy skip function, for use if the compression layer doesn't provide + * one: This code just reads data and discards it. + */ +static off_t +dummy_skip(struct archive_read * a, off_t request) +{ + const void * dummy_buffer; + ssize_t bytes_read; + off_t bytes_skipped; + + for (bytes_skipped = 0; request > 0;) { + bytes_read = (a->compression_read_ahead)(a, &dummy_buffer, 1); + if (bytes_read < 0) + return (bytes_read); + if (bytes_read == 0) { + /* Premature EOF. */ + archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC, + "Truncated input file (need to skip %jd bytes)", + (intmax_t)request); + return (ARCHIVE_FATAL); + } + if (bytes_read > request) + bytes_read = request; + (a->compression_read_consume)(a, bytes_read); + request -= bytes_read; + bytes_skipped += bytes_read; + } + + return (bytes_skipped); +} + +/* * Read header of next entry. */ int ==== //depot/projects/powerpc/lib/libarchive/archive_read_support_format_iso9660.c#4 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_support_format_iso9660.c,v 1.20 2007/03/03 07:37:36 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_support_format_iso9660.c,v 1.21 2007/03/31 22:59:43 cperciva Exp $"); #ifdef HAVE_SYS_STAT_H #include @@ -917,33 +917,13 @@ offset = file->offset; /* Seek forward to the start of the entry. */ - /* Use fast compression_skip if it's available. */ - if (iso9660->current_position < offset - && a->compression_skip != NULL) { + if (iso9660->current_position < offset) { off_t step = offset - iso9660->current_position; off_t bytes_read; bytes_read = (a->compression_skip)(a, step); - iso9660->current_position += bytes_read; - } - - /* Use a series of reads if compression_skip didn't - * get us all the way there. */ - while (iso9660->current_position < offset) { - ssize_t step = offset - iso9660->current_position; - ssize_t bytes_read; - const void *buff; - - if (step > iso9660->logical_block_size) - step = iso9660->logical_block_size; - bytes_read = (a->compression_read_ahead)(a, &buff, step); - if (bytes_read <= 0) { - release_file(iso9660, file); - return (ARCHIVE_FATAL); - } - if (bytes_read > step) - bytes_read = step; - iso9660->current_position += bytes_read; - (a->compression_read_consume)(a, bytes_read); + if (bytes_read < 0) + return (bytes_read); + iso9660->current_position = offset; } /* We found body of file; handle it now. */ ==== //depot/projects/powerpc/lib/libarchive/archive_read_support_format_tar.c#4 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_support_format_tar.c,v 1.49 2007/03/03 07:37:36 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_support_format_tar.c,v 1.50 2007/03/31 22:59:43 cperciva Exp $"); #ifdef HAVE_SYS_STAT_H #include @@ -546,18 +546,8 @@ off_t bytes_skipped; struct tar* tar; struct sparse_block *p; - int r = ARCHIVE_OK; - const void *b; /* dummy variables */ - size_t s; - off_t o; - tar = (struct tar *)*(a->pformat_data); - if (a->compression_skip == NULL) { - while (r == ARCHIVE_OK) - r = archive_read_format_tar_read_data(a, &b, &s, &o); - return (r); - } /* * Compression layer skip functions are required to either skip the ==== //depot/projects/powerpc/share/man/man4/man4.i386/Makefile#2 (text+ko) ==== @@ -1,6 +1,7 @@ -# $FreeBSD: src/share/man/man4/man4.i386/Makefile,v 1.184 2006/05/14 02:01:59 gnn Exp $ +# $FreeBSD: src/share/man/man4/man4.i386/Makefile,v 1.185 2007/03/30 21:19:10 takawata Exp $ -MAN= acpi_asus.4 \ +MAN= acpi_aiboost.4 \ + acpi_asus.4 \ acpi_fujitsu.4 \ acpi_ibm.4 \ acpi_panasonic.4 \ ==== //depot/projects/powerpc/share/man/man9/Makefile#6 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/share/man/man9/Makefile,v 1.304 2007/03/30 17:56:19 julian Exp $ +# $FreeBSD: src/share/man/man9/Makefile,v 1.306 2007/04/01 09:48:59 maxim Exp $ MAN= accept_filter.9 \ accf_data.9 \ @@ -1058,6 +1058,7 @@ sx.9 sx_destroy.9 \ sx.9 sx_downgrade.9 \ sx.9 sx_init.9 \ + sx.9 sx_init_flags.9 \ sx.9 sx_slock.9 \ sx.9 sx_sunlock.9 \ sx.9 SX_SYSINIT.9 \ @@ -1181,7 +1182,8 @@ vfs_getopt.9 vfs_filteropt.9 MLINKS+=VFS_LOCK_GIANT.9 VFS_UNLOCK_GIANT.9 MLINKS+=vgone.9 vgonel.9 -MLINKS+=vhold.9 vdrop.9 +MLINKS+=vhold.9 vdrop.9 \ + vhold.9 vdropl.9 MLINKS+=vm_map_lock.9 vm_map_lock_downgrade.9 \ vm_map_lock.9 vm_map_lock_read.9 \ vm_map_lock.9 vm_map_lock_upgrade.9 \ ==== //depot/projects/powerpc/share/man/man9/sx.9#3 (text+ko) ==== @@ -24,7 +24,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH .\" DAMAGE. .\" -.\" $FreeBSD: src/share/man/man9/sx.9,v 1.37 2007/03/30 18:07:26 julian Exp $ +.\" $FreeBSD: src/share/man/man9/sx.9,v 1.38 2007/03/31 23:23:40 jhb Exp $ .\" .Dd February 1, 2006 .Dt SX 9 @@ -32,6 +32,7 @@ .Sh NAME .Nm sx , .Nm sx_init , +.Nm sx_init_flags , .Nm sx_destroy , .Nm sx_slock , .Nm sx_xlock , @@ -54,6 +55,8 @@ .Ft void .Fn sx_init "struct sx *sx" "const char *description" .Ft void +.Fn sx_init_flags "struct sx *sx" "const char *description" "int opts" +.Ft void .Fn sx_destroy "struct sx *sx" .Ft void .Fn sx_slock "struct sx *sx" @@ -87,11 +90,14 @@ .Sh DESCRIPTION Shared/exclusive locks are used to protect data that are read far more often than they are written. -Mutexes are inherently more efficient than shared/exclusive locks, so +Shared/exclusive locks do not implement priority propagation like mutexes and +reader/writer locks to prevent priority inversions, so shared/exclusive locks should be used prudently. .Pp -Shared/exclusive locks are created with -.Fn sx_init , +Shared/exclusive locks are created with either +.Fn sx_init +or +.Fn sx_init_flags where .Fa sx is a pointer to space for a @@ -100,8 +106,40 @@ .Fa description is a pointer to a null-terminated character string that describes the shared/exclusive lock. +The +.Fa opts +argument to +.Fn sx_init_flags +specifies a set of optional flags to alter the behavior of +.Fa sx . +It contains one or more of the following flags: +.Bl -tag -width SX_ADAPTIVESPIN +.It Dv SX_ADAPTIVESPIN +If the kernel is compiled with +.Cd "options ADAPTIVE_SX" , +then lock operations for +.Fa sx +will spin instead of sleeping while an exclusive lock holder is executing on +another CPU. +.It Dv SX_DUPOK +Witness should not log messages about duplicate locks being acquired. +.It Dv SX_NOWITNESS +Instruct +.Xr witness 4 +to ignore this lock. +.It Dv SX_NOPROFILE +Do not profile this lock. +.It Dv SX_QUIET +Do not log any operations for this lock via +.Xr ktr 4 . +.El +.Pp Shared/exclusive locks are destroyed with .Fn sx_destroy . +The lock +.Fa sx +must not be locked by any thread when it is destroyed. +.Pp Threads acquire and release a shared lock by calling .Fn sx_slock or @@ -155,7 +193,7 @@ for the assertions specified in .Fa what , and panics if they are not met. -The following assertions are supported: +One of the following assertions must be specified: .Bl -tag -width ".Dv SX_UNLOCKED" .It Dv SX_LOCKED Assert that the current thread has either a shared or an exclusive lock on the @@ -178,6 +216,22 @@ by the first argument. .El .Pp +In addition, one of the following optional assertions may be included with +either an +.Dv SX_LOCKED , +.Dv SX_SLOCKED , +or +.Dv SX_XLOCKED +assertion: +.Bl -tag -width ".Dv SX_NOTRECURSED" +.It Dv SX_RECURSED +Assert that the current thread has a recursed lock on +.Fa sx . +.It Dv SX_NOTRECURSED +Assert that the current thread does not have a recursed lock on +.Fa sx . +.El +.Pp .Fn sx_xlocked will return non-zero if the current thread holds the exclusive lock; otherwise, it will return zero. ==== //depot/projects/powerpc/share/man/man9/vhold.9#2 (text+ko) ==== @@ -24,13 +24,13 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH .\" DAMAGE. .\" -.\" $FreeBSD: src/share/man/man9/vhold.9,v 1.4 2005/07/22 00:28:22 rodrigc Exp $ +.\" $FreeBSD: src/share/man/man9/vhold.9,v 1.5 2007/04/01 09:48:59 maxim Exp $ .\" -.Dd November 21, 2001 +.Dd April 1, 2007 .Dt VHOLD 9 .Os .Sh NAME -.Nm vhold , vdrop +.Nm vhold , vdrop , vdropl .Nd "acquire/release a hold on a vnode" .Sh SYNOPSIS .In sys/param.h @@ -39,6 +39,8 @@ .Fn vhold "struct vnode *vp" .Ft void .Fn vdrop "struct vnode *vp" +.Ft void +.Fn vdropl "struct vnode *vp" .Sh DESCRIPTION The .Fn vhold @@ -50,13 +52,29 @@ .Pp The .Fn vdrop -function decrements the +and +.Fn vdropl +functions decrement the .Va v_holdcnt of the vnode. If the holdcount is less than or equal to zero prior to calling -.Fn vdrop , +.Fn vdrop +or +.Fn vdropl , the system will panic. If the vnode is no longer referenced, it will be freed. +.Pp +The difference between +.Fn vdrop +and +.Fn vdropl +is that +.Fn vdrop +locks the vnode interlock and then calls +.Fn vdropl +while +.Fn vdropl +expects the interlock to already be locked. .Sh SEE ALSO .Xr vbusy 9 , .Xr vfree 9 ==== //depot/projects/powerpc/share/misc/Makefile#3 (text+ko) ==== @@ -1,5 +1,5 @@ # From: @(#)Makefile 8.1 (Berkeley) 6/8/93 -# $FreeBSD: src/share/misc/Makefile,v 1.24 2007/03/30 16:56:38 flz Exp $ +# $FreeBSD: src/share/misc/Makefile,v 1.26 2007/03/31 07:28:53 simon Exp $ FILES= ascii birthtoken bsd-family-tree committers-doc.dot committers-ports.dot \ committers-src.dot eqnchar flowers init.ee \ ==== //depot/projects/powerpc/share/misc/committers-doc.dot#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/share/misc/committers-doc.dot,v 1.4 2007/03/30 17:42:01 flz Exp $ +# $FreeBSD: src/share/misc/committers-doc.dot,v 1.13 2007/03/31 19:17:24 keramida Exp $ digraph doc { @@ -8,6 +8,7 @@ # # ????/??/?? is the date when the commit bit was obtained, usually the one you # can find looking at CVS logs for the access (or avail) file under CVSROOT. +# Use YYYY/MM/DD format. # # For returned commit bits, the node definition will follow this example: # @@ -24,20 +25,70 @@ # Current doc committers go here. Try to keep things sorted. +ale [label="Alex Dupre\nale@FreeBSD.org\n2003/12/22"] +blackend [label="Marc Fonvieille\nblackend@FreeBSD.org\n2002/06/16"] +bmah [label="Bruce A. Mah\nbmah@FreeBSD.org\n2000/08/22"] +brd [label="Brad Davis\nbrd@FreeBSD.org\n2005/06/01"] +brueffer [label="Christian Brueffer\nbrueffer@FreeBSD.org\n2003/01/13"] bvs [label="Vitaly Bogdanov\nbvs@FreeBSD.org\n2005/10/03"] +ceri [label="Ceri Davies\nceri@FreeBSD.org\n2002/03/17"] +chinsan [label="Chinsan Huang\nchinsan@FreeBSD.org\n2006/09/20"] +danger [label="Daniel Gerzo\ndanger@FreeBSD.org\n2006/08/20"] den [label="Denis Peplin\nden@FreeBSD.org\n2003/09/13"] +delphij [label="Xin Li\ndelphij@FreeBSD.org\n2004/09/14"] gabor [label="Gabor Kovesdan\ngabor@FreeBSD.org\n2007/02/02"] +garys [label="Gary W. Swearingen\ngarys@FreeBSD.org\n2005/08/21"] +jim [label="Jim Mock\njim@FreeBSD.org\n1999/08/11\n2003/12/15"] +joel [label="Joel Dahl\njoel@FreeBSD.org\n2005/04/05"] +josef [label="Josef El-Rayes\njosef@FreeBSD.org\n2004/01/15"] keramida [label="Giorgos Keramidas\nkeramida@FreeBSD.org\n2001/10/12"] +linimon [label="Mark Linimon\nlinimon@FreeBSD.org\n2004/03/31"] marck [label="Dmitry Morozovsky\nmarck@FreeBSD.org\n2004/08/10"] +murray [label="Murray Stokely\nmurray@FreeBSD.org\n2000/04/05"] +nik [label="Nik Clayton\nnik@FreeBSD.org\n1998/02/26"] +pav [label="Pav Lucistnik\npav@FreeBSD.org\n2005/08/12"] +remko [label="Remko Lodder\nremko@FreeBSD.org\n2004/10/16"] +roam [label="Peter Pentchev\nroam@FreeBSD.org\n2003/02/14"] +simon [label="Simon L. Nielsen\nsimon@FreeBSD.org\n2003/07/20"] +trhodes [label="Tom Rhodes\ntrhodes@FreeBSD.org\n2002/03/25"] # Here are the mentor/mentee relationships. # Group together all the mentees for a particular mentor. # Keep the list sorted by mentor login. +blackend -> ale + +brueffer -> joel + +ceri -> brd +ceri -> brueffer +ceri -> linimon +ceri -> roam +ceri -> simon + den -> marck +delphij -> chinsan + +jim -> trhodes + +keramida -> blackend +keramida -> danger keramida -> gabor +keramida -> garys +keramida -> pav marck -> bvs +murray -> ceri +murray -> delphij + +nik -> bmah +nik -> keramida + +simon -> josef +simon -> remko + +trhodes -> danger + } ==== //depot/projects/powerpc/share/misc/committers-ports.dot#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/share/misc/committers-ports.dot,v 1.13 2007/03/30 19:08:33 ehaupt Exp $ +# $FreeBSD: src/share/misc/committers-ports.dot,v 1.26 2007/03/31 22:45:48 mat Exp $ digraph ports { @@ -21,6 +21,9 @@ # Alumni go here.. Try to keep things sorted. adamw [label="Adam Weinberger\nadamw@FreeBSD.org\n2002/10/16\n2006/09/25"] +bmah [label="Bruce A. Mah\nbmah@FreeBSD.org\n2000/08/23\n2006/12/19"] +jmallett [label="Juli Mallett\njmallett@FreeBSD.org\n2003/01/16\n2006/08/10"] +steve [label="Steve Price\nsteve@FreeBSD.org\nxxxx/xx/xx\nxxxx/xx/xx"] node [color=lightblue2, style=filled, bgcolor=black]; @@ -28,29 +31,57 @@ acm [label="Jose Alonso Cardenas Marquez\nacm@FreeBSD.org\n2006/07/18"] ahze [label="Michael Johnson\nahze@FreeBSD.org\n2004/10/29"] +ale [label="Alex Dupre\nale@FreeBSD.org\n2004/01/12"] alepulver [label="Alejandro Pulver\nalepulver@FreeBSD.org\n2006/04/01"] +bland [label="Alexander Nedotsukov\nbland@FreeBSD.org\n2003/08/14"] +brooks [label="Brooks Davies\nbrooks@FreeBSD.org\n2004/05/03"] +bsam [label="Boris Samorodov\nbsam@FreeBSD.org\n2006/07/20"] clement [label="Clement Laforet\nclement@FreeBSD.org\n2003/12/17"] +clsung [label="Cheng-Lung Sung\nclsung@FreeBSD.org\n2004/8/18"] +daichi [label="Daichi Goto\ndaichi@FreeBSD.org\n2002/10/17"] db [label="Diane Bruce\ndb@FreeBSD.org\n2007/01/18"] +delphij [label="Xin Li\ndelphij@FreeBSD.org\n2006/05/01"] +demon [label="Dmitry Sivachenko\ndemon@FreeBSD.org\n2000/11/13"] edwin [label="Edwin Groothuis\nedwin@FreeBSD.org\n2002/10/22"] ehaupt [label="Emanuel Haupt\nehaupt@FreeBSD.org\n2005/10/03"] +eik [label="Oliver Eikemeier\neik@FreeBSD.org\n2003/11/12"] erwin [label="Erwin Lansing\nerwin@FreeBSD.org\n2003/06/04"] +fjoe [label="Max Khon\nfjoe@FreeBSD.org\n2001/08/06"] flz [label="Florent Thoumie\nflz@FreeBSD.org\n2005/03/01"] gabor [label="Gabor Kovesdan\ngabor@FreeBSD.org\n2006/12/05"] garga [label="Renato Botelho\ngarga@FreeBSD.org\n2005/07/11"] jmelo [label="Jean Milanez Melo\njmelo@FreeBSD.org\n2006/03/31"] +joerg [label="Joerg Wunsch\njoerg@FreeBSD.org\n1994/08/22"] johans [label="Johan Selst\njohans@FreeBSD.org\n2006/04/01"] josef [label="Josef El-Rayes\njosef@FreeBSD.org\n2004/12/20"] jylefort [label="Jean-Yves Lefort\njylefort@FreeBSD.org\n2005/04/12"] +knu [label="Akinori Musha\nknu@FreeBSD.org\n2000/03/22"] +krion [label="Kirill Ponomarew\nkrion@FreeBSD.org\n2003/07/20"] kwm [label="Koop Mast\nkwm@FreeBSD.org\n2004/09/14"] +koitsu [label="Jeremy Chadwick\nkoitsu@FreeBSD.org\n2006/11/10"] laszlof [label="Frank Laszlo\nlaszlof@FreeBSD.org\n2006/11/07"] lbr [label="Lars Balker Rasmussen\lbr@FreeBSD.org\n2006/04/30"] lth [label="Lars Thegler\nlth@FreeBSD.org\n2004/05/04"] +maho [label="Maho Nakata\nmaho@FreeBSD.org\n2002/10/17"] +marcus [label="Joe Marcus Clarke\nmarcus@FreeBSD.org\n2002/04/05"] +mat [label="Mathieu Arnold\nmat@FreeBSD.org\n2003/08/15"] mezz [label="Jeremy Messenger\nmezz@FreeBSD.org\n2004/04/30"] -mnag [label="Marcus Grando\nmnag@FreeBSD.org\n2005/09/15"] +miwi [label="Martin Wilke\nmiwi@FreeBSD.org\n2006/06/04"] +mnag [label="Marcus Alves Grando\nmnag@FreeBSD.org\n2005/09/15"] +netchild [label="Alexander Leidinger\nnetchild@FreeBSD.org\n2002/03/19"] +nobutaka [label="Nobutaka Mantani\nnobutaka@FreeBSD.org\n2001/11/02"] +nork [label="Norikatsu Shigemura\nnork@FreeBSD.org\n2002/04/01"] novel [label="Roman Bogorodskiy\nnovel@FreeBSD.org\n2005/03/07"] pav [label="Pav Lucistnik\npav@FreeBSD.org\n2003/11/12"] +philip [label="Philip Paeps\nphilip@FreeBSD.org\n2005/10/19"] +rafan [label="Rong-En Fan\nrafan@FreeBSD.org\n2006/06/23"] +sat [label="Andrew Pantyukhin\nsat@FreeBSD.org\n2006/05/06"] +sem [label="Sergey Matveychuk\nsem@FreeBSD.org\n2004/07/07"] +sergei [label="Sergei Kolobov\nsergei@FreeBSD.org\n2003/10/21"] shaun [label="Shaun Amott\nshaun@FreeBSD.org\n2006/06/19"] simon [label="Simon L. Nielsen\nsimon@FreeBSD.org\n2005/01/08"] +tdb [label="Tim Bishop\ntdb@FreeBSD.org\n2005/11/30"] +thierry [label="Thierry Thomas\nthierry@FreeBSD.org\n2004/03/15"] tmclaugh [label="Tom McLaughlin\ntmclaugh@FreeBSD.org\n2005/09/15"] vd [label="Vasil Dimov\nvd@FreeBSD.org\n2006/01/19"] @@ -66,6 +97,12 @@ ahze -> shaun ahze -> tmclaugh +clement -> tdb + +delphij -> rafan + +demon -> mat + edwin -> erwin ehaupt -> db @@ -76,6 +113,8 @@ erwin -> lth erwin -> simon +fjoe -> krion + flz -> garga flz -> johans flz -> laszlof @@ -84,8 +123,33 @@ garga -> alepulver garga -> vd +joerg -> netchild + +knu -> daichi +knu -> maho +knu -> nobutaka +knu -> nork + +krion -> brooks +krion -> miwi +krion -> novel +krion -> philip +krion -> sat +krion -> sem +krion -> sergei + +marcus -> bland +marcus -> eik +marcus -> jmallett + +mat -> thierry + mnag -> jmelo +netchild -> bsam + +nork -> ale + novel -> ehaupt pav -> flz @@ -93,4 +157,10 @@ pav -> kwm pav -> mnag +philip -> koitsu + +sem -> delphij + +steve -> netchild + } ==== //depot/projects/powerpc/share/misc/committers-src.dot#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/share/misc/committers-src.dot,v 1.7 2007/03/30 19:01:36 jkim Exp $ +# $FreeBSD: src/share/misc/committers-src.dot,v 1.41 2007/04/01 08:48:00 ume Exp $ digraph src { @@ -20,57 +20,280 @@ # Alumni go here.. Try to keep things sorted. +adrian [label="Adrian Chadd\nadrian@FreeBSD.org\n2000/07/03\n2006/05/30"] +alm [label="???\nalm@FreeBSD.org\n1993/06/12\n????/??/??"] +asmodai [label="Jeroen Ruigrok\nasmodai@FreeBSD.org\n1999/12/16\n2001/11/16"] +furuta [label="Atsushi Furuta\nfuruta@FreeBSD.org\n2000/06/21\n????/??/??"] +jtc [label="???\njtc@FreeBSD.org\n1993/06/12\n????/??/??"] +keichii [label="Michael Wu\nkeichii@FreeBSD.org\n2001/03/07\n2006/04/28"] +mb [label="Maxim Bolotin\nmb@FreeBSD.org\n2000/04/06\n????/??/??"] +nate [label="Nate Willams\nnate@FreeBSD.org\n1993/06/12\n2003/12/15"] +non [label="Noriaki Mitsnaga\nnon@FreeBSD.org\n2000/06/19\n2007/03/06"] +rgrimes [label="Rod Grimes\nrgrimes@FreeBSD.org\n1993/06/12\n????/??/??"] +shafeeq [label="Shafeeq Sinnamohideen\nshafeeq@FreeBSD.org\n2000/06/19\n????/??/??"] +sheldonh [label="Sheldon Hearn\nsheldonh@FreeBSD.org\n1999/06/14\n2006/05/13"] +shin [label="Yoshinobu Inoue\nshin@FreeBSD.org\n1999/07/29\n2003/03/08"] +tmm [label="Thomas Moestl\ntmm@FreeBSD.org\n2001/03/07\n2006/07/12"] +toshi [label="Toshihiko Arai\ntoshi@FreeBSD.org\n2000/07/06\n????/??/??"] +tshiozak [label="Takuya SHIOZAKI\ntshiozak@FreeBSD.org\n2001/04/25\n2003/03/08"] +uch [label="UCHIYAMA Yasushi\nuch@FreeBSD.org\n2000/06/21\n????/??/??"] + node [color=lightblue2, style=filled, bgcolor=black]; # Current src committers go here. Try to keep things sorted. +akiyama [label="Shunsuke Akiyama\nakiyama@FreeBSD.org\n2000/06/19"] +ambrisko [label="Doug Ambrisko\nambrisko@FreeBSD.org\n2001/12/19"] +andre [label="Andre Oppermann\nandre@FreeBSD.org\n2003/11/12"] anholt [label="Eric Anholt\nanholt@FreeBSD.org\n2002/04/22"] +ariff [label="Ariff Abdullah\nariff@FreeBSD.org\n2005/11/14"] benjsc [label="Benjamin Close\nbenjsc@FreeBSD.org\n2007/02/09"] +benno [label="Benno Rice\nbenno@FreeBSD.org\n2000/11/02"] +bmah [label="Bruce A. Mah\nbmah@FreeBSD.org\n2002/01/29"] +bmilekic [label="Bosko Milekic\nbmilekic@FreeBSD.org\n????/??/??"] bms [label="Bruce M Simpson\nbms@FreeBSD.org\n2003/08/06"] +brueffer [label="Christian Brueffer\nbrueffer@FreeBSD.org\n2006/02/28"] +brooks [label="Brooks Davis\nbrooks@FreeBSD.org\n????/??/??"] +bruno [label="Bruno Ducrot\nbruno@FreeBSD.org\n2005/07/18"] +bz [label="Bjoern A. Zeeb\nbz@FreeBSD.org\n2004/07/27"] cperciva [label="Colin Percival\ncperciva@FreeBSD.org\n2004/01/20"] +csjp [label="Christian S.J. Peron\ncsjp@FreeBSD.org\n2004/05/04"] dds [label="Diomidis Spinellis\ndds@FreeBSD.org\n2003/06/20"] +delphij [label="Xin Li\ndelphij@FreeBSD.org\n2004/09/14"] des [label="Dag-Erling Smorgrav\ndes@FreeBSD.org\n1998/04/03"] +dg [label="David Greenman\ndg@FreeBSD.org\n1993/06/14"] dhartmei [label="Daniel Hartmeier\ndhartmei@FreeBSD.org\n2004/04/06"] +dmlb [label="Duncan Barclay\ndmlb@FreeBSD.org\n2001/12/14"] +dwmalone [label="David Malone\ndwmalone@FreeBSD.org\n2000/07/11"] +emaste [label="Ed Maste\nemaste@FreeBSD.org\n2005/10/04"] +emax [label="Maksim Yevmenkin\nemax@FreeBSD.org\n2003/10/12"] +fanf [label="Tony Finch\nfanf@FreeBSD.org\n2002/05/05"] flz [label="Florent Thoumie\nflz@FreeBSD.org\n2006/03/30"] +gibbs [label="Justin T. Gibbs\ngibbs@FreeBSD.org\n????/??/??"] +gnn [label="George V. Neville-Neil\ngnn@FreeBSD.org\n2004/10/11"] +grehan [label="Peter Grehan\ngrehan@FreeBSD.org\n2002/08/08"] grog [label="Greg Lehey\ngrog@FreeBSD.org\n1998/08/30"] +gshapiro [label="Gregory Shapiro\ngshapiro@FreeBSD.org\n2000/07/12"] +iedowse [label="Ian Dowse\niedowse@FreeBSD.org\n2000/12/01"] +imp [label="Warner Losh\nimp@FreeBSD.org\n1996/09/20"] +jayanth [label="Jayanth Vijayaraghavan\njayanth@FreeBSD.org\n2000/05/08"] jake [label="Jake Burkholder\njake@FreeBSD.org\n2000/05/16"] +jinmei [label="JINMEI Tatuya\njinmei@FreeBSD.org\n2007/03/17"] +jkh [label="Jordan K. Hubbard\njkh@FreeBSD.org\n1993/06/12"] jkim [label="Jung-uk Kim\njkim@FreeBSD.org\n2005/07/06"] -joerg [label="Joerg Wunsch\njoerg@FreeBSD.org\n????/??/??"] +jls [label="Jordan Sissel\njls@FreeBSD.org\n2006/12/06"] +joe [label="Josef Karthauser\njoe@FreeBSD.org\n1999/10/22"] +joerg [label="Joerg Wunsch\njoerg@FreeBSD.org\n1993/11/14"] +jon [label="Jonathan Chen\njon@FreeBSD.org\n2000/10/17"] +kensmith [label="Ken Smith\nkensmith@FreeBSD.org\n2004/01/23"] +kmacy [label="Kip Macy\nkmacy@FreeBSD.org\n2005/06/01"] le [label="Lukas Ertl\nle@FreeBSD.org\n2004/02/02"] +linimon [label="Mark Linimon\nlinimon@FreeBSD.org\n2006/09/30"] +marks [label="Mark Santcroos\nmarks@FreeBSD.org\n2004/03/18"] +matteo [label="Matteo Riondato\nmatteo@FreeBSD.org\n2006/01/18"] +mjacob [label="Matt Jacob\nmjacob@FreeBSD.org\n1997/08/13"] mlaier [label="Max Laier\nmlaier@FreeBSD.org\n2004/02/10"] -obrien [label="David E. O'Brien\nobrien@FreeBSD.org\n????/??/??"] +mr [label="Michael Reifenberger\nmr@FreeBSD.org\n2001/09/30"] +murray [label="Murray Stokely\nmurray@FreeBSD.org\n2000/04/05"] +netchild [label="Alexander Leidinger\nnetchild@FreeBSD.org\n2005/03/31"] +njl [label="Nate Lawson\nnjl@FreeBSD.org\n2002/08/07"] +obrien [label="David E. O'Brien\nobrien@FreeBSD.org\n1996/10/29"] +onoe [label="Atsushi Onoe\nonoe@FreeBSD.org\n2000/07/21"] +peadar [label="Peter Edwards\npeadar@FreeBSD.org\n2004/03/08"] +peter [label="Peter Wemm\npeter@FreeBSD.org\n????/??/??"] +philip [label="Philip Paeps\nphilip@FreBSD.org\n2004/01/21"] +phk [label="Poul-Henning Kamp\nphk@FreeBSD.org\n1994/02/21"] +ps [label="Paul Saab\nps@FreeBSD.org\n2000/02/23"] +qingli [label="Qing Li\nqingli@FreeBSD.org\n2005/04/13"] +rafan [label="Rong-En Fan\nrafan@FreeBSD.org\n2007/01/31"] +remko [label="Remko Lodder\nremko@FreeBSD.org\n2007/02/23"] +rik [label="Roman Kurakin\nrik@FreeBSD.org\n2003/12/18"] +rink [label="Rink Springer\nrink@FreeBSD.org\n2006/01/16"] +rrs [label="Randall R Stewart\nrrs@FreeBSD.org\n2007/02/08"] +rse [label="Ralf S. Engelschall\nrse@FreeBSD.org\n1997/07/31"] +rwatson [label="Robert N. M. Watson\nrwatson@FreeBSD.org\n1999/12/16"] sam [label="Sam Leffler\nsam@FreeBSD.org\n2002/07/02"] +sanpei [label="MIHIRA Sanpei Yoshiro\nsanpei@FreeBSD.org\n2000/06/19"] schweikh [label="Jens Schweikhardt\nschweikh@FreeBSD.org\n2001/04/06"] +sepotvin [label="Stephane E. Potvin\nsepotvin@FreeBSD.org\n2007/02/15"] +shiba [label="Takeshi Shibagaki\nshiba@FreeBSD.org\n2000/06/19"] +simon [label="Simon L. Nielsen\nsimon@FreeBSD.org\n2006/03/07"] +suz [label="SUZUKI Shinsuke\nsuz@FreeBSD.org\n2002/03/26"] +syrinx [label="Shteryana Shopova\nsyrinx@FreeBSD.org\n2006/10/07"] +takawata [label="Takanori Watanabe\ntakawata@FreeBSD.org\n2000/07/06"] thompsa [label="Andrew Thompson\nthompsa@FreeBSD.org\n2005/05/25"] +trhodes [label="Tom Rhodes\ntrhodes@FreeBSD.org\n2002/05/28"] +ume [label="Hajimu UMEMOTO\nume@FreeBSD.org\n2000/02/26"] +wilko [label="Wilko Bulte\nwilko@FreeBSD.org\n2000/01/13"] +wsalamon [label="Wayne Salamon\nwsalamon@FreeBSD.org\n2005/06/25"] + +# Pseudo target representing rev 1.1 of commit.allow +day1 [label="Birth of FreeBSD"] # Here are the mentor/mentee relationships. # Group together all the mentees for a particular mentor. # Keep the list sorted by mentor login. +day1 -> jtc +day1 -> jkh +day1 -> nate +day1 -> rgrimes +day1 -> alm +day1 -> dg + +andre -> qingli + anholt -> jkim -cperciva -> flz +benno -> grehan + +billf -> dougb +billf -> gad +billf -> jedgar +billf -> jhb +billf -> shafeeq + +bmilekic -> csjp bms -> mlaier bms -> dhartmei bms -> thompsa +brooks -> bushman + +bz -> syrinx + +cperciva -> flz +cperciva -> simon + +csjp -> bushman + +delphij -> rafan + des -> anholt +des -> hmp +des -> mike + +eivind -> des +eivind -> rwatson + +dwmalone -> fanf +dwmalone -> peadar + +gnn -> jinmei +gnn -> rrs + +imp -> akiyama +imp -> ambrisko +imp -> bmah +imp -> bruno +imp -> dmlb +imp -> emax +imp -> furuta +imp -> joe +imp -> jon +imp -> keichii +imp -> mb +imp -> mr +imp -> non +imp -> onoe +imp -> remko +imp -> rink +imp -> rik +imp -> sanpei +imp -> shiba +imp -> takawata +imp -> toshi +imp -> uch jake -> bms +jake -> gordon +jake -> harti +jake -> jeff +jake -> kmacy +jake -> robert +jake -> yongari + +jhb -> arr +jhb -> jeff +jhb -> kbyanc + +jkh -> imp +jkh -> jlemon +jkh -> joerg +jkh -> phk + +jlemon -> bmilekic joerg -> le +joerg -> netchild + +gibbs -> mjacob +gibbs -> njl grog -> le +mdodd -> jake + mlaier -> benjsc mlaier -> dhartmei mlaier -> thompsa +msmith -> scottl + +murray -> delphij + +netchild -> ariff + +njl -> marks +njl -> philip +njl -> sepotvin + +obrien -> benno +obrien -> groudier +obrien -> gshapiro +obrien -> kan obrien -> sam +peter -> jayanth +peter -> ps +peter -> asmodai + +philip -> jls +philip -> matteo + +rwatson -> adrian +rwatson -> bmah +rwatson -> brueffer +rwatson -> bz +rwatson -> cperciva +rwatson -> emaste +rwatson -> gnn +rwatson -> kensmith +rwatson -> kmacy >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Apr 1 18:16:13 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DBA3916A408; Sun, 1 Apr 2007 18:16:12 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 9B21616A401 for ; Sun, 1 Apr 2007 18:16:12 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 752C913C45B for ; Sun, 1 Apr 2007 18:16:12 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l31IGCfn076051 for ; Sun, 1 Apr 2007 18:16:12 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l31IGCml076048 for perforce@freebsd.org; Sun, 1 Apr 2007 18:16:12 GMT (envelope-from kmacy@freebsd.org) Date: Sun, 1 Apr 2007 18:16:12 GMT Message-Id: <200704011816.l31IGCml076048@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 117115 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 01 Apr 2007 18:16:13 -0000 http://perforce.freebsd.org/chv.cgi?CH=117115 Change 117115 by kmacy@kmacy_vt-x:opentoe_init on 2007/04/01 18:15:41 fix ithread scheduling to be curcpu Affected files ... .. //depot/projects/opentoe/sys/kern/sched_ule.c#2 edit Differences ... ==== //depot/projects/opentoe/sys/kern/sched_ule.c#2 (text+ko) ==== @@ -1859,8 +1859,7 @@ CTR2(KTR_ULE, "ithd %d < %d", td->td_priority, PRI_MAX_ITHD); ts->ts_cpu = cpuid; - } - if (pick_pri) + } else if (pick_pri) ts->ts_cpu = tdq_pickpri(tdq, ts, flags); else ts->ts_cpu = tdq_pickidle(tdq, ts); From owner-p4-projects@FreeBSD.ORG Sun Apr 1 20:12:43 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 888B816A40F; Sun, 1 Apr 2007 20:12:43 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 12ECB16A403 for ; Sun, 1 Apr 2007 20:12:43 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id EC34D13C4C9 for ; Sun, 1 Apr 2007 20:12:42 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l31KCgFU096877 for ; Sun, 1 Apr 2007 20:12:42 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l31KCgMg096871 for perforce@freebsd.org; Sun, 1 Apr 2007 20:12:42 GMT (envelope-from kmacy@freebsd.org) Date: Sun, 1 Apr 2007 20:12:42 GMT Message-Id: <200704012012.l31KCgMg096871@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 117121 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 01 Apr 2007 20:12:43 -0000 http://perforce.freebsd.org/chv.cgi?CH=117121 Change 117121 by kmacy@kmacy_vt-x:opentoe_init on 2007/04/01 20:11:47 fix mb_ctor_clust to actually reference the correct zone for a cluster eliminate duplicate calls to uma_find_refcnt cleanup the INVARIANT checks in mb_dtor_clust add m_cljset to attach a cluster to a deferred mbuf add m_getzone to eliminate duplicated zone lookup code for clusters add mbuf_iovec for using pktdat for cache-friendly scatter-gather of clusters Affected files ... .. //depot/projects/opentoe/sys/kern/kern_mbuf.c#3 edit .. //depot/projects/opentoe/sys/sys/mbuf.h#3 edit Differences ... ==== //depot/projects/opentoe/sys/kern/kern_mbuf.c#3 (text+ko) ==== @@ -423,7 +423,11 @@ default: panic("unknown cluster size"); break; - } + } + + refcnt = uma_find_refcnt(zone, mem); + *refcnt = 1; + m = (struct mbuf *)arg; if (m != NULL) { m->m_ext.ext_buf = (caddr_t)mem; @@ -433,12 +437,9 @@ m->m_ext.ext_args = NULL; m->m_ext.ext_size = size; m->m_ext.ext_type = type; - m->m_ext.ref_cnt = uma_find_refcnt(zone, mem); - *m->m_ext.ref_cnt = 1; - } else { - refcnt = uma_find_refcnt(zone, mem); - *refcnt = 1; + m->m_ext.ref_cnt = refcnt; } + return (0); } @@ -448,11 +449,13 @@ static void mb_dtor_clust(void *mem, int size, void *arg) { +#ifdef INVARIANTS + uma_zone_t zone = m_getzone(size); - KASSERT(*(uma_find_refcnt(zone_clust, mem)) <= 1, + KASSERT(*(uma_find_refcnt(zone, mem)) <= 1, ("%s: refcnt incorrect %u", __func__, - *(uma_find_refcnt(zone_clust, mem))) ); -#ifdef INVARIANTS + *(uma_find_refcnt(zone, mem))) ); + trash_dtor(mem, size, arg); #endif } ==== //depot/projects/opentoe/sys/sys/mbuf.h#3 (text+ko) ==== @@ -185,6 +185,8 @@ #define M_LASTFRAG 0x2000 /* packet is last fragment */ #define M_VLANTAG 0x10000 /* ether_vtag is valid */ #define M_PROMISC 0x20000 /* packet was not for us */ +#define M_IOVEC 0x40000 /* mbuf immediate data area is used to reference clusters */ +#define M_LRO 0x80000 /* large receive offload in use for packet */ /* * External buffer types: identify ext_buf type. @@ -275,6 +277,21 @@ }; /* + * m_pktdat == 200 bytes on 64-bit arches, need to stay below that + * + */ +#define MAX_MBUF_IOV 12 +struct mbuf_iovec { + uint16_t mi_first; /* first valid cluster */ + uint16_t mi_count; /* number of valid clusters */ + uint16_t mi_flags[MAX_MBUF_IOV]; /* per-cluster flags */ + uint16_t mi_offsets[MAX_MBUF_IOV];/* data offsets of clusters */ + uint16_t mi_lens[MAX_MBUF_IOV]; /* length of clusters */ + uint32_t pad; /* 8-byte align mi_bases */ + caddr_t mi_bases[MAX_MBUF_IOV]; /* pointers to clusters */ +}; + +/* * Flags specifying how an allocation should be made. * * The flag to use is as follows: @@ -392,6 +409,33 @@ return ((struct mbuf *)(uma_zalloc_arg(zone_pack, &args, how))); } +static __inline uma_zone_t +m_getzone(int size) +{ + uma_zone_t zone; + + switch (size) { + case MCLBYTES: + zone = zone_clust; + break; +#if MJUMPAGESIZE != MCLBYTES + case MJUMPAGESIZE: + zone = zone_jumbop; + break; +#endif + case MJUM9BYTES: + zone = zone_jumbo9; + break; + case MJUM16BYTES: + zone = zone_jumbo16; + break; + default: + panic("%s: m_getjcl: invalid cluster type", __func__); + } + + return (zone); +} + /* * m_getjcl() returns an mbuf with a cluster of the specified size attached. * For size it takes MCLBYTES, MJUMPAGESIZE, MJUM9BYTES, MJUM16BYTES. @@ -412,24 +456,7 @@ if (m == NULL) return (NULL); - switch (size) { - case MCLBYTES: - zone = zone_clust; - break; -#if MJUMPAGESIZE != MCLBYTES - case MJUMPAGESIZE: - zone = zone_jumbop; - break; -#endif - case MJUM9BYTES: - zone = zone_jumbo9; - break; - case MJUM16BYTES: - zone = zone_jumbo16; - break; - default: - panic("%s: m_getjcl: invalid cluster type", __func__); - } + zone = m_getzone(size); n = uma_zalloc_arg(zone, m, how); if (n == NULL) { uma_zfree(zone_mbuf, m); @@ -468,6 +495,7 @@ } } + /* * m_cljget() is different from m_clget() as it can allocate clusters without * attaching them to an mbuf. In that case the return value is the pointer @@ -478,35 +506,55 @@ static __inline void * m_cljget(struct mbuf *m, int how, int size) { - uma_zone_t zone; - + uma_zone_t zone = m_getzone(size); + if (m && m->m_flags & M_EXT) printf("%s: %p mbuf already has cluster\n", __func__, m); if (m != NULL) m->m_ext.ext_buf = NULL; + return (uma_zalloc_arg(zone, m, how)); +} + +static __inline void +m_cljset(struct mbuf *m, void *cl, int size) +{ + uma_zone_t zone; + int type; + switch (size) { case MCLBYTES: + type = EXT_CLUSTER; zone = zone_clust; break; #if MJUMPAGESIZE != MCLBYTES case MJUMPAGESIZE: + type = EXT_JUMBOP; zone = zone_jumbop; break; #endif case MJUM9BYTES: + type = EXT_JUMBO9; zone = zone_jumbo9; break; case MJUM16BYTES: + type = EXT_JUMBO16; zone = zone_jumbo16; break; default: - panic("%s: m_getjcl: invalid cluster type", __func__); + panic("unknown cluster size"); + break; } - return (uma_zalloc_arg(zone, m, how)); + m->m_data = m->m_ext.ext_buf = cl; + m->m_ext.ext_free = m->m_ext.ext_args = NULL; + m->m_ext.ext_size = size; + m->m_ext.ext_type = type; + m->m_ext.ref_cnt = uma_find_refcnt(zone, cl); + m->m_flags |= M_EXT; + } - + static __inline void m_chtype(struct mbuf *m, short new_type) { From owner-p4-projects@FreeBSD.ORG Sun Apr 1 20:20:55 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E432316A404; Sun, 1 Apr 2007 20:20:54 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 7862716A40B for ; Sun, 1 Apr 2007 20:20:54 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 5D13A13C4C1 for ; Sun, 1 Apr 2007 20:20:54 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l31KKstv097743 for ; Sun, 1 Apr 2007 20:20:54 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l31KKr0O097740 for perforce@freebsd.org; Sun, 1 Apr 2007 20:20:53 GMT (envelope-from kmacy@freebsd.org) Date: Sun, 1 Apr 2007 20:20:53 GMT Message-Id: <200704012020.l31KKr0O097740@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 117123 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 01 Apr 2007 20:20:55 -0000 http://perforce.freebsd.org/chv.cgi?CH=117123 Change 117123 by kmacy@kmacy_vt-x:opentoe_init on 2007/04/01 20:20:02 add entry busdma tag to each each queue to allow mappings to be created in parallel track zone and type for rx freelist for simplifying later free convert rx freelists over to only using clusters, allocating the mbuf right before the call to get_packet This change alleviates a good portion of the recent (last 2 weeks) 18% performance drop in peak TCP throughput Affected files ... .. //depot/projects/opentoe/sys/dev/cxgb/cxgb_adapter.h#4 edit .. //depot/projects/opentoe/sys/dev/cxgb/cxgb_sge.c#3 edit Differences ... ==== //depot/projects/opentoe/sys/dev/cxgb/cxgb_adapter.h#4 (text+ko) ==== @@ -175,7 +175,9 @@ uint64_t empty; bus_dma_tag_t desc_tag; bus_dmamap_t desc_map; - struct mtx fl_locks[8]; + bus_dma_tag_t entry_tag; + uma_zone_t zone; + int type; }; struct tx_desc; @@ -201,6 +203,7 @@ uint64_t restarts; bus_dma_tag_t desc_tag; bus_dmamap_t desc_map; + bus_dma_tag_t entry_tag; struct mtx lock; }; ==== //depot/projects/opentoe/sys/dev/cxgb/cxgb_sge.c#3 (text+ko) ==== @@ -126,7 +126,7 @@ }; struct rx_sw_desc { /* SW state per Rx descriptor */ - struct mbuf *m; + void *cl; bus_dmamap_t map; int flags; }; @@ -137,6 +137,12 @@ unsigned int pidx; }; +struct refill_fl_cb_arg { + int error; + bus_dma_segment_t seg; + int nseg; +}; + /* * Maps a number of flits to the number of Tx descriptors that can hold them. * The formula is @@ -440,6 +446,16 @@ qs->rspq.polling = 0 /* p->polling */; } +static void +refill_fl_cb(void *arg, bus_dma_segment_t *segs, int nseg, int error) +{ + struct refill_fl_cb_arg *cb_arg = arg; + + cb_arg->error = error; + cb_arg->seg = segs[0]; + cb_arg->nseg = nseg; + +} /** * refill_fl - refill an SGE free-buffer list @@ -453,41 +469,50 @@ static void refill_fl(adapter_t *sc, struct sge_fl *q, int n) { - bus_dma_segment_t seg; struct rx_sw_desc *sd = &q->sdesc[q->pidx]; struct rx_desc *d = &q->desc[q->pidx]; - struct mbuf *m; - int err, nsegs; + void *cl; + int err; + struct refill_fl_cb_arg cb_arg; + cb_arg.error = 0; + while (n--) { - m = m_getjcl(M_DONTWAIT, MT_DATA, M_PKTHDR, q->buf_size); + /* + * We only allocate a cluster, mbuf allocation happens after rx + */ + cl = m_cljget(NULL, M_DONTWAIT, q->buf_size); - if (m == NULL) { - log(LOG_WARNING, "Failed to allocate mbuf\n"); + if (cl == NULL) { + log(LOG_WARNING, "Failed to allocate cluster\n"); goto done; } if ((sd->flags & RX_SW_DESC_MAP_CREATED) == 0) { - if ((err = bus_dmamap_create(sc->rx_jumbo_dmat, 0, &sd->map))) { + if ((err = bus_dmamap_create(q->entry_tag, 0, &sd->map))) { log(LOG_WARNING, "bus_dmamap_create failed %d\n", err); + /* + * XXX free cluster + */ goto done; } sd->flags |= RX_SW_DESC_MAP_CREATED; } - sd->flags |= RX_SW_DESC_INUSE; - m->m_pkthdr.len = m->m_len = q->buf_size; - err = bus_dmamap_load_mbuf_sg(sc->rx_jumbo_dmat, sd->map, m, &seg, - &nsegs, BUS_DMA_NOWAIT); - if (err != 0) { - log(LOG_WARNING, "failure in refill_fl %d\n", err); - m_freem(m); + err = bus_dmamap_load(q->entry_tag, sd->map, cl, q->buf_size, refill_fl_cb, &cb_arg, 0); + + if (err || cb_arg.error) { + log(LOG_WARNING, "failure in refill_fl %d\n", cb_arg.error); + /* + * XXX free cluster + */ return; } - sd->m = m; - d->addr_lo = htobe32(seg.ds_addr & 0xffffffff); - d->addr_hi = htobe32(((uint64_t)seg.ds_addr >>32) & 0xffffffff); + sd->flags |= RX_SW_DESC_INUSE; + sd->cl = cl; + d->addr_lo = htobe32(cb_arg.seg.ds_addr & 0xffffffff); + d->addr_hi = htobe32(((uint64_t)cb_arg.seg.ds_addr >>32) & 0xffffffff); d->len_gen = htobe32(V_FLD_GEN1(q->gen)); d->gen2 = htobe32(V_FLD_GEN2(q->gen)); @@ -520,16 +545,17 @@ free_rx_bufs(adapter_t *sc, struct sge_fl *q) { u_int cidx = q->cidx; - + while (q->credits--) { struct rx_sw_desc *d = &q->sdesc[cidx]; if (d->flags & RX_SW_DESC_INUSE) { - bus_dmamap_unload(sc->rx_jumbo_dmat, d->map); - bus_dmamap_destroy(sc->rx_jumbo_dmat, d->map); - m_freem(d->m); + bus_dmamap_unload(q->entry_tag, d->map); + bus_dmamap_destroy(q->entry_tag, d->map); + uma_zfree(q->zone, d->cl); } - d->m = NULL; + + d->cl = NULL; if (++cidx == q->size) cidx = 0; } @@ -552,8 +578,8 @@ static int alloc_ring(adapter_t *sc, size_t nelem, size_t elem_size, size_t sw_size, - bus_addr_t *phys, void *desc, void *sdesc, bus_dma_tag_t *tag, - bus_dmamap_t *map) + bus_addr_t *phys, void *desc, void *sdesc, bus_dma_tag_t *tag, + bus_dmamap_t *map, bus_dma_tag_t parent_entry_tag, bus_dma_tag_t *entry_tag) { size_t len = nelem * elem_size; void *s = NULL; @@ -584,6 +610,19 @@ bzero(s, len); *(void **)sdesc = s; } + + if (parent_entry_tag == NULL) + return (0); + + if ((err = bus_dma_tag_create(parent_entry_tag, PAGE_SIZE, 0, + BUS_SPACE_MAXADDR, BUS_SPACE_MAXADDR, + NULL, NULL, PAGE_SIZE, 1, + PAGE_SIZE, BUS_DMA_ALLOCNOW, + NULL, NULL, entry_tag)) != 0) { + device_printf(sc->dev, "Cannot allocate descriptor entry tag\n"); + return (ENOMEM); + } + return (0); } @@ -1361,23 +1400,26 @@ if ((ret = alloc_ring(sc, p->fl_size, sizeof(struct rx_desc), sizeof(struct rx_sw_desc), &q->fl[0].phys_addr, - &q->fl[0].desc, &q->fl[0].sdesc, - &q->fl[0].desc_tag, &q->fl[0].desc_map)) != 0) { + &q->fl[0].desc, &q->fl[0].sdesc, + &q->fl[0].desc_tag, &q->fl[0].desc_map, + sc->rx_dmat, &q->fl[0].entry_tag)) != 0) { printf("error %d from alloc ring fl0\n", ret); goto err; } if ((ret = alloc_ring(sc, p->jumbo_size, sizeof(struct rx_desc), sizeof(struct rx_sw_desc), &q->fl[1].phys_addr, - &q->fl[1].desc, &q->fl[1].sdesc, - &q->fl[1].desc_tag, &q->fl[1].desc_map)) != 0) { + &q->fl[1].desc, &q->fl[1].sdesc, + &q->fl[1].desc_tag, &q->fl[1].desc_map, + sc->rx_jumbo_dmat, &q->fl[1].entry_tag)) != 0) { printf("error %d from alloc ring fl1\n", ret); goto err; } if ((ret = alloc_ring(sc, p->rspq_size, sizeof(struct rsp_desc), 0, - &q->rspq.phys_addr, &q->rspq.desc, NULL, - &q->rspq.desc_tag, &q->rspq.desc_map)) != 0) { + &q->rspq.phys_addr, &q->rspq.desc, NULL, + &q->rspq.desc_tag, &q->rspq.desc_map, + NULL, NULL)) != 0) { printf("error %d from alloc ring rspq\n", ret); goto err; } @@ -1393,8 +1435,8 @@ if ((ret = alloc_ring(sc, p->txq_size[i], sizeof(struct tx_desc), sz, &q->txq[i].phys_addr, &q->txq[i].desc, - &q->txq[i].sdesc, &q->txq[i].desc_tag, - &q->txq[i].desc_map)) != 0) { + &q->txq[i].sdesc, &q->txq[i].desc_tag, &q->txq[i].desc_map, + sc->tx_dmat, &q->txq[i].entry_tag)) != 0) { printf("error %d from alloc ring tx %i\n", ret, i); goto err; } @@ -1416,7 +1458,13 @@ flits_to_desc(sgl_len(TX_MAX_SEGS + 1) + 3); q->fl[0].buf_size = MCLBYTES; + q->fl[0].zone = zone_clust; + q->fl[0].type = EXT_CLUSTER; + q->fl[1].buf_size = MJUMPAGESIZE; + q->fl[1].zone = zone_jumbop; + q->fl[1].type = EXT_JUMBOP; + q->lro.enabled = lro_default; mtx_lock(&sc->sge.reg_lock); @@ -1614,8 +1662,8 @@ DPRINTF("cidx=%d d=%p\n", cidx, d); if (d->m) { if (d->flags & TX_SW_DESC_MAPPED) { - bus_dmamap_unload(sc->tx_dmat, d->map); - bus_dmamap_destroy(sc->tx_dmat, d->map); + bus_dmamap_unload(q->entry_tag, d->map); + bus_dmamap_destroy(q->entry_tag, d->map); d->flags &= ~TX_SW_DESC_MAPPED; } m_vec[nbufs] = d->m; @@ -1742,12 +1790,14 @@ * threshold and the packet is too big to copy, or (b) the packet should * be copied but there is no memory for the copy. */ + +#include +#include static int get_packet(adapter_t *adap, unsigned int drop_thres, struct sge_qset *qs, - struct t3_mbuf_hdr *mh, struct rsp_desc *r) + struct t3_mbuf_hdr *mh, struct rsp_desc *r, struct mbuf *m) { - struct mbuf *m = NULL; unsigned int len_cq = ntohl(r->len_cq); struct sge_fl *fl = (len_cq & F_RSPD_FLQ) ? &qs->fl[1] : &qs->fl[0]; struct rx_sw_desc *sd = &fl->sdesc[fl->cidx]; @@ -1756,12 +1806,13 @@ uint8_t sopeop = G_RSPD_SOP_EOP(flags); int ret = 0; - prefetch(sd->m->m_data); + prefetch(sd->cl); fl->credits--; - bus_dmamap_sync(adap->rx_jumbo_dmat, sd->map, BUS_DMASYNC_POSTREAD); - bus_dmamap_unload(adap->rx_jumbo_dmat, sd->map); - m = sd->m; + bus_dmamap_sync(fl->entry_tag, sd->map, BUS_DMASYNC_POSTREAD); + bus_dmamap_unload(fl->entry_tag, sd->map); + + m_cljset(m, sd->cl, fl->buf_size); m->m_len = len; switch(sopeop) { @@ -1941,9 +1992,14 @@ rspq->imm_data++; } else if (r->len_cq) { int drop_thresh = eth ? SGE_RX_DROP_THRES : 0; - + struct mbuf *m = m_gethdr(M_NOWAIT, MT_DATA); + + if (m == NULL) { + log(LOG_WARNING, "failed to get mbuf for packet\n"); + break; + } ethpad = 2; - eop = get_packet(adap, drop_thresh, qs, &rspq->mh, r); + eop = get_packet(adap, drop_thresh, qs, &rspq->mh, r, m); } else { DPRINTF("pure response\n"); rspq->pure_rsps++; @@ -2044,7 +2100,6 @@ adapter_t *adap = data; struct sge_rspq *q0 = &adap->sge.qs[0].rspq; struct sge_rspq *q1 = &adap->sge.qs[1].rspq; - t3_write_reg(adap, A_PL_CLI, 0); map = t3_read_reg(adap, A_SG_DATA_INTR); From owner-p4-projects@FreeBSD.ORG Sun Apr 1 21:21:50 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1A85516A409; Sun, 1 Apr 2007 21:21:50 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id E02AC16A407 for ; Sun, 1 Apr 2007 21:21:49 +0000 (UTC) (envelope-from andre@freebsd.org) Received: from c00l3r.networx.ch (c00l3r.networx.ch [62.48.2.2]) by mx1.freebsd.org (Postfix) with ESMTP id 5297613C459 for ; Sun, 1 Apr 2007 21:21:49 +0000 (UTC) (envelope-from andre@freebsd.org) Received: (qmail 3971 invoked from network); 1 Apr 2007 20:22:00 -0000 Received: from c00l3r.networx.ch (HELO [127.0.0.1]) ([62.48.2.2]) (envelope-sender ) by c00l3r.networx.ch (qmail-ldap-1.03) with SMTP for ; 1 Apr 2007 20:22:00 -0000 Message-ID: <46101C26.5030306@freebsd.org> Date: Sun, 01 Apr 2007 22:55:02 +0200 From: Andre Oppermann User-Agent: Thunderbird 1.5.0.10 (Windows/20070221) MIME-Version: 1.0 To: Kip Macy References: <200704012020.l31KKr0O097740@repoman.freebsd.org> In-Reply-To: <200704012020.l31KKr0O097740@repoman.freebsd.org> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Cc: Perforce Change Reviews Subject: Re: PERFORCE change 117123 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 01 Apr 2007 21:21:50 -0000 Kip Macy wrote: > http://perforce.freebsd.org/chv.cgi?CH=117123 > > Change 117123 by kmacy@kmacy_vt-x:opentoe_init on 2007/04/01 20:20:02 > > add entry busdma tag to each each queue to allow mappings to be created in parallel > track zone and type for rx freelist for simplifying later free > convert rx freelists over to only using clusters, allocating the mbuf right before the > call to get_packet Thanks for using it. This was the idea behind providing this interface. From a cache busting point of view attaching the mbuf after the cluster has been filled is very good. The Sandvine guys found that out a long time ago and it indeed makes a lot of sense. When allocating whole clusters the mbuf gets touched twice, once at allocation and once when the driver fills in the information from the RX ring. This way it only gets touched in the latter case and the former cache pollution is skipped over. > This change alleviates a good portion of the recent (last 2 weeks) 18% performance drop > in peak TCP throughput Can you attribute any specific change to the drop in performance? -- Andre From owner-p4-projects@FreeBSD.ORG Sun Apr 1 21:31:49 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F011316A407; Sun, 1 Apr 2007 21:31:48 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 9DE9516A406 for ; Sun, 1 Apr 2007 21:31:48 +0000 (UTC) (envelope-from kip.macy@gmail.com) Received: from wx-out-0506.google.com (wx-out-0506.google.com [66.249.82.228]) by mx1.freebsd.org (Postfix) with ESMTP id 4A9BC13C455 for ; Sun, 1 Apr 2007 21:31:48 +0000 (UTC) (envelope-from kip.macy@gmail.com) Received: by wx-out-0506.google.com with SMTP id s18so993667wxc for ; Sun, 01 Apr 2007 14:31:47 -0700 (PDT) DKIM-Signature: a=rsa-sha1; c=relaxed/relaxed; d=gmail.com; s=beta; h=domainkey-signature:received:received:message-id:date:from:to:subject:cc:in-reply-to:mime-version:content-type:content-transfer-encoding:content-disposition:references; b=DOaI/wfjxqjtRBFr0ZWyx0UbSUskRGhLD08Q+20jUT3EEzFg2uR5k2omC8SEK6xRNbOD1WitrpBocCRJX3eObgNhuQemidKMUvOufS4CI8wdwfMnZRwa9UC9WrGIvHwBgOQK9VbO3Y28LSrmoniAXQwnqXAd5eI/FFISVtW3cDw= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=beta; h=received:message-id:date:from:to:subject:cc:in-reply-to:mime-version:content-type:content-transfer-encoding:content-disposition:references; b=osafUiRsmPkuYieVRWCSzwEsmB0DTvysZCRlwUofmfFToAP3RVApFKJIVQYzlFJOPlGgscRwj6UwRt0n48m//VO/+w9OiAI9j0ujSWVhR3gfKP6A922n4+nGh7ye3+VpztfGt6tJcDsHjF5UrdhUTcqMlfhwJIqbhcoldXXKMqM= Received: by 10.90.106.11 with SMTP id e11mr2762800agc.1175461349416; Sun, 01 Apr 2007 14:02:29 -0700 (PDT) Received: by 10.90.116.6 with HTTP; Sun, 1 Apr 2007 14:02:29 -0700 (PDT) Message-ID: Date: Sun, 1 Apr 2007 14:02:29 -0700 From: "Kip Macy" To: "Andre Oppermann" In-Reply-To: <46101C26.5030306@freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Content-Disposition: inline References: <200704012020.l31KKr0O097740@repoman.freebsd.org> <46101C26.5030306@freebsd.org> Cc: Perforce Change Reviews , Kip Macy Subject: Re: PERFORCE change 117123 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 01 Apr 2007 21:31:49 -0000 > Thanks for using it. This was the idea behind providing this interface. > From a cache busting point of view attaching the mbuf after the cluster > has been filled is very good. The Sandvine guys found that out a long > time ago and it indeed makes a lot of sense. When allocating whole > clusters the mbuf gets touched twice, once at allocation and once when > the driver fills in the information from the RX ring. This way it only > gets touched in the latter case and the former cache pollution is skipped > over. Yup. This is actually only the initial part of what I'm working on. I was expecting < 3% improvement. However, the before and after numbers look more like: before: chaos# netperf -H 10.0.0.150 -tTCP_SENDFILE -F /var/tmp/bigfile -Cc -P0 -l 5 65536 32768 32768 5.00 7682.06 25.36 36.07 1.082 1.539 65536 32768 32768 5.00 7713.27 24.55 36.97 1.043 1.571 65536 32768 32768 5.00 7755.67 26.25 40.62 1.109 1.716 65536 32768 32768 5.00 7593.98 21.03 34.79 0.908 1.501 after: chaos# netperf -H 10.0.0.150 -tTCP_SENDFILE -F /var/tmp/bigfile -Cc -P0 -l 5 65536 32768 32768 5.00 8109.80 33.65 33.22 1.360 1.342 65536 32768 32768 5.00 8649.49 32.89 45.29 1.246 1.716 65536 32768 32768 5.00 8211.80 26.35 34.70 1.051 1.385 65536 32768 32768 5.00 8538.48 29.55 44.05 1.134 1.691 A couple of weeks ago I was getting 8.8 - 9.6 Gbps > > > This change alleviates a good portion of the recent (last 2 weeks) 18% performance drop > > in peak TCP throughput > > Can you attribute any specific change to the drop in performance? Unfortunately, I haven't tracked HEAD the last 2 weeks or so. -Kip From owner-p4-projects@FreeBSD.ORG Sun Apr 1 21:52:18 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E6DA416A401; Sun, 1 Apr 2007 21:52:17 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 847D916A405 for ; Sun, 1 Apr 2007 21:52:17 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 75FC613C44B for ; Sun, 1 Apr 2007 21:52:17 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l31LqHlb022638 for ; Sun, 1 Apr 2007 21:52:17 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l31LqHuB022635 for perforce@freebsd.org; Sun, 1 Apr 2007 21:52:17 GMT (envelope-from marcel@freebsd.org) Date: Sun, 1 Apr 2007 21:52:17 GMT Message-Id: <200704012152.l31LqHuB022635@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Cc: Subject: PERFORCE change 117140 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 01 Apr 2007 21:52:18 -0000 http://perforce.freebsd.org/chv.cgi?CH=117140 Change 117140 by marcel@marcel_xcllnt on 2007/04/01 21:52:12 Create PCPU structures for all CPUs. Reduce dependency on MAXCPU by allocating PCPU structures on demand. Affected files ... .. //depot/projects/powerpc/sys/powerpc/include/pcpu.h#6 edit .. //depot/projects/powerpc/sys/powerpc/powerpc/machdep.c#8 edit .. //depot/projects/powerpc/sys/powerpc/powerpc/mp_machdep.c#9 edit .. //depot/projects/powerpc/sys/powerpc/powerpc/ofw_machdep.c#7 edit Differences ... ==== //depot/projects/powerpc/sys/powerpc/include/pcpu.h#6 (text+ko) ==== @@ -40,6 +40,7 @@ int pc_inside_intr; \ struct pmap *pc_curpmap; /* current pmap */ \ struct thread *pc_fputhread; /* current fpu user */ \ + int pc_bsp:1; \ int pc_awake:1; \ register_t pc_tempsave[CPUSAVE_LEN]; \ register_t pc_disisave[CPUSAVE_LEN]; \ ==== //depot/projects/powerpc/sys/powerpc/powerpc/machdep.c#8 (text+ko) ==== @@ -127,8 +127,8 @@ int cold = 1; -struct pcpu __pcpu[MAXCPU]; -struct trapframe frame0; +static struct pcpu pcpu0; +static struct trapframe frame0; vm_offset_t kstack0; vm_offset_t kstack0_phys; @@ -290,7 +290,7 @@ /* * Set up per-cpu data. */ - pc = &__pcpu[0]; + pc = &pcpu0; pcpu_init(pc, 0, sizeof(struct pcpu)); pc->pc_curthread = &thread0; pc->pc_curpcb = thread0.td_pcb; ==== //depot/projects/powerpc/sys/powerpc/powerpc/mp_machdep.c#9 (text+ko) ==== @@ -37,6 +37,8 @@ #include +MALLOC_DEFINE(M_SMP, "smp", "SMP specific datastructures"); + volatile static int ap_awake; volatile static int ap_spin; @@ -45,9 +47,9 @@ void cpu_mp_setmaxid(void) { + char buf[8]; phandle_t dev, root; int res; - char buf[8]; mp_ncpus = 0; @@ -93,6 +95,57 @@ void cpu_mp_start(void) { + char buf[8]; + struct pcpu *pc; + ihandle_t inst; + phandle_t bsp, chosen, dev, root; + int cpuid, res; + + /* Get the p-handle of the BSP. */ + chosen = OF_finddevice("/chosen"); + if (chosen != -1) { + res = OF_getprop(chosen, "cpu", &inst, sizeof(inst)); + bsp = (res > 0) ? OF_instance_to_package(inst) : -1; + } else + bsp = -1; + + root = OF_peer(0); + dev = OF_child(root); + while (dev != 0) { + res = OF_getprop(dev, "name", buf, sizeof(buf)); + if (res > 0 && !strcmp(buf, "cpus")) + break; + dev = OF_peer(dev); + } + KASSERT(dev != 0, ("%s: dev == 0", __func__)); + for (dev = OF_child(dev); dev != 0; dev = OF_peer(dev)) { + res = OF_getprop(dev, "device_type", buf, sizeof(buf)); + if (res < 0 || strcmp(buf, "cpu") != 0) + continue; + res = OF_getprop(dev, "reg", &cpuid, sizeof(cpuid)); + if (res < 0) + continue; + cpuid &= 0xff; + if (cpuid >= MAXCPU) { + printf("SMP: cpu%d: skipped -- ID out of range\n", + cpuid); + continue; + } + if (all_cpus & (1 << cpuid)) { + printf("SMP: cpu%d: skipped - duplicate ID\n", cpuid); + continue; + } + if (dev != bsp) { + pc = (struct pcpu *)malloc(sizeof(*pc), M_SMP, + M_WAITOK); + pcpu_init(pc, cpuid, sizeof(*pc)); + } else { + KASSERT(cpuid == 0, ("%s: cpuid != 0", __func__)); + pc = pcpup; + pc->pc_bsp = 1; + } + all_cpus |= 1 << cpuid; + } } void @@ -106,7 +159,7 @@ if (pc == NULL) continue; printf("cpu%d", i); - if (i == 0) + if (pc->pc_bsp) printf(" (BSP)"); printf("\n"); } @@ -152,6 +205,9 @@ static void ipi_send(struct pcpu *pc, int ipi) { + /* + * + */ } /* Send an IPI to a set of cpus. */ ==== //depot/projects/powerpc/sys/powerpc/powerpc/ofw_machdep.c#7 (text+ko) ==== @@ -63,7 +63,6 @@ static struct mem_region OFfree[OFMEM_REGIONS + 3]; extern register_t ofmsr[5]; -extern struct pcpu __pcpu[MAXCPU]; extern struct pmap ofw_pmap; static int (*ofwcall)(void *); From owner-p4-projects@FreeBSD.ORG Mon Apr 2 01:01:22 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3470F16A405; Mon, 2 Apr 2007 01:01:22 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 03AC916A402 for ; Mon, 2 Apr 2007 01:01:22 +0000 (UTC) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id E83B013C448 for ; Mon, 2 Apr 2007 01:01:21 +0000 (UTC) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l3211Lcc073468 for ; Mon, 2 Apr 2007 01:01:21 GMT (envelope-from mjacob@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l3211LZ6073461 for perforce@freebsd.org; Mon, 2 Apr 2007 01:01:21 GMT (envelope-from mjacob@freebsd.org) Date: Mon, 2 Apr 2007 01:01:21 GMT Message-Id: <200704020101.l3211LZ6073461@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 117150 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 02 Apr 2007 01:01:22 -0000 http://perforce.freebsd.org/chv.cgi?CH=117150 Change 117150 by mjacob@mjexp on 2007/04/02 01:00:59 Temporarily desupport simultaneous target and initiator mode. When the linux port changes were imported which split the target command list to be separate from the initiator command list and the handle format changed to encode a type in the handle the implications to the function isp_handle_index (which only the NetBSD/OpenBSD/FreeBSD ports use) were overlooked. The fault is twofold: first, the index into the DMA maps in isp_pci is wrong because a target command handle with the type bit left in place caused a bad index (and panic) into dma map. Secondly, the assumption of the array of DMA maps in either PCS or SBUS attachment structures is that there is a linear mapping between handle index and DMA map index. This can no longer be true if there are overlapping index spaces for initiator mode and target mode commands. These changes bandaid around the problem by forcing us to not have simultaneous dual roles and doing the appropriate masking to make sure things are indexed correctly. A longer term fix is being devloped. Affected files ... .. //depot/projects/mjexp/sys/conf/NOTES#15 edit .. //depot/projects/mjexp/sys/dev/isp/isp_freebsd.c#14 edit .. //depot/projects/mjexp/sys/dev/isp/isp_freebsd.h#10 edit .. //depot/projects/mjexp/sys/dev/isp/isp_library.c#6 edit .. //depot/projects/mjexp/sys/dev/isp/isp_library.h#6 edit .. //depot/projects/mjexp/sys/dev/isp/isp_pci.c#20 edit .. //depot/projects/mjexp/sys/dev/isp/isp_sbus.c#9 edit Differences ... ==== //depot/projects/mjexp/sys/conf/NOTES#15 (text+ko) ==== @@ -1521,9 +1521,13 @@ # options ISP_TARGET_MODE=1 # -# ISP_DEFAULT_ROLES - default role (none, target, init, both) +# ISP_DEFAULT_ROLES - default role +# none=0 +# target=1 +# initiator=2 +# both=3 (not supported currently) # -options ISP_DEFAULT_ROLES=3 +options ISP_DEFAULT_ROLES=2 # Options used in dev/sym/ (Symbios SCSI driver). #options SYM_SETUP_LP_PROBE_MAP #-Low Priority Probe Map (bits) ==== //depot/projects/mjexp/sys/dev/isp/isp_freebsd.c#14 (text+ko) ==== @@ -382,6 +382,14 @@ retval = EINVAL; break; } + /* + * XXX: Current + */ + if (nr == ISP_ROLE_BOTH) { + isp_prt(isp, ISP_LOGERR, "dual roles not supported"); + retval = EINVAL; + break; + } *(int *)addr = isp->isp_role; isp->isp_role = nr; /* FALLTHROUGH */ @@ -1133,7 +1141,7 @@ static void isp_ledone(ispsoftc_t *isp, lun_entry_t *lep) { - const char lfmt[] = "now %sabled for target mode"; + const char lfmt[] = "now %sabled for target mode\n"; union ccb *ccb; uint32_t seq; tstate_t *tptr; ==== //depot/projects/mjexp/sys/dev/isp/isp_freebsd.h#10 (text+ko) ==== @@ -532,4 +532,10 @@ #include +/* + * XXX: Temp + */ +#if ISP_DEFAULT_ROLES == ISP_ROLE_BOTH +#error "Dual Role Temporarily Unsupported" +#endif #endif /* _ISP_FREEBSD_H */ ==== //depot/projects/mjexp/sys/dev/isp/isp_library.c#6 (text) ==== @@ -1499,12 +1499,12 @@ void * isp_find_xs_tgt(ispsoftc_t *isp, uint32_t handle) { - if (handle == 0 || (handle & 0x8000) == 0 || - (handle & 0x7fff) > isp->isp_maxcmds) { + if (handle == 0 || IS_TARGET_HANDLE(handle) == 0 || + (handle & ISP_HANDLE_MASK) > isp->isp_maxcmds) { isp_prt(isp, ISP_LOGERR, "bad handle in isp_find_xs_tgt"); return (NULL); } else { - return (isp->isp_tgtlist[(handle & 0x7fff) - 1]); + return (isp->isp_tgtlist[(handle & ISP_HANDLE_MASK) - 1]); } } @@ -1515,7 +1515,7 @@ if (xs != NULL) { for (i = 0; i < isp->isp_maxcmds; i++) { if (isp->isp_tgtlist[i] == xs) { - return ((i+1) & 0x7fff); + return ((i+1) & ISP_HANDLE_MASK); } } } @@ -1525,12 +1525,12 @@ void isp_destroy_tgt_handle(ispsoftc_t *isp, uint32_t handle) { - if (handle == 0 || (handle & 0x8000) == 0 || - (handle & 0x7fff) > isp->isp_maxcmds) { + if (handle == 0 || IS_TARGET_HANDLE(handle) == 0 || + (handle & ISP_HANDLE_MASK) > isp->isp_maxcmds) { isp_prt(isp, ISP_LOGERR, "bad handle in isp_destroy_tgt_handle"); } else { - isp->isp_tgtlist[(handle & 0x7fff) - 1] = NULL; + isp->isp_tgtlist[(handle & ISP_HANDLE_MASK) - 1] = NULL; } } ==== //depot/projects/mjexp/sys/dev/isp/isp_library.h#6 (text) ==== @@ -128,6 +128,8 @@ extern void isp_get_ct_hdr(ispsoftc_t *isp, ct_hdr_t *, ct_hdr_t *); extern void isp_put_ct_hdr(ispsoftc_t *isp, ct_hdr_t *, ct_hdr_t *); +#define ISP_HANDLE_MASK 0x7fff + #ifdef ISP_TARGET_MODE #if defined(__NetBSD__) || defined(__OpenBSD__) #include ==== //depot/projects/mjexp/sys/dev/isp/isp_pci.c#20 (text+ko) ==== @@ -1994,7 +1994,7 @@ cto->ct_scsi_status = 0; pcs = (struct isp_pcisoftc *)isp; - dp = &pcs->dmaps[isp_handle_index(handle)]; + dp = &pcs->dmaps[isp_handle_index(handle & ISP_HANDLE_MASK)]; if ((csio->ccb_h.flags & CAM_DIR_MASK) == CAM_DIR_IN) { bus_dmamap_sync(pcs->dmat, *dp, BUS_DMASYNC_PREREAD); } else { @@ -2388,7 +2388,7 @@ isp = mp->isp; rq = mp->rq; pcs = (struct isp_pcisoftc *)mp->isp; - dp = &pcs->dmaps[isp_handle_index(rq->req_handle)]; + dp = &pcs->dmaps[isp_handle_index(rq->req_handle & ISP_HANDLE_MASK)]; nxti = *mp->nxtip; if ((csio->ccb_h.flags & CAM_DIR_MASK) == CAM_DIR_IN) { @@ -2494,7 +2494,7 @@ isp = mp->isp; rq = mp->rq; pcs = (struct isp_pcisoftc *)mp->isp; - dp = &pcs->dmaps[isp_handle_index(rq->req_handle)]; + dp = &pcs->dmaps[isp_handle_index(rq->req_handle & ISP_HANDLE_MASK)]; nxti = *mp->nxtip; if ((csio->ccb_h.flags & CAM_DIR_MASK) == CAM_DIR_IN) { @@ -2628,7 +2628,7 @@ isp = mp->isp; rq = mp->rq; pcs = (struct isp_pcisoftc *)mp->isp; - dp = &pcs->dmaps[isp_handle_index(rq->req_handle)]; + dp = &pcs->dmaps[isp_handle_index(rq->req_handle & ISP_HANDLE_MASK)]; nxti = *mp->nxtip; if ((csio->ccb_h.flags & CAM_DIR_MASK) == CAM_DIR_IN) { @@ -2795,7 +2795,8 @@ if ((csio->ccb_h.flags & CAM_SCATTER_VALID) == 0) { if ((csio->ccb_h.flags & CAM_DATA_PHYS) == 0) { int error, s; - dp = &pcs->dmaps[isp_handle_index(rq->req_handle)]; + dp = &pcs->dmaps[isp_handle_index( + rq->req_handle & ISP_HANDLE_MASK)]; s = splsoftvm(); error = bus_dmamap_load(pcs->dmat, *dp, csio->data_ptr, csio->dxfer_len, eptr, mp, 0); @@ -2880,7 +2881,8 @@ isp_pci_dmateardown(ispsoftc_t *isp, XS_T *xs, uint32_t handle) { struct isp_pcisoftc *pcs = (struct isp_pcisoftc *)isp; - bus_dmamap_t *dp = &pcs->dmaps[isp_handle_index(handle)]; + bus_dmamap_t *dp; + dp = &pcs->dmaps[isp_handle_index(handle & ISP_HANDLE_MASK)]; if ((xs->ccb_h.flags & CAM_DIR_MASK) == CAM_DIR_IN) { bus_dmamap_sync(pcs->dmat, *dp, BUS_DMASYNC_POSTREAD); } else { ==== //depot/projects/mjexp/sys/dev/isp/isp_sbus.c#9 (text+ko) ==== @@ -624,7 +624,7 @@ isp = mp->isp; rq = mp->rq; sbs = (struct isp_sbussoftc *)mp->isp; - dp = &sbs->dmaps[isp_handle_index(rq->req_handle)]; + dp = &sbs->dmaps[isp_handle_index(rq->req_handle & ISP_HANDLE_MASK)]; nxti = *mp->nxtip; if ((csio->ccb_h.flags & CAM_DIR_MASK) == CAM_DIR_IN) { @@ -735,7 +735,8 @@ if ((csio->ccb_h.flags & CAM_SCATTER_VALID) == 0) { if ((csio->ccb_h.flags & CAM_DATA_PHYS) == 0) { int error, s; - dp = &sbs->dmaps[isp_handle_index(rq->req_handle)]; + dp = &sbs->dmaps[isp_handle_index( + rq->req_handle & ISP_HANDLE_MASK)]; s = splsoftvm(); error = bus_dmamap_load(sbs->dmat, *dp, csio->data_ptr, csio->dxfer_len, eptr, mp, 0); @@ -809,7 +810,8 @@ isp_sbus_dmateardown(ispsoftc_t *isp, XS_T *xs, uint32_t handle) { struct isp_sbussoftc *sbs = (struct isp_sbussoftc *)isp; - bus_dmamap_t *dp = &sbs->dmaps[isp_handle_index(handle)]; + bus_dmamap_t *dp; + dp = &sbs->dmaps[isp_handle_index(handle & ISP_HANDLE_MASK)]; if ((xs->ccb_h.flags & CAM_DIR_MASK) == CAM_DIR_IN) { bus_dmamap_sync(sbs->dmat, *dp, BUS_DMASYNC_POSTREAD); } else { From owner-p4-projects@FreeBSD.ORG Mon Apr 2 01:38:10 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BFB2516A406; Mon, 2 Apr 2007 01:38:09 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 7292E16A404 for ; Mon, 2 Apr 2007 01:38:09 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 629DC13C45D for ; Mon, 2 Apr 2007 01:38:09 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l321c9Hu080667 for ; Mon, 2 Apr 2007 01:38:09 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l321c8cx080664 for perforce@freebsd.org; Mon, 2 Apr 2007 01:38:08 GMT (envelope-from kmacy@freebsd.org) Date: Mon, 2 Apr 2007 01:38:08 GMT Message-Id: <200704020138.l321c8cx080664@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 117153 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 02 Apr 2007 01:38:10 -0000 http://perforce.freebsd.org/chv.cgi?CH=117153 Change 117153 by kmacy@kmacy_vt-x:opentoe_init on 2007/04/02 01:37:22 define routine for freeing mbuf_iovec - neglect to handle sfbufs for the moment add additional helper routines for mbuf iovec manipulation Affected files ... .. //depot/projects/opentoe/sys/kern/uipc_mbuf.c#2 edit .. //depot/projects/opentoe/sys/sys/mbuf.h#4 edit Differences ... ==== //depot/projects/opentoe/sys/kern/uipc_mbuf.c#2 (text+ko) ==== @@ -269,6 +269,90 @@ } /* + * Non-directly-exported function to clean up after mbufs with M_EXT + * storage attached to them if the reference count hits 1. + */ +void +mb_free_vec(struct mbuf *m) +{ + struct mbuf_iovec *iov; + + KASSERT((m->m_flags & M_IOVEC) == M_IOVEC, ("%s: M_IOVEC not set", __func__)); + + iov = mtoiov(m); + KASSERT(iov->mi_count <= MAX_MBUF_IOV, ("%s: mi_count too large %d", __func__, + iov->mi_count)); + + for (i = iov->mi_first; i < iov->mi_count; i++) { + uma_zone_t zone; + int type; + + + refcnt = uma_find_refcnt(zone, iov->mi_bases[i]); + if (*refcnt != 1 && atomic_fetchadd_int(refcnt, -1) != 1) + continue; + + type = (iov->mi_flags[i] & MBUF_IOV_TYPE_MASK); + switch (type) { + case EXT_CLUSTER: + zone = zone_clust; + break; + case EXT_JUMBOP: + zone = zone_jumbop; + break; + case EXT_JUMBO9: + zone = zone_jumbo9; + break; + case EXT_JUMBO16: + zone = zone_jumbo16; + break; + default: + zone = NULL; + break; + } + + switch (type) { + case EXT_PACKET: /* The packet zone is special. */ + if (*refcnt == 0) + *refcnt = 1; + uma_zfree(zone_pack, m); + return; /* Job done. */ + case EXT_CLUSTER: + case EXT_JUMBOP: + case EXT_JUMBO9: + case EXT_JUMBO16: + uma_zfree(zone, iov->mi_bases[i]); + break; + case EXT_SFBUF: + *refcnt = 0; + uma_zfree(zone_ext_refcnt, __DEVOLATILE(u_int *, + refcnt)); + /* FALLTHROUGH */ + case EXT_EXTREF: +#ifdef notyet + KASSERT(m->m_ext.ext_free != NULL, + ("%s: ext_free not set", __func__)); + (*(m->m_ext.ext_free))(m->m_ext.ext_buf, + m->m_ext.ext_args); +#endif + panic("unsupported mbuf_iovec type: %d\n", type); + break; + default: + KASSERT(m->m_ext.ext_type == 0, + ("%s: unknown ext_type", __func__)); + + + } + } + /* + * Free this mbuf back to the mbuf zone with all m_ext + * information purged. + */ + m->m_flags &= ~M_IOVEC; + uma_zfree(zone_mbuf, m); +} + +/* * Attach the the cluster from *m to *n, set up m_ext in *n * and bump the refcount of the cluster. */ ==== //depot/projects/opentoe/sys/sys/mbuf.h#4 (text+ko) ==== @@ -66,6 +66,7 @@ */ #define mtod(m, t) ((t)((m)->m_data)) #define dtom(x) ((struct mbuf *)((intptr_t)(x) & ~(MSIZE-1))) +#define mtoiov(m) ((struct mbuf_iovec *)((m)->m_pktdat)) /* * Argument structure passed to UMA routines during mbuf and packet @@ -197,6 +198,7 @@ #define EXT_JUMBO9 4 /* jumbo cluster 9216 bytes */ #define EXT_JUMBO16 5 /* jumbo cluster 16184 bytes */ #define EXT_PACKET 6 /* mbuf+cluster from packet zone */ +#define EXT_MBUF 7 /* external mbuf from mbuf zone */ #define EXT_NET_DRV 100 /* custom ext_buf provided by net driver(s) */ #define EXT_MOD_TYPE 200 /* custom module's ext_buf type */ #define EXT_DISPOSABLE 300 /* can throw this buffer away w/page flipping */ @@ -281,6 +283,12 @@ * */ #define MAX_MBUF_IOV 12 +#define MBUF_IOV_TYPE_MASK ((1<<3)-1) +#define mbuf_iovec_set_type(iov, i, type) \ + (iov)->mi_flags[(i)] = (((iov)->mi_flags[(i)] & ~MBUF_IOV_TYPE_MASK) | type) + +#define mbuf_iovec_get_type(iov, i) ((iov)->mi_flags[(i)] & MBUF_IOV_TYPE_MASK) + struct mbuf_iovec { uint16_t mi_first; /* first valid cluster */ uint16_t mi_count; /* number of valid clusters */ @@ -291,6 +299,60 @@ caddr_t mi_bases[MAX_MBUF_IOV]; /* pointers to clusters */ }; +static __inline int +m_gettype(int size) +{ + int type; + + switch (size) { + case MSIZE: + type = EXT_MBUF; + break; + case MCLBYTES: + type = EXT_CLUSTER; + break; +#if MJUMPAGESIZE != MCLBYTES + case MJUMPAGESIZE: + type = EXT_JUMBOP; + break; +#endif + case MJUM9BYTES: + type = EXT_JUMBO9; + break; + case MJUM16BYTES: + type = EXT_JUMBO16; + break; + default: + panic("%s: m_getjcl: invalid cluster type", __func__); + } + + return (type); +} + +static __inline void +m_iovappend(struct mbuf *m, void *cl, int size, int len) +{ + struct mbuf_iovec *iov = mtoiov(m); + int idx = iov->mi_first + iov->mi_count; + + KASSERT(idx <= MAX_MBUF_IOV, ("tried to append too many clusters to mbuf iovec")); + + if ((m->m_flags & (M_EXT|M_IOVEC)) != M_IOVEC) + panic("invalid flags in %s", __func__); + + + if (iov->mi_count == 0) { + m->m_data = cl; + m->m_len = len; + } + + iov->mi_flags[idx] = m_gettype(size); + iov->mi_bases[idx] = cl; + iov->mi_lens[idx] = len; + iov->mi_offsets[idx] = 0; + iov->mi_count++; +} + /* * Flags specifying how an allocation should be made. * @@ -361,6 +423,7 @@ static __inline void *m_cljget(struct mbuf *m, int how, int size); static __inline void m_chtype(struct mbuf *m, short new_type); void mb_free_ext(struct mbuf *); +void mb_free_vec(struct mbuf *); static __inline struct mbuf * m_get(int how, short type) @@ -415,6 +478,9 @@ uma_zone_t zone; switch (size) { + case MSIZE: + zone = zone_mbuf; + break; case MCLBYTES: zone = zone_clust; break; @@ -472,6 +538,8 @@ if (m->m_flags & M_EXT) mb_free_ext(m); + else if (m->m_flags & M_IOVEC) + mb_free_vec(m); else uma_zfree(zone_mbuf, m); return (n); @@ -517,32 +585,32 @@ } static __inline void -m_cljset(struct mbuf *m, void *cl, int size) +m_cljset(struct mbuf *m, void *cl, int type) { uma_zone_t zone; - int type; + int size; - switch (size) { - case MCLBYTES: - type = EXT_CLUSTER; + switch (type) { + case EXT_CLUSTER: + size = MCLBYTES; zone = zone_clust; break; #if MJUMPAGESIZE != MCLBYTES - case MJUMPAGESIZE: - type = EXT_JUMBOP; + case EXT_JUMBOP: + size = MJUMPAGESIZE; zone = zone_jumbop; break; #endif - case MJUM9BYTES: - type = EXT_JUMBO9; + case EXT_JUMBO9: + size = MJUM9BYTES; zone = zone_jumbo9; break; - case MJUM16BYTES: - type = EXT_JUMBO16; + case EXT_JUMBO16: + size = MJUM16BYTES; zone = zone_jumbo16; break; default: - panic("unknown cluster size"); + panic("unknown cluster type"); break; } From owner-p4-projects@FreeBSD.ORG Mon Apr 2 01:41:14 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3E35A16A406; Mon, 2 Apr 2007 01:41:14 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id EAD1C16A402 for ; Mon, 2 Apr 2007 01:41:13 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id DA56813C44C for ; Mon, 2 Apr 2007 01:41:13 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l321fDPK081326 for ; Mon, 2 Apr 2007 01:41:13 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l321fDGT081316 for perforce@freebsd.org; Mon, 2 Apr 2007 01:41:13 GMT (envelope-from kmacy@freebsd.org) Date: Mon, 2 Apr 2007 01:41:13 GMT Message-Id: <200704020141.l321fDGT081316@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 117154 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 02 Apr 2007 01:41:14 -0000 http://perforce.freebsd.org/chv.cgi?CH=117154 Change 117154 by kmacy@kmacy_vt-x:opentoe_init on 2007/04/02 01:40:58 convert receive processing over to using mbuf_iovec disable lro enabling until it can be re-written appropriately explode mbuf_iovec into traditional mbuf chain before calling if_input Affected files ... .. //depot/projects/opentoe/sys/dev/cxgb/cxgb_adapter.h#5 edit .. //depot/projects/opentoe/sys/dev/cxgb/cxgb_lro.c#2 edit .. //depot/projects/opentoe/sys/dev/cxgb/cxgb_osdep.h#4 edit .. //depot/projects/opentoe/sys/dev/cxgb/cxgb_sge.c#4 edit Differences ... ==== //depot/projects/opentoe/sys/dev/cxgb/cxgb_adapter.h#5 (text+ko) ==== @@ -115,7 +115,7 @@ }; struct sge_lro_session { - struct t3_mbuf_hdr mh; + struct mbuf *m; uint32_t seq; uint16_t ip_len; }; @@ -154,7 +154,7 @@ uint32_t cntxt_id; bus_dma_tag_t desc_tag; bus_dmamap_t desc_map; - struct t3_mbuf_hdr mh; + struct mbuf *m; struct mtx lock; }; @@ -403,7 +403,7 @@ int t3_sge_init_sw(adapter_t *); void t3_sge_deinit_sw(adapter_t *); -void t3_rx_eth_lro(adapter_t *adap, struct sge_rspq *rq, struct t3_mbuf_hdr *mh, +void t3_rx_eth_lro(adapter_t *adap, struct sge_rspq *rq, struct mbuf *m, int ethpad, uint32_t rss_hash, uint32_t rss_csum, int lro); void t3_rx_eth(struct port_info *p, struct sge_rspq *rq, struct mbuf *m, int ethpad); void t3_sge_lro_flush_all(adapter_t *adap, struct sge_qset *qs); ==== //depot/projects/opentoe/sys/dev/cxgb/cxgb_lro.c#2 (text+ko) ==== @@ -65,22 +65,17 @@ #endif #ifdef DEBUG -#define MBUF_HEADER_CHECK(mh) do { \ - struct mbuf *head = mh->mh_head; \ - struct mbuf *tail = mh->mh_tail; \ - if (head->m_len == 0 || head->m_pkthdr.len == 0 \ - || (head->m_flags & M_PKTHDR) == 0) \ +#define MBUF_HEADER_CHECK(m) do { \ + if (m->m_len == 0 || m->m_pkthdr.len == 0 \ + || (m->m_flags & M_PKTHDR) == 0) \ panic("lro_flush_session - mbuf len=%d pktlen=%d flags=0x%x\n", \ - head->m_len, head->m_pkthdr.len, head->m_flags); \ - if ((head->m_flags & M_PKTHDR) == 0) \ + m->m_len, m->m_pkthdr.len, m->m_flags); \ + if (m->m_flags & M_PKTHDR) == 0) \ panic("first mbuf is not packet header - flags=0x%x\n", \ - head->m_flags); \ - if ((head == tail && head->m_len != head->m_pkthdr.len)) \ - panic("len=%d pktlen=%d mismatch\n", \ - head->m_len, head->m_pkthdr.len); \ - if (head->m_len < ETHER_HDR_LEN || head->m_pkthdr.len < ETHER_HDR_LEN) \ + m->m_flags); \ + if (m->m_len < ETHER_HDR_LEN || m->m_pkthdr.len < ETHER_HDR_LEN) \ panic("packet too small len=%d pktlen=%d\n", \ - head->m_len, head->m_pkthdr.len);\ + m->m_len, m->m_pkthdr.len);\ } while (0) #else #define MBUF_HEADER_CHECK(m) @@ -100,7 +95,7 @@ lro_match_session(struct sge_lro_session *s, struct ip *ih, struct tcphdr *th) { - struct ip *sih = (struct ip *)(s->mh.mh_head->m_data + IPH_OFFSET); + struct ip *sih = (struct ip *)(s->m->m_data + IPH_OFFSET); struct tcphdr *sth = (struct tcphdr *) (sih + 1); /* @@ -121,7 +116,7 @@ while (active < l->num_active) { s = lro_session(l, idx); - if (s->mh.mh_head) { + if (s->m) { if (lro_match_session(s, ih, th)) { l->last_s = s; return s; @@ -179,39 +174,37 @@ } static __inline void -lro_new_session_init(struct sge_lro_session *s, struct t3_mbuf_hdr *mh) +lro_new_session_init(struct sge_lro_session *s, struct mbuf *m) { - struct ip *ih = (struct ip *)(mh->mh_head->m_data + IPH_OFFSET); + struct ip *ih = (struct ip *)(m->m_data + IPH_OFFSET); struct tcphdr *th = (struct tcphdr *) (ih + 1); int ip_len = ntohs(ih->ip_len); - DPRINTF("%s(s=%p, mh->mh_head=%p, mh->mh_tail=%p)\n", __FUNCTION__, - s, mh->mh_head, mh->mh_tail); + DPRINTF("%s(s=%p, m=%p)\n", __FUNCTION__, s, m); + + s->m = m; - *&(s->mh) = *mh; - - MBUF_HEADER_CHECK(mh); + MBUF_HEADER_CHECK(m); s->ip_len = ip_len; s->seq = ntohl(th->th_seq) + ip_len - sizeof(*ih) - (th->th_off << 2); } static void -lro_flush_session(struct sge_qset *qs, struct sge_lro_session *s, struct t3_mbuf_hdr *mh) +lro_flush_session(struct sge_qset *qs, struct sge_lro_session *s, struct mbuf *m) { struct sge_lro *l = &qs->lro; - struct t3_mbuf_hdr *smh = &s->mh; - struct ip *ih = (struct ip *)(smh->mh_head->m_data + IPH_OFFSET); + struct mbuf *sm = s->m; + struct ip *ih = (struct ip *)(sm->m_data + IPH_OFFSET); DPRINTF("%s(qs=%p, s=%p, ", __FUNCTION__, qs, s); - if (mh) - DPRINTF("mh->mh_head=%p, mh->mh_tail=%p)\n", - mh->mh_head, mh->mh_tail); + if (m) + DPRINTF("m=%p)\n", m); else - DPRINTF("mh=NULL)\n"); + DPRINTF("m=NULL)\n"); ih->ip_len = htons(s->ip_len); ih->ip_sum = 0; @@ -219,15 +212,14 @@ MBUF_HEADER_CHECK(smh); - smh->mh_head->m_flags |= M_LRO; - t3_rx_eth(qs->port, &qs->rspq, smh->mh_head, 2); + sm->m_flags |= M_LRO; + t3_rx_eth(qs->port, &qs->rspq, sm, 2); - if (mh) { - *smh = *mh; - lro_new_session_init(s, mh); + if (m) { + s->m = m; + lro_new_session_init(s, m); } else { - smh->mh_head = NULL; - smh->mh_tail = NULL; + s->m = NULL; l->num_active--; } @@ -235,23 +227,23 @@ } static __inline struct sge_lro_session * -lro_new_session(struct sge_qset *qs, struct t3_mbuf_hdr *mh, uint32_t rss_hash) +lro_new_session(struct sge_qset *qs, struct mbuf *m, uint32_t rss_hash) { struct sge_lro *l = &qs->lro; int idx = LRO_SESSION_IDX_HINT_HASH(rss_hash); struct sge_lro_session *s = lro_session(l, idx); - DPRINTF("%s(qs=%p, mh->mh_head=%p, mh->mh_tail=%p, rss_hash=0x%x)\n", __FUNCTION__, - qs, mh->mh_head, mh->mh_tail, rss_hash); + DPRINTF("%s(qs=%p, m=%p, rss_hash=0x%x)\n", __FUNCTION__, + qs, m, rss_hash); - if (__predict_true(!s->mh.mh_head)) + if (__predict_true(!s->m)) goto done; if (l->num_active > MAX_LRO_PER_QSET) panic("MAX_LRO_PER_QSET exceeded"); if (l->num_active == MAX_LRO_PER_QSET) { - lro_flush_session(qs, s, mh); + lro_flush_session(qs, s, m); qs->port_stats[SGE_PSTATS_LRO_X_STREAMS]++; return s; } @@ -259,24 +251,21 @@ while (1) { LRO_IDX_INC(idx); s = lro_session(l, idx); - if (!s->mh.mh_head) + if (!s->m) break; } done: - lro_new_session_init(s, mh); - + lro_new_session_init(s, m); l->num_active++; - return s; - + return s; } static __inline int -lro_update_session(struct sge_lro_session *s, struct t3_mbuf_hdr *mh) +lro_update_session(struct sge_lro_session *s, struct mbuf *m) { - struct mbuf *m = mh->mh_head; - struct t3_mbuf_hdr *smh = &s->mh; - struct cpl_rx_pkt *cpl = (struct cpl_rx_pkt *)(smh->mh_head->m_data + 2); + struct mbuf *sm = s->m; + struct cpl_rx_pkt *cpl = (struct cpl_rx_pkt *)(sm->m_data + 2); struct cpl_rx_pkt *ncpl = (struct cpl_rx_pkt *)(m->m_data + 2); struct ip *nih = (struct ip *)(m->m_data + IPH_OFFSET); struct tcphdr *th, *nth = (struct tcphdr *)(nih + 1); @@ -284,8 +273,7 @@ int plen, tcpiphlen, olen = (nth->th_off << 2) - sizeof (*nth); - DPRINTF("%s(s=%p, mh->mh_head=%p, mh->mh_tail=%p)\n", __FUNCTION__, - s, mh->mh_head, mh->mh_tail); + DPRINTF("%s(s=%p, m=%p)\n", __FUNCTION__, s, m); if (cpl->vlan_valid && cpl->vlan != ncpl->vlan) { return -1; } @@ -295,7 +283,7 @@ } MBUF_HEADER_CHECK(smh); - th = (struct tcphdr *)(smh->mh_head->m_data + IPH_OFFSET + sizeof (struct ip)); + th = (struct tcphdr *)(sm->m_data + IPH_OFFSET + sizeof (struct ip)); if (olen) { uint32_t *ptr = (uint32_t *)(th + 1); @@ -315,7 +303,13 @@ plen = ntohs(nih->ip_len) - tcpiphlen; s->seq += plen; s->ip_len += plen; - smh->mh_head->m_pkthdr.len += plen; + sm->m_pkthdr.len += plen; + + /* + * XXX FIX ME + * + * + */ #if 0 /* XXX this I *do not* understand */ @@ -323,8 +317,8 @@ skb_shinfo(s->skb)->gso_size = plen; #endif #if __FreeBSD_version > 700000 - if (plen > smh->mh_head->m_pkthdr.tso_segsz) - smh->mh_head->m_pkthdr.tso_segsz = plen; + if (plen > sm->m_pkthdr.tso_segsz) + sm->m_pkthdr.tso_segsz = plen; #endif DPRINTF("m_adj(%d)\n", (int)(IPH_OFFSET + tcpiphlen)); m_adj(m, IPH_OFFSET + tcpiphlen); @@ -333,9 +327,7 @@ skb_shinfo(s->skb)->frag_list = skb; #endif - mh->mh_head->m_flags &= ~M_PKTHDR; - smh->mh_tail->m_next = mh->mh_head; - smh->mh_tail = mh->mh_tail; + #if 0 /* @@ -354,10 +346,9 @@ } void -t3_rx_eth_lro(adapter_t *adap, struct sge_rspq *rq, struct t3_mbuf_hdr *mh, +t3_rx_eth_lro(adapter_t *adap, struct sge_rspq *rq, struct mbuf *m, int ethpad, uint32_t rss_hash, uint32_t rss_csum, int lro) { - struct mbuf *m = mh->mh_head; struct sge_qset *qs = rspq_to_qset(rq); struct cpl_rx_pkt *cpl = (struct cpl_rx_pkt *)(m->m_data + ethpad); struct ether_header *eh = (struct ether_header *)(cpl + 1); @@ -384,12 +375,12 @@ if (__predict_false(!can_lro_tcpsegment(th))) { goto no_lro; } else if (__predict_false(!s)) { - s = lro_new_session(qs, mh, rss_hash); + s = lro_new_session(qs, m, rss_hash); } else { - if (lro_update_session(s, mh)) { - lro_flush_session(qs, s, mh); + if (lro_update_session(s, m)) { + lro_flush_session(qs, s, m); } - if (__predict_false(s->mh.mh_head->m_pkthdr.len + pi->ifp->if_mtu > 65535)) { + if (__predict_false(s->m->m_pkthdr.len + pi->ifp->if_mtu > 65535)) { lro_flush_session(qs, s, NULL); } } @@ -417,7 +408,7 @@ s = lro_session(l, idx); while (active < num_active) { - if (s->mh.mh_head) { + if (s->m) { lro_flush_session(qs, s, NULL); active++; } ==== //depot/projects/opentoe/sys/dev/cxgb/cxgb_osdep.h#4 (text+ko) ==== @@ -52,11 +52,6 @@ struct sge_rspq; -struct t3_mbuf_hdr { - struct mbuf *mh_head; - struct mbuf *mh_tail; -}; - #if __FreeBSD_version > 700030 #define INTR_FILTERS #define FIRMWARE_LATEST ==== //depot/projects/opentoe/sys/dev/cxgb/cxgb_sge.c#4 (text+ko) ==== @@ -268,42 +268,36 @@ * Return a packet containing the immediate data of the given response. */ static __inline int -get_imm_packet(adapter_t *sc, const struct rsp_desc *resp, struct t3_mbuf_hdr *mh) +get_imm_packet(adapter_t *sc, const struct rsp_desc *resp, struct mbuf *m) { - struct mbuf *m; - int len; + int len, idx; uint32_t flags = ntohl(resp->flags); uint8_t sopeop = G_RSPD_SOP_EOP(flags); - + struct mbuf_iovec *iov; + /* * would be a firmware bug */ if (sopeop == RSPQ_NSOP_NEOP || sopeop == RSPQ_SOP) - return (0); + panic("invalid hw response for sopeop\n"); - m = m_gethdr(M_NOWAIT, MT_DATA); len = G_RSPD_LEN(ntohl(resp->len_cq)); - - if (m) { + + switch (sopeop) { + case RSPQ_SOP_EOP: + m->m_len = m->m_pkthdr.len = len; + m->m_flags |= M_PKTHDR; + memcpy(m->m_data, resp->imm_data, IMMED_PKT_SIZE); MH_ALIGN(m, IMMED_PKT_SIZE); - memcpy(m->m_data, resp->imm_data, IMMED_PKT_SIZE); - m->m_len = len; - - switch (sopeop) { - case RSPQ_SOP_EOP: - mh->mh_head = mh->mh_tail = m; - m->m_pkthdr.len = len; - m->m_flags |= M_PKTHDR; - break; - case RSPQ_EOP: - m->m_flags &= ~M_PKTHDR; - mh->mh_head->m_pkthdr.len += len; - mh->mh_tail->m_next = m; - mh->mh_tail = m; - break; - } + break; + case RSPQ_EOP: + m->m_pkthdr.len += len; + iov = mtoiov(m); + idx = iov->mi_count + iov->mi_first - 1; + iov->mi_lens[idx] = len; + memcpy(iov->mi_bases[idx], resp->imm_data, IMMED_PKT_SIZE); + break; } - return (m != NULL); } @@ -862,7 +856,6 @@ err, m0->m_pkthdr.len, n); #endif } - if (err == EFBIG) { /* Too many segments, try to defrag */ @@ -1706,8 +1699,7 @@ #define NOMEM_INTR_DELAY 2500 static __inline void -deliver_partial_bundle(struct t3cdev *tdev, - struct sge_rspq *q) +deliver_partial_bundle(struct t3cdev *tdev, struct sge_rspq *q) { ; } @@ -1750,14 +1742,12 @@ panic("bad port index %d m->m_data=%p\n", cpl->iff, m->m_data); - m_adj(m, sizeof(*cpl) + ethpad); - - if ((ifp->if_capenable & IFCAP_RXCSUM) && !cpl->fragment && cpl->csum_valid && cpl->csum == 0xffff) { m->m_pkthdr.csum_flags = (CSUM_IP_CHECKED|CSUM_IP_VALID); rspq_to_qset(rq)->port_stats[SGE_PSTAT_RX_CSUM_GOOD]++; - m->m_pkthdr.csum_flags = (CSUM_IP_CHECKED|CSUM_IP_VALID|CSUM_DATA_VALID|CSUM_PSEUDO_HDR); + m->m_pkthdr.csum_flags = (CSUM_IP_CHECKED|CSUM_IP_VALID| + CSUM_DATA_VALID|CSUM_PSEUDO_HDR); m->m_pkthdr.csum_data = 0xffff; } /* @@ -1771,6 +1761,35 @@ #endif m->m_pkthdr.rcvif = ifp; + if (m->m_flags & M_IOVEC) { + int i, offset, type; + struct mbuf_iovec *iov; + void *cl; + struct mbuf *m0, *head = NULL; + + iov = mtoiov(m); + for (i = iov->mi_count + iov->mi_first - 1; + i > iov->mi_first; i--) { + cl = iov->mi_bases[i]; + m0 = m_get(M_NOWAIT, MT_DATA); + m0->m_flags = 0; + type = mbuf_iovec_get_type(iov, i); + m_cljset(m0, (uint8_t *)cl, type); + m->m_data += iov->mi_offsets[i]; + m0->m_len = iov->mi_lens[i]; + m0->m_next = head; + head = m0; + } + cl = iov->mi_bases[0]; + offset = iov->mi_offsets[0]; + type = mbuf_iovec_get_type(iov, 0); + m->m_flags &= ~(M_IOVEC); + m_cljset(m, cl, type); + m->m_next = head; + } + + m_adj(m, sizeof(*cpl) + ethpad); + (*ifp->if_input)(ifp, m); } @@ -1791,11 +1810,9 @@ * be copied but there is no memory for the copy. */ -#include -#include static int get_packet(adapter_t *adap, unsigned int drop_thres, struct sge_qset *qs, - struct t3_mbuf_hdr *mh, struct rsp_desc *r, struct mbuf *m) + struct mbuf *m, struct rsp_desc *r) { unsigned int len_cq = ntohl(r->len_cq); @@ -1804,6 +1821,7 @@ uint32_t len = G_RSPD_LEN(len_cq); uint32_t flags = ntohl(r->flags); uint8_t sopeop = G_RSPD_SOP_EOP(flags); + struct mbuf_iovec *iov; int ret = 0; prefetch(sd->cl); @@ -1812,47 +1830,37 @@ bus_dmamap_sync(fl->entry_tag, sd->map, BUS_DMASYNC_POSTREAD); bus_dmamap_unload(fl->entry_tag, sd->map); - m_cljset(m, sd->cl, fl->buf_size); - m->m_len = len; - switch(sopeop) { case RSPQ_SOP_EOP: DBG(DBG_RX, ("get_packet: SOP-EOP m %p\n", m)); - mh->mh_head = mh->mh_tail = m; - m->m_pkthdr.len = len; + m_cljset(m, sd->cl, fl->type); + m->m_len = m->m_pkthdr.len = len; m->m_flags |= M_PKTHDR; ret = 1; + goto done; break; case RSPQ_NSOP_NEOP: DBG(DBG_RX, ("get_packet: NO_SOP-NO_EOP m %p\n", m)); - m->m_flags &= ~M_PKTHDR; - if (mh->mh_tail == NULL) { - if (cxgb_debug) - printf("discarding intermediate descriptor entry\n"); - m_freem(m); - break; - } - mh->mh_tail->m_next = m; - mh->mh_tail = m; - mh->mh_head->m_pkthdr.len += len; + m->m_pkthdr.len += len; ret = 0; break; case RSPQ_SOP: DBG(DBG_RX, ("get_packet: SOP m %p\n", m)); - m->m_pkthdr.len = len; - mh->mh_head = mh->mh_tail = m; - m->m_flags |= M_PKTHDR; + m->m_len = m->m_pkthdr.len = len; + m->m_flags |= (M_PKTHDR|M_IOVEC); + iov = mtoiov(m); + iov->mi_first = iov->mi_count = 0; ret = 0; break; case RSPQ_EOP: DBG(DBG_RX, ("get_packet: EOP m %p\n", m)); - m->m_flags &= ~M_PKTHDR; - mh->mh_head->m_pkthdr.len += len; - mh->mh_tail->m_next = m; - mh->mh_tail = m; + m->m_pkthdr.len += len; ret = 1; break; } + m_iovappend(m, sd->cl, fl->buf_size, len); + +done: if (++fl->cidx == fl->size) fl->cidx = 0; @@ -1978,28 +1986,37 @@ printf("async notification\n"); } else if (flags & F_RSPD_IMM_DATA_VALID) { + struct mbuf *m = NULL; + if (cxgb_debug) printf("IMM DATA VALID\n"); - - if(get_imm_packet(adap, r, &rspq->mh) == 0) { + if (rspq->m == NULL) { + rspq->m = m_gethdr(M_NOWAIT, MT_DATA); + } else { + m = m_gethdr(M_NOWAIT, MT_DATA); + if (m) + m_iovappend(rspq->m, m, MSIZE, 0); + } + if (rspq->m == NULL || m == NULL) { rspq->next_holdoff = NOMEM_INTR_DELAY; budget_left--; break; - } else { - eop = 1; - } - + } + get_imm_packet(adap, r, rspq->m); + eop = 1; rspq->imm_data++; } else if (r->len_cq) { int drop_thresh = eth ? SGE_RX_DROP_THRES : 0; - struct mbuf *m = m_gethdr(M_NOWAIT, MT_DATA); - if (m == NULL) { + if (rspq->m == NULL) { + rspq->m = m_gethdr(M_NOWAIT, MT_DATA); + rspq->m->m_flags = 0; + } else if (rspq->m == NULL) { log(LOG_WARNING, "failed to get mbuf for packet\n"); break; } ethpad = 2; - eop = get_packet(adap, drop_thresh, qs, &rspq->mh, r, m); + eop = get_packet(adap, drop_thresh, qs, rspq->m, r); } else { DPRINTF("pure response\n"); rspq->pure_rsps++; @@ -2024,14 +2041,14 @@ } if (eop) { - prefetch(rspq->mh.mh_head->m_data); - prefetch(rspq->mh.mh_head->m_data + L1_CACHE_BYTES); + prefetch(rspq->m->m_data); + prefetch(rspq->m->m_data + L1_CACHE_BYTES); if (eth) { - t3_rx_eth_lro(adap, rspq, &rspq->mh, ethpad, + t3_rx_eth_lro(adap, rspq, rspq->m, ethpad, rss_hash, rss_csum, lro); - rspq->mh.mh_tail = rspq->mh.mh_head = NULL; + rspq->m = NULL; } else { #ifdef notyet if (__predict_false(r->rss_hdr.opcode == CPL_TRACE_PKT)) @@ -2167,11 +2184,18 @@ mtx_unlock(&rspq->lock); } +/* + * broken by recent mbuf changes + */ static int t3_lro_enable(SYSCTL_HANDLER_ARGS) { adapter_t *sc; int i, j, enabled, err, nqsets = 0; + +#ifndef LRO_WORKING + return (0); +#endif sc = arg1; enabled = sc->sge.qs[0].lro.enabled; @@ -2252,13 +2276,11 @@ "firmware_version", CTLFLAG_RD, &sc->fw_version, 0, "firmware version"); - SYSCTL_ADD_PROC(ctx, children, OID_AUTO, "enable_lro", CTLTYPE_INT|CTLFLAG_RW, sc, 0, t3_lro_enable, "I", "enable large receive offload"); - SYSCTL_ADD_PROC(ctx, children, OID_AUTO, "intr_coal", CTLTYPE_INT|CTLFLAG_RW, sc, From owner-p4-projects@FreeBSD.ORG Mon Apr 2 06:21:21 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EDA9916A404; Mon, 2 Apr 2007 06:21:20 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 6A7B616A402 for ; Mon, 2 Apr 2007 06:21:20 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 586AE13C455 for ; Mon, 2 Apr 2007 06:21:20 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l326LKRo043878 for ; Mon, 2 Apr 2007 06:21:20 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l326LIp4043827 for perforce@freebsd.org; Mon, 2 Apr 2007 06:21:18 GMT (envelope-from marcel@freebsd.org) Date: Mon, 2 Apr 2007 06:21:18 GMT Message-Id: <200704020621.l326LIp4043827@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Cc: Subject: PERFORCE change 117170 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 02 Apr 2007 06:21:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=117170 Change 117170 by marcel@marcel_cluster on 2007/04/02 06:20:52 IFC @117168 Affected files ... .. //depot/projects/uart/amd64/amd64/support.S#10 integrate .. //depot/projects/uart/conf/NOTES#49 integrate .. //depot/projects/uart/conf/options#46 integrate .. //depot/projects/uart/dev/acpica/acpi_ec.c#18 integrate .. //depot/projects/uart/dev/ahb/ahb.c#10 integrate .. //depot/projects/uart/dev/arcmsr/arcmsr.c#7 integrate .. //depot/projects/uart/dev/ed/if_ed_pccard.c#15 integrate .. //depot/projects/uart/dev/firewire/fwohci_pci.c#15 integrate .. //depot/projects/uart/dev/ipmi/ipmi_pci.c#3 integrate .. //depot/projects/uart/dev/isp/isp_freebsd.c#21 integrate .. //depot/projects/uart/dev/isp/isp_freebsd.h#17 integrate .. //depot/projects/uart/dev/isp/isp_library.c#10 integrate .. //depot/projects/uart/dev/isp/isp_library.h#7 integrate .. //depot/projects/uart/dev/isp/isp_pci.c#21 integrate .. //depot/projects/uart/dev/isp/isp_sbus.c#16 integrate .. //depot/projects/uart/dev/mxge/if_mxge.c#8 integrate .. //depot/projects/uart/dev/pci/pci.c#30 integrate .. //depot/projects/uart/dev/pci/pci_pci.c#12 integrate .. //depot/projects/uart/dev/pci/pcireg.h#14 integrate .. //depot/projects/uart/dev/sk/if_sk.c#14 integrate .. //depot/projects/uart/dev/sk/if_skreg.h#9 integrate .. //depot/projects/uart/dev/sound/pcm/channel.c#12 integrate .. //depot/projects/uart/dev/sound/pcm/mixer.c#12 integrate .. //depot/projects/uart/dev/sound/usb/uaudio.c#9 integrate .. //depot/projects/uart/dev/usb/if_aue.c#15 integrate .. //depot/projects/uart/dev/usb/if_axe.c#16 integrate .. //depot/projects/uart/dev/usb/ubser.c#6 integrate .. //depot/projects/uart/gnu/fs/xfs/FreeBSD/support/mrlock.c#2 integrate .. //depot/projects/uart/gnu/fs/xfs/FreeBSD/support/mrlock.h#2 integrate .. //depot/projects/uart/i386/acpica/acpi_machdep.c#11 integrate .. //depot/projects/uart/i386/i386/support.s#10 integrate .. //depot/projects/uart/i4b/layer1/ifpnp/i4b_ifpnp_avm.c#5 integrate .. //depot/projects/uart/i4b/layer1/ihfc/i4b_ihfc_pnp.c#5 integrate .. //depot/projects/uart/i4b/layer1/isic/i4b_avm_a1.c#5 integrate .. //depot/projects/uart/i4b/layer1/isic/i4b_isic_pnp.c#5 integrate .. //depot/projects/uart/i4b/layer1/isic/i4b_itk_ix1.c#5 integrate .. //depot/projects/uart/i4b/layer1/isic/i4b_tel_s016.c#5 integrate .. //depot/projects/uart/i4b/layer1/isic/i4b_tel_s0163.c#5 integrate .. //depot/projects/uart/kern/kern_sx.c#12 integrate .. //depot/projects/uart/kern/subr_witness.c#21 integrate .. //depot/projects/uart/kern/vfs_lookup.c#17 integrate .. //depot/projects/uart/kern/vfs_mount.c#31 integrate .. //depot/projects/uart/kern/vfs_subr.c#39 integrate .. //depot/projects/uart/modules/cryptodev/Makefile#2 integrate .. //depot/projects/uart/netgraph/ng_base.c#17 integrate .. //depot/projects/uart/netinet/sctp_auth.c#3 integrate .. //depot/projects/uart/netinet/sctp_constants.h#3 integrate .. //depot/projects/uart/netinet/sctp_indata.c#3 integrate .. //depot/projects/uart/netinet/sctp_input.c#3 integrate .. //depot/projects/uart/netinet/sctp_os_bsd.h#3 integrate .. //depot/projects/uart/netinet/sctp_output.c#3 integrate .. //depot/projects/uart/netinet/sctp_pcb.c#3 integrate .. //depot/projects/uart/netinet/sctp_pcb.h#3 integrate .. //depot/projects/uart/netinet/sctp_structs.h#3 integrate .. //depot/projects/uart/netinet/sctp_sysctl.c#2 integrate .. //depot/projects/uart/netinet/sctp_sysctl.h#2 integrate .. //depot/projects/uart/netinet/sctp_uio.h#3 integrate .. //depot/projects/uart/netinet/sctp_usrreq.c#3 integrate .. //depot/projects/uart/netinet/sctputil.c#3 integrate .. //depot/projects/uart/netinet6/in6_src.c#14 integrate .. //depot/projects/uart/netinet6/sctp6_usrreq.c#3 integrate .. //depot/projects/uart/powerpc/conf/GENERIC#16 integrate .. //depot/projects/uart/powerpc/conf/NOTES#6 integrate .. //depot/projects/uart/powerpc/powermac/uninorth.c#7 integrate .. //depot/projects/uart/powerpc/powerpc/extintr.c#2 delete .. //depot/projects/uart/sys/_sx.h#1 branch .. //depot/projects/uart/sys/mount.h#22 integrate .. //depot/projects/uart/sys/sleepqueue.h#6 integrate .. //depot/projects/uart/sys/sx.h#10 integrate .. //depot/projects/uart/sys/vnode.h#21 integrate Differences ... ==== //depot/projects/uart/amd64/amd64/support.S#10 (text+ko) ==== @@ -27,7 +27,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/amd64/support.S,v 1.122 2007/03/30 01:07:27 jkim Exp $ + * $FreeBSD: src/sys/amd64/amd64/support.S,v 1.126 2007/03/31 01:47:37 jkim Exp $ */ #include "opt_ddb.h" @@ -242,7 +242,7 @@ cmpq %rcx,%rax ja copyout_fault - xchgq %rdi, %rsi + xchgq %rdi,%rsi /* bcopy(%rsi, %rdi, %rdx) */ movq %rdx,%rcx @@ -288,8 +288,8 @@ cmpq %rcx,%rax ja copyin_fault - xchgq %rdi, %rsi - movq %rdx, %rcx + xchgq %rdi,%rsi + movq %rdx,%rcx movb %cl,%al shrq $3,%rcx /* copy longword-wise */ cld @@ -353,11 +353,11 @@ cmpq %rax,%rdi /* verify address is valid */ ja fusufault - movq %rsi, %rax /* old */ + movq %rsi,%rax /* old */ #ifdef SMP lock #endif - cmpxchgq %rdx, (%rdi) /* new = %rdx */ + cmpxchgq %rdx,(%rdi) /* new = %rdx */ /* * The old value is in %eax. If the store succeeded it will be the @@ -501,7 +501,7 @@ cmpq %rax,%rdi /* verify address validity */ ja fusufault - movl %esi, %eax + movl %esi,%eax movb %al,(%rdi) xorl %eax,%eax movq PCPU(CURPCB),%rcx /* restore trashed register */ @@ -518,9 +518,9 @@ * return the actual length in *lencopied. */ ENTRY(copyinstr) - movq %rdx, %r8 /* %r8 = maxlen */ - movq %rcx, %r9 /* %r9 = *len */ - xchgq %rdi, %rsi /* %rdi = from, %rsi = to */ + movq %rdx,%r8 /* %r8 = maxlen */ + movq %rcx,%r9 /* %r9 = *len */ + xchgq %rdi,%rsi /* %rdi = from, %rsi = to */ movq PCPU(CURPCB),%rcx movq $cpystrflt,PCB_ONFAULT(%rcx) @@ -582,9 +582,9 @@ * %rdi, %rsi, %rdx, %rcx */ ENTRY(copystr) - movq %rdx, %r8 /* %r8 = maxlen */ + movq %rdx,%r8 /* %r8 = maxlen */ - xchgq %rdi, %rsi + xchgq %rdi,%rsi incq %rdx cld 1: @@ -605,11 +605,11 @@ 6: - testq %rcx, %rcx + testq %rcx,%rcx jz 7f /* set *lencopied and return %rax */ - subq %rdx, %r8 - movq %r8, (%rcx) + subq %rdx,%r8 + movq %r8,(%rcx) 7: ret @@ -626,7 +626,7 @@ jmp 1f nop 1: - movl $KDSEL, %eax + movl $KDSEL,%eax movl %eax,%ds movl %eax,%es movl %eax,%fs /* Beware, use wrmsr to set 64 bit base */ @@ -671,6 +671,49 @@ incl %eax ret +/*****************************************************************************/ +/* linux_futex support */ +/*****************************************************************************/ + +futex_fault: + movq $0,PCB_ONFAULT(%rcx) + movq $-EFAULT,%rax + ret + +ENTRY(futex_xchgl) + movq PCPU(CURPCB),%rcx + movq $futex_fault,PCB_ONFAULT(%rcx) + + movq $VM_MAXUSER_ADDRESS-4,%rax + cmpq %rax,%rsi + ja futex_fault + +#ifdef SMP + lock +#endif + xchgl %edi,(%rsi) + movl %edi,(%rdx) + xorl %eax,%eax + movq %rax,PCB_ONFAULT(%rcx) + ret + +ENTRY(futex_addl) + movq PCPU(CURPCB),%rcx + movq $futex_fault,PCB_ONFAULT(%rcx) + + movq $VM_MAXUSER_ADDRESS-4,%rax + cmpq %rax,%rsi + ja futex_fault + +#ifdef SMP + lock +#endif + xaddl %edi,(%rsi) + movl %edi,(%rdx) + xorl %eax,%eax + movq %rax,PCB_ONFAULT(%rcx) + ret + /* * Support for BB-profiling (gcc -a). The kernbb program will extract * the data from the kernel. @@ -689,47 +732,3 @@ movq %rax,32(%rdi) movq %rdi,bbhead NON_GPROF_RET - -#if defined(SMP) || !defined(_KERNEL) -#define MPLOCKED lock ; -#else -#define MPLOCKED -#endif - - .text - -futex_fault: - movq PCPU(CURPCB), %rdx - movq $0, PCB_ONFAULT(%rdx) - movq $-EFAULT, %rax - ret - -/* int futex_xchgl(int oparg, caddr_t uaddr, int *oldval); */ -ENTRY(futex_xchgl) - movq PCPU(CURPCB), %r11 - movq $futex_fault, PCB_ONFAULT(%r11) - - movq $VM_MAXUSER_ADDRESS-4, %rax - cmpq %rax, %rsi - ja futex_fault - - MPLOCKED xchgl %edi, (%rsi) - movl %edi, (%rdx) - xorl %eax, %eax - movq %rax, PCB_ONFAULT(%r11) - ret - -/* int futex_addl(int oparg, caddr_t uaddr, int *oldval); */ -ENTRY(futex_addl) - movq PCPU(CURPCB), %r11 - movq $futex_fault, PCB_ONFAULT(%r11) - - movq $VM_MAXUSER_ADDRESS-4, %rax - cmpq %rax, %rsi - ja futex_fault - - MPLOCKED xaddl %edi, (%rsi) - movl %edi, (%rdx) - xorl %eax, %eax - movq %rax, PCB_ONFAULT(%r11) - ret ==== //depot/projects/uart/conf/NOTES#49 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/NOTES,v 1.1416 2007/03/26 09:10:28 yar Exp $ +# $FreeBSD: src/sys/conf/NOTES,v 1.1418 2007/04/02 01:04:20 mjacob Exp $ # # NOTES -- Lines that can be cut/pasted into kernel and hints configs. # @@ -214,6 +214,12 @@ # to sleep rather than spinning. options ADAPTIVE_GIANT +# ADAPTIVE_SX changes the behavior of sx locks to spin if the thread +# that currently owns the lock is executing on another CPU. Note that +# in addition to enabling this option, individual sx locks must be +# initialized with the SX_ADAPTIVESPIN flag. +options ADAPTIVE_SX + # MUTEX_NOINLINE forces mutex operations to call functions to perform each # operation rather than inlining the simple cases. This can be used to # shrink the size of the kernel text segment. Note that this behavior is @@ -233,6 +239,13 @@ # and WITNESS options. options RWLOCK_NOINLINE +# SX_NOINLINE forces sx lock operations to call functions to perform each +# operation rather than inlining the simple cases. This can be used to +# shrink the size of the kernel text segment. Note that this behavior is +# already implied by the INVARIANT_SUPPORT, INVARIANTS, KTR, LOCK_PROFILING, +# and WITNESS options. +options SX_NOINLINE + # SMP Debugging Options: # # PREEMPTION allows the threads that are in the kernel to be preempted @@ -1521,9 +1534,13 @@ # options ISP_TARGET_MODE=1 # -# ISP_DEFAULT_ROLES - default role (none, target, init, both) +# ISP_DEFAULT_ROLES - default role +# none=0 +# target=1 +# initiator=2 +# both=3 (not supported currently) # -options ISP_DEFAULT_ROLES=3 +options ISP_DEFAULT_ROLES=2 # Options used in dev/sym/ (Symbios SCSI driver). #options SYM_SETUP_LP_PROBE_MAP #-Low Priority Probe Map (bits) ==== //depot/projects/uart/conf/options#46 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options,v 1.583 2007/03/27 19:32:40 jhb Exp $ +# $FreeBSD: src/sys/conf/options,v 1.584 2007/03/31 23:23:41 jhb Exp $ # # On the handling of kernel options # @@ -59,6 +59,7 @@ # Miscellaneous options. ADAPTIVE_GIANT opt_adaptive_mutexes.h +ADAPTIVE_SX ALQ AUDIT opt_global.h CODA_COMPAT_5 opt_coda.h @@ -555,6 +556,7 @@ REGRESSION opt_global.h RESTARTABLE_PANICS opt_global.h RWLOCK_NOINLINE opt_global.h +SX_NOINLINE opt_global.h VFS_BIO_DEBUG opt_global.h # These are VM related options ==== //depot/projects/uart/dev/acpica/acpi_ec.c#18 (text+ko) ==== @@ -136,12 +136,13 @@ *****************************************************************************/ #include -__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_ec.c,v 1.72 2007/03/22 18:16:40 jkim Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_ec.c,v 1.73 2007/03/31 23:23:41 jhb Exp $"); #include "opt_acpi.h" #include #include #include +#include #include #include #include ==== //depot/projects/uart/dev/ahb/ahb.c#10 (text+ko) ==== @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/ahb/ahb.c,v 1.39 2007/02/23 12:18:30 piso Exp $ + * $FreeBSD: src/sys/dev/ahb/ahb.c,v 1.40 2007/04/01 16:55:31 netchild Exp $ */ #include @@ -378,8 +378,10 @@ goto error_exit; /* Enable our interrupt */ - bus_setup_intr(dev, irq, INTR_TYPE_CAM|INTR_ENTROPY, NULL, ahbintr, - ahb, &ih); + if (bus_setup_intr(dev, irq, INTR_TYPE_CAM|INTR_ENTROPY, NULL, ahbintr, + ahb, &ih) != 0) + goto error_exit; + return (0); error_exit: ==== //depot/projects/uart/dev/arcmsr/arcmsr.c#7 (text+ko) ==== @@ -56,7 +56,7 @@ ** and cause g_vfs_done() read write error ****************************************************************************************** -* $FreeBSD: src/sys/dev/arcmsr/arcmsr.c,v 1.20 2007/03/12 05:10:29 mjacob Exp $ +* $FreeBSD: src/sys/dev/arcmsr/arcmsr.c,v 1.21 2007/04/02 03:31:37 scottl Exp $ */ #include #include @@ -1270,8 +1270,7 @@ , acb->pci_unit, error); } if((pccb->ccb_h.status & CAM_STATUS_MASK) == CAM_REQ_INPROG) { - xpt_freeze_devq(pccb->ccb_h.path, /*count*/1); - pccb->ccb_h.status |= (CAM_REQ_TOO_BIG|CAM_DEV_QFRZN); + pccb->ccb_h.status |= CAM_REQ_TOO_BIG; } arcmsr_srb_complete(srb, 0); return; @@ -1307,14 +1306,14 @@ arcmsr_srb_complete(srb, 0); return; } - pccb->ccb_h.status |= CAM_SIM_QUEUED; if(acb->srboutstandingcount >= ARCMSR_MAX_OUTSTANDING_CMD) { - pccb->ccb_h.status &= ~CAM_STATUS_MASK; - pccb->ccb_h.status |= (CAM_REQUEUE_REQ|CAM_DEV_QFRZN); + xpt_freeze_simq(acb->psim, 1); + pccb->ccb_h.status = CAM_REQUEUE_REQ; acb->acb_flags |= ACB_F_CAM_DEV_QFRZN; arcmsr_srb_complete(srb, 0); return; } + pccb->ccb_h.status |= CAM_SIM_QUEUED; arcmsr_build_srb(srb, dm_segs, nseg); arcmsr_post_srb(acb, srb); return; ==== //depot/projects/uart/dev/ed/if_ed_pccard.c#15 (text+ko) ==== @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/ed/if_ed_pccard.c,v 1.111 2007/02/23 12:18:38 piso Exp $ + * $FreeBSD: src/sys/dev/ed/if_ed_pccard.c,v 1.112 2007/04/01 14:15:26 netchild Exp $ */ /* @@ -541,7 +541,7 @@ sc->chip_type == ED_CHIP_TYPE_DL10022) { /* Probe for an MII bus, but ignore errors. */ ed_pccard_dl100xx_mii_reset(sc); - mii_phy_probe(dev, &sc->miibus, ed_ifmedia_upd, + (void)mii_phy_probe(dev, &sc->miibus, ed_ifmedia_upd, ed_ifmedia_sts); } else if (sc->chip_type == ED_CHIP_TYPE_AX88190) { ed_pccard_ax88x90_mii_reset(sc); ==== //depot/projects/uart/dev/firewire/fwohci_pci.c#15 (text+ko) ==== @@ -31,7 +31,7 @@ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/firewire/fwohci_pci.c,v 1.58 2007/03/19 03:41:27 simokawa Exp $ + * $FreeBSD: src/sys/dev/firewire/fwohci_pci.c,v 1.59 2007/03/30 22:25:26 simokawa Exp $ */ #define BOUNCE_BUFFER_TEST 0 @@ -424,19 +424,18 @@ FWOHCI_INTMASKCLR, OHCI_INT_EN); if (sc->irq_res) { - int err = bus_teardown_intr(self, sc->irq_res, sc->ih); - if (err) - /* XXX or should we panic? */ - device_printf(self, "Could not tear down irq, %d\n", - err); + int err; + if (sc->ih) { + err = bus_teardown_intr(self, sc->irq_res, sc->ih); + if (err) + device_printf(self, + "Could not tear down irq, %d\n", err); #if defined(__DragonFly__) || __FreeBSD_version < 500000 - bus_teardown_intr(self, sc->irq_res, sc->ih_cam); - bus_teardown_intr(self, sc->irq_res, sc->ih_bio); + bus_teardown_intr(self, sc->irq_res, sc->ih_cam); + bus_teardown_intr(self, sc->irq_res, sc->ih_bio); #endif - sc->ih = NULL; - } - - if (sc->irq_res) { + sc->ih = NULL; + } bus_release_resource(self, SYS_RES_IRQ, 0, sc->irq_res); sc->irq_res = NULL; } ==== //depot/projects/uart/dev/ipmi/ipmi_pci.c#3 (text) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ipmi/ipmi_pci.c,v 1.2 2006/09/22 22:11:29 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ipmi/ipmi_pci.c,v 1.4 2007/03/31 21:39:02 jhb Exp $"); #include #include @@ -185,7 +185,7 @@ { if (pci_get_class(dev) == PCIC_SERIALBUS && - pci_get_subclass(dev) == 0x07) { + pci_get_subclass(dev) == PCIS_SERIALBUS_IPMI) { device_set_desc(dev, "IPMI System Interface"); return (BUS_PROBE_GENERIC); } @@ -204,13 +204,13 @@ /* Interface is determined by progif. */ switch (pci_get_progif(dev)) { - case 0: + case PCIP_SERIALBUS_IPMI_SMIC: iface = SMIC_MODE; break; - case 1: + case PCIP_SERIALBUS_IPMI_KCS: iface = KCS_MODE; break; - case 2: + case PCIP_SERIALBUS_IPMI_BT: iface = BT_MODE; device_printf(dev, "BT interface unsupported\n"); return (ENXIO); @@ -220,12 +220,9 @@ return (ENXIO); } - /* - * Bottom bit of bar indicates resouce type. There should be - * constants in pcireg.h for fields in a BAR. - */ + /* Check the BAR to determine our resource type. */ sc->ipmi_io_rid = PCIR_BAR(0); - if (pci_read_config(dev, PCIR_BAR(0), 4) & 0x1) + if (PCI_BAR_IO(pci_read_config(dev, PCIR_BAR(0), 4))) type = SYS_RES_IOPORT; else type = SYS_RES_MEMORY; ==== //depot/projects/uart/dev/isp/isp_freebsd.c#21 (text+ko) ==== @@ -28,7 +28,7 @@ * Platform (FreeBSD) dependent common attachment code for Qlogic adapters. */ #include -__FBSDID("$FreeBSD: src/sys/dev/isp/isp_freebsd.c,v 1.136 2007/03/12 04:54:30 mjacob Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/isp/isp_freebsd.c,v 1.137 2007/04/02 01:04:20 mjacob Exp $"); #include #include #include @@ -382,6 +382,14 @@ retval = EINVAL; break; } + /* + * XXX: Current + */ + if (nr == ISP_ROLE_BOTH) { + isp_prt(isp, ISP_LOGERR, "dual roles not supported"); + retval = EINVAL; + break; + } *(int *)addr = isp->isp_role; isp->isp_role = nr; /* FALLTHROUGH */ @@ -1133,7 +1141,7 @@ static void isp_ledone(ispsoftc_t *isp, lun_entry_t *lep) { - const char lfmt[] = "now %sabled for target mode"; + const char lfmt[] = "now %sabled for target mode\n"; union ccb *ccb; uint32_t seq; tstate_t *tptr; ==== //depot/projects/uart/dev/isp/isp_freebsd.h#17 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/dev/isp/isp_freebsd.h,v 1.102 2007/03/13 06:46:08 mjacob Exp $ */ +/* $FreeBSD: src/sys/dev/isp/isp_freebsd.h,v 1.104 2007/04/02 01:04:20 mjacob Exp $ */ /*- * Qlogic ISP SCSI Host Adapter FreeBSD Wrapper Definitions * @@ -532,4 +532,10 @@ #include +/* + * XXX: Temp + */ +#if ISP_DEFAULT_ROLES == ISP_ROLE_BOTH +#error "Dual Role Temporarily Unsupported" +#endif #endif /* _ISP_FREEBSD_H */ ==== //depot/projects/uart/dev/isp/isp_library.c#10 (text) ==== @@ -34,7 +34,7 @@ #endif #ifdef __FreeBSD__ #include -__FBSDID("$FreeBSD: src/sys/dev/isp/isp_library.c,v 1.12 2007/03/22 23:38:31 mjacob Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/isp/isp_library.c,v 1.13 2007/04/02 01:04:20 mjacob Exp $"); #include #endif #ifdef __OpenBSD__ @@ -1499,12 +1499,12 @@ void * isp_find_xs_tgt(ispsoftc_t *isp, uint32_t handle) { - if (handle == 0 || (handle & 0x8000) == 0 || - (handle & 0x7fff) > isp->isp_maxcmds) { + if (handle == 0 || IS_TARGET_HANDLE(handle) == 0 || + (handle & ISP_HANDLE_MASK) > isp->isp_maxcmds) { isp_prt(isp, ISP_LOGERR, "bad handle in isp_find_xs_tgt"); return (NULL); } else { - return (isp->isp_tgtlist[(handle & 0x7fff) - 1]); + return (isp->isp_tgtlist[(handle & ISP_HANDLE_MASK) - 1]); } } @@ -1515,7 +1515,7 @@ if (xs != NULL) { for (i = 0; i < isp->isp_maxcmds; i++) { if (isp->isp_tgtlist[i] == xs) { - return ((i+1) & 0x7fff); + return ((i+1) & ISP_HANDLE_MASK); } } } @@ -1525,12 +1525,12 @@ void isp_destroy_tgt_handle(ispsoftc_t *isp, uint32_t handle) { - if (handle == 0 || (handle & 0x8000) == 0 || - (handle & 0x7fff) > isp->isp_maxcmds) { + if (handle == 0 || IS_TARGET_HANDLE(handle) == 0 || + (handle & ISP_HANDLE_MASK) > isp->isp_maxcmds) { isp_prt(isp, ISP_LOGERR, "bad handle in isp_destroy_tgt_handle"); } else { - isp->isp_tgtlist[(handle & 0x7fff) - 1] = NULL; + isp->isp_tgtlist[(handle & ISP_HANDLE_MASK) - 1] = NULL; } } ==== //depot/projects/uart/dev/isp/isp_library.h#7 (text) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/dev/isp/isp_library.h,v 1.7 2007/03/22 23:38:31 mjacob Exp $ */ +/* $FreeBSD: src/sys/dev/isp/isp_library.h,v 1.8 2007/04/02 01:04:20 mjacob Exp $ */ /*- * Copyright (c) 1997-2007 by Matthew Jacob * All rights reserved. @@ -128,6 +128,8 @@ extern void isp_get_ct_hdr(ispsoftc_t *isp, ct_hdr_t *, ct_hdr_t *); extern void isp_put_ct_hdr(ispsoftc_t *isp, ct_hdr_t *, ct_hdr_t *); +#define ISP_HANDLE_MASK 0x7fff + #ifdef ISP_TARGET_MODE #if defined(__NetBSD__) || defined(__OpenBSD__) #include ==== //depot/projects/uart/dev/isp/isp_pci.c#21 (text+ko) ==== @@ -28,7 +28,7 @@ * FreeBSD Version. */ #include -__FBSDID("$FreeBSD: src/sys/dev/isp/isp_pci.c,v 1.141 2007/03/22 23:38:32 mjacob Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/isp/isp_pci.c,v 1.142 2007/04/02 01:04:20 mjacob Exp $"); #include #include @@ -1994,7 +1994,7 @@ cto->ct_scsi_status = 0; pcs = (struct isp_pcisoftc *)isp; - dp = &pcs->dmaps[isp_handle_index(handle)]; + dp = &pcs->dmaps[isp_handle_index(handle & ISP_HANDLE_MASK)]; if ((csio->ccb_h.flags & CAM_DIR_MASK) == CAM_DIR_IN) { bus_dmamap_sync(pcs->dmat, *dp, BUS_DMASYNC_PREREAD); } else { @@ -2388,7 +2388,7 @@ isp = mp->isp; rq = mp->rq; pcs = (struct isp_pcisoftc *)mp->isp; - dp = &pcs->dmaps[isp_handle_index(rq->req_handle)]; + dp = &pcs->dmaps[isp_handle_index(rq->req_handle & ISP_HANDLE_MASK)]; nxti = *mp->nxtip; if ((csio->ccb_h.flags & CAM_DIR_MASK) == CAM_DIR_IN) { @@ -2494,7 +2494,7 @@ isp = mp->isp; rq = mp->rq; pcs = (struct isp_pcisoftc *)mp->isp; - dp = &pcs->dmaps[isp_handle_index(rq->req_handle)]; + dp = &pcs->dmaps[isp_handle_index(rq->req_handle & ISP_HANDLE_MASK)]; nxti = *mp->nxtip; if ((csio->ccb_h.flags & CAM_DIR_MASK) == CAM_DIR_IN) { @@ -2628,7 +2628,7 @@ isp = mp->isp; rq = mp->rq; pcs = (struct isp_pcisoftc *)mp->isp; - dp = &pcs->dmaps[isp_handle_index(rq->req_handle)]; + dp = &pcs->dmaps[isp_handle_index(rq->req_handle & ISP_HANDLE_MASK)]; nxti = *mp->nxtip; if ((csio->ccb_h.flags & CAM_DIR_MASK) == CAM_DIR_IN) { @@ -2795,7 +2795,8 @@ if ((csio->ccb_h.flags & CAM_SCATTER_VALID) == 0) { if ((csio->ccb_h.flags & CAM_DATA_PHYS) == 0) { int error, s; - dp = &pcs->dmaps[isp_handle_index(rq->req_handle)]; + dp = &pcs->dmaps[isp_handle_index( + rq->req_handle & ISP_HANDLE_MASK)]; s = splsoftvm(); error = bus_dmamap_load(pcs->dmat, *dp, csio->data_ptr, csio->dxfer_len, eptr, mp, 0); @@ -2880,7 +2881,8 @@ isp_pci_dmateardown(ispsoftc_t *isp, XS_T *xs, uint32_t handle) { struct isp_pcisoftc *pcs = (struct isp_pcisoftc *)isp; - bus_dmamap_t *dp = &pcs->dmaps[isp_handle_index(handle)]; + bus_dmamap_t *dp; + dp = &pcs->dmaps[isp_handle_index(handle & ISP_HANDLE_MASK)]; if ((xs->ccb_h.flags & CAM_DIR_MASK) == CAM_DIR_IN) { bus_dmamap_sync(pcs->dmat, *dp, BUS_DMASYNC_POSTREAD); } else { ==== //depot/projects/uart/dev/isp/isp_sbus.c#16 (text+ko) ==== @@ -29,7 +29,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/isp/isp_sbus.c,v 1.31 2007/03/28 16:34:11 mjacob Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/isp/isp_sbus.c,v 1.32 2007/04/02 01:04:20 mjacob Exp $"); #include #include @@ -624,7 +624,7 @@ isp = mp->isp; rq = mp->rq; sbs = (struct isp_sbussoftc *)mp->isp; - dp = &sbs->dmaps[isp_handle_index(rq->req_handle)]; + dp = &sbs->dmaps[isp_handle_index(rq->req_handle & ISP_HANDLE_MASK)]; nxti = *mp->nxtip; if ((csio->ccb_h.flags & CAM_DIR_MASK) == CAM_DIR_IN) { @@ -735,7 +735,8 @@ if ((csio->ccb_h.flags & CAM_SCATTER_VALID) == 0) { if ((csio->ccb_h.flags & CAM_DATA_PHYS) == 0) { int error, s; - dp = &sbs->dmaps[isp_handle_index(rq->req_handle)]; + dp = &sbs->dmaps[isp_handle_index( + rq->req_handle & ISP_HANDLE_MASK)]; s = splsoftvm(); error = bus_dmamap_load(sbs->dmat, *dp, csio->data_ptr, csio->dxfer_len, eptr, mp, 0); @@ -809,7 +810,8 @@ isp_sbus_dmateardown(ispsoftc_t *isp, XS_T *xs, uint32_t handle) { struct isp_sbussoftc *sbs = (struct isp_sbussoftc *)isp; - bus_dmamap_t *dp = &sbs->dmaps[isp_handle_index(handle)]; + bus_dmamap_t *dp; + dp = &sbs->dmaps[isp_handle_index(handle & ISP_HANDLE_MASK)]; if ((xs->ccb_h.flags & CAM_DIR_MASK) == CAM_DIR_IN) { bus_dmamap_sync(sbs->dmat, *dp, BUS_DMASYNC_POSTREAD); } else { ==== //depot/projects/uart/dev/mxge/if_mxge.c#8 (text+ko) ==== @@ -32,7 +32,7 @@ ***************************************************************************/ #include -__FBSDID("$FreeBSD: src/sys/dev/mxge/if_mxge.c,v 1.24 2007/03/27 15:55:32 gallatin Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/mxge/if_mxge.c,v 1.25 2007/03/31 23:23:41 jhb Exp $"); #include #include @@ -44,6 +44,7 @@ #include #include #include +#include #include #include #include ==== //depot/projects/uart/dev/pci/pci.c#30 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/pci/pci.c,v 1.345 2007/03/26 20:18:52 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/pci/pci.c,v 1.348 2007/03/31 21:39:02 jhb Exp $"); #include "opt_bus.h" @@ -72,7 +72,7 @@ #endif static uint32_t pci_mapbase(unsigned mapreg); -static int pci_maptype(unsigned mapreg); +static const char *pci_maptype(unsigned mapreg); static int pci_mapsize(unsigned testval); static int pci_maprange(unsigned mapreg); static void pci_fixancient(pcicfgregs *cfg); @@ -305,29 +305,24 @@ static uint32_t pci_mapbase(uint32_t mapreg) { - int mask = 0x03; - if ((mapreg & 0x01) == 0) - mask = 0x0f; - return (mapreg & ~mask); + + if (PCI_BAR_MEM(mapreg)) + return (mapreg & PCIM_BAR_MEM_BASE); + else + return (mapreg & PCIM_BAR_IO_BASE); } /* return map type of memory or port map */ -static int +static const char * pci_maptype(unsigned mapreg) { - static uint8_t maptype[0x10] = { - PCI_MAPMEM, PCI_MAPPORT, - PCI_MAPMEM, 0, - PCI_MAPMEM, PCI_MAPPORT, - 0, 0, - PCI_MAPMEM|PCI_MAPMEMP, PCI_MAPPORT, - PCI_MAPMEM|PCI_MAPMEMP, 0, - PCI_MAPMEM|PCI_MAPMEMP, PCI_MAPPORT, - 0, 0, - }; - return (maptype[mapreg & 0x0f]); + if (PCI_BAR_IO(mapreg)) + return ("I/O Port"); + if (mapreg & PCIM_BAR_MEM_PREFETCH) + return ("Prefetchable Memory"); + return ("Memory"); } /* return log2 of map size decoded for memory or port map */ @@ -355,19 +350,21 @@ pci_maprange(unsigned mapreg) { int ln2range = 0; - switch (mapreg & 0x07) { - case 0x00: - case 0x01: - case 0x05: + + if (PCI_BAR_IO(mapreg)) ln2range = 32; - break; - case 0x02: - ln2range = 20; - break; - case 0x04: - ln2range = 64; - break; - } + else + switch (mapreg & PCIM_BAR_MEM_TYPE) { + case PCIM_BAR_MEM_32: + ln2range = 32; + break; + case PCIM_BAR_MEM_1MB: + ln2range = 20; + break; + case PCIM_BAR_MEM_64: + ln2range = 64; + break; + } return (ln2range); } @@ -1062,7 +1059,7 @@ uint32_t offset, bit; KASSERT(cfg->msix.msix_alloc > index, ("bogus index")); - offset = cfg->msix.msix_pba_offset + (index / 4) * 4; + offset = cfg->msix.msix_pba_offset + (index / 32) * 4; bit = 1 << index % 32; return (bus_read_4(cfg->msix.msix_pba_res, offset) & bit); } @@ -1972,7 +1969,7 @@ testval = PCIB_READ_CONFIG(pcib, b, s, f, reg, 4); PCIB_WRITE_CONFIG(pcib, b, s, f, reg, map, 4); - if (pci_maptype(map) & PCI_MAPMEM) + if (PCI_BAR_MEM(map)) type = SYS_RES_MEMORY; else type = SYS_RES_IOPORT; @@ -1988,8 +1985,7 @@ * areas to the type of memory involved. Memory must be at least * 16 bytes in size, while I/O ranges must be at least 4. */ - if ((testval & 0x1) == 0x1 && - (testval & 0x2) != 0) + if (PCI_BAR_IO(testval) && (testval & PCIM_BAR_IO_RESERVED) != 0) return (barlen); if ((type == SYS_RES_MEMORY && ln2size < 4) || (type == SYS_RES_IOPORT && ln2size < 2)) @@ -1999,7 +1995,7 @@ /* Read the other half of a 64bit map register */ base |= (uint64_t) PCIB_READ_CONFIG(pcib, b, s, f, reg + 4, 4) << 32; if (bootverbose) { - printf("\tmap[%02x]: type %x, range %2d, base %#jx, size %2d", + printf("\tmap[%02x]: type %s, range %2d, base %#jx, size %2d", reg, pci_maptype(map), ln2range, (uintmax_t)base, ln2size); if (type == SYS_RES_IOPORT && !pci_porten(pcib, b, s, f)) printf(", port disabled\n"); @@ -2920,7 +2916,7 @@ map |= (pci_addr_t)pci_read_config(child, *rid + 4, 4) << 32; if (pci_mapbase(testval) == 0) goto out; - if (pci_maptype(testval) & PCI_MAPMEM) { + if (PCI_BAR_MEM(testval)) { if (type != SYS_RES_MEMORY) { if (bootverbose) device_printf(dev, ==== //depot/projects/uart/dev/pci/pci_pci.c#12 (text+ko) ==== @@ -29,7 +29,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/pci/pci_pci.c,v 1.46 2007/01/22 21:48:43 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/pci/pci_pci.c,v 1.47 2007/03/31 20:41:00 jhb Exp $"); /* * PCI:PCI bridge support. @@ -253,7 +253,7 @@ * parts as subtractive. */ if ((pci_get_devid(dev) & 0xff00ffff) == 0x24008086 || - pci_read_config(dev, PCIR_PROGIF, 1) == 1) + pci_read_config(dev, PCIR_PROGIF, 1) == PCIP_BRIDGE_PCI_SUBTRACTIVE) sc->flags |= PCIB_SUBTRACTIVE; if (bootverbose) { ==== //depot/projects/uart/dev/pci/pcireg.h#14 (text+ko) ==== @@ -23,7 +23,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/pci/pcireg.h,v 1.59 2007/03/05 16:18:31 jhb Exp $ + * $FreeBSD: src/sys/dev/pci/pcireg.h,v 1.61 2007/03/31 21:39:02 jhb Exp $ * */ @@ -118,6 +118,19 @@ #define PCIR_BARS 0x10 #define PCIR_BAR(x) (PCIR_BARS + (x) * 4) #define PCI_RID2BAR(rid) (((rid)-PCIR_BARS)/4) +#define PCI_BAR_IO(x) (((x) & PCIM_BAR_SPACE) == PCIM_BAR_IO_SPACE) +#define PCI_BAR_MEM(x) (((x) & PCIM_BAR_SPACE) == PCIM_BAR_MEM_SPACE) +#define PCIM_BAR_SPACE 0x00000001 +#define PCIM_BAR_MEM_SPACE 0 +#define PCIM_BAR_IO_SPACE 1 +#define PCIM_BAR_MEM_TYPE 0x00000006 +#define PCIM_BAR_MEM_32 0 +#define PCIM_BAR_MEM_1MB 2 /* Locate below 1MB in PCI <= 2.1 */ +#define PCIM_BAR_MEM_64 4 >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Apr 2 12:32:23 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3D30416A40B; Mon, 2 Apr 2007 12:32:23 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id D9B3016A405 for ; Mon, 2 Apr 2007 12:32:22 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id C990A13C46A for ; Mon, 2 Apr 2007 12:32:22 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l32CWMWR030050 for ; Mon, 2 Apr 2007 12:32:22 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l32CWKoX030043 for perforce@freebsd.org; Mon, 2 Apr 2007 12:32:20 GMT (envelope-from jhb@freebsd.org) Date: Mon, 2 Apr 2007 12:32:20 GMT Message-Id: <200704021232.l32CWKoX030043@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 117177 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 02 Apr 2007 12:32:23 -0000 http://perforce.freebsd.org/chv.cgi?CH=117177 Change 117177 by jhb@jhb_mutex on 2007/04/02 12:31:20 IFC @117176. Affected files ... .. //depot/projects/smpng/sys/amd64/amd64/support.S#19 integrate .. //depot/projects/smpng/sys/conf/NOTES#140 integrate .. //depot/projects/smpng/sys/conf/options#139 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_ec.c#44 integrate .. //depot/projects/smpng/sys/dev/ahb/ahb.c#18 integrate .. //depot/projects/smpng/sys/dev/arcmsr/arcmsr.c#15 integrate .. //depot/projects/smpng/sys/dev/ed/if_ed_pccard.c#39 integrate .. //depot/projects/smpng/sys/dev/firewire/fwohci_pci.c#40 integrate .. //depot/projects/smpng/sys/dev/ipmi/ipmi_pci.c#3 integrate .. //depot/projects/smpng/sys/dev/isp/isp_freebsd.c#54 integrate .. //depot/projects/smpng/sys/dev/isp/isp_freebsd.h#40 integrate .. //depot/projects/smpng/sys/dev/isp/isp_library.c#11 integrate .. //depot/projects/smpng/sys/dev/isp/isp_library.h#7 integrate .. //depot/projects/smpng/sys/dev/isp/isp_pci.c#54 integrate .. //depot/projects/smpng/sys/dev/isp/isp_sbus.c#25 integrate .. //depot/projects/smpng/sys/dev/mxge/if_mxge.c#14 integrate .. //depot/projects/smpng/sys/dev/pci/pci.c#89 integrate .. //depot/projects/smpng/sys/dev/pci/pci_pci.c#33 integrate .. //depot/projects/smpng/sys/dev/pci/pcireg.h#22 integrate .. //depot/projects/smpng/sys/dev/sk/if_sk.c#12 integrate .. //depot/projects/smpng/sys/dev/sk/if_skreg.h#7 integrate .. //depot/projects/smpng/sys/dev/sound/midi/midi.c#15 integrate .. //depot/projects/smpng/sys/dev/sound/pcm/channel.c#40 integrate .. //depot/projects/smpng/sys/dev/sound/pcm/mixer.c#27 integrate .. //depot/projects/smpng/sys/dev/sound/usb/uaudio.c#18 integrate .. //depot/projects/smpng/sys/dev/usb/if_aue.c#49 integrate .. //depot/projects/smpng/sys/dev/usb/if_axe.c#29 integrate .. //depot/projects/smpng/sys/dev/usb/ubser.c#13 integrate .. //depot/projects/smpng/sys/gnu/fs/xfs/FreeBSD/support/mrlock.c#2 integrate .. //depot/projects/smpng/sys/gnu/fs/xfs/FreeBSD/support/mrlock.h#2 integrate .. //depot/projects/smpng/sys/i386/acpica/acpi_machdep.c#26 integrate .. //depot/projects/smpng/sys/i386/i386/support.s#24 integrate .. //depot/projects/smpng/sys/i4b/layer1/ifpnp/i4b_ifpnp_avm.c#11 integrate .. //depot/projects/smpng/sys/i4b/layer1/ihfc/i4b_ihfc_pnp.c#8 integrate .. //depot/projects/smpng/sys/i4b/layer1/isic/i4b_avm_a1.c#7 integrate .. //depot/projects/smpng/sys/i4b/layer1/isic/i4b_isic_pnp.c#10 integrate .. //depot/projects/smpng/sys/i4b/layer1/isic/i4b_itk_ix1.c#8 integrate .. //depot/projects/smpng/sys/i4b/layer1/isic/i4b_tel_s016.c#8 integrate .. //depot/projects/smpng/sys/i4b/layer1/isic/i4b_tel_s0163.c#7 integrate .. //depot/projects/smpng/sys/kern/kern_sx.c#45 integrate .. //depot/projects/smpng/sys/kern/subr_witness.c#161 integrate .. //depot/projects/smpng/sys/kern/vfs_lookup.c#42 integrate .. //depot/projects/smpng/sys/kern/vfs_mount.c#71 integrate .. //depot/projects/smpng/sys/kern/vfs_subr.c#139 integrate .. //depot/projects/smpng/sys/modules/cryptodev/Makefile#2 integrate .. //depot/projects/smpng/sys/netgraph/ng_base.c#49 integrate .. //depot/projects/smpng/sys/netinet/sctp_auth.c#6 integrate .. //depot/projects/smpng/sys/netinet/sctp_constants.h#7 integrate .. //depot/projects/smpng/sys/netinet/sctp_indata.c#8 integrate .. //depot/projects/smpng/sys/netinet/sctp_input.c#8 integrate .. //depot/projects/smpng/sys/netinet/sctp_os_bsd.h#7 integrate .. //depot/projects/smpng/sys/netinet/sctp_output.c#8 integrate .. //depot/projects/smpng/sys/netinet/sctp_pcb.c#7 integrate .. //depot/projects/smpng/sys/netinet/sctp_pcb.h#6 integrate .. //depot/projects/smpng/sys/netinet/sctp_structs.h#7 integrate .. //depot/projects/smpng/sys/netinet/sctp_sysctl.c#2 integrate .. //depot/projects/smpng/sys/netinet/sctp_sysctl.h#2 integrate .. //depot/projects/smpng/sys/netinet/sctp_uio.h#7 integrate .. //depot/projects/smpng/sys/netinet/sctp_usrreq.c#8 integrate .. //depot/projects/smpng/sys/netinet/sctputil.c#9 integrate .. //depot/projects/smpng/sys/netinet6/in6_src.c#29 integrate .. //depot/projects/smpng/sys/netinet6/sctp6_usrreq.c#7 integrate .. //depot/projects/smpng/sys/powerpc/conf/GENERIC#42 integrate .. //depot/projects/smpng/sys/powerpc/conf/NOTES#7 integrate .. //depot/projects/smpng/sys/powerpc/powermac/uninorth.c#12 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/extintr.c#7 delete .. //depot/projects/smpng/sys/sys/_sx.h#1 branch .. //depot/projects/smpng/sys/sys/mount.h#59 integrate .. //depot/projects/smpng/sys/sys/sleepqueue.h#12 integrate .. //depot/projects/smpng/sys/sys/sx.h#25 integrate .. //depot/projects/smpng/sys/sys/vnode.h#79 integrate Differences ... ==== //depot/projects/smpng/sys/amd64/amd64/support.S#19 (text+ko) ==== @@ -27,7 +27,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/amd64/support.S,v 1.124 2007/03/30 19:33:52 jkim Exp $ + * $FreeBSD: src/sys/amd64/amd64/support.S,v 1.126 2007/03/31 01:47:37 jkim Exp $ */ #include "opt_ddb.h" @@ -671,37 +671,18 @@ incl %eax ret -/* - * Support for BB-profiling (gcc -a). The kernbb program will extract - * the data from the kernel. - */ - - .data - ALIGN_DATA - .globl bbhead -bbhead: - .quad 0 +/*****************************************************************************/ +/* linux_futex support */ +/*****************************************************************************/ - .text -NON_GPROF_ENTRY(__bb_init_func) - movq $1,(%rdi) - movq bbhead,%rax - movq %rax,32(%rdi) - movq %rdi,bbhead - NON_GPROF_RET - - .text - futex_fault: - movq PCPU(CURPCB),%rdx - movq $0,PCB_ONFAULT(%rdx) + movq $0,PCB_ONFAULT(%rcx) movq $-EFAULT,%rax ret -/* int futex_xchgl(int oparg, caddr_t uaddr, int *oldval); */ ENTRY(futex_xchgl) - movq PCPU(CURPCB),%r11 - movq $futex_fault,PCB_ONFAULT(%r11) + movq PCPU(CURPCB),%rcx + movq $futex_fault,PCB_ONFAULT(%rcx) movq $VM_MAXUSER_ADDRESS-4,%rax cmpq %rax,%rsi @@ -713,13 +694,12 @@ xchgl %edi,(%rsi) movl %edi,(%rdx) xorl %eax,%eax - movq %rax,PCB_ONFAULT(%r11) + movq %rax,PCB_ONFAULT(%rcx) ret -/* int futex_addl(int oparg, caddr_t uaddr, int *oldval); */ ENTRY(futex_addl) - movq PCPU(CURPCB),%r11 - movq $futex_fault,PCB_ONFAULT(%r11) + movq PCPU(CURPCB),%rcx + movq $futex_fault,PCB_ONFAULT(%rcx) movq $VM_MAXUSER_ADDRESS-4,%rax cmpq %rax,%rsi @@ -731,5 +711,24 @@ xaddl %edi,(%rsi) movl %edi,(%rdx) xorl %eax,%eax - movq %rax,PCB_ONFAULT(%r11) + movq %rax,PCB_ONFAULT(%rcx) ret + +/* + * Support for BB-profiling (gcc -a). The kernbb program will extract + * the data from the kernel. + */ + + .data + ALIGN_DATA + .globl bbhead +bbhead: + .quad 0 + + .text +NON_GPROF_ENTRY(__bb_init_func) + movq $1,(%rdi) + movq bbhead,%rax + movq %rax,32(%rdi) + movq %rdi,bbhead + NON_GPROF_RET ==== //depot/projects/smpng/sys/conf/NOTES#140 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/NOTES,v 1.1416 2007/03/26 09:10:28 yar Exp $ +# $FreeBSD: src/sys/conf/NOTES,v 1.1418 2007/04/02 01:04:20 mjacob Exp $ # # NOTES -- Lines that can be cut/pasted into kernel and hints configs. # @@ -214,6 +214,12 @@ # to sleep rather than spinning. options ADAPTIVE_GIANT +# ADAPTIVE_SX changes the behavior of sx locks to spin if the thread +# that currently owns the lock is executing on another CPU. Note that +# in addition to enabling this option, individual sx locks must be +# initialized with the SX_ADAPTIVESPIN flag. +options ADAPTIVE_SX + # MUTEX_NOINLINE forces mutex operations to call functions to perform each # operation rather than inlining the simple cases. This can be used to # shrink the size of the kernel text segment. Note that this behavior is @@ -233,6 +239,13 @@ # and WITNESS options. options RWLOCK_NOINLINE +# SX_NOINLINE forces sx lock operations to call functions to perform each +# operation rather than inlining the simple cases. This can be used to +# shrink the size of the kernel text segment. Note that this behavior is +# already implied by the INVARIANT_SUPPORT, INVARIANTS, KTR, LOCK_PROFILING, +# and WITNESS options. +options SX_NOINLINE + # SMP Debugging Options: # # PREEMPTION allows the threads that are in the kernel to be preempted @@ -1521,9 +1534,13 @@ # options ISP_TARGET_MODE=1 # -# ISP_DEFAULT_ROLES - default role (none, target, init, both) +# ISP_DEFAULT_ROLES - default role +# none=0 +# target=1 +# initiator=2 +# both=3 (not supported currently) # -options ISP_DEFAULT_ROLES=3 +options ISP_DEFAULT_ROLES=2 # Options used in dev/sym/ (Symbios SCSI driver). #options SYM_SETUP_LP_PROBE_MAP #-Low Priority Probe Map (bits) ==== //depot/projects/smpng/sys/conf/options#139 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options,v 1.583 2007/03/27 19:32:40 jhb Exp $ +# $FreeBSD: src/sys/conf/options,v 1.584 2007/03/31 23:23:41 jhb Exp $ # # On the handling of kernel options # @@ -59,6 +59,7 @@ # Miscellaneous options. ADAPTIVE_GIANT opt_adaptive_mutexes.h +ADAPTIVE_SX ALQ AUDIT opt_global.h CODA_COMPAT_5 opt_coda.h @@ -555,6 +556,7 @@ REGRESSION opt_global.h RESTARTABLE_PANICS opt_global.h RWLOCK_NOINLINE opt_global.h +SX_NOINLINE opt_global.h VFS_BIO_DEBUG opt_global.h # These are VM related options ==== //depot/projects/smpng/sys/dev/acpica/acpi_ec.c#44 (text+ko) ==== @@ -136,12 +136,13 @@ *****************************************************************************/ #include -__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_ec.c,v 1.72 2007/03/22 18:16:40 jkim Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_ec.c,v 1.73 2007/03/31 23:23:41 jhb Exp $"); #include "opt_acpi.h" #include #include #include +#include #include #include #include ==== //depot/projects/smpng/sys/dev/ahb/ahb.c#18 (text+ko) ==== @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/ahb/ahb.c,v 1.39 2007/02/23 12:18:30 piso Exp $ + * $FreeBSD: src/sys/dev/ahb/ahb.c,v 1.40 2007/04/01 16:55:31 netchild Exp $ */ #include @@ -378,8 +378,10 @@ goto error_exit; /* Enable our interrupt */ - bus_setup_intr(dev, irq, INTR_TYPE_CAM|INTR_ENTROPY, NULL, ahbintr, - ahb, &ih); + if (bus_setup_intr(dev, irq, INTR_TYPE_CAM|INTR_ENTROPY, NULL, ahbintr, + ahb, &ih) != 0) + goto error_exit; + return (0); error_exit: ==== //depot/projects/smpng/sys/dev/arcmsr/arcmsr.c#15 (text+ko) ==== @@ -56,7 +56,7 @@ ** and cause g_vfs_done() read write error ****************************************************************************************** -* $FreeBSD: src/sys/dev/arcmsr/arcmsr.c,v 1.20 2007/03/12 05:10:29 mjacob Exp $ +* $FreeBSD: src/sys/dev/arcmsr/arcmsr.c,v 1.21 2007/04/02 03:31:37 scottl Exp $ */ #include #include @@ -1270,8 +1270,7 @@ , acb->pci_unit, error); } if((pccb->ccb_h.status & CAM_STATUS_MASK) == CAM_REQ_INPROG) { - xpt_freeze_devq(pccb->ccb_h.path, /*count*/1); - pccb->ccb_h.status |= (CAM_REQ_TOO_BIG|CAM_DEV_QFRZN); + pccb->ccb_h.status |= CAM_REQ_TOO_BIG; } arcmsr_srb_complete(srb, 0); return; @@ -1307,14 +1306,14 @@ arcmsr_srb_complete(srb, 0); return; } - pccb->ccb_h.status |= CAM_SIM_QUEUED; if(acb->srboutstandingcount >= ARCMSR_MAX_OUTSTANDING_CMD) { - pccb->ccb_h.status &= ~CAM_STATUS_MASK; - pccb->ccb_h.status |= (CAM_REQUEUE_REQ|CAM_DEV_QFRZN); + xpt_freeze_simq(acb->psim, 1); + pccb->ccb_h.status = CAM_REQUEUE_REQ; acb->acb_flags |= ACB_F_CAM_DEV_QFRZN; arcmsr_srb_complete(srb, 0); return; } + pccb->ccb_h.status |= CAM_SIM_QUEUED; arcmsr_build_srb(srb, dm_segs, nseg); arcmsr_post_srb(acb, srb); return; ==== //depot/projects/smpng/sys/dev/ed/if_ed_pccard.c#39 (text+ko) ==== @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/ed/if_ed_pccard.c,v 1.111 2007/02/23 12:18:38 piso Exp $ + * $FreeBSD: src/sys/dev/ed/if_ed_pccard.c,v 1.112 2007/04/01 14:15:26 netchild Exp $ */ /* @@ -541,7 +541,7 @@ sc->chip_type == ED_CHIP_TYPE_DL10022) { /* Probe for an MII bus, but ignore errors. */ ed_pccard_dl100xx_mii_reset(sc); - mii_phy_probe(dev, &sc->miibus, ed_ifmedia_upd, + (void)mii_phy_probe(dev, &sc->miibus, ed_ifmedia_upd, ed_ifmedia_sts); } else if (sc->chip_type == ED_CHIP_TYPE_AX88190) { ed_pccard_ax88x90_mii_reset(sc); ==== //depot/projects/smpng/sys/dev/firewire/fwohci_pci.c#40 (text+ko) ==== @@ -31,7 +31,7 @@ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/firewire/fwohci_pci.c,v 1.58 2007/03/19 03:41:27 simokawa Exp $ + * $FreeBSD: src/sys/dev/firewire/fwohci_pci.c,v 1.59 2007/03/30 22:25:26 simokawa Exp $ */ #define BOUNCE_BUFFER_TEST 0 @@ -424,19 +424,18 @@ FWOHCI_INTMASKCLR, OHCI_INT_EN); if (sc->irq_res) { - int err = bus_teardown_intr(self, sc->irq_res, sc->ih); - if (err) - /* XXX or should we panic? */ - device_printf(self, "Could not tear down irq, %d\n", - err); + int err; + if (sc->ih) { + err = bus_teardown_intr(self, sc->irq_res, sc->ih); + if (err) + device_printf(self, + "Could not tear down irq, %d\n", err); #if defined(__DragonFly__) || __FreeBSD_version < 500000 - bus_teardown_intr(self, sc->irq_res, sc->ih_cam); - bus_teardown_intr(self, sc->irq_res, sc->ih_bio); + bus_teardown_intr(self, sc->irq_res, sc->ih_cam); + bus_teardown_intr(self, sc->irq_res, sc->ih_bio); #endif - sc->ih = NULL; - } - - if (sc->irq_res) { + sc->ih = NULL; + } bus_release_resource(self, SYS_RES_IRQ, 0, sc->irq_res); sc->irq_res = NULL; } ==== //depot/projects/smpng/sys/dev/ipmi/ipmi_pci.c#3 (text) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ipmi/ipmi_pci.c,v 1.2 2006/09/22 22:11:29 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ipmi/ipmi_pci.c,v 1.4 2007/03/31 21:39:02 jhb Exp $"); #include #include @@ -185,7 +185,7 @@ { if (pci_get_class(dev) == PCIC_SERIALBUS && - pci_get_subclass(dev) == 0x07) { + pci_get_subclass(dev) == PCIS_SERIALBUS_IPMI) { device_set_desc(dev, "IPMI System Interface"); return (BUS_PROBE_GENERIC); } @@ -204,13 +204,13 @@ /* Interface is determined by progif. */ switch (pci_get_progif(dev)) { - case 0: + case PCIP_SERIALBUS_IPMI_SMIC: iface = SMIC_MODE; break; - case 1: + case PCIP_SERIALBUS_IPMI_KCS: iface = KCS_MODE; break; - case 2: + case PCIP_SERIALBUS_IPMI_BT: iface = BT_MODE; device_printf(dev, "BT interface unsupported\n"); return (ENXIO); @@ -220,12 +220,9 @@ return (ENXIO); } - /* - * Bottom bit of bar indicates resouce type. There should be - * constants in pcireg.h for fields in a BAR. - */ + /* Check the BAR to determine our resource type. */ sc->ipmi_io_rid = PCIR_BAR(0); - if (pci_read_config(dev, PCIR_BAR(0), 4) & 0x1) + if (PCI_BAR_IO(pci_read_config(dev, PCIR_BAR(0), 4))) type = SYS_RES_IOPORT; else type = SYS_RES_MEMORY; ==== //depot/projects/smpng/sys/dev/isp/isp_freebsd.c#54 (text+ko) ==== @@ -28,7 +28,7 @@ * Platform (FreeBSD) dependent common attachment code for Qlogic adapters. */ #include -__FBSDID("$FreeBSD: src/sys/dev/isp/isp_freebsd.c,v 1.136 2007/03/12 04:54:30 mjacob Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/isp/isp_freebsd.c,v 1.137 2007/04/02 01:04:20 mjacob Exp $"); #include #include #include @@ -382,6 +382,14 @@ retval = EINVAL; break; } + /* + * XXX: Current + */ + if (nr == ISP_ROLE_BOTH) { + isp_prt(isp, ISP_LOGERR, "dual roles not supported"); + retval = EINVAL; + break; + } *(int *)addr = isp->isp_role; isp->isp_role = nr; /* FALLTHROUGH */ @@ -1133,7 +1141,7 @@ static void isp_ledone(ispsoftc_t *isp, lun_entry_t *lep) { - const char lfmt[] = "now %sabled for target mode"; + const char lfmt[] = "now %sabled for target mode\n"; union ccb *ccb; uint32_t seq; tstate_t *tptr; ==== //depot/projects/smpng/sys/dev/isp/isp_freebsd.h#40 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/dev/isp/isp_freebsd.h,v 1.102 2007/03/13 06:46:08 mjacob Exp $ */ +/* $FreeBSD: src/sys/dev/isp/isp_freebsd.h,v 1.104 2007/04/02 01:04:20 mjacob Exp $ */ /*- * Qlogic ISP SCSI Host Adapter FreeBSD Wrapper Definitions * @@ -532,4 +532,10 @@ #include +/* + * XXX: Temp + */ +#if ISP_DEFAULT_ROLES == ISP_ROLE_BOTH +#error "Dual Role Temporarily Unsupported" +#endif #endif /* _ISP_FREEBSD_H */ ==== //depot/projects/smpng/sys/dev/isp/isp_library.c#11 (text) ==== @@ -34,7 +34,7 @@ #endif #ifdef __FreeBSD__ #include -__FBSDID("$FreeBSD: src/sys/dev/isp/isp_library.c,v 1.12 2007/03/22 23:38:31 mjacob Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/isp/isp_library.c,v 1.13 2007/04/02 01:04:20 mjacob Exp $"); #include #endif #ifdef __OpenBSD__ @@ -1499,12 +1499,12 @@ void * isp_find_xs_tgt(ispsoftc_t *isp, uint32_t handle) { - if (handle == 0 || (handle & 0x8000) == 0 || - (handle & 0x7fff) > isp->isp_maxcmds) { + if (handle == 0 || IS_TARGET_HANDLE(handle) == 0 || + (handle & ISP_HANDLE_MASK) > isp->isp_maxcmds) { isp_prt(isp, ISP_LOGERR, "bad handle in isp_find_xs_tgt"); return (NULL); } else { - return (isp->isp_tgtlist[(handle & 0x7fff) - 1]); + return (isp->isp_tgtlist[(handle & ISP_HANDLE_MASK) - 1]); } } @@ -1515,7 +1515,7 @@ if (xs != NULL) { for (i = 0; i < isp->isp_maxcmds; i++) { if (isp->isp_tgtlist[i] == xs) { - return ((i+1) & 0x7fff); + return ((i+1) & ISP_HANDLE_MASK); } } } @@ -1525,12 +1525,12 @@ void isp_destroy_tgt_handle(ispsoftc_t *isp, uint32_t handle) { - if (handle == 0 || (handle & 0x8000) == 0 || - (handle & 0x7fff) > isp->isp_maxcmds) { + if (handle == 0 || IS_TARGET_HANDLE(handle) == 0 || + (handle & ISP_HANDLE_MASK) > isp->isp_maxcmds) { isp_prt(isp, ISP_LOGERR, "bad handle in isp_destroy_tgt_handle"); } else { - isp->isp_tgtlist[(handle & 0x7fff) - 1] = NULL; + isp->isp_tgtlist[(handle & ISP_HANDLE_MASK) - 1] = NULL; } } ==== //depot/projects/smpng/sys/dev/isp/isp_library.h#7 (text) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/dev/isp/isp_library.h,v 1.7 2007/03/22 23:38:31 mjacob Exp $ */ +/* $FreeBSD: src/sys/dev/isp/isp_library.h,v 1.8 2007/04/02 01:04:20 mjacob Exp $ */ /*- * Copyright (c) 1997-2007 by Matthew Jacob * All rights reserved. @@ -128,6 +128,8 @@ extern void isp_get_ct_hdr(ispsoftc_t *isp, ct_hdr_t *, ct_hdr_t *); extern void isp_put_ct_hdr(ispsoftc_t *isp, ct_hdr_t *, ct_hdr_t *); +#define ISP_HANDLE_MASK 0x7fff + #ifdef ISP_TARGET_MODE #if defined(__NetBSD__) || defined(__OpenBSD__) #include ==== //depot/projects/smpng/sys/dev/isp/isp_pci.c#54 (text+ko) ==== @@ -28,7 +28,7 @@ * FreeBSD Version. */ #include -__FBSDID("$FreeBSD: src/sys/dev/isp/isp_pci.c,v 1.141 2007/03/22 23:38:32 mjacob Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/isp/isp_pci.c,v 1.142 2007/04/02 01:04:20 mjacob Exp $"); #include #include @@ -1994,7 +1994,7 @@ cto->ct_scsi_status = 0; pcs = (struct isp_pcisoftc *)isp; - dp = &pcs->dmaps[isp_handle_index(handle)]; + dp = &pcs->dmaps[isp_handle_index(handle & ISP_HANDLE_MASK)]; if ((csio->ccb_h.flags & CAM_DIR_MASK) == CAM_DIR_IN) { bus_dmamap_sync(pcs->dmat, *dp, BUS_DMASYNC_PREREAD); } else { @@ -2388,7 +2388,7 @@ isp = mp->isp; rq = mp->rq; pcs = (struct isp_pcisoftc *)mp->isp; - dp = &pcs->dmaps[isp_handle_index(rq->req_handle)]; + dp = &pcs->dmaps[isp_handle_index(rq->req_handle & ISP_HANDLE_MASK)]; nxti = *mp->nxtip; if ((csio->ccb_h.flags & CAM_DIR_MASK) == CAM_DIR_IN) { @@ -2494,7 +2494,7 @@ isp = mp->isp; rq = mp->rq; pcs = (struct isp_pcisoftc *)mp->isp; - dp = &pcs->dmaps[isp_handle_index(rq->req_handle)]; + dp = &pcs->dmaps[isp_handle_index(rq->req_handle & ISP_HANDLE_MASK)]; nxti = *mp->nxtip; if ((csio->ccb_h.flags & CAM_DIR_MASK) == CAM_DIR_IN) { @@ -2628,7 +2628,7 @@ isp = mp->isp; rq = mp->rq; pcs = (struct isp_pcisoftc *)mp->isp; - dp = &pcs->dmaps[isp_handle_index(rq->req_handle)]; + dp = &pcs->dmaps[isp_handle_index(rq->req_handle & ISP_HANDLE_MASK)]; nxti = *mp->nxtip; if ((csio->ccb_h.flags & CAM_DIR_MASK) == CAM_DIR_IN) { @@ -2795,7 +2795,8 @@ if ((csio->ccb_h.flags & CAM_SCATTER_VALID) == 0) { if ((csio->ccb_h.flags & CAM_DATA_PHYS) == 0) { int error, s; - dp = &pcs->dmaps[isp_handle_index(rq->req_handle)]; + dp = &pcs->dmaps[isp_handle_index( + rq->req_handle & ISP_HANDLE_MASK)]; s = splsoftvm(); error = bus_dmamap_load(pcs->dmat, *dp, csio->data_ptr, csio->dxfer_len, eptr, mp, 0); @@ -2880,7 +2881,8 @@ isp_pci_dmateardown(ispsoftc_t *isp, XS_T *xs, uint32_t handle) { struct isp_pcisoftc *pcs = (struct isp_pcisoftc *)isp; - bus_dmamap_t *dp = &pcs->dmaps[isp_handle_index(handle)]; + bus_dmamap_t *dp; + dp = &pcs->dmaps[isp_handle_index(handle & ISP_HANDLE_MASK)]; if ((xs->ccb_h.flags & CAM_DIR_MASK) == CAM_DIR_IN) { bus_dmamap_sync(pcs->dmat, *dp, BUS_DMASYNC_POSTREAD); } else { ==== //depot/projects/smpng/sys/dev/isp/isp_sbus.c#25 (text+ko) ==== @@ -29,7 +29,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/isp/isp_sbus.c,v 1.31 2007/03/28 16:34:11 mjacob Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/isp/isp_sbus.c,v 1.32 2007/04/02 01:04:20 mjacob Exp $"); #include #include @@ -624,7 +624,7 @@ isp = mp->isp; rq = mp->rq; sbs = (struct isp_sbussoftc *)mp->isp; - dp = &sbs->dmaps[isp_handle_index(rq->req_handle)]; + dp = &sbs->dmaps[isp_handle_index(rq->req_handle & ISP_HANDLE_MASK)]; nxti = *mp->nxtip; if ((csio->ccb_h.flags & CAM_DIR_MASK) == CAM_DIR_IN) { @@ -735,7 +735,8 @@ if ((csio->ccb_h.flags & CAM_SCATTER_VALID) == 0) { if ((csio->ccb_h.flags & CAM_DATA_PHYS) == 0) { int error, s; - dp = &sbs->dmaps[isp_handle_index(rq->req_handle)]; + dp = &sbs->dmaps[isp_handle_index( + rq->req_handle & ISP_HANDLE_MASK)]; s = splsoftvm(); error = bus_dmamap_load(sbs->dmat, *dp, csio->data_ptr, csio->dxfer_len, eptr, mp, 0); @@ -809,7 +810,8 @@ isp_sbus_dmateardown(ispsoftc_t *isp, XS_T *xs, uint32_t handle) { struct isp_sbussoftc *sbs = (struct isp_sbussoftc *)isp; - bus_dmamap_t *dp = &sbs->dmaps[isp_handle_index(handle)]; + bus_dmamap_t *dp; + dp = &sbs->dmaps[isp_handle_index(handle & ISP_HANDLE_MASK)]; if ((xs->ccb_h.flags & CAM_DIR_MASK) == CAM_DIR_IN) { bus_dmamap_sync(sbs->dmat, *dp, BUS_DMASYNC_POSTREAD); } else { ==== //depot/projects/smpng/sys/dev/mxge/if_mxge.c#14 (text+ko) ==== @@ -32,7 +32,7 @@ ***************************************************************************/ #include -__FBSDID("$FreeBSD: src/sys/dev/mxge/if_mxge.c,v 1.24 2007/03/27 15:55:32 gallatin Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/mxge/if_mxge.c,v 1.25 2007/03/31 23:23:41 jhb Exp $"); #include #include @@ -44,6 +44,7 @@ #include #include #include +#include #include #include #include ==== //depot/projects/smpng/sys/dev/pci/pci.c#89 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/pci/pci.c,v 1.345 2007/03/26 20:18:52 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/pci/pci.c,v 1.348 2007/03/31 21:39:02 jhb Exp $"); #include "opt_bus.h" @@ -72,7 +72,7 @@ #endif static uint32_t pci_mapbase(unsigned mapreg); -static int pci_maptype(unsigned mapreg); +static const char *pci_maptype(unsigned mapreg); static int pci_mapsize(unsigned testval); static int pci_maprange(unsigned mapreg); static void pci_fixancient(pcicfgregs *cfg); @@ -305,29 +305,24 @@ static uint32_t pci_mapbase(uint32_t mapreg) { - int mask = 0x03; - if ((mapreg & 0x01) == 0) - mask = 0x0f; - return (mapreg & ~mask); + + if (PCI_BAR_MEM(mapreg)) + return (mapreg & PCIM_BAR_MEM_BASE); + else + return (mapreg & PCIM_BAR_IO_BASE); } /* return map type of memory or port map */ -static int +static const char * pci_maptype(unsigned mapreg) { - static uint8_t maptype[0x10] = { - PCI_MAPMEM, PCI_MAPPORT, - PCI_MAPMEM, 0, - PCI_MAPMEM, PCI_MAPPORT, - 0, 0, - PCI_MAPMEM|PCI_MAPMEMP, PCI_MAPPORT, - PCI_MAPMEM|PCI_MAPMEMP, 0, - PCI_MAPMEM|PCI_MAPMEMP, PCI_MAPPORT, - 0, 0, - }; - return (maptype[mapreg & 0x0f]); + if (PCI_BAR_IO(mapreg)) + return ("I/O Port"); + if (mapreg & PCIM_BAR_MEM_PREFETCH) + return ("Prefetchable Memory"); + return ("Memory"); } /* return log2 of map size decoded for memory or port map */ @@ -355,19 +350,21 @@ pci_maprange(unsigned mapreg) { int ln2range = 0; - switch (mapreg & 0x07) { - case 0x00: - case 0x01: - case 0x05: + + if (PCI_BAR_IO(mapreg)) ln2range = 32; - break; - case 0x02: - ln2range = 20; - break; - case 0x04: - ln2range = 64; - break; - } + else + switch (mapreg & PCIM_BAR_MEM_TYPE) { + case PCIM_BAR_MEM_32: + ln2range = 32; + break; + case PCIM_BAR_MEM_1MB: + ln2range = 20; + break; + case PCIM_BAR_MEM_64: + ln2range = 64; + break; + } return (ln2range); } @@ -1062,7 +1059,7 @@ uint32_t offset, bit; KASSERT(cfg->msix.msix_alloc > index, ("bogus index")); - offset = cfg->msix.msix_pba_offset + (index / 4) * 4; + offset = cfg->msix.msix_pba_offset + (index / 32) * 4; bit = 1 << index % 32; return (bus_read_4(cfg->msix.msix_pba_res, offset) & bit); } @@ -1972,7 +1969,7 @@ testval = PCIB_READ_CONFIG(pcib, b, s, f, reg, 4); PCIB_WRITE_CONFIG(pcib, b, s, f, reg, map, 4); - if (pci_maptype(map) & PCI_MAPMEM) + if (PCI_BAR_MEM(map)) type = SYS_RES_MEMORY; else type = SYS_RES_IOPORT; @@ -1988,8 +1985,7 @@ * areas to the type of memory involved. Memory must be at least * 16 bytes in size, while I/O ranges must be at least 4. */ - if ((testval & 0x1) == 0x1 && - (testval & 0x2) != 0) + if (PCI_BAR_IO(testval) && (testval & PCIM_BAR_IO_RESERVED) != 0) return (barlen); if ((type == SYS_RES_MEMORY && ln2size < 4) || (type == SYS_RES_IOPORT && ln2size < 2)) @@ -1999,7 +1995,7 @@ /* Read the other half of a 64bit map register */ base |= (uint64_t) PCIB_READ_CONFIG(pcib, b, s, f, reg + 4, 4) << 32; if (bootverbose) { - printf("\tmap[%02x]: type %x, range %2d, base %#jx, size %2d", + printf("\tmap[%02x]: type %s, range %2d, base %#jx, size %2d", reg, pci_maptype(map), ln2range, (uintmax_t)base, ln2size); if (type == SYS_RES_IOPORT && !pci_porten(pcib, b, s, f)) printf(", port disabled\n"); @@ -2920,7 +2916,7 @@ map |= (pci_addr_t)pci_read_config(child, *rid + 4, 4) << 32; if (pci_mapbase(testval) == 0) goto out; - if (pci_maptype(testval) & PCI_MAPMEM) { + if (PCI_BAR_MEM(testval)) { if (type != SYS_RES_MEMORY) { if (bootverbose) device_printf(dev, ==== //depot/projects/smpng/sys/dev/pci/pci_pci.c#33 (text+ko) ==== @@ -29,7 +29,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/pci/pci_pci.c,v 1.46 2007/01/22 21:48:43 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/pci/pci_pci.c,v 1.47 2007/03/31 20:41:00 jhb Exp $"); /* * PCI:PCI bridge support. @@ -253,7 +253,7 @@ * parts as subtractive. */ if ((pci_get_devid(dev) & 0xff00ffff) == 0x24008086 || - pci_read_config(dev, PCIR_PROGIF, 1) == 1) + pci_read_config(dev, PCIR_PROGIF, 1) == PCIP_BRIDGE_PCI_SUBTRACTIVE) sc->flags |= PCIB_SUBTRACTIVE; if (bootverbose) { ==== //depot/projects/smpng/sys/dev/pci/pcireg.h#22 (text+ko) ==== @@ -23,7 +23,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/pci/pcireg.h,v 1.59 2007/03/05 16:18:31 jhb Exp $ + * $FreeBSD: src/sys/dev/pci/pcireg.h,v 1.61 2007/03/31 21:39:02 jhb Exp $ * */ @@ -118,6 +118,19 @@ #define PCIR_BARS 0x10 #define PCIR_BAR(x) (PCIR_BARS + (x) * 4) #define PCI_RID2BAR(rid) (((rid)-PCIR_BARS)/4) +#define PCI_BAR_IO(x) (((x) & PCIM_BAR_SPACE) == PCIM_BAR_IO_SPACE) +#define PCI_BAR_MEM(x) (((x) & PCIM_BAR_SPACE) == PCIM_BAR_MEM_SPACE) +#define PCIM_BAR_SPACE 0x00000001 +#define PCIM_BAR_MEM_SPACE 0 +#define PCIM_BAR_IO_SPACE 1 +#define PCIM_BAR_MEM_TYPE 0x00000006 +#define PCIM_BAR_MEM_32 0 +#define PCIM_BAR_MEM_1MB 2 /* Locate below 1MB in PCI <= 2.1 */ +#define PCIM_BAR_MEM_64 4 +#define PCIM_BAR_MEM_PREFETCH 0x00000008 +#define PCIM_BAR_MEM_BASE 0xfffffff0 +#define PCIM_BAR_IO_RESERVED 0x00000002 +#define PCIM_BAR_IO_BASE 0xfffffffc #define PCIR_CIS 0x28 #define PCIM_CIS_ASI_MASK 0x7 #define PCIM_CIS_ASI_TUPLE 0 @@ -211,6 +224,10 @@ #define PCIS_STORAGE_FLOPPY 0x02 #define PCIS_STORAGE_IPI 0x03 #define PCIS_STORAGE_RAID 0x04 +#define PCIS_STORAGE_ATA_ADMA 0x05 +#define PCIS_STORAGE_SATA 0x06 +#define PCIP_STORAGE_SATA_AHCI_1_0 0x01 +#define PCIS_STORAGE_SAS 0x07 #define PCIS_STORAGE_OTHER 0x80 #define PCIC_NETWORK 0x02 @@ -219,6 +236,8 @@ #define PCIS_NETWORK_FDDI 0x02 #define PCIS_NETWORK_ATM 0x03 #define PCIS_NETWORK_ISDN 0x04 +#define PCIS_NETWORK_WORLDFIP 0x05 +#define PCIS_NETWORK_PICMG 0x06 #define PCIS_NETWORK_OTHER 0x80 #define PCIC_DISPLAY 0x03 @@ -244,10 +263,13 @@ #define PCIS_BRIDGE_EISA 0x02 #define PCIS_BRIDGE_MCA 0x03 #define PCIS_BRIDGE_PCI 0x04 +#define PCIP_BRIDGE_PCI_SUBTRACTIVE 0x01 #define PCIS_BRIDGE_PCMCIA 0x05 #define PCIS_BRIDGE_NUBUS 0x06 #define PCIS_BRIDGE_CARDBUS 0x07 #define PCIS_BRIDGE_RACEWAY 0x08 +#define PCIS_BRIDGE_PCI_TRANSPARENT 0x09 +#define PCIS_BRIDGE_INFINIBAND 0x0a #define PCIS_BRIDGE_OTHER 0x80 #define PCIC_SIMPLECOMM 0x07 @@ -262,6 +284,8 @@ #define PCIS_SIMPLECOMM_PAR 0x01 #define PCIS_SIMPLECOMM_MULSER 0x02 #define PCIS_SIMPLECOMM_MODEM 0x03 +#define PCIS_SIMPLECOMM_GPIB 0x04 +#define PCIS_SIMPLECOMM_SMART_CARD 0x05 #define PCIS_SIMPLECOMM_OTHER 0x80 #define PCIC_BASEPERIPH 0x08 @@ -304,16 +328,28 @@ #define PCIS_SERIALBUS_ACCESS 0x01 #define PCIS_SERIALBUS_SSA 0x02 #define PCIS_SERIALBUS_USB 0x03 -#define PCIP_SERIALBUS_USB_UHCI 0x00 -#define PCIP_SERIALBUS_USB_OHCI 0x10 -#define PCIP_SERIALBUS_USB_EHCI 0x20 +#define PCIP_SERIALBUS_USB_UHCI 0x00 +#define PCIP_SERIALBUS_USB_OHCI 0x10 +#define PCIP_SERIALBUS_USB_EHCI 0x20 +#define PCIP_SERIALBUS_USB_DEVICE 0xfe #define PCIS_SERIALBUS_FC 0x04 #define PCIS_SERIALBUS_SMBUS 0x05 +#define PCIS_SERIALBUS_INFINIBAND 0x06 +#define PCIS_SERIALBUS_IPMI 0x07 +#define PCIP_SERIALBUS_IPMI_SMIC 0x00 +#define PCIP_SERIALBUS_IPMI_KCS 0x01 +#define PCIP_SERIALBUS_IPMI_BT 0x02 +#define PCIS_SERIALBUS_SERCOS 0x08 +#define PCIS_SERIALBUS_CANBUS 0x09 #define PCIC_WIRELESS 0x0d #define PCIS_WIRELESS_IRDA 0x00 #define PCIS_WIRELESS_IR 0x01 #define PCIS_WIRELESS_RF 0x10 +#define PCIS_WIRELESS_BLUETOOTH 0x11 +#define PCIS_WIRELESS_BROADBAND 0x12 +#define PCIS_WIRELESS_80211A 0x20 +#define PCIS_WIRELESS_80211B 0x21 #define PCIS_WIRELESS_OTHER 0x80 #define PCIC_INTELLIIO 0x0e @@ -331,8 +367,11 @@ #define PCIS_CRYPTO_OTHER 0x80 #define PCIC_DASP 0x11 -#define PCIS_DASP_DPIO 0x00 -#define PCIS_DASP_OTHER 0x80 +#define PCIS_DASP_DPIO 0x00 +#define PCIS_DASP_PERFCNTRS 0x01 +#define PCIS_DASP_COMM_SYNC 0x10 +#define PCIS_DASP_MGMT_CARD 0x20 +#define PCIS_DASP_OTHER 0x80 #define PCIC_OTHER 0xff ==== //depot/projects/smpng/sys/dev/sk/if_sk.c#12 (text) ==== @@ -48,7 +48,7 @@ */ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Apr 2 13:17:49 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BFF0D16A40B; Mon, 2 Apr 2007 13:17:49 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 63A9816A408; Mon, 2 Apr 2007 13:17:49 +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 E9D7A13C4D1; Mon, 2 Apr 2007 13:17:48 +0000 (UTC) (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.8/8.13.8) with ESMTP id l32DHiQa085527; Mon, 2 Apr 2007 09:17:46 -0400 (EDT) (envelope-from jhb@freebsd.org) From: John Baldwin To: Roman Divacky Date: Mon, 2 Apr 2007 09:09:25 -0400 User-Agent: KMail/1.9.6 References: <200704011736.l31HaDhx068622@repoman.freebsd.org> In-Reply-To: <200704011736.l31HaDhx068622@repoman.freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset="iso-8859-15" Content-Transfer-Encoding: 7bit Content-Disposition: inline Message-Id: <200704020909.26327.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, 02 Apr 2007 09:17:47 -0400 (EDT) X-Virus-Scanned: ClamAV 0.88.3/2997/Mon Apr 2 06:19:52 2007 on server.baldwin.cx X-Virus-Status: Clean X-Spam-Status: No, score=-4.4 required=4.2 tests=ALL_TRUSTED,AWL,BAYES_00 autolearn=ham version=3.1.3 X-Spam-Checker-Version: SpamAssassin 3.1.3 (2006-06-01) on server.baldwin.cx Cc: Perforce Change Reviews Subject: Re: PERFORCE change 117109 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 02 Apr 2007 13:17:50 -0000 On Sunday 01 April 2007 01:36:13 pm Roman Divacky wrote: > http://perforce.freebsd.org/chv.cgi?CH=117109 > > Change 117109 by rdivacky@rdivacky_witten on 2007/04/01 17:35:45 > > Semi-implement fstatat64() - only compile tested. > Check for fp being a vnode before referencing fp->f_vnode [1] > > Pointed out by: rwatson > > I commit this because my harddisk is likely to die in a few hours. > > Affected files ... > > .. //depot/projects/linuxolator/src/sys/compat/linux/linux_file.c#20 edit > .. //depot/projects/linuxolator/src/sys/compat/linux/linux_stats.c#8 edit > .. //depot/projects/linuxolator/src/sys/compat/linux/linux_util.h#5 edit > > Differences ... > > ==== //depot/projects/linuxolator/src/sys/compat/linux/linux_file.c#20 (text+ko) ==== > > @@ -105,6 +105,10 @@ > error = fget(td, dirfd, &fp); > if (error) > return (error); > + if (fp->f_type != DTYPE_VNODE) { > + fdrop(fp, td); > + return (EBADF); > + } > dvp = fp->f_vnode; > /* only a dir can be dfd */ > if (dvp->v_type != VDIR) { > @@ -144,7 +148,7 @@ > } > > > -static int > +int > linux_common_open(struct thread *td, char *path, int l_flags, int mode, int openat) > { > struct proc *p = td->td_proc; > @@ -1387,12 +1391,6 @@ > } > > int > -linux_fstatat64(struct thread *td, struct linux_fstatat64_args *args) > -{ > - return (ENOSYS); > -} > - > -int > linux_fchownat(struct thread *td, struct linux_fchownat_args *args) > { > return (ENOSYS); > > ==== //depot/projects/linuxolator/src/sys/compat/linux/linux_stats.c#8 (text+ko) ==== > > @@ -43,6 +43,7 @@ > #include > #include > #include > +#include > #include > #include > #include > @@ -593,4 +594,52 @@ > return (error); > } > > +/* XXX: racy? */ > +int > +linux_fstatat64(struct thread *td, struct linux_fstatat64_args *args) > +{ > + int error; > + char *newpath, *oldpath, *freebuf = NULL, *path; > + int fd; > + struct close_args cargs; > + struct stat buf; > + > + /* open the file */ > + oldpath = malloc(MAXPATHLEN, M_TEMP, M_WAITOK); > + error = copyinstr(args->pathname, oldpath, MAXPATHLEN, NULL); > +#ifdef DEBUG > + if (ldebug(fstatat64)) > + printf(ARGS(fstatat64, "%i, %s, %i"), args->dfd, args->pathname, args->flag); > +#endif > + > + error = linux_at(td, args->dfd, oldpath, &newpath, &freebuf); > + if (error) > + return (error); > + LCONVPATH_SEG(td, newpath, &path, 0, UIO_SYSSPACE); > + if (freebuf) > + free(freebuf, M_TEMP); > + if (*oldpath != '/') > + free(newpath, M_TEMP); > + > + error = linux_common_open(td, path, O_RDONLY, 0, 1); > + free(oldpath, M_TEMP); > + if (error) > + return (error); > + /* file opened */ > + fd = td->td_retval[0]; > + td->td_retval[0] = 0; > + > + /* do the actual fstat */ > + > + error = kern_fstat(td, fd, &buf); > + translate_fd_major_minor(td, fd, &buf); > + if (!error) > + error = stat64_copyout(&buf, args->statbuf); > + > + /* close the opened file */ > + cargs.fd = fd; > + close(td, &cargs); > + return (0); > +} Why not use kern_close()? -- John Baldwin From owner-p4-projects@FreeBSD.ORG Mon Apr 2 13:17:51 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 58A6B16A405; Mon, 2 Apr 2007 13:17:51 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 33A5C16A401; Mon, 2 Apr 2007 13:17:51 +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 D303013C44C; Mon, 2 Apr 2007 13:17:50 +0000 (UTC) (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.8/8.13.8) with ESMTP id l32DHiQb085527; Mon, 2 Apr 2007 09:17:48 -0400 (EDT) (envelope-from jhb@freebsd.org) From: John Baldwin To: Marcel Moolenaar Date: Mon, 2 Apr 2007 09:15:03 -0400 User-Agent: KMail/1.9.6 References: <200704012152.l31LqHuB022635@repoman.freebsd.org> In-Reply-To: <200704012152.l31LqHuB022635@repoman.freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset="iso-8859-15" Content-Transfer-Encoding: 7bit Content-Disposition: inline Message-Id: <200704020915.03985.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, 02 Apr 2007 09:17:49 -0400 (EDT) X-Virus-Scanned: ClamAV 0.88.3/2997/Mon Apr 2 06:19:52 2007 on server.baldwin.cx X-Virus-Status: Clean X-Spam-Status: No, score=-4.4 required=4.2 tests=ALL_TRUSTED,AWL,BAYES_00 autolearn=ham version=3.1.3 X-Spam-Checker-Version: SpamAssassin 3.1.3 (2006-06-01) on server.baldwin.cx Cc: Perforce Change Reviews Subject: Re: PERFORCE change 117140 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 02 Apr 2007 13:17:51 -0000 On Sunday 01 April 2007 05:52:17 pm Marcel Moolenaar wrote: > http://perforce.freebsd.org/chv.cgi?CH=117140 > > Change 117140 by marcel@marcel_xcllnt on 2007/04/01 21:52:12 > > Create PCPU structures for all CPUs. Reduce dependency > on MAXCPU by allocating PCPU structures on demand. > > Affected files ... > > .. //depot/projects/powerpc/sys/powerpc/include/pcpu.h#6 edit > .. //depot/projects/powerpc/sys/powerpc/powerpc/machdep.c#8 edit > .. //depot/projects/powerpc/sys/powerpc/powerpc/mp_machdep.c#9 edit > .. //depot/projects/powerpc/sys/powerpc/powerpc/ofw_machdep.c#7 edit > > Differences ... > > ==== //depot/projects/powerpc/sys/powerpc/include/pcpu.h#6 (text+ko) ==== > > @@ -40,6 +40,7 @@ > int pc_inside_intr; \ > struct pmap *pc_curpmap; /* current pmap */ \ > struct thread *pc_fputhread; /* current fpu user */ \ > + int pc_bsp:1; \ FYI, other places in MI code assume that CPU 0 (pc_cpuid) is the BSP. -- John Baldwin From owner-p4-projects@FreeBSD.ORG Mon Apr 2 13:42:09 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5C7D316A409; Mon, 2 Apr 2007 13:42:09 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 00B1A16A401 for ; Mon, 2 Apr 2007 13:42:09 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id E5E0B13C48A for ; Mon, 2 Apr 2007 13:42:08 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l32Dg85H051768 for ; Mon, 2 Apr 2007 13:42:08 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l32Dg8nw051765 for perforce@freebsd.org; Mon, 2 Apr 2007 13:42:08 GMT (envelope-from jhb@freebsd.org) Date: Mon, 2 Apr 2007 13:42:08 GMT Message-Id: <200704021342.l32Dg8nw051765@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 117183 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 02 Apr 2007 13:42:09 -0000 http://perforce.freebsd.org/chv.cgi?CH=117183 Change 117183 by jhb@jhb_mutex on 2007/04/02 13:41:44 Merge in fixes and new sx tests from jhb_lock. Affected files ... .. //depot/projects/smpng/sys/modules/crash/crash.c#37 integrate .. //depot/projects/smpng/sys/modules/crash2/crash2.c#21 integrate Differences ... ==== //depot/projects/smpng/sys/modules/crash/crash.c#37 (text+ko) ==== @@ -87,6 +87,23 @@ /* Events. */ static void +cv_sx(void) +{ + struct cv blah; + + cv_init(&blah, "blah"); + sx_slock(&foo); + cv_timedwait(&blah, &foo, hz/10); + if (sx_try_upgrade(&foo) == 0) + printf("bad juju, upgrade failed\n"); + else { + cv_timedwait(&blah, &foo, hz/10); + sx_xunlock(&foo); + } +} +CRASH_EVENT("test cv_wait() with sx", cv_sx); + +static void sleep_sx_recurse(void) { sx_slock(&foo); @@ -660,7 +677,7 @@ kdb_enter("order should be test1 then test2"); printf("Check order of test1 -> test2 should succeed.\n"); mtx_lock(&test1_mtx); - witness_check_mutex(&test2_mtx); + witness_check(&test2_mtx); mtx_unlock(&test1_mtx); status = WITNESS_DEFINEORDER(&test2_mtx, &test1_mtx); printf("Status of test2 -> test1 set order should be EDOOFUS: %d\n", ==== //depot/projects/smpng/sys/modules/crash2/crash2.c#21 (text+ko) ==== @@ -94,6 +94,7 @@ static struct sx one, two, three, four; static struct lock fee, fi, fo, fum; static int crash2_wait = 1; +static volatile int lots = 50000; static int mod_event(struct module *module, int cmd, void *arg); static int load(void *arg); @@ -131,6 +132,111 @@ static struct sx *sxs[] = { &one, &two, &three, &four }; static void +one_grades(int dummy) +{ + + switch (arc4random() % 10) { + case 0: + sx_xlock(&one); + DELAY(30); + sx_xunlock(&one); + break; + case 1: + case 2: + sx_slock(&one); + DELAY(40); + if (!sx_try_upgrade(&one)) { + sx_sunlock(&one); + sx_xlock(&one); + DELAY(40); + } + DELAY(10); + sx_xunlock(&one); + break; + case 3: + case 4: + case 5: + case 6: + sx_xlock(&one); + DELAY(30); + sx_downgrade(&one); + DELAY(20); + sx_sunlock(&one); + break; + default: + sx_slock(&one); + DELAY(50); + sx_sunlock(&one); + } +} + +static void +one_grades_lots(int dummy) +{ + int i; + + for (i = 0; i < lots; i++) + one_grades(dummy); +} + +CRASH2_EVENT("lots of one up/downgrades", one_grades_lots, one_grades_lots, + one_grades_lots, one_grades_lots); +CRASH2_EVENT("one up/downgrades", one_grades, one_grades, one_grades, + one_grades); + +static void +whack_one(int dummy) +{ + switch (arc4random() % 10) { + case 0: + case 1: + case 2: + sx_xlock(&one); + DELAY(30); + sx_xunlock(&one); + break; + default: + sx_slock(&one); + DELAY(150); + sx_sunlock(&one); + } +} + +static void +whack_one_lots(int dummy) +{ + int i; + + for (i = 0; i < lots; i++) + whack_one(dummy); +} + +static void +xlock_one(int dummy) +{ + + sx_xlock(&one); + DELAY(1000); + sx_xunlock(&one); +} + +static void +slock_one(int dummy) +{ + + sx_slock(&one); + DELAY(1000); + sx_sunlock(&one); +} + +CRASH2_EVENT("whack one repeatedly", whack_one_lots, whack_one_lots, + whack_one_lots, whack_one_lots); +CRASH2_EVENT("whack one", whack_one, whack_one, whack_one, whack_one); +CRASH2_EVENT("one 2 each", slock_one, xlock_one, slock_one, xlock_one); +CRASH2_EVENT("one writers", xlock_one, xlock_one, xlock_one, xlock_one); +CRASH2_EVENT("one readers", slock_one, slock_one, slock_one, slock_one); + +static void sleep_deadlock(int thread) { @@ -212,7 +318,7 @@ { int i; - for (i = 0; i < 50000; i++) + for (i = 0; i < lots; i++) foo_grades(dummy); } @@ -254,7 +360,7 @@ { int i; - for (i = 0; i < 50000; i++) + for (i = 0; i < lots; i++) whack_foo(dummy); } @@ -341,6 +447,9 @@ SYSCTL_PROC(_debug_crash2, OID_AUTO, test, CTLTYPE_INT | CTLFLAG_RW, 0, 0, sysctl_debug_crash2_test, "I", ""); +SYSCTL_INT(_debug_crash2, OID_AUTO, lots, CTLFLAG_RW, + __DEVOLATILE(int *, &lots), 0, "Iterations for 'lots' tests"); + static void crash_thread(void *arg) { @@ -355,14 +464,15 @@ while ((ev = event[i]) == 0) cv_wait(&event_cv, &event_mtx); event[i] = 0; + mtx_unlock(&event_mtx); if (ev == -1) { printf("crash2[%d]: exiting\n", i); - mtx_unlock(&event_mtx); kthread_exit(0); break; } /* Give sysctl time to finish. */ pause("delay", hz / 5); + mtx_lock(&event_mtx); if (ev < 0 || ev >= MAX_EVENT) { printf("crash2[%d]: event %d is not defined!\n", i, ev); continue; From owner-p4-projects@FreeBSD.ORG Mon Apr 2 13:48:18 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 117C716A407; Mon, 2 Apr 2007 13:48:18 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id D8B0916A404 for ; Mon, 2 Apr 2007 13:48:17 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 991DF13C457 for ; Mon, 2 Apr 2007 13:48:17 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l32DmHhT052432 for ; Mon, 2 Apr 2007 13:48:17 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l32DmHDV052429 for perforce@freebsd.org; Mon, 2 Apr 2007 13:48:17 GMT (envelope-from jhb@freebsd.org) Date: Mon, 2 Apr 2007 13:48:17 GMT Message-Id: <200704021348.l32DmHDV052429@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 117185 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 02 Apr 2007 13:48:18 -0000 http://perforce.freebsd.org/chv.cgi?CH=117185 Change 117185 by jhb@jhb_mutex on 2007/04/02 13:47:39 Merge in MAKE_SYSENT() macro from jhb_lock. Affected files ... .. //depot/projects/smpng/sys/nfsserver/nfs_srvsubs.c#38 integrate .. //depot/projects/smpng/sys/sys/sysent.h#24 integrate Differences ... ==== //depot/projects/smpng/sys/nfsserver/nfs_srvsubs.c#38 (text+ko) ==== @@ -100,11 +100,7 @@ static int nfssvc_offset = SYS_nfssvc; static struct sysent nfssvc_prev_sysent; -static struct sysent nfssvc_sysent = { - sizeof(struct nfssvc_args) / sizeof(register_t), - (sy_call_t *)&nfssvc, - AUE_NFS_SVC -}; +MAKE_SYSENT(nfssvc); struct mtx nfsd_mtx; @@ -527,6 +523,7 @@ static int nfsrv_modevent(module_t mod, int type, void *data) { + static int registered; int error = 0; NET_LOCK_GIANT(); @@ -559,8 +556,11 @@ NFSD_UNLOCK(); nfsrv_timer(0); - (void)syscall_register(&nfssvc_offset, &nfssvc_sysent, + error = syscall_register(&nfssvc_offset, &nfssvc_sysent, &nfssvc_prev_sysent); + if (error) + break; + registered = 1; break; case MOD_UNLOAD: @@ -569,8 +569,10 @@ break; } + if (registered) + syscall_deregister(&nfssvc_offset, &nfssvc_prev_sysent); callout_drain(&nfsrv_callout); - syscall_deregister(&nfssvc_offset, &nfssvc_prev_sysent); + nfsrv_destroycache(); /* Free the server request cache */ nfsrv_destroycache(); /* Free the server request cache */ mtx_destroy(&nfsd_mtx); break; ==== //depot/projects/smpng/sys/sys/sysent.h#24 (text+ko) ==== @@ -119,6 +119,14 @@ struct sysent old_sysent; /* old sysent */ }; +#define MAKE_SYSENT(syscallname) \ +static struct sysent syscallname##_sysent = { \ + (sizeof(struct syscallname ## _args ) \ + / sizeof(register_t)), \ + (sy_call_t *)& syscallname, \ + SYS_AUE_##syscallname \ +} + #define SYSCALL_MODULE(name, offset, new_sysent, evh, arg) \ static struct syscall_module_data name##_syscall_mod = { \ evh, arg, offset, new_sysent, { 0, NULL, AUE_NULL } \ @@ -133,12 +141,7 @@ #define SYSCALL_MODULE_HELPER(syscallname) \ static int syscallname##_syscall = SYS_##syscallname; \ -static struct sysent syscallname##_sysent = { \ - (sizeof(struct syscallname ## _args ) \ - / sizeof(register_t)), \ - (sy_call_t *)& syscallname, \ - SYS_AUE_##syscallname \ -}; \ +MAKE_SYSENT(syscallname); \ SYSCALL_MODULE(syscallname, \ & syscallname##_syscall, & syscallname##_sysent, \ NULL, NULL); From owner-p4-projects@FreeBSD.ORG Mon Apr 2 14:01:36 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E711616A405; Mon, 2 Apr 2007 14:01:35 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id C356C16A401 for ; Mon, 2 Apr 2007 14:01:35 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id B4ED213C4BB for ; Mon, 2 Apr 2007 14:01:35 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l32E1ZQD055100 for ; Mon, 2 Apr 2007 14:01:35 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l32E1ZTs055095 for perforce@freebsd.org; Mon, 2 Apr 2007 14:01:35 GMT (envelope-from jhb@freebsd.org) Date: Mon, 2 Apr 2007 14:01:35 GMT Message-Id: <200704021401.l32E1ZTs055095@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 117188 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 02 Apr 2007 14:01:36 -0000 http://perforce.freebsd.org/chv.cgi?CH=117188 Change 117188 by jhb@jhb_mutex on 2007/04/02 14:01:17 IFC @117186. Affected files ... .. //depot/projects/smpng/sys/kern/vfs_syscalls.c#127 integrate .. //depot/projects/smpng/sys/nfsserver/nfs_srvsubs.c#39 integrate .. //depot/projects/smpng/sys/sys/sysent.h#25 integrate Differences ... ==== //depot/projects/smpng/sys/kern/vfs_syscalls.c#127 (text+ko) ==== @@ -35,7 +35,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/vfs_syscalls.c,v 1.434 2007/03/21 19:32:08 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/vfs_syscalls.c,v 1.435 2007/04/02 13:40:38 jhb Exp $"); #include "opt_compat.h" #include "opt_mac.h" ==== //depot/projects/smpng/sys/nfsserver/nfs_srvsubs.c#39 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/nfsserver/nfs_srvsubs.c,v 1.146 2007/03/17 18:18:08 jeff Exp $"); +__FBSDID("$FreeBSD: src/sys/nfsserver/nfs_srvsubs.c,v 1.147 2007/04/02 13:53:26 jhb Exp $"); /* * These functions support the macros and help fiddle mbuf chains for ==== //depot/projects/smpng/sys/sys/sysent.h#25 (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/sys/sysent.h,v 1.52 2006/12/20 19:00:52 jkim Exp $ + * $FreeBSD: src/sys/sys/sysent.h,v 1.53 2007/04/02 13:53:26 jhb Exp $ */ #ifndef _SYS_SYSENT_H_ From owner-p4-projects@FreeBSD.ORG Mon Apr 2 14:30:43 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D8AB816A408; Mon, 2 Apr 2007 14:30:42 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id A2AC616A406; Mon, 2 Apr 2007 14:30:42 +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 4503A13C4BB; Mon, 2 Apr 2007 14:30:42 +0000 (UTC) (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 503F947330; Mon, 2 Apr 2007 10:30:41 -0400 (EDT) Date: Mon, 2 Apr 2007 15:30:41 +0100 (BST) From: Robert Watson X-X-Sender: robert@fledge.watson.org To: John Baldwin In-Reply-To: <200704020915.03985.jhb@freebsd.org> Message-ID: <20070402152910.A82995@fledge.watson.org> References: <200704012152.l31LqHuB022635@repoman.freebsd.org> <200704020915.03985.jhb@freebsd.org> MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII; format=flowed Cc: Marcel Moolenaar , Perforce Change Reviews Subject: Re: PERFORCE change 117140 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 02 Apr 2007 14:30:43 -0000 On Mon, 2 Apr 2007, John Baldwin wrote: >> @@ -40,6 +40,7 @@ >> int pc_inside_intr; \ >> struct pmap *pc_curpmap; /* current pmap */ \ >> struct thread *pc_fputhread; /* current fpu user */ \ >> + int pc_bsp:1; \ > > FYI, other places in MI code assume that CPU 0 (pc_cpuid) is the BSP. I realized the hard way, the other day, that the boot thread itself can migrate to another CPU during sysinit processing, once SMP is kicked off. No more KASSERT(curcpu == 0, ()) for me. :-) Robert N M Watson Computer Laboratory University of Cambridge From owner-p4-projects@FreeBSD.ORG Mon Apr 2 15:55:48 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 04ACE16A409; Mon, 2 Apr 2007 15:55:48 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id B10CE16A403; Mon, 2 Apr 2007 15:55:47 +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 3532313C46C; Mon, 2 Apr 2007 15:55:47 +0000 (UTC) (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.8/8.13.8) with ESMTP id l32FtZFK086560; Mon, 2 Apr 2007 11:55:35 -0400 (EDT) (envelope-from jhb@freebsd.org) From: John Baldwin To: Marcel Moolenaar Date: Mon, 2 Apr 2007 11:55:19 -0400 User-Agent: KMail/1.9.6 References: <200704012152.l31LqHuB022635@repoman.freebsd.org> <200704020915.03985.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: <200704021155.21453.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, 02 Apr 2007 11:55:35 -0400 (EDT) X-Virus-Scanned: ClamAV 0.88.3/2997/Mon Apr 2 06:19:52 2007 on server.baldwin.cx X-Virus-Status: Clean X-Spam-Status: No, score=-4.4 required=4.2 tests=ALL_TRUSTED,AWL,BAYES_00 autolearn=ham version=3.1.3 X-Spam-Checker-Version: SpamAssassin 3.1.3 (2006-06-01) on server.baldwin.cx Cc: Marcel Moolenaar , Perforce Change Reviews Subject: Re: PERFORCE change 117140 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 02 Apr 2007 15:55:48 -0000 On Monday 02 April 2007 11:22:09 am Marcel Moolenaar wrote: > > On Apr 2, 2007, at 6:15 AM, John Baldwin wrote: > > > On Sunday 01 April 2007 05:52:17 pm Marcel Moolenaar wrote: > >> http://perforce.freebsd.org/chv.cgi?CH=117140 > >> > >> Change 117140 by marcel@marcel_xcllnt on 2007/04/01 21:52:12 > >> > >> Create PCPU structures for all CPUs. Reduce dependency > >> on MAXCPU by allocating PCPU structures on demand. > >> > >> Affected files ... > >> > >> .. //depot/projects/powerpc/sys/powerpc/include/pcpu.h#6 edit > >> .. //depot/projects/powerpc/sys/powerpc/powerpc/machdep.c#8 edit > >> .. //depot/projects/powerpc/sys/powerpc/powerpc/mp_machdep.c#9 edit > >> .. //depot/projects/powerpc/sys/powerpc/powerpc/ofw_machdep.c#7 edit > >> > >> Differences ... > >> > >> ==== //depot/projects/powerpc/sys/powerpc/include/pcpu.h#6 (text > >> +ko) ==== > >> > >> @@ -40,6 +40,7 @@ > >> int pc_inside_intr; \ > >> struct pmap *pc_curpmap; /* current pmap */ \ > >> struct thread *pc_fputhread; /* current fpu user */ \ > >> + int pc_bsp:1; \ > > > > FYI, other places in MI code assume that CPU 0 (pc_cpuid) is the BSP. > > Not a problem so far, but it's probably better to eliminate that > assumption. If firmware is to select the BSP and there's no > requirement for it to select CPU0, then there will be situations > where it will not select CPU0. One such situation is when CPU0 > is disabled. It is used during shutdown so that we shutdown on the BSP. > For example, to analyze machine checks on on pluto1, I disabled CPU0 > and CPU1 in succession to see if one of the CPUs was the cause of the > MC. As such, CPU1 had to be the BSP when CPU0 was disabled. Luckily > pluto1 is only a dual-CPU machine, so that disabling a CPU also stops > SMP operation :-) FreeBSD CPU ID's != firmware CPU IDs. FreeBSD CPU ID's (pc_cpuid) are a logical CPU ID that the OS assigns, and I think it's ok for the OS to always give CPU 0 to the BSP. CPU ID's != local APIC ID's on x86 for example, nor are they identical to the CPU indices in the hwprb on Alpha. FreeBSD CPU ID's tend to not be sparse for example, because they are completely separate from firmware IDs. -- John Baldwin From owner-p4-projects@FreeBSD.ORG Mon Apr 2 16:02:09 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E70DB16A403; Mon, 2 Apr 2007 16:02:08 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 8887A16A40D for ; Mon, 2 Apr 2007 16:02:08 +0000 (UTC) (envelope-from xcllnt@mac.com) Received: from smtpout.mac.com (smtpout.mac.com [17.250.248.186]) by mx1.freebsd.org (Postfix) with ESMTP id 7384613C48A for ; Mon, 2 Apr 2007 16:02:08 +0000 (UTC) (envelope-from xcllnt@mac.com) Received: from mac.com (smtpin04-en2 [10.13.10.149]) by smtpout.mac.com (Xserve/smtpout16/MantshX 4.0) with ESMTP id l32FN12Y005776; Mon, 2 Apr 2007 08:23:01 -0700 (PDT) Received: from [192.168.1.3] (c-24-6-177-228.hsd1.ca.comcast.net [24.6.177.228]) (authenticated bits=0) by mac.com (Xserve/smtpin04/MantshX 4.0) with ESMTP id l32FMs9j025712 (version=TLSv1/SSLv3 cipher=AES128-SHA bits=128 verify=NO); Mon, 2 Apr 2007 08:22:56 -0700 (PDT) In-Reply-To: <200704020915.03985.jhb@freebsd.org> References: <200704012152.l31LqHuB022635@repoman.freebsd.org> <200704020915.03985.jhb@freebsd.org> Mime-Version: 1.0 (Apple Message framework v752.3) Content-Type: text/plain; charset=US-ASCII; delsp=yes; format=flowed Message-Id: Content-Transfer-Encoding: 7bit From: Marcel Moolenaar Date: Mon, 2 Apr 2007 08:22:09 -0700 To: John Baldwin X-Mailer: Apple Mail (2.752.3) X-Brightmail-Tracker: AAAAAA== X-Brightmail-scanned: yes Cc: Marcel Moolenaar , Perforce Change Reviews Subject: Re: PERFORCE change 117140 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 02 Apr 2007 16:02:09 -0000 On Apr 2, 2007, at 6:15 AM, John Baldwin wrote: > On Sunday 01 April 2007 05:52:17 pm Marcel Moolenaar wrote: >> http://perforce.freebsd.org/chv.cgi?CH=117140 >> >> Change 117140 by marcel@marcel_xcllnt on 2007/04/01 21:52:12 >> >> Create PCPU structures for all CPUs. Reduce dependency >> on MAXCPU by allocating PCPU structures on demand. >> >> Affected files ... >> >> .. //depot/projects/powerpc/sys/powerpc/include/pcpu.h#6 edit >> .. //depot/projects/powerpc/sys/powerpc/powerpc/machdep.c#8 edit >> .. //depot/projects/powerpc/sys/powerpc/powerpc/mp_machdep.c#9 edit >> .. //depot/projects/powerpc/sys/powerpc/powerpc/ofw_machdep.c#7 edit >> >> Differences ... >> >> ==== //depot/projects/powerpc/sys/powerpc/include/pcpu.h#6 (text >> +ko) ==== >> >> @@ -40,6 +40,7 @@ >> int pc_inside_intr; \ >> struct pmap *pc_curpmap; /* current pmap */ \ >> struct thread *pc_fputhread; /* current fpu user */ \ >> + int pc_bsp:1; \ > > FYI, other places in MI code assume that CPU 0 (pc_cpuid) is the BSP. Not a problem so far, but it's probably better to eliminate that assumption. If firmware is to select the BSP and there's no requirement for it to select CPU0, then there will be situations where it will not select CPU0. One such situation is when CPU0 is disabled. For example, to analyze machine checks on on pluto1, I disabled CPU0 and CPU1 in succession to see if one of the CPUs was the cause of the MC. As such, CPU1 had to be the BSP when CPU0 was disabled. Luckily pluto1 is only a dual-CPU machine, so that disabling a CPU also stops SMP operation :-) -- Marcel Moolenaar xcllnt@mac.com From owner-p4-projects@FreeBSD.ORG Mon Apr 2 17:11:51 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1753416A40A; Mon, 2 Apr 2007 17:11:51 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id C73DE16A404; Mon, 2 Apr 2007 17:11:50 +0000 (UTC) (envelope-from xcllnt@mac.com) Received: from smtpout.mac.com (smtpout.mac.com [17.250.248.175]) by mx1.freebsd.org (Postfix) with ESMTP id 9511913C45B; Mon, 2 Apr 2007 17:11:50 +0000 (UTC) (envelope-from xcllnt@mac.com) Received: from mac.com (smtpin08-en2 [10.13.10.153]) by smtpout.mac.com (Xserve/smtpout05/MantshX 4.0) with ESMTP id l32HBoBN028253; Mon, 2 Apr 2007 10:11:50 -0700 (PDT) Received: from [172.24.104.104] (natint3.juniper.net [66.129.224.36]) (authenticated bits=0) by mac.com (Xserve/smtpin08/MantshX 4.0) with ESMTP id l32HBlqv013613 (version=TLSv1/SSLv3 cipher=AES128-SHA bits=128 verify=NO); Mon, 2 Apr 2007 10:11:48 -0700 (PDT) In-Reply-To: <200704021155.21453.jhb@freebsd.org> References: <200704012152.l31LqHuB022635@repoman.freebsd.org> <200704020915.03985.jhb@freebsd.org> <200704021155.21453.jhb@freebsd.org> Mime-Version: 1.0 (Apple Message framework v752.3) Content-Type: text/plain; charset=US-ASCII; delsp=yes; format=flowed Message-Id: <645BFA2D-3FC3-4AAB-ADCC-8D18431688E9@mac.com> Content-Transfer-Encoding: 7bit From: Marcel Moolenaar Date: Mon, 2 Apr 2007 10:10:55 -0700 To: John Baldwin X-Mailer: Apple Mail (2.752.3) X-Brightmail-Tracker: AAAAAA== X-Brightmail-scanned: yes Cc: Marcel Moolenaar , Perforce Change Reviews Subject: Re: PERFORCE change 117140 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 02 Apr 2007 17:11:51 -0000 On Apr 2, 2007, at 8:55 AM, John Baldwin wrote: >> For example, to analyze machine checks on on pluto1, I disabled CPU0 >> and CPU1 in succession to see if one of the CPUs was the cause of the >> MC. As such, CPU1 had to be the BSP when CPU0 was disabled. Luckily >> pluto1 is only a dual-CPU machine, so that disabling a CPU also stops >> SMP operation :-) > > FreeBSD CPU ID's != firmware CPU IDs. It is important, and not only for identification, that the logical CPU ID used by FreeBSD is the same as used by the firmware (if at all possible). A different ID only causes confusion, especially when the firmware draws its IDs from the same domain. What is called CPU4 within FreeBSD may not be called CPU4 in the firmware, even though CPU4 may exist. > CPU ID's != local APIC ID's on x86 for example, nor > are they identical to the CPU indices in the hwprb on Alpha. They are also not the same on ia64. In fact, on ia64 the APIC ID consists of 2 elements. The ACPI ID is exactly the kind of ID we want... > FreeBSD CPU > ID's tend to not be sparse for example, because they are completely > separate > from firmware IDs. This statement is flawed. Sparseness is unavoidable when CPUs can be hot-plugged. While we should have a CPU ID that maps trivially to a bit field for masking purposes, there's no reason to allow sparse IDs to certain extend. Both ACPI and Open Firmware have CPU IDs that map trivially to a mask and they tend to be dense. I see no reason to not use the firmware IDs as FreeBSD's notion of CPU ID. In fact, I see reasons not to create our own IDs. In such reason is the added overhead of mapping from one to the other during runtime. I think that testing for CPU0 when we really want to know if we're running on the BSP is also flawed. On ia64 there's typically 1 BSP that is used to boot the machine, but each cell in a NUMA system has a monarch CPU that serves the purpose of the BSP for that cell. This means that some tests that check for the BSP may need to be changed to check for the monarch instead. Since there can obviously be only 1 CPU0, there will (ipso facto) be BSP-like processors with an ID != 0. It's therefore better not to assume "special powers" for CPU0 and instead check the PCPU for flags that corresponds 1-on-1 with such powers. -- Marcel Moolenaar xcllnt@mac.com From owner-p4-projects@FreeBSD.ORG Mon Apr 2 18:52:50 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DB3E416A405; Mon, 2 Apr 2007 18:52:49 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id AB8FB16A403 for ; Mon, 2 Apr 2007 18:52:49 +0000 (UTC) (envelope-from jkim@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 5BDA113C4B9 for ; Mon, 2 Apr 2007 18:52:49 +0000 (UTC) (envelope-from jkim@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l32Iqn7b030446 for ; Mon, 2 Apr 2007 18:52:49 GMT (envelope-from jkim@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l32IqlvI030437 for perforce@freebsd.org; Mon, 2 Apr 2007 18:52:47 GMT (envelope-from jkim@freebsd.org) Date: Mon, 2 Apr 2007 18:52:47 GMT Message-Id: <200704021852.l32IqlvI030437@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jkim@freebsd.org using -f From: Jung-uk Kim To: Perforce Change Reviews Cc: Subject: PERFORCE change 117207 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 02 Apr 2007 18:52:50 -0000 http://perforce.freebsd.org/chv.cgi?CH=117207 Change 117207 by jkim@jkim_hammer on 2007/04/02 18:52:10 IFC @117206 Affected files ... .. //depot/projects/linuxolator/src/sys/amd64/amd64/support.S#5 integrate .. //depot/projects/linuxolator/src/sys/amd64/linux32/linux32_sysvec.c#13 integrate .. //depot/projects/linuxolator/src/sys/compat/linux/linux_emul.c#42 integrate .. //depot/projects/linuxolator/src/sys/compat/linux/linux_emul.h#11 integrate .. //depot/projects/linuxolator/src/sys/conf/NOTES#22 integrate .. //depot/projects/linuxolator/src/sys/conf/options#21 integrate .. //depot/projects/linuxolator/src/sys/dev/acpica/acpi_ec.c#4 integrate .. //depot/projects/linuxolator/src/sys/dev/ahb/ahb.c#5 integrate .. //depot/projects/linuxolator/src/sys/dev/arcmsr/arcmsr.c#7 integrate .. //depot/projects/linuxolator/src/sys/dev/ed/if_ed_pccard.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/firewire/fwohci_pci.c#6 integrate .. //depot/projects/linuxolator/src/sys/dev/ipmi/ipmi_pci.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/isp/isp_freebsd.c#11 integrate .. //depot/projects/linuxolator/src/sys/dev/isp/isp_freebsd.h#11 integrate .. //depot/projects/linuxolator/src/sys/dev/isp/isp_library.c#8 integrate .. //depot/projects/linuxolator/src/sys/dev/isp/isp_library.h#7 integrate .. //depot/projects/linuxolator/src/sys/dev/isp/isp_pci.c#16 integrate .. //depot/projects/linuxolator/src/sys/dev/isp/isp_sbus.c#10 integrate .. //depot/projects/linuxolator/src/sys/dev/mxge/if_mxge.c#10 integrate .. //depot/projects/linuxolator/src/sys/dev/pci/pci.c#21 integrate .. //depot/projects/linuxolator/src/sys/dev/pci/pci_pci.c#8 integrate .. //depot/projects/linuxolator/src/sys/dev/pci/pcireg.h#8 integrate .. //depot/projects/linuxolator/src/sys/dev/sk/if_sk.c#6 integrate .. //depot/projects/linuxolator/src/sys/dev/sk/if_skreg.h#4 integrate .. //depot/projects/linuxolator/src/sys/dev/sound/midi/midi.c#5 integrate .. //depot/projects/linuxolator/src/sys/dev/sound/pcm/channel.c#8 integrate .. //depot/projects/linuxolator/src/sys/dev/sound/pcm/mixer.c#6 integrate .. //depot/projects/linuxolator/src/sys/dev/sound/usb/uaudio.c#6 integrate .. //depot/projects/linuxolator/src/sys/dev/usb/if_aue.c#8 integrate .. //depot/projects/linuxolator/src/sys/dev/usb/if_axe.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/usb/ubser.c#2 integrate .. //depot/projects/linuxolator/src/sys/gnu/fs/xfs/FreeBSD/support/mrlock.c#2 integrate .. //depot/projects/linuxolator/src/sys/gnu/fs/xfs/FreeBSD/support/mrlock.h#2 integrate .. //depot/projects/linuxolator/src/sys/i386/acpica/acpi_machdep.c#3 integrate .. //depot/projects/linuxolator/src/sys/i386/i386/support.s#5 integrate .. //depot/projects/linuxolator/src/sys/i386/linux/linux_sysvec.c#6 integrate .. //depot/projects/linuxolator/src/sys/i4b/layer1/ifpnp/i4b_ifpnp_avm.c#3 integrate .. //depot/projects/linuxolator/src/sys/i4b/layer1/ihfc/i4b_ihfc_pnp.c#3 integrate .. //depot/projects/linuxolator/src/sys/i4b/layer1/isic/i4b_avm_a1.c#3 integrate .. //depot/projects/linuxolator/src/sys/i4b/layer1/isic/i4b_isic_pnp.c#3 integrate .. //depot/projects/linuxolator/src/sys/i4b/layer1/isic/i4b_itk_ix1.c#3 integrate .. //depot/projects/linuxolator/src/sys/i4b/layer1/isic/i4b_tel_s016.c#3 integrate .. //depot/projects/linuxolator/src/sys/i4b/layer1/isic/i4b_tel_s0163.c#3 integrate .. //depot/projects/linuxolator/src/sys/kern/kern_lock.c#8 integrate .. //depot/projects/linuxolator/src/sys/kern/kern_rwlock.c#8 integrate .. //depot/projects/linuxolator/src/sys/kern/kern_sx.c#7 integrate .. //depot/projects/linuxolator/src/sys/kern/subr_witness.c#10 integrate .. //depot/projects/linuxolator/src/sys/kern/vfs_lookup.c#7 integrate .. //depot/projects/linuxolator/src/sys/kern/vfs_mount.c#12 integrate .. //depot/projects/linuxolator/src/sys/kern/vfs_subr.c#11 integrate .. //depot/projects/linuxolator/src/sys/kern/vfs_syscalls.c#12 integrate .. //depot/projects/linuxolator/src/sys/modules/cryptodev/Makefile#2 integrate .. //depot/projects/linuxolator/src/sys/netgraph/ng_base.c#6 integrate .. //depot/projects/linuxolator/src/sys/netinet/sctp_auth.c#6 integrate .. //depot/projects/linuxolator/src/sys/netinet/sctp_constants.h#8 integrate .. //depot/projects/linuxolator/src/sys/netinet/sctp_indata.c#10 integrate .. //depot/projects/linuxolator/src/sys/netinet/sctp_input.c#10 integrate .. //depot/projects/linuxolator/src/sys/netinet/sctp_os_bsd.h#9 integrate .. //depot/projects/linuxolator/src/sys/netinet/sctp_output.c#10 integrate .. //depot/projects/linuxolator/src/sys/netinet/sctp_pcb.c#10 integrate .. //depot/projects/linuxolator/src/sys/netinet/sctp_pcb.h#8 integrate .. //depot/projects/linuxolator/src/sys/netinet/sctp_structs.h#10 integrate .. //depot/projects/linuxolator/src/sys/netinet/sctp_sysctl.c#2 integrate .. //depot/projects/linuxolator/src/sys/netinet/sctp_sysctl.h#2 integrate .. //depot/projects/linuxolator/src/sys/netinet/sctp_uio.h#7 integrate .. //depot/projects/linuxolator/src/sys/netinet/sctp_usrreq.c#10 integrate .. //depot/projects/linuxolator/src/sys/netinet/sctputil.c#10 integrate .. //depot/projects/linuxolator/src/sys/netinet6/in6_src.c#4 integrate .. //depot/projects/linuxolator/src/sys/netinet6/sctp6_usrreq.c#10 integrate .. //depot/projects/linuxolator/src/sys/nfsserver/nfs_srvsubs.c#5 integrate .. //depot/projects/linuxolator/src/sys/powerpc/conf/GENERIC#7 integrate .. //depot/projects/linuxolator/src/sys/powerpc/conf/NOTES#4 integrate .. //depot/projects/linuxolator/src/sys/powerpc/powermac/uninorth.c#2 integrate .. //depot/projects/linuxolator/src/sys/powerpc/powerpc/extintr.c#2 delete .. //depot/projects/linuxolator/src/sys/sys/_sx.h#1 branch .. //depot/projects/linuxolator/src/sys/sys/lockmgr.h#4 integrate .. //depot/projects/linuxolator/src/sys/sys/mount.h#9 integrate .. //depot/projects/linuxolator/src/sys/sys/mutex.h#8 integrate .. //depot/projects/linuxolator/src/sys/sys/sleepqueue.h#6 integrate .. //depot/projects/linuxolator/src/sys/sys/sx.h#4 integrate .. //depot/projects/linuxolator/src/sys/sys/sysent.h#4 integrate .. //depot/projects/linuxolator/src/sys/sys/vnode.h#7 integrate Differences ... ==== //depot/projects/linuxolator/src/sys/amd64/amd64/support.S#5 (text+ko) ==== @@ -27,7 +27,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/amd64/support.S,v 1.122 2007/03/30 01:07:27 jkim Exp $ + * $FreeBSD: src/sys/amd64/amd64/support.S,v 1.126 2007/03/31 01:47:37 jkim Exp $ */ #include "opt_ddb.h" @@ -242,7 +242,7 @@ cmpq %rcx,%rax ja copyout_fault - xchgq %rdi, %rsi + xchgq %rdi,%rsi /* bcopy(%rsi, %rdi, %rdx) */ movq %rdx,%rcx @@ -288,8 +288,8 @@ cmpq %rcx,%rax ja copyin_fault - xchgq %rdi, %rsi - movq %rdx, %rcx + xchgq %rdi,%rsi + movq %rdx,%rcx movb %cl,%al shrq $3,%rcx /* copy longword-wise */ cld @@ -353,11 +353,11 @@ cmpq %rax,%rdi /* verify address is valid */ ja fusufault - movq %rsi, %rax /* old */ + movq %rsi,%rax /* old */ #ifdef SMP lock #endif - cmpxchgq %rdx, (%rdi) /* new = %rdx */ + cmpxchgq %rdx,(%rdi) /* new = %rdx */ /* * The old value is in %eax. If the store succeeded it will be the @@ -501,7 +501,7 @@ cmpq %rax,%rdi /* verify address validity */ ja fusufault - movl %esi, %eax + movl %esi,%eax movb %al,(%rdi) xorl %eax,%eax movq PCPU(CURPCB),%rcx /* restore trashed register */ @@ -518,9 +518,9 @@ * return the actual length in *lencopied. */ ENTRY(copyinstr) - movq %rdx, %r8 /* %r8 = maxlen */ - movq %rcx, %r9 /* %r9 = *len */ - xchgq %rdi, %rsi /* %rdi = from, %rsi = to */ + movq %rdx,%r8 /* %r8 = maxlen */ + movq %rcx,%r9 /* %r9 = *len */ + xchgq %rdi,%rsi /* %rdi = from, %rsi = to */ movq PCPU(CURPCB),%rcx movq $cpystrflt,PCB_ONFAULT(%rcx) @@ -582,9 +582,9 @@ * %rdi, %rsi, %rdx, %rcx */ ENTRY(copystr) - movq %rdx, %r8 /* %r8 = maxlen */ + movq %rdx,%r8 /* %r8 = maxlen */ - xchgq %rdi, %rsi + xchgq %rdi,%rsi incq %rdx cld 1: @@ -605,11 +605,11 @@ 6: - testq %rcx, %rcx + testq %rcx,%rcx jz 7f /* set *lencopied and return %rax */ - subq %rdx, %r8 - movq %r8, (%rcx) + subq %rdx,%r8 + movq %r8,(%rcx) 7: ret @@ -626,7 +626,7 @@ jmp 1f nop 1: - movl $KDSEL, %eax + movl $KDSEL,%eax movl %eax,%ds movl %eax,%es movl %eax,%fs /* Beware, use wrmsr to set 64 bit base */ @@ -671,6 +671,49 @@ incl %eax ret +/*****************************************************************************/ +/* linux_futex support */ +/*****************************************************************************/ + +futex_fault: + movq $0,PCB_ONFAULT(%rcx) + movq $-EFAULT,%rax + ret + +ENTRY(futex_xchgl) + movq PCPU(CURPCB),%rcx + movq $futex_fault,PCB_ONFAULT(%rcx) + + movq $VM_MAXUSER_ADDRESS-4,%rax + cmpq %rax,%rsi + ja futex_fault + +#ifdef SMP + lock +#endif + xchgl %edi,(%rsi) + movl %edi,(%rdx) + xorl %eax,%eax + movq %rax,PCB_ONFAULT(%rcx) + ret + +ENTRY(futex_addl) + movq PCPU(CURPCB),%rcx + movq $futex_fault,PCB_ONFAULT(%rcx) + + movq $VM_MAXUSER_ADDRESS-4,%rax + cmpq %rax,%rsi + ja futex_fault + +#ifdef SMP + lock +#endif + xaddl %edi,(%rsi) + movl %edi,(%rdx) + xorl %eax,%eax + movq %rax,PCB_ONFAULT(%rcx) + ret + /* * Support for BB-profiling (gcc -a). The kernbb program will extract * the data from the kernel. @@ -689,47 +732,3 @@ movq %rax,32(%rdi) movq %rdi,bbhead NON_GPROF_RET - -#if defined(SMP) || !defined(_KERNEL) -#define MPLOCKED lock ; -#else -#define MPLOCKED -#endif - - .text - -futex_fault: - movq PCPU(CURPCB), %rdx - movq $0, PCB_ONFAULT(%rdx) - movq $-EFAULT, %rax - ret - -/* int futex_xchgl(int oparg, caddr_t uaddr, int *oldval); */ -ENTRY(futex_xchgl) - movq PCPU(CURPCB), %r11 - movq $futex_fault, PCB_ONFAULT(%r11) - - movq $VM_MAXUSER_ADDRESS-4, %rax - cmpq %rax, %rsi - ja futex_fault - - MPLOCKED xchgl %edi, (%rsi) - movl %edi, (%rdx) - xorl %eax, %eax - movq %rax, PCB_ONFAULT(%r11) - ret - -/* int futex_addl(int oparg, caddr_t uaddr, int *oldval); */ -ENTRY(futex_addl) - movq PCPU(CURPCB), %r11 - movq $futex_fault, PCB_ONFAULT(%r11) - - movq $VM_MAXUSER_ADDRESS-4, %rax - cmpq %rax, %rsi - ja futex_fault - - MPLOCKED xaddl %edi, (%rsi) - movl %edi, (%rdx) - xorl %eax, %eax - movq %rax, PCB_ONFAULT(%r11) - ret ==== //depot/projects/linuxolator/src/sys/amd64/linux32/linux32_sysvec.c#13 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_sysvec.c,v 1.27 2007/03/30 00:06:21 jkim Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_sysvec.c,v 1.28 2007/04/02 18:38:12 jkim Exp $"); #include "opt_compat.h" #ifndef COMPAT_IA32 ==== //depot/projects/linuxolator/src/sys/compat/linux/linux_emul.c#42 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/linux/linux_emul.c,v 1.19 2007/03/02 00:08:47 jkim Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linux/linux_emul.c,v 1.20 2007/04/02 18:38:13 jkim Exp $"); #include "opt_compat.h" @@ -55,8 +55,8 @@ #include #endif -struct sx emul_shared_lock; -struct mtx emul_lock; +struct sx emul_shared_lock; +struct mtx emul_lock; /* this returns locked reference to the emuldata entry (if found) */ struct linux_emuldata * ==== //depot/projects/linuxolator/src/sys/compat/linux/linux_emul.h#11 (text+ko) ==== @@ -25,11 +25,11 @@ * (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/compat/linux/linux_emul.h,v 1.6 2007/01/07 19:00:38 netchild Exp $ + * $FreeBSD: src/sys/compat/linux/linux_emul.h,v 1.7 2007/04/02 18:38:13 jkim Exp $ */ #ifndef _LINUX_EMUL_H_ -#define _LINUX_EMUL_H_ +#define _LINUX_EMUL_H_ struct linux_emuldata_shared { int refs; @@ -55,26 +55,26 @@ LIST_ENTRY(linux_emuldata) threads; /* list of linux threads */ }; -struct linux_emuldata *em_find(struct proc *, int locked); +struct linux_emuldata *em_find(struct proc *, int locked); -#define EMUL_LOCK(l) mtx_lock(l) -#define EMUL_UNLOCK(l) mtx_unlock(l) +#define EMUL_LOCK(l) mtx_lock(l) +#define EMUL_UNLOCK(l) mtx_unlock(l) -#define EMUL_SHARED_RLOCK(l) sx_slock(l) -#define EMUL_SHARED_RUNLOCK(l) sx_sunlock(l) -#define EMUL_SHARED_WLOCK(l) sx_xlock(l) -#define EMUL_SHARED_WUNLOCK(l) sx_xunlock(l) +#define EMUL_SHARED_RLOCK(l) sx_slock(l) +#define EMUL_SHARED_RUNLOCK(l) sx_sunlock(l) +#define EMUL_SHARED_WLOCK(l) sx_xlock(l) +#define EMUL_SHARED_WUNLOCK(l) sx_xunlock(l) /* for em_find use */ -#define EMUL_DOLOCK 1 -#define EMUL_DONTLOCK 0 +#define EMUL_DOLOCK 1 +#define EMUL_DONTLOCK 0 int linux_proc_init(struct thread *, pid_t, int); void linux_proc_exit(void *, struct proc *); void linux_schedtail(void *, struct proc *); void linux_proc_exec(void *, struct proc *, struct image_params *); -extern struct sx emul_shared_lock; -extern struct mtx emul_lock; +extern struct sx emul_shared_lock; +extern struct mtx emul_lock; #endif /* !_LINUX_EMUL_H_ */ ==== //depot/projects/linuxolator/src/sys/conf/NOTES#22 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/NOTES,v 1.1416 2007/03/26 09:10:28 yar Exp $ +# $FreeBSD: src/sys/conf/NOTES,v 1.1418 2007/04/02 01:04:20 mjacob Exp $ # # NOTES -- Lines that can be cut/pasted into kernel and hints configs. # @@ -214,6 +214,12 @@ # to sleep rather than spinning. options ADAPTIVE_GIANT +# ADAPTIVE_SX changes the behavior of sx locks to spin if the thread +# that currently owns the lock is executing on another CPU. Note that +# in addition to enabling this option, individual sx locks must be +# initialized with the SX_ADAPTIVESPIN flag. +options ADAPTIVE_SX + # MUTEX_NOINLINE forces mutex operations to call functions to perform each # operation rather than inlining the simple cases. This can be used to # shrink the size of the kernel text segment. Note that this behavior is @@ -233,6 +239,13 @@ # and WITNESS options. options RWLOCK_NOINLINE +# SX_NOINLINE forces sx lock operations to call functions to perform each +# operation rather than inlining the simple cases. This can be used to +# shrink the size of the kernel text segment. Note that this behavior is +# already implied by the INVARIANT_SUPPORT, INVARIANTS, KTR, LOCK_PROFILING, +# and WITNESS options. +options SX_NOINLINE + # SMP Debugging Options: # # PREEMPTION allows the threads that are in the kernel to be preempted @@ -1521,9 +1534,13 @@ # options ISP_TARGET_MODE=1 # -# ISP_DEFAULT_ROLES - default role (none, target, init, both) +# ISP_DEFAULT_ROLES - default role +# none=0 +# target=1 +# initiator=2 +# both=3 (not supported currently) # -options ISP_DEFAULT_ROLES=3 +options ISP_DEFAULT_ROLES=2 # Options used in dev/sym/ (Symbios SCSI driver). #options SYM_SETUP_LP_PROBE_MAP #-Low Priority Probe Map (bits) ==== //depot/projects/linuxolator/src/sys/conf/options#21 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options,v 1.583 2007/03/27 19:32:40 jhb Exp $ +# $FreeBSD: src/sys/conf/options,v 1.584 2007/03/31 23:23:41 jhb Exp $ # # On the handling of kernel options # @@ -59,6 +59,7 @@ # Miscellaneous options. ADAPTIVE_GIANT opt_adaptive_mutexes.h +ADAPTIVE_SX ALQ AUDIT opt_global.h CODA_COMPAT_5 opt_coda.h @@ -555,6 +556,7 @@ REGRESSION opt_global.h RESTARTABLE_PANICS opt_global.h RWLOCK_NOINLINE opt_global.h +SX_NOINLINE opt_global.h VFS_BIO_DEBUG opt_global.h # These are VM related options ==== //depot/projects/linuxolator/src/sys/dev/acpica/acpi_ec.c#4 (text+ko) ==== @@ -136,12 +136,13 @@ *****************************************************************************/ #include -__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_ec.c,v 1.72 2007/03/22 18:16:40 jkim Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_ec.c,v 1.73 2007/03/31 23:23:41 jhb Exp $"); #include "opt_acpi.h" #include #include #include +#include #include #include #include ==== //depot/projects/linuxolator/src/sys/dev/ahb/ahb.c#5 (text+ko) ==== @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/ahb/ahb.c,v 1.39 2007/02/23 12:18:30 piso Exp $ + * $FreeBSD: src/sys/dev/ahb/ahb.c,v 1.40 2007/04/01 16:55:31 netchild Exp $ */ #include @@ -378,8 +378,10 @@ goto error_exit; /* Enable our interrupt */ - bus_setup_intr(dev, irq, INTR_TYPE_CAM|INTR_ENTROPY, NULL, ahbintr, - ahb, &ih); + if (bus_setup_intr(dev, irq, INTR_TYPE_CAM|INTR_ENTROPY, NULL, ahbintr, + ahb, &ih) != 0) + goto error_exit; + return (0); error_exit: ==== //depot/projects/linuxolator/src/sys/dev/arcmsr/arcmsr.c#7 (text+ko) ==== @@ -56,7 +56,7 @@ ** and cause g_vfs_done() read write error ****************************************************************************************** -* $FreeBSD: src/sys/dev/arcmsr/arcmsr.c,v 1.20 2007/03/12 05:10:29 mjacob Exp $ +* $FreeBSD: src/sys/dev/arcmsr/arcmsr.c,v 1.21 2007/04/02 03:31:37 scottl Exp $ */ #include #include @@ -1270,8 +1270,7 @@ , acb->pci_unit, error); } if((pccb->ccb_h.status & CAM_STATUS_MASK) == CAM_REQ_INPROG) { - xpt_freeze_devq(pccb->ccb_h.path, /*count*/1); - pccb->ccb_h.status |= (CAM_REQ_TOO_BIG|CAM_DEV_QFRZN); + pccb->ccb_h.status |= CAM_REQ_TOO_BIG; } arcmsr_srb_complete(srb, 0); return; @@ -1307,14 +1306,14 @@ arcmsr_srb_complete(srb, 0); return; } - pccb->ccb_h.status |= CAM_SIM_QUEUED; if(acb->srboutstandingcount >= ARCMSR_MAX_OUTSTANDING_CMD) { - pccb->ccb_h.status &= ~CAM_STATUS_MASK; - pccb->ccb_h.status |= (CAM_REQUEUE_REQ|CAM_DEV_QFRZN); + xpt_freeze_simq(acb->psim, 1); + pccb->ccb_h.status = CAM_REQUEUE_REQ; acb->acb_flags |= ACB_F_CAM_DEV_QFRZN; arcmsr_srb_complete(srb, 0); return; } + pccb->ccb_h.status |= CAM_SIM_QUEUED; arcmsr_build_srb(srb, dm_segs, nseg); arcmsr_post_srb(acb, srb); return; ==== //depot/projects/linuxolator/src/sys/dev/ed/if_ed_pccard.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/ed/if_ed_pccard.c,v 1.111 2007/02/23 12:18:38 piso Exp $ + * $FreeBSD: src/sys/dev/ed/if_ed_pccard.c,v 1.112 2007/04/01 14:15:26 netchild Exp $ */ /* @@ -541,7 +541,7 @@ sc->chip_type == ED_CHIP_TYPE_DL10022) { /* Probe for an MII bus, but ignore errors. */ ed_pccard_dl100xx_mii_reset(sc); - mii_phy_probe(dev, &sc->miibus, ed_ifmedia_upd, + (void)mii_phy_probe(dev, &sc->miibus, ed_ifmedia_upd, ed_ifmedia_sts); } else if (sc->chip_type == ED_CHIP_TYPE_AX88190) { ed_pccard_ax88x90_mii_reset(sc); ==== //depot/projects/linuxolator/src/sys/dev/firewire/fwohci_pci.c#6 (text+ko) ==== @@ -31,7 +31,7 @@ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/firewire/fwohci_pci.c,v 1.58 2007/03/19 03:41:27 simokawa Exp $ + * $FreeBSD: src/sys/dev/firewire/fwohci_pci.c,v 1.59 2007/03/30 22:25:26 simokawa Exp $ */ #define BOUNCE_BUFFER_TEST 0 @@ -424,19 +424,18 @@ FWOHCI_INTMASKCLR, OHCI_INT_EN); if (sc->irq_res) { - int err = bus_teardown_intr(self, sc->irq_res, sc->ih); - if (err) - /* XXX or should we panic? */ - device_printf(self, "Could not tear down irq, %d\n", - err); + int err; + if (sc->ih) { + err = bus_teardown_intr(self, sc->irq_res, sc->ih); + if (err) + device_printf(self, + "Could not tear down irq, %d\n", err); #if defined(__DragonFly__) || __FreeBSD_version < 500000 - bus_teardown_intr(self, sc->irq_res, sc->ih_cam); - bus_teardown_intr(self, sc->irq_res, sc->ih_bio); + bus_teardown_intr(self, sc->irq_res, sc->ih_cam); + bus_teardown_intr(self, sc->irq_res, sc->ih_bio); #endif - sc->ih = NULL; - } - - if (sc->irq_res) { + sc->ih = NULL; + } bus_release_resource(self, SYS_RES_IRQ, 0, sc->irq_res); sc->irq_res = NULL; } ==== //depot/projects/linuxolator/src/sys/dev/ipmi/ipmi_pci.c#3 (text) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ipmi/ipmi_pci.c,v 1.2 2006/09/22 22:11:29 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ipmi/ipmi_pci.c,v 1.4 2007/03/31 21:39:02 jhb Exp $"); #include #include @@ -185,7 +185,7 @@ { if (pci_get_class(dev) == PCIC_SERIALBUS && - pci_get_subclass(dev) == 0x07) { + pci_get_subclass(dev) == PCIS_SERIALBUS_IPMI) { device_set_desc(dev, "IPMI System Interface"); return (BUS_PROBE_GENERIC); } @@ -204,13 +204,13 @@ /* Interface is determined by progif. */ switch (pci_get_progif(dev)) { - case 0: + case PCIP_SERIALBUS_IPMI_SMIC: iface = SMIC_MODE; break; - case 1: + case PCIP_SERIALBUS_IPMI_KCS: iface = KCS_MODE; break; - case 2: + case PCIP_SERIALBUS_IPMI_BT: iface = BT_MODE; device_printf(dev, "BT interface unsupported\n"); return (ENXIO); @@ -220,12 +220,9 @@ return (ENXIO); } - /* - * Bottom bit of bar indicates resouce type. There should be - * constants in pcireg.h for fields in a BAR. - */ + /* Check the BAR to determine our resource type. */ sc->ipmi_io_rid = PCIR_BAR(0); - if (pci_read_config(dev, PCIR_BAR(0), 4) & 0x1) + if (PCI_BAR_IO(pci_read_config(dev, PCIR_BAR(0), 4))) type = SYS_RES_IOPORT; else type = SYS_RES_MEMORY; ==== //depot/projects/linuxolator/src/sys/dev/isp/isp_freebsd.c#11 (text+ko) ==== @@ -28,7 +28,7 @@ * Platform (FreeBSD) dependent common attachment code for Qlogic adapters. */ #include -__FBSDID("$FreeBSD: src/sys/dev/isp/isp_freebsd.c,v 1.136 2007/03/12 04:54:30 mjacob Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/isp/isp_freebsd.c,v 1.137 2007/04/02 01:04:20 mjacob Exp $"); #include #include #include @@ -382,6 +382,14 @@ retval = EINVAL; break; } + /* + * XXX: Current + */ + if (nr == ISP_ROLE_BOTH) { + isp_prt(isp, ISP_LOGERR, "dual roles not supported"); + retval = EINVAL; + break; + } *(int *)addr = isp->isp_role; isp->isp_role = nr; /* FALLTHROUGH */ @@ -1133,7 +1141,7 @@ static void isp_ledone(ispsoftc_t *isp, lun_entry_t *lep) { - const char lfmt[] = "now %sabled for target mode"; + const char lfmt[] = "now %sabled for target mode\n"; union ccb *ccb; uint32_t seq; tstate_t *tptr; ==== //depot/projects/linuxolator/src/sys/dev/isp/isp_freebsd.h#11 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/dev/isp/isp_freebsd.h,v 1.102 2007/03/13 06:46:08 mjacob Exp $ */ +/* $FreeBSD: src/sys/dev/isp/isp_freebsd.h,v 1.104 2007/04/02 01:04:20 mjacob Exp $ */ /*- * Qlogic ISP SCSI Host Adapter FreeBSD Wrapper Definitions * @@ -532,4 +532,10 @@ #include +/* + * XXX: Temp + */ +#if ISP_DEFAULT_ROLES == ISP_ROLE_BOTH +#error "Dual Role Temporarily Unsupported" +#endif #endif /* _ISP_FREEBSD_H */ ==== //depot/projects/linuxolator/src/sys/dev/isp/isp_library.c#8 (text) ==== @@ -34,7 +34,7 @@ #endif #ifdef __FreeBSD__ #include -__FBSDID("$FreeBSD: src/sys/dev/isp/isp_library.c,v 1.12 2007/03/22 23:38:31 mjacob Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/isp/isp_library.c,v 1.13 2007/04/02 01:04:20 mjacob Exp $"); #include #endif #ifdef __OpenBSD__ @@ -1499,12 +1499,12 @@ void * isp_find_xs_tgt(ispsoftc_t *isp, uint32_t handle) { - if (handle == 0 || (handle & 0x8000) == 0 || - (handle & 0x7fff) > isp->isp_maxcmds) { + if (handle == 0 || IS_TARGET_HANDLE(handle) == 0 || + (handle & ISP_HANDLE_MASK) > isp->isp_maxcmds) { isp_prt(isp, ISP_LOGERR, "bad handle in isp_find_xs_tgt"); return (NULL); } else { - return (isp->isp_tgtlist[(handle & 0x7fff) - 1]); + return (isp->isp_tgtlist[(handle & ISP_HANDLE_MASK) - 1]); } } @@ -1515,7 +1515,7 @@ if (xs != NULL) { for (i = 0; i < isp->isp_maxcmds; i++) { if (isp->isp_tgtlist[i] == xs) { - return ((i+1) & 0x7fff); + return ((i+1) & ISP_HANDLE_MASK); } } } @@ -1525,12 +1525,12 @@ void isp_destroy_tgt_handle(ispsoftc_t *isp, uint32_t handle) { - if (handle == 0 || (handle & 0x8000) == 0 || - (handle & 0x7fff) > isp->isp_maxcmds) { + if (handle == 0 || IS_TARGET_HANDLE(handle) == 0 || + (handle & ISP_HANDLE_MASK) > isp->isp_maxcmds) { isp_prt(isp, ISP_LOGERR, "bad handle in isp_destroy_tgt_handle"); } else { - isp->isp_tgtlist[(handle & 0x7fff) - 1] = NULL; + isp->isp_tgtlist[(handle & ISP_HANDLE_MASK) - 1] = NULL; } } ==== //depot/projects/linuxolator/src/sys/dev/isp/isp_library.h#7 (text) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/dev/isp/isp_library.h,v 1.7 2007/03/22 23:38:31 mjacob Exp $ */ +/* $FreeBSD: src/sys/dev/isp/isp_library.h,v 1.8 2007/04/02 01:04:20 mjacob Exp $ */ /*- * Copyright (c) 1997-2007 by Matthew Jacob * All rights reserved. @@ -128,6 +128,8 @@ extern void isp_get_ct_hdr(ispsoftc_t *isp, ct_hdr_t *, ct_hdr_t *); extern void isp_put_ct_hdr(ispsoftc_t *isp, ct_hdr_t *, ct_hdr_t *); +#define ISP_HANDLE_MASK 0x7fff + #ifdef ISP_TARGET_MODE #if defined(__NetBSD__) || defined(__OpenBSD__) #include ==== //depot/projects/linuxolator/src/sys/dev/isp/isp_pci.c#16 (text+ko) ==== @@ -28,7 +28,7 @@ * FreeBSD Version. */ #include -__FBSDID("$FreeBSD: src/sys/dev/isp/isp_pci.c,v 1.141 2007/03/22 23:38:32 mjacob Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/isp/isp_pci.c,v 1.142 2007/04/02 01:04:20 mjacob Exp $"); #include #include @@ -1994,7 +1994,7 @@ cto->ct_scsi_status = 0; pcs = (struct isp_pcisoftc *)isp; - dp = &pcs->dmaps[isp_handle_index(handle)]; + dp = &pcs->dmaps[isp_handle_index(handle & ISP_HANDLE_MASK)]; if ((csio->ccb_h.flags & CAM_DIR_MASK) == CAM_DIR_IN) { bus_dmamap_sync(pcs->dmat, *dp, BUS_DMASYNC_PREREAD); } else { @@ -2388,7 +2388,7 @@ isp = mp->isp; rq = mp->rq; pcs = (struct isp_pcisoftc *)mp->isp; - dp = &pcs->dmaps[isp_handle_index(rq->req_handle)]; + dp = &pcs->dmaps[isp_handle_index(rq->req_handle & ISP_HANDLE_MASK)]; nxti = *mp->nxtip; if ((csio->ccb_h.flags & CAM_DIR_MASK) == CAM_DIR_IN) { @@ -2494,7 +2494,7 @@ isp = mp->isp; rq = mp->rq; pcs = (struct isp_pcisoftc *)mp->isp; - dp = &pcs->dmaps[isp_handle_index(rq->req_handle)]; + dp = &pcs->dmaps[isp_handle_index(rq->req_handle & ISP_HANDLE_MASK)]; nxti = *mp->nxtip; if ((csio->ccb_h.flags & CAM_DIR_MASK) == CAM_DIR_IN) { @@ -2628,7 +2628,7 @@ isp = mp->isp; rq = mp->rq; pcs = (struct isp_pcisoftc *)mp->isp; - dp = &pcs->dmaps[isp_handle_index(rq->req_handle)]; + dp = &pcs->dmaps[isp_handle_index(rq->req_handle & ISP_HANDLE_MASK)]; nxti = *mp->nxtip; if ((csio->ccb_h.flags & CAM_DIR_MASK) == CAM_DIR_IN) { @@ -2795,7 +2795,8 @@ if ((csio->ccb_h.flags & CAM_SCATTER_VALID) == 0) { if ((csio->ccb_h.flags & CAM_DATA_PHYS) == 0) { int error, s; - dp = &pcs->dmaps[isp_handle_index(rq->req_handle)]; + dp = &pcs->dmaps[isp_handle_index( + rq->req_handle & ISP_HANDLE_MASK)]; s = splsoftvm(); error = bus_dmamap_load(pcs->dmat, *dp, csio->data_ptr, csio->dxfer_len, eptr, mp, 0); @@ -2880,7 +2881,8 @@ isp_pci_dmateardown(ispsoftc_t *isp, XS_T *xs, uint32_t handle) { struct isp_pcisoftc *pcs = (struct isp_pcisoftc *)isp; - bus_dmamap_t *dp = &pcs->dmaps[isp_handle_index(handle)]; + bus_dmamap_t *dp; + dp = &pcs->dmaps[isp_handle_index(handle & ISP_HANDLE_MASK)]; if ((xs->ccb_h.flags & CAM_DIR_MASK) == CAM_DIR_IN) { bus_dmamap_sync(pcs->dmat, *dp, BUS_DMASYNC_POSTREAD); } else { ==== //depot/projects/linuxolator/src/sys/dev/isp/isp_sbus.c#10 (text+ko) ==== @@ -29,7 +29,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/isp/isp_sbus.c,v 1.31 2007/03/28 16:34:11 mjacob Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/isp/isp_sbus.c,v 1.32 2007/04/02 01:04:20 mjacob Exp $"); #include #include @@ -624,7 +624,7 @@ isp = mp->isp; rq = mp->rq; sbs = (struct isp_sbussoftc *)mp->isp; - dp = &sbs->dmaps[isp_handle_index(rq->req_handle)]; + dp = &sbs->dmaps[isp_handle_index(rq->req_handle & ISP_HANDLE_MASK)]; nxti = *mp->nxtip; if ((csio->ccb_h.flags & CAM_DIR_MASK) == CAM_DIR_IN) { @@ -735,7 +735,8 @@ if ((csio->ccb_h.flags & CAM_SCATTER_VALID) == 0) { if ((csio->ccb_h.flags & CAM_DATA_PHYS) == 0) { int error, s; - dp = &sbs->dmaps[isp_handle_index(rq->req_handle)]; + dp = &sbs->dmaps[isp_handle_index( + rq->req_handle & ISP_HANDLE_MASK)]; s = splsoftvm(); error = bus_dmamap_load(sbs->dmat, *dp, csio->data_ptr, csio->dxfer_len, eptr, mp, 0); @@ -809,7 +810,8 @@ isp_sbus_dmateardown(ispsoftc_t *isp, XS_T *xs, uint32_t handle) { struct isp_sbussoftc *sbs = (struct isp_sbussoftc *)isp; - bus_dmamap_t *dp = &sbs->dmaps[isp_handle_index(handle)]; + bus_dmamap_t *dp; + dp = &sbs->dmaps[isp_handle_index(handle & ISP_HANDLE_MASK)]; if ((xs->ccb_h.flags & CAM_DIR_MASK) == CAM_DIR_IN) { bus_dmamap_sync(sbs->dmat, *dp, BUS_DMASYNC_POSTREAD); } else { ==== //depot/projects/linuxolator/src/sys/dev/mxge/if_mxge.c#10 (text+ko) ==== @@ -32,7 +32,7 @@ ***************************************************************************/ #include -__FBSDID("$FreeBSD: src/sys/dev/mxge/if_mxge.c,v 1.24 2007/03/27 15:55:32 gallatin Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/mxge/if_mxge.c,v 1.25 2007/03/31 23:23:41 jhb Exp $"); #include #include @@ -44,6 +44,7 @@ #include #include #include +#include #include #include #include ==== //depot/projects/linuxolator/src/sys/dev/pci/pci.c#21 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/pci/pci.c,v 1.345 2007/03/26 20:18:52 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/pci/pci.c,v 1.348 2007/03/31 21:39:02 jhb Exp $"); #include "opt_bus.h" @@ -72,7 +72,7 @@ #endif static uint32_t pci_mapbase(unsigned mapreg); -static int pci_maptype(unsigned mapreg); +static const char *pci_maptype(unsigned mapreg); static int pci_mapsize(unsigned testval); static int pci_maprange(unsigned mapreg); static void pci_fixancient(pcicfgregs *cfg); @@ -305,29 +305,24 @@ static uint32_t pci_mapbase(uint32_t mapreg) { - int mask = 0x03; - if ((mapreg & 0x01) == 0) - mask = 0x0f; - return (mapreg & ~mask); + + if (PCI_BAR_MEM(mapreg)) + return (mapreg & PCIM_BAR_MEM_BASE); + else + return (mapreg & PCIM_BAR_IO_BASE); } /* return map type of memory or port map */ -static int +static const char * pci_maptype(unsigned mapreg) { - static uint8_t maptype[0x10] = { - PCI_MAPMEM, PCI_MAPPORT, - PCI_MAPMEM, 0, - PCI_MAPMEM, PCI_MAPPORT, - 0, 0, - PCI_MAPMEM|PCI_MAPMEMP, PCI_MAPPORT, - PCI_MAPMEM|PCI_MAPMEMP, 0, - PCI_MAPMEM|PCI_MAPMEMP, PCI_MAPPORT, - 0, 0, - }; - return (maptype[mapreg & 0x0f]); + if (PCI_BAR_IO(mapreg)) + return ("I/O Port"); + if (mapreg & PCIM_BAR_MEM_PREFETCH) + return ("Prefetchable Memory"); + return ("Memory"); } /* return log2 of map size decoded for memory or port map */ @@ -355,19 +350,21 @@ pci_maprange(unsigned mapreg) { int ln2range = 0; - switch (mapreg & 0x07) { - case 0x00: - case 0x01: - case 0x05: + + if (PCI_BAR_IO(mapreg)) ln2range = 32; - break; - case 0x02: - ln2range = 20; - break; - case 0x04: - ln2range = 64; - break; - } + else + switch (mapreg & PCIM_BAR_MEM_TYPE) { + case PCIM_BAR_MEM_32: + ln2range = 32; + break; >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Apr 2 19:02:02 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BB32216A407; Mon, 2 Apr 2007 19:02:01 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 876B816A402 for ; Mon, 2 Apr 2007 19:02:01 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 789E013C4B0 for ; Mon, 2 Apr 2007 19:02:01 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l32J21dt031887 for ; Mon, 2 Apr 2007 19:02:01 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l32J21tV031883 for perforce@freebsd.org; Mon, 2 Apr 2007 19:02:01 GMT (envelope-from jhb@freebsd.org) Date: Mon, 2 Apr 2007 19:02:01 GMT Message-Id: <200704021902.l32J21tV031883@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 117208 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 02 Apr 2007 19:02:02 -0000 http://perforce.freebsd.org/chv.cgi?CH=117208 Change 117208 by jhb@jhb_mutex on 2007/04/02 19:01:15 Don't call soclose() on the sockets during failure once the file descriptors are fully constructed. Affected files ... .. //depot/projects/smpng/sys/kern/uipc_syscalls.c#100 edit Differences ... ==== //depot/projects/smpng/sys/kern/uipc_syscalls.c#100 (text+ko) ==== @@ -664,6 +664,7 @@ fp2->f_ops = &socketops; fp2->f_type = DTYPE_SOCKET; FILE_UNLOCK(fp2); + so1 = so2 = NULL; error = copyout(sv, uap->rsv, 2 * sizeof (int)); if (error) goto free4; @@ -677,9 +678,11 @@ fdclose(fdp, fp1, sv[0], td); fdrop(fp1, td); free2: - (void)soclose(so2); + if (so2 != NULL) + (void)soclose(so2); free1: - (void)soclose(so1); + if (so1 != NULL) + (void)soclose(so1); done2: NET_UNLOCK_GIANT(); return (error); From owner-p4-projects@FreeBSD.ORG Mon Apr 2 19:18:24 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3213716A403; Mon, 2 Apr 2007 19:18:24 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id E766016A402 for ; Mon, 2 Apr 2007 19:18:23 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id D837613C458 for ; Mon, 2 Apr 2007 19:18:23 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l32JIN1P035603 for ; Mon, 2 Apr 2007 19:18:23 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l32JINsi035600 for perforce@freebsd.org; Mon, 2 Apr 2007 19:18:23 GMT (envelope-from jhb@freebsd.org) Date: Mon, 2 Apr 2007 19:18:23 GMT Message-Id: <200704021918.l32JINsi035600@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 117211 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 02 Apr 2007 19:18:24 -0000 http://perforce.freebsd.org/chv.cgi?CH=117211 Change 117211 by jhb@jhb_mutex on 2007/04/02 19:18:11 IFC @117210. Affected files ... .. //depot/projects/smpng/sys/amd64/linux32/linux32_sysvec.c#24 integrate .. //depot/projects/smpng/sys/compat/linux/linux_emul.c#10 integrate .. //depot/projects/smpng/sys/compat/linux/linux_emul.h#5 integrate .. //depot/projects/smpng/sys/dev/bge/if_bge.c#92 integrate .. //depot/projects/smpng/sys/i386/linux/linux_sysvec.c#55 integrate .. //depot/projects/smpng/sys/kern/uipc_syscalls.c#101 integrate Differences ... ==== //depot/projects/smpng/sys/amd64/linux32/linux32_sysvec.c#24 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_sysvec.c,v 1.27 2007/03/30 00:06:21 jkim Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_sysvec.c,v 1.28 2007/04/02 18:38:12 jkim Exp $"); #include "opt_compat.h" #ifndef COMPAT_IA32 @@ -1079,7 +1079,7 @@ linux_ioctl_register_handler(*lihp); SET_FOREACH(ldhp, linux_device_handler_set) linux_device_register_handler(*ldhp); - sx_init(&emul_lock, "emuldata lock"); + mtx_init(&emul_lock, "emuldata lock", NULL, MTX_DEF); sx_init(&emul_shared_lock, "emuldata->shared lock"); LIST_INIT(&futex_list); sx_init(&futex_sx, "futex protection lock"); @@ -1110,7 +1110,7 @@ linux_ioctl_unregister_handler(*lihp); SET_FOREACH(ldhp, linux_device_handler_set) linux_device_unregister_handler(*ldhp); - sx_destroy(&emul_lock); + mtx_destroy(&emul_lock); sx_destroy(&emul_shared_lock); sx_destroy(&futex_sx); EVENTHANDLER_DEREGISTER(process_exit, linux_exit_tag); ==== //depot/projects/smpng/sys/compat/linux/linux_emul.c#10 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/linux/linux_emul.c,v 1.19 2007/03/02 00:08:47 jkim Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linux/linux_emul.c,v 1.20 2007/04/02 18:38:13 jkim Exp $"); #include "opt_compat.h" @@ -55,8 +55,8 @@ #include #endif -struct sx emul_shared_lock; -struct sx emul_lock; +struct sx emul_shared_lock; +struct mtx emul_lock; /* this returns locked reference to the emuldata entry (if found) */ struct linux_emuldata * ==== //depot/projects/smpng/sys/compat/linux/linux_emul.h#5 (text+ko) ==== @@ -25,11 +25,11 @@ * (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/compat/linux/linux_emul.h,v 1.6 2007/01/07 19:00:38 netchild Exp $ + * $FreeBSD: src/sys/compat/linux/linux_emul.h,v 1.7 2007/04/02 18:38:13 jkim Exp $ */ #ifndef _LINUX_EMUL_H_ -#define _LINUX_EMUL_H_ +#define _LINUX_EMUL_H_ struct linux_emuldata_shared { int refs; @@ -55,26 +55,26 @@ LIST_ENTRY(linux_emuldata) threads; /* list of linux threads */ }; -struct linux_emuldata *em_find(struct proc *, int locked); +struct linux_emuldata *em_find(struct proc *, int locked); -#define EMUL_LOCK(l) sx_xlock(l) -#define EMUL_UNLOCK(l) sx_xunlock(l) +#define EMUL_LOCK(l) mtx_lock(l) +#define EMUL_UNLOCK(l) mtx_unlock(l) -#define EMUL_SHARED_RLOCK(l) sx_slock(l) -#define EMUL_SHARED_RUNLOCK(l) sx_sunlock(l) -#define EMUL_SHARED_WLOCK(l) sx_xlock(l) -#define EMUL_SHARED_WUNLOCK(l) sx_xunlock(l) +#define EMUL_SHARED_RLOCK(l) sx_slock(l) +#define EMUL_SHARED_RUNLOCK(l) sx_sunlock(l) +#define EMUL_SHARED_WLOCK(l) sx_xlock(l) +#define EMUL_SHARED_WUNLOCK(l) sx_xunlock(l) /* for em_find use */ -#define EMUL_DOLOCK 1 -#define EMUL_DONTLOCK 0 +#define EMUL_DOLOCK 1 +#define EMUL_DONTLOCK 0 int linux_proc_init(struct thread *, pid_t, int); void linux_proc_exit(void *, struct proc *); void linux_schedtail(void *, struct proc *); void linux_proc_exec(void *, struct proc *, struct image_params *); -extern struct sx emul_shared_lock; -extern struct sx emul_lock; +extern struct sx emul_shared_lock; +extern struct mtx emul_lock; #endif /* !_LINUX_EMUL_H_ */ ==== //depot/projects/smpng/sys/dev/bge/if_bge.c#92 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/bge/if_bge.c,v 1.186 2007/03/13 00:41:55 scottl Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/bge/if_bge.c,v 1.187 2007/04/02 19:09:06 jkim Exp $"); /* * Broadcom BCM570x family gigabit ethernet driver for FreeBSD. @@ -2114,7 +2114,7 @@ return (0); } -#if __FreeBSD_version > 700025 +#if __FreeBSD_version > 602105 /* * Return true if this device has more than one port. */ @@ -2277,7 +2277,7 @@ } #endif -#if __FreeBSD_version > 700025 +#if __FreeBSD_version > 602105 { int msicount; @@ -2596,7 +2596,7 @@ bus_release_resource(dev, SYS_RES_IRQ, sc->bge_flags & BGE_FLAG_MSI ? 1 : 0, sc->bge_irq); -#if __FreeBSD_version > 700025 +#if __FreeBSD_version > 602105 if (sc->bge_flags & BGE_FLAG_MSI) pci_release_msi(dev); #endif ==== //depot/projects/smpng/sys/i386/linux/linux_sysvec.c#55 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/i386/linux/linux_sysvec.c,v 1.148 2006/09/09 16:25:25 netchild Exp $"); +__FBSDID("$FreeBSD: src/sys/i386/linux/linux_sysvec.c,v 1.149 2007/04/02 18:38:13 jkim Exp $"); #include #include @@ -915,7 +915,7 @@ linux_ioctl_register_handler(*lihp); SET_FOREACH(ldhp, linux_device_handler_set) linux_device_register_handler(*ldhp); - sx_init(&emul_lock, "emuldata lock"); + mtx_init(&emul_lock, "emuldata lock", NULL, MTX_DEF); sx_init(&emul_shared_lock, "emuldata->shared lock"); LIST_INIT(&futex_list); sx_init(&futex_sx, "futex protection lock"); @@ -946,7 +946,7 @@ linux_ioctl_unregister_handler(*lihp); SET_FOREACH(ldhp, linux_device_handler_set) linux_device_unregister_handler(*ldhp); - sx_destroy(&emul_lock); + mtx_destroy(&emul_lock); sx_destroy(&emul_shared_lock); sx_destroy(&futex_sx); EVENTHANDLER_DEREGISTER(process_exit, linux_exit_tag); ==== //depot/projects/smpng/sys/kern/uipc_syscalls.c#101 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/uipc_syscalls.c,v 1.248 2007/03/05 13:10:58 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/uipc_syscalls.c,v 1.249 2007/04/02 19:15:47 jhb Exp $"); #include "opt_sctp.h" #include "opt_compat.h" From owner-p4-projects@FreeBSD.ORG Mon Apr 2 20:47:35 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 77CDB16A406; Mon, 2 Apr 2007 20:47:35 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 0925A16A47D; Mon, 2 Apr 2007 20:47:35 +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 8543F13C448; Mon, 2 Apr 2007 20:47:34 +0000 (UTC) (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.8/8.13.8) with ESMTP id l32KlV9Y088373; Mon, 2 Apr 2007 16:47:32 -0400 (EDT) (envelope-from jhb@freebsd.org) From: John Baldwin To: Marcel Moolenaar Date: Mon, 2 Apr 2007 16:42:06 -0400 User-Agent: KMail/1.9.6 References: <200704012152.l31LqHuB022635@repoman.freebsd.org> <200704021155.21453.jhb@freebsd.org> <645BFA2D-3FC3-4AAB-ADCC-8D18431688E9@mac.com> In-Reply-To: <645BFA2D-3FC3-4AAB-ADCC-8D18431688E9@mac.com> MIME-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit Content-Disposition: inline Message-Id: <200704021642.06901.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, 02 Apr 2007 16:47:32 -0400 (EDT) X-Virus-Scanned: ClamAV 0.88.3/2997/Mon Apr 2 06:19:52 2007 on server.baldwin.cx X-Virus-Status: Clean X-Spam-Status: No, score=-4.4 required=4.2 tests=ALL_TRUSTED,AWL,BAYES_00 autolearn=ham version=3.1.3 X-Spam-Checker-Version: SpamAssassin 3.1.3 (2006-06-01) on server.baldwin.cx Cc: Marcel Moolenaar , Perforce Change Reviews Subject: Re: PERFORCE change 117140 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 02 Apr 2007 20:47:35 -0000 On Monday 02 April 2007 01:10:55 pm Marcel Moolenaar wrote: > > On Apr 2, 2007, at 8:55 AM, John Baldwin wrote: > > >> For example, to analyze machine checks on on pluto1, I disabled CPU0 > >> and CPU1 in succession to see if one of the CPUs was the cause of the > >> MC. As such, CPU1 had to be the BSP when CPU0 was disabled. Luckily > >> pluto1 is only a dual-CPU machine, so that disabling a CPU also stops > >> SMP operation :-) > > > > FreeBSD CPU ID's != firmware CPU IDs. > > It is important, and not only for identification, that the logical > CPU ID > used by FreeBSD is the same as used by the firmware (if at all > possible). > A different ID only causes confusion, especially when the firmware draws > its IDs from the same domain. What is called CPU4 within FreeBSD may not > be called CPU4 in the firmware, even though CPU4 may exist. Given cores vs htts, etc. it would seem that what FreeBSD considers a CPU should be a purely logical object, and not required to be tied to whatever firmware, etc. BTW, thanks for ignoring the discussion about this on arch over the past several years. :-/ > > CPU ID's != local APIC ID's on x86 for example, nor > > are they identical to the CPU indices in the hwprb on Alpha. > > They are also not the same on ia64. In fact, on ia64 the APIC ID > consists of 2 elements. The ACPI ID is exactly the kind of ID we > want... Then ia64 likely is not shutting down properly: /* * Shutdown the system cleanly to prepare for reboot, halt, or power off. */ static void boot(int howto) { static int first_buf_printf = 1; #if defined(SMP) /* * Bind us to CPU 0 so that all shutdown code runs there. Some * systems don't shutdown properly (i.e., ACPI power off) if we * run on another processor. */ mtx_lock_spin(&sched_lock); sched_bind(curthread, 0); mtx_unlock_spin(&sched_lock); KASSERT(PCPU_GET(cpuid) == 0, ("boot: not running on cpu 0")); #endif > > FreeBSD CPU > > ID's tend to not be sparse for example, because they are completely > > separate > > from firmware IDs. > > This statement is flawed. Sparseness is unavoidable when CPUs can be > hot-plugged. While we should have a CPU ID that maps trivially to a > bit field for masking purposes, there's no reason to allow sparse IDs > to certain extend. I said "tend to", not "required to". We had a discussion about this when mp_maxid was settled upon for UMA rather than using MAXCPU. > Both ACPI and Open Firmware have CPU IDs that map trivially to a mask > and they tend to be dense. I see no reason to not use the firmware IDs > as FreeBSD's notion of CPU ID. In fact, I see reasons not to create > our own IDs. In such reason is the added overhead of mapping from one > to the other during runtime. ACPI ID's may be sparse, but they don't have to be. They could start at 2 billion if they wanted to (they are UInt32 and are only small right now due to the current whims of BIOS writes), and then they wouldn't fit into the current cpumask. I see no problem with requiring the MD code to determine which CPUs exist from firmware/BIOS/etc. and then map that into a logical ID space that fits into that arch's cpumask_t while keeping cpumask_t simple if possible. > I think that testing for CPU0 when we really want to know if we're > running on the BSP is also flawed. On ia64 there's typically 1 BSP > that is used to boot the machine, but each cell in a NUMA system > has a monarch CPU that serves the purpose of the BSP for that cell. > This means that some tests that check for the BSP may need to be > changed to check for the monarch instead. Since there can obviously > be only 1 CPU0, there will (ipso facto) be BSP-like processors with > an ID != 0. It's therefore better not to assume "special powers" for > CPU0 and instead check the PCPU for flags that corresponds 1-on-1 > with such powers. I'm not a huge fan of assuming CPU 0 is BSP, but that is the current model under which FreeBSD operates. I'm not sure what should happen for shutdown in NUMA systems for example as in the patch above. If you have an alternative design, feel free to present it on arch@. Until then, it would probably be best to at least conform to what is there now. -- John Baldwin From owner-p4-projects@FreeBSD.ORG Mon Apr 2 20:49:25 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E941316A408; Mon, 2 Apr 2007 20:49:24 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id A3DDD16A406 for ; Mon, 2 Apr 2007 20:49:24 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 92FE213C483 for ; Mon, 2 Apr 2007 20:49:24 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l32KnO2D075722 for ; Mon, 2 Apr 2007 20:49:24 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l32KnOpr075719 for perforce@freebsd.org; Mon, 2 Apr 2007 20:49:24 GMT (envelope-from hselasky@FreeBSD.org) Date: Mon, 2 Apr 2007 20:49:24 GMT Message-Id: <200704022049.l32KnOpr075719@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 117219 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 02 Apr 2007 20:49:25 -0000 http://perforce.freebsd.org/chv.cgi?CH=117219 Change 117219 by hselasky@hselasky_mini_itx on 2007/04/02 20:49:18 Add support for Ax88178 and Ax88772 to if_axe. Ported from OpenBSD. Fixed some bugs. Please test. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/if_axe.c#18 edit .. //depot/projects/usb/src/sys/dev/usb/if_axereg.h#12 edit .. //depot/projects/usb/src/sys/dev/usb/if_ural.c#21 edit .. //depot/projects/usb/src/sys/dev/usb/usbdevs#8 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/if_axe.c#18 (text+ko) ==== @@ -68,6 +68,15 @@ */ /* + * Ax88178 and Ax88772 support backported from the OpenBSD driver. + * 2007/02/12, J.R. Oldroyd, fbsd@opal.com + * + * Manual here: + * http://www.asix.com.tw/FrootAttach/datasheet/AX88178_datasheet_Rev10.pdf + * http://www.asix.com.tw/FrootAttach/datasheet/AX88772_datasheet_Rev10.pdf + */ + +/* * NOTE: all function names beginning like "axe_cfg_" can only * be called from within the config thread function ! */ @@ -125,20 +134,35 @@ #define DPRINTF(...) #endif - /* * Various supported device vendors/products. */ static struct axe_type axe_devs[] = { - { USB_VENDOR_ASIX, USB_PRODUCT_ASIX_AX88172 }, - { USB_VENDOR_DLINK, USB_PRODUCT_DLINK_DUBE100 }, - { USB_VENDOR_JVC, USB_PRODUCT_JVC_MP_PRX1 }, - { USB_VENDOR_LINKSYS2, USB_PRODUCT_LINKSYS2_USB200M }, - { USB_VENDOR_MELCO, USB_PRODUCT_MELCO_LUAU2KTX }, - { USB_VENDOR_NETGEAR, USB_PRODUCT_NETGEAR_FA120 }, - { USB_VENDOR_SYSTEMTALKS, USB_PRODUCT_SYSTEMTALKS_SGCX2UL }, - { USB_VENDOR_SITECOM, USB_PRODUCT_SITECOM_LN029 }, - { 0, 0 } + { USB_VENDOR_ABOCOM, USB_PRODUCT_ABOCOM_UF200, 0 }, + { USB_VENDOR_ACERCM, USB_PRODUCT_ACERCM_EP1427X2, 0 }, + { USB_VENDOR_ASIX, USB_PRODUCT_ASIX_AX88172, 0 }, + { USB_VENDOR_ASIX, USB_PRODUCT_ASIX_AX88178, AXE_FLAG_178 }, + { USB_VENDOR_ASIX, USB_PRODUCT_ASIX_AX88772, AXE_FLAG_772 }, + { USB_VENDOR_ATEN, USB_PRODUCT_ATEN_UC210T, 0 }, + { USB_VENDOR_BELKIN, USB_PRODUCT_BELKIN_F5D5055 , AXE_FLAG_178 }, + { USB_VENDOR_BILLIONTON, USB_PRODUCT_BILLIONTON_USB2AR, 0}, + { USB_VENDOR_CISCOLINKSYS, USB_PRODUCT_CISCOLINKSYS_USB200MV2, AXE_FLAG_772 }, + { USB_VENDOR_COREGA, USB_PRODUCT_COREGA_FETHER_USB2_TX , 0}, + { USB_VENDOR_DLINK, USB_PRODUCT_DLINK_DUBE100, 0 }, + { USB_VENDOR_DLINK, USB_PRODUCT_DLINK_DUBE100B1 , AXE_FLAG_772 }, + { USB_VENDOR_GOODWAY, USB_PRODUCT_GOODWAY_GWUSB2E, 0 }, + { USB_VENDOR_IODATA, USB_PRODUCT_IODATA_ETGUS2, AXE_FLAG_178 }, + { USB_VENDOR_JVC, USB_PRODUCT_JVC_MP_PRX1, 0 }, + { USB_VENDOR_LINKSYS2, USB_PRODUCT_LINKSYS2_USB200M, 0 }, + { USB_VENDOR_LINKSYS4, USB_PRODUCT_LINKSYS4_USB1000, AXE_FLAG_178 }, + { USB_VENDOR_MELCO, USB_PRODUCT_MELCO_LUAU2KTX, 0 }, + { USB_VENDOR_NETGEAR, USB_PRODUCT_NETGEAR_FA120, 0 }, + { USB_VENDOR_OQO, USB_PRODUCT_OQO_ETHER01PLUS, AXE_FLAG_772 }, + { USB_VENDOR_PLANEX3, USB_PRODUCT_PLANEX3_GU1000T , AXE_FLAG_178 }, + { USB_VENDOR_SITECOM, USB_PRODUCT_SITECOM_LN029, 0 }, + { USB_VENDOR_SITECOMEU, USB_PRODUCT_SITECOMEU_LN028 , AXE_FLAG_178 }, + { USB_VENDOR_SYSTEMTALKS, USB_PRODUCT_SYSTEMTALKS_SGCX2UL, 0 }, + { 0, 0, 0 } }; static device_probe_t axe_probe; @@ -196,13 +220,19 @@ static void axe_watchdog(void *arg); +static void +axe_cfg_ax88178_init(struct axe_softc *); + +static void +axe_cfg_ax88772_init(struct axe_softc *); + static const struct usbd_config axe_config[AXE_ENDPT_MAX] = { [0] = { .type = UE_BULK, .endpoint = -1, /* any */ .direction = UE_DIR_OUT, - .bufsize = MCLBYTES, + .bufsize = AXE_BULK_BUF_SIZE, .flags = (USBD_USE_DMA|USBD_FORCE_SHORT_XFER), .callback = &axe_bulk_write_callback, .timeout = 10000, /* 10 seconds */ @@ -212,7 +242,7 @@ .type = UE_BULK, .endpoint = -1, /* any */ .direction = UE_DIR_IN, - .bufsize = MCLBYTES, + .bufsize = AXE_BULK_BUF_SIZE, .flags = (USBD_USE_DMA|USBD_SHORT_XFER_OK), .callback = &axe_bulk_read_callback, .timeout = 0, /* no timeout */ @@ -313,7 +343,7 @@ if (err) { - DPRINTF(sc, 0, "device request failed, err=%s " + DPRINTF(sc, -1, "device request failed, err=%s " "(ignored)\n", usbd_errstr(err)); error: @@ -391,7 +421,37 @@ static void axe_cfg_miibus_statchg(device_t dev) { - /* doesn't seem to be necessary */ + struct axe_softc * sc = device_get_softc(dev); + struct mii_data * mii = GET_MII(sc); + uint16_t val; + + mtx_lock(&(sc->sc_mtx)); /* XXX */ + + if ((mii->mii_media_active & IFM_GMASK) == IFM_FDX) + val = AXE_MEDIA_FULL_DUPLEX; + else + val = 0; + + if (sc->sc_flags & (AXE_FLAG_772|AXE_FLAG_178)) { + + val |= (AXE_178_MEDIA_RX_EN | AXE_178_MEDIA_MAGIC); + + switch (IFM_SUBTYPE(mii->mii_media_active)) { + case IFM_1000_T: + val |= AXE_178_MEDIA_GMII | AXE_178_MEDIA_ENCK; + break; + case IFM_100_TX: + val |= AXE_178_MEDIA_100TX; + break; + case IFM_10_T: + /* doesn't need to be handled */ + break; + } + } + + axe_cfg_cmd(sc, AXE_CMD_WRITE_MEDIA, 0, val, NULL); + + mtx_unlock(&(sc->sc_mtx)); /* XXX */ return; } @@ -545,6 +605,22 @@ return; } +static struct axe_type * +axe_find_product(struct usb_attach_arg *uaa) +{ + struct axe_type *t; + + t = axe_devs; + while(t->axe_vid) { + if ((uaa->vendor == t->axe_vid) && + (uaa->product == t->axe_did)) { + return t; + } + t++; + } + return NULL; +} + /* * Probe for a AX88172 chip. */ @@ -552,21 +628,13 @@ axe_probe(device_t dev) { struct usb_attach_arg *uaa = device_get_ivars(dev); - struct axe_type *t; if (uaa->iface != NULL) { return UMATCH_NONE; } - t = axe_devs; - while(t->axe_vid) { - if ((uaa->vendor == t->axe_vid) && - (uaa->product == t->axe_did)) { - return UMATCH_VENDOR_PRODUCT; - } - t++; - } - return UMATCH_NONE; + return (axe_find_product(uaa) ? + UMATCH_VENDOR_PRODUCT : UMATCH_NONE); } /* @@ -577,6 +645,7 @@ axe_attach(device_t dev) { struct usb_attach_arg *uaa = device_get_ivars(dev); + struct axe_type *t = axe_find_product(uaa); struct axe_softc *sc = device_get_softc(dev); int32_t error; @@ -587,6 +656,7 @@ sc->sc_udev = uaa->device; sc->sc_dev = dev; sc->sc_unit = device_get_unit(dev); + sc->sc_flags = t->axe_flags; usbd_set_desc(dev, uaa->device); @@ -627,6 +697,12 @@ sc->sc_flags |= AXE_FLAG_WAIT_LINK; + /* correct maximum bulk-receive length */ + + sc->sc_xfer[1]->length = + (sc->sc_flags & (AXE_FLAG_772|AXE_FLAG_178)) ? + AXE_BULK_BUF_SIZE : MIN(MCLBYTES, AXE_BULK_BUF_SIZE); + /* start setup */ usbd_config_td_queue_command @@ -644,6 +720,112 @@ } static void +axe_cfg_ax88178_init(struct axe_softc *sc) +{ + uint16_t eeprom; + uint16_t phymode; + uint16_t gpio0; + uint8_t err; + + DPRINTF(sc, 0, "\n"); + + axe_cfg_cmd(sc, AXE_CMD_SROM_WR_ENABLE, 0, 0, NULL); + /* XXX magic */ + axe_cfg_cmd(sc, AXE_CMD_SROM_READ, 0, 0x0017, &eeprom); + axe_cfg_cmd(sc, AXE_CMD_SROM_WR_DISABLE, 0, 0, NULL); + + /* For big-endian machines: */ + eeprom = le16toh(eeprom); + + /* if EEPROM is invalid we have to use to GPIO0 */ + if (eeprom == 0xffff) { + phymode = 0; + gpio0 = 1; + } else { + phymode = (eeprom & 7); + gpio0 = (eeprom & 0x80) ? 0 : 1; + } + + axe_cfg_cmd(sc, AXE_CMD_WRITE_GPIO, 0, 0x008c, NULL); + err = usbd_config_td_sleep(&(sc->sc_config_td), hz/16); + + if ((eeprom >> 8) != 0x01) { + axe_cfg_cmd(sc, AXE_CMD_WRITE_GPIO, 0, 0x003c, NULL); + err = usbd_config_td_sleep(&(sc->sc_config_td), hz/32); + + axe_cfg_cmd(sc, AXE_CMD_WRITE_GPIO, 0, 0x001c, NULL); + err = usbd_config_td_sleep(&(sc->sc_config_td), hz/3); + + axe_cfg_cmd(sc, AXE_CMD_WRITE_GPIO, 0, 0x003c, NULL); + err = usbd_config_td_sleep(&(sc->sc_config_td), hz/32); + } else { + axe_cfg_cmd(sc, AXE_CMD_WRITE_GPIO, 0, 0x0004, NULL); + err = usbd_config_td_sleep(&(sc->sc_config_td), hz/32); + + axe_cfg_cmd(sc, AXE_CMD_WRITE_GPIO, 0, 0x000c, NULL); + err = usbd_config_td_sleep(&(sc->sc_config_td), hz/32); + } + + /* soft reset */ + axe_cfg_cmd(sc, AXE_CMD_SW_RESET_REG, 0, AXE_SW_RESET_CLEAR, NULL); + err = usbd_config_td_sleep(&(sc->sc_config_td), hz/4); + + axe_cfg_cmd(sc, AXE_CMD_SW_RESET_REG, 0, + AXE_SW_RESET_PRL | AXE_178_RESET_MAGIC, NULL); + err = usbd_config_td_sleep(&(sc->sc_config_td), hz/4); + + axe_cfg_cmd(sc, AXE_CMD_RXCTL_WRITE, 0, 0, NULL); + return; +} + +static void +axe_cfg_ax88772_init(struct axe_softc *sc) +{ + uint8_t err; + + DPRINTF(sc, 0, "\n"); + + axe_cfg_cmd(sc, AXE_CMD_WRITE_GPIO, 0, 0x00b0, NULL); + err = usbd_config_td_sleep(&(sc->sc_config_td), hz/16); + + if (sc->sc_phyaddrs[1] == AXE_INTPHY) { + /* ask for the embedded PHY */ + axe_cfg_cmd(sc, AXE_CMD_SW_PHY_SELECT, 0, 0x01, NULL); + err = usbd_config_td_sleep(&(sc->sc_config_td), hz/64); + + /* power down and reset state, pin reset state */ + axe_cfg_cmd(sc, AXE_CMD_SW_RESET_REG, 0, + AXE_SW_RESET_CLEAR, NULL); + err = usbd_config_td_sleep(&(sc->sc_config_td), hz/16); + + /* power down/reset state, pin operating state */ + axe_cfg_cmd(sc, AXE_CMD_SW_RESET_REG, 0, + AXE_SW_RESET_IPPD | AXE_SW_RESET_PRL, NULL); + err = usbd_config_td_sleep(&(sc->sc_config_td), hz/4); + + /* power up, reset */ + axe_cfg_cmd(sc, AXE_CMD_SW_RESET_REG, 0, + AXE_SW_RESET_PRL, NULL); + + /* power up, operating */ + axe_cfg_cmd(sc, AXE_CMD_SW_RESET_REG, 0, + AXE_SW_RESET_IPRL | AXE_SW_RESET_PRL, NULL); + } else { + /* ask for external PHY */ + axe_cfg_cmd(sc, AXE_CMD_SW_PHY_SELECT, 0, 0x00, NULL); + err = usbd_config_td_sleep(&(sc->sc_config_td), hz/64); + + /* power down internal PHY */ + axe_cfg_cmd(sc, AXE_CMD_SW_RESET_REG, 0, + AXE_SW_RESET_IPPD | AXE_SW_RESET_PRL, NULL); + } + + err = usbd_config_td_sleep(&(sc->sc_config_td), hz/4); + axe_cfg_cmd(sc, AXE_CMD_RXCTL_WRITE, 0, 0, NULL); + return; +} + +static void axe_cfg_first_time_setup(struct axe_softc *sc, struct axe_config_copy *cc, u_int16_t refcount) { @@ -655,15 +837,28 @@ bzero(eaddr, sizeof(eaddr)); /* + * Load PHY indexes first. Needed by axe_xxx_init(). + */ + axe_cfg_cmd(sc, AXE_CMD_READ_PHYID, 0, 0, sc->sc_phyaddrs); + + if (sc->sc_flags & AXE_FLAG_178) { + axe_cfg_ax88178_init(sc); + } else if (sc->sc_flags & AXE_FLAG_772) { + axe_cfg_ax88772_init(sc); + } + + /* * Get station address. */ - axe_cfg_cmd(sc, AXE_CMD_READ_NODEID, 0, 0, eaddr); + if (sc->sc_flags & (AXE_FLAG_178|AXE_FLAG_772)) + axe_cfg_cmd(sc, AXE_178_CMD_READ_NODEID, 0, 0, eaddr); + else + axe_cfg_cmd(sc, AXE_172_CMD_READ_NODEID, 0, 0, eaddr); /* - * Load IPG values and PHY indexes. + * Load IPG values. */ axe_cfg_cmd(sc, AXE_CMD_READ_IPG012, 0, 0, sc->sc_ipgs); - axe_cfg_cmd(sc, AXE_CMD_READ_PHYID, 0, 0, sc->sc_phyaddrs); /* * Work around broken adapters that appear to lie about @@ -852,12 +1047,20 @@ return; } +#if (AXE_BULK_BUF_SIZE >= 0x10000) +#error "Please update axe_bulk_read_callback()!" +#endif + static void axe_bulk_read_callback(struct usbd_xfer *xfer) { struct axe_softc *sc = xfer->priv_sc; + struct axe_sframe_hdr hdr; struct ifnet *ifp = sc->sc_ifp; struct mbuf *m; + uint16_t pos; + uint16_t len; + uint16_t adjust; USBD_CHECK_STATUS(xfer); @@ -873,27 +1076,80 @@ tr_transferred: - if (xfer->actlen < sizeof(struct ether_header)) { - ifp->if_ierrors++; - goto tr_setup; - } + pos = 0; + + while (1) { + + if (sc->sc_flags & (AXE_FLAG_772|AXE_FLAG_178)) { + + if (xfer->actlen < sizeof(hdr)) { + /* too little data */ + break; + } + + usbd_copy_out(&(xfer->buf_data), pos, &hdr, sizeof(hdr)); + + if ((hdr.len ^ hdr.ilen) != 0xFFFF) { + /* we lost sync */ + break; + } + + xfer->actlen -= sizeof(hdr); + pos += sizeof(hdr); + + len = le16toh(hdr.len); + if (len > xfer->actlen) { + /* invalid length */ + break; + } + + adjust = (len & 1); + + } else { + len = xfer->actlen; + adjust = 0; + } + + if (len < sizeof(struct ether_header)) { + ifp->if_ierrors++; + goto skip; + } + + m = usbd_ether_get_mbuf(); + + if (m == NULL) { + /* we are out of memory */ + break; + } + + if (m->m_len > len) { + m->m_len = len; + } + + usbd_copy_out(&(xfer->buf_data), pos, m->m_data, m->m_len); + + ifp->if_ipackets++; + m->m_pkthdr.rcvif = ifp; + m->m_pkthdr.len = m->m_len; - m = usbd_ether_get_mbuf(); + (ifp->if_input)(ifp, m); - if (m == NULL) { - ifp->if_ierrors++; - goto tr_setup; - } + skip: - xfer->actlen = min(xfer->actlen, m->m_len); + pos += len; + xfer->actlen -= len; - usbd_copy_out(&(xfer->buf_data), 0, m->m_data, xfer->actlen); + if (xfer->actlen <= adjust) { + /* we are finished */ + goto tr_setup; + } - ifp->if_ipackets++; - m->m_pkthdr.rcvif = ifp; - m->m_pkthdr.len = m->m_len = xfer->actlen; + pos += adjust; + xfer->actlen -= adjust; + } - (ifp->if_input)(ifp, m); + /* count an error */ + ifp->if_ierrors++; tr_setup: @@ -932,12 +1188,18 @@ return; } +#if ((AXE_BULK_BUF_SIZE >= 0x10000) || (AXE_BULK_BUF_SIZE < (MCLBYTES+4))) +#error "Please update axe_bulk_write_callback()!" +#endif + static void axe_bulk_write_callback(struct usbd_xfer *xfer) { struct axe_softc *sc = xfer->priv_sc; + struct axe_sframe_hdr hdr; struct ifnet *ifp = sc->sc_ifp; struct mbuf *m; + uint16_t pos; USBD_CHECK_STATUS(xfer); @@ -975,33 +1237,69 @@ goto done; } - IF_DEQUEUE(&(ifp->if_snd), m); + pos = 0; + + while (1) { + + IF_DEQUEUE(&(ifp->if_snd), m); + + if (m == NULL) { + if (pos > 0) + break; /* send out data */ + else + goto done; + } + + if (m->m_pkthdr.len > MCLBYTES) { + m->m_pkthdr.len = MCLBYTES; + } + + if (sc->sc_flags & (AXE_FLAG_772|AXE_FLAG_178)) { + + hdr.len = htole16(m->m_pkthdr.len); + hdr.ilen = ~hdr.len; + + usbd_copy_in(&(xfer->buf_data), pos, &hdr, sizeof(hdr)); + + pos += sizeof(hdr); + + /* NOTE: Some drivers force a short + * packet by appending a dummy header + * with zero length at then end of the + * USB transfer. This driver uses the + * USBD_FORCE_SHORT_XFER flag instead. + */ + } - if (m == NULL) { - goto done; - } + usbd_m_copy_in(&(xfer->buf_data), pos, + m, 0, m->m_pkthdr.len); - if (m->m_pkthdr.len > MCLBYTES) { - m->m_pkthdr.len = MCLBYTES; - } + pos += m->m_pkthdr.len; - xfer->length = m->m_pkthdr.len; + /* + * if there's a BPF listener, bounce a copy + * of this frame to him: + */ + BPF_MTAP(ifp, m); - usbd_m_copy_in(&(xfer->buf_data), 0, - m, 0, m->m_pkthdr.len); + m_freem(m); - /* - * if there's a BPF listener, bounce a copy - * of this frame to him: - */ - BPF_MTAP(ifp, m); + if (sc->sc_flags & (AXE_FLAG_772|AXE_FLAG_178)) { + if (pos > (AXE_BULK_BUF_SIZE-MCLBYTES-sizeof(hdr))) { + /* send out frame(s) */ + break; + } + } else { + /* send out frame */ + break; + } + } - m_freem(m); + xfer->length = pos; usbd_start_hardware(xfer); ifp->if_drv_flags |= IFF_DRV_OACTIVE; - done: return; } @@ -1118,12 +1416,22 @@ #endif /* Set transmitter IPG values */ - axe_cfg_cmd(sc, AXE_CMD_WRITE_IPG0, 0, sc->sc_ipgs[0], NULL); - axe_cfg_cmd(sc, AXE_CMD_WRITE_IPG1, 0, sc->sc_ipgs[1], NULL); - axe_cfg_cmd(sc, AXE_CMD_WRITE_IPG2, 0, sc->sc_ipgs[2], NULL); + if (sc->sc_flags & (AXE_FLAG_178|AXE_FLAG_772)) { + axe_cfg_cmd(sc, AXE_178_CMD_WRITE_IPG012, sc->sc_ipgs[2], + (sc->sc_ipgs[1] << 8) | (sc->sc_ipgs[0]), NULL); + } else { + axe_cfg_cmd(sc, AXE_172_CMD_WRITE_IPG0, 0, sc->sc_ipgs[0], NULL); + axe_cfg_cmd(sc, AXE_172_CMD_WRITE_IPG1, 0, sc->sc_ipgs[1], NULL); + axe_cfg_cmd(sc, AXE_172_CMD_WRITE_IPG2, 0, sc->sc_ipgs[2], NULL); + } /* Enable receiver, set RX mode */ - rxmode = (AXE_RXCMD_UNICAST|AXE_RXCMD_MULTICAST|AXE_RXCMD_ENABLE); + rxmode = (AXE_RXCMD_MULTICAST|AXE_RXCMD_ENABLE); + if (sc->sc_flags & (AXE_FLAG_178|AXE_FLAG_772)) { + rxmode |= AXE_178_RXCMD_MFB_16384; /* default */ + } else { + rxmode |= AXE_172_RXCMD_UNICAST; + } /* If we want promiscuous mode, set the allframes bit. */ if (cc->if_flags & IFF_PROMISC) { ==== //depot/projects/usb/src/sys/dev/usb/if_axereg.h#12 (text+ko) ==== @@ -33,15 +33,15 @@ */ /* - * Definitions for the ASIX Electronics AX88172 to ethernet controller. + * Definitions for the ASIX Electronics AX88172, AX88178 + * and AX88772 to ethernet controllers. */ - /* * Vendor specific commands. ASIX conveniently doesn't document the 'set * NODEID' command in their datasheet (thanks a lot guys). * To make handling these commands easier, I added some extra data which is - * decided by the axe_cmd() routine. Commands are encoded in 16 bytes, with + * decided by the axe_cmd() routine. Commands are encoded in 16 bits, with * the format: LDCC. L and D are both nibbles in the high byte. L represents * the data length (0 to 15) and D represents the direction (0 for vendor read, * 1 for vendor write). CC is the command byte, as specified in the manual. @@ -51,49 +51,93 @@ #define AXE_CMD_LEN(x) (((x) & 0xF000) >> 12) #define AXE_CMD_CMD(x) ((x) & 0x00FF) -#define AXE_CMD_READ_RXTX_SRAM 0x2002 -#define AXE_CMD_WRITE_RX_SRAM 0x0103 -#define AXE_CMD_WRITE_TX_SRAM 0x0104 +#define AXE_172_CMD_READ_RXTX_SRAM 0x2002 +#define AXE_182_CMD_READ_RXTX_SRAM 0x8002 +#define AXE_172_CMD_WRITE_RX_SRAM 0x0103 +#define AXE_182_CMD_WRITE_RXTX_SRAM 0x8103 +#define AXE_172_CMD_WRITE_TX_SRAM 0x0104 #define AXE_CMD_MII_OPMODE_SW 0x0106 #define AXE_CMD_MII_READ_REG 0x2007 #define AXE_CMD_MII_WRITE_REG 0x2108 #define AXE_CMD_MII_READ_OPMODE 0x1009 #define AXE_CMD_MII_OPMODE_HW 0x010A -#define AXE_CMD_SROM_READ 0x200B +#define AXE_CMD_SROM_READ 0x200B #define AXE_CMD_SROM_WRITE 0x010C #define AXE_CMD_SROM_WR_ENABLE 0x010D #define AXE_CMD_SROM_WR_DISABLE 0x010E #define AXE_CMD_RXCTL_READ 0x200F #define AXE_CMD_RXCTL_WRITE 0x0110 #define AXE_CMD_READ_IPG012 0x3011 -#define AXE_CMD_WRITE_IPG0 0x0112 -#define AXE_CMD_WRITE_IPG1 0x0113 -#define AXE_CMD_WRITE_IPG2 0x0114 +#define AXE_172_CMD_WRITE_IPG0 0x0112 +#define AXE_178_CMD_WRITE_IPG012 0x0112 +#define AXE_172_CMD_WRITE_IPG1 0x0113 +#define AXE_178_CMD_READ_NODEID 0x6013 +#define AXE_172_CMD_WRITE_IPG2 0x0114 +#define AXE_178_CMD_WRITE_NODEID 0x6114 #define AXE_CMD_READ_MCAST 0x8015 #define AXE_CMD_WRITE_MCAST 0x8116 -#define AXE_CMD_READ_NODEID 0x6017 -#define AXE_CMD_WRITE_NODEID 0x6118 +#define AXE_172_CMD_READ_NODEID 0x6017 +#define AXE_172_CMD_WRITE_NODEID 0x6118 + #define AXE_CMD_READ_PHYID 0x2019 -#define AXE_CMD_READ_MEDIA 0x101A +#define AXE_172_CMD_READ_MEDIA 0x101A +#define AXE_178_CMD_READ_MEDIA 0x201A #define AXE_CMD_WRITE_MEDIA 0x011B #define AXE_CMD_READ_MONITOR_MODE 0x101C #define AXE_CMD_WRITE_MONITOR_MODE 0x011D #define AXE_CMD_READ_GPIO 0x101E #define AXE_CMD_WRITE_GPIO 0x011F +#define AXE_CMD_SW_RESET_REG 0x0120 +#define AXE_CMD_SW_PHY_STATUS 0x0021 +#define AXE_CMD_SW_PHY_SELECT 0x0122 + +#define AXE_SW_RESET_CLEAR 0x00 +#define AXE_SW_RESET_RR 0x01 +#define AXE_SW_RESET_RT 0x02 +#define AXE_SW_RESET_PRTE 0x04 +#define AXE_SW_RESET_PRL 0x08 +#define AXE_SW_RESET_BZ 0x10 +#define AXE_SW_RESET_IPRL 0x20 +#define AXE_SW_RESET_IPPD 0x40 + +/* AX88178 documentation says to always write this bit... */ +#define AXE_178_RESET_MAGIC 0x40 + +#define AXE_178_MEDIA_GMII 0x0001 +#define AXE_MEDIA_FULL_DUPLEX 0x0002 +#define AXE_172_MEDIA_TX_ABORT_ALLOW 0x0004 + +/* AX88178 documentation says to always write 1 to reserved bit... */ +#define AXE_178_MEDIA_MAGIC 0x0004 +#define AXE_178_MEDIA_ENCK 0x0008 +#define AXE_172_MEDIA_FLOW_CONTROL_EN 0x0010 +#define AXE_178_MEDIA_RXFLOW_CONTROL_EN 0x0010 +#define AXE_178_MEDIA_TXFLOW_CONTROL_EN 0x0020 +#define AXE_178_MEDIA_JUMBO_EN 0x0040 +#define AXE_178_MEDIA_LTPF_ONLY 0x0080 +#define AXE_178_MEDIA_RX_EN 0x0100 +#define AXE_178_MEDIA_100TX 0x0200 +#define AXE_178_MEDIA_SBP 0x0800 +#define AXE_178_MEDIA_SUPERMAC 0x1000 + #define AXE_RXCMD_PROMISC 0x0001 #define AXE_RXCMD_ALLMULTI 0x0002 -#define AXE_RXCMD_UNICAST 0x0004 +#define AXE_172_RXCMD_UNICAST 0x0004 +#define AXE_178_RXCMD_KEEP_INVALID_CRC 0x0004 #define AXE_RXCMD_BROADCAST 0x0008 #define AXE_RXCMD_MULTICAST 0x0010 #define AXE_RXCMD_ENABLE 0x0080 +#define AXE_178_RXCMD_MFB_MASK 0x0300 +#define AXE_178_RXCMD_MFB_2048 0x0000 +#define AXE_178_RXCMD_MFB_4096 0x0100 +#define AXE_178_RXCMD_MFB_8192 0x0200 +#define AXE_178_RXCMD_MFB_16384 0x0300 #define AXE_NOPHY 0xE0 +#define AXE_INTPHY 0x10 -#define AXE_TIMEOUT 1000 -#define AXE_MIN_FRAMELEN 60 -#define AXE_RX_FRAMES 1 -#define AXE_TX_FRAMES 1 +#define AXE_BULK_BUF_SIZE 16384 /* bytes */ #define AXE_CTL_READ 0x01 #define AXE_CTL_WRITE 0x02 @@ -107,9 +151,15 @@ struct axe_type { uint16_t axe_vid; uint16_t axe_did; + uint16_t axe_flags; }; -#define GET_MII(sc) ((sc)->sc_miibus ? \ +struct axe_sframe_hdr { + uint16_t len; + uint16_t ilen; +} __packed; + +#define GET_MII(sc) ((sc)->sc_miibus ? \ device_get_softc((sc)->sc_miibus) : NULL) struct axe_softc { @@ -136,6 +186,8 @@ #define AXE_FLAG_WRITE_STALL 0x0008 #define AXE_FLAG_LL_READY 0x0010 #define AXE_FLAG_HL_READY 0x0020 +#define AXE_FLAG_772 0x0040 /* AX88772 */ +#define AXE_FLAG_178 0x0080 /* AX88178 */ uint8_t sc_ipgs[3]; uint8_t sc_phyaddrs[2]; ==== //depot/projects/usb/src/sys/dev/usb/if_ural.c#21 (text+ko) ==== @@ -231,9 +231,9 @@ { USB_VENDOR_DLINK, USB_PRODUCT_DLINK_DWLG122 }, { USB_VENDOR_GIGABYTE, USB_PRODUCT_GIGABYTE_GNWBKG }, { USB_VENDOR_GUILLEMOT, USB_PRODUCT_GUILLEMOT_HWGUSB254 }, - { USB_VENDOR_LINKSYS4, USB_PRODUCT_LINKSYS4_WUSB54G }, - { USB_VENDOR_LINKSYS4, USB_PRODUCT_LINKSYS4_WUSB54GP }, - { USB_VENDOR_LINKSYS4, USB_PRODUCT_LINKSYS4_HU200TS }, + { USB_VENDOR_CISCOLINKSYS, USB_PRODUCT_CISCOLINKSYS_WUSB54G }, + { USB_VENDOR_CISCOLINKSYS, USB_PRODUCT_CISCOLINKSYS_WUSB54GP }, + { USB_VENDOR_CISCOLINKSYS, USB_PRODUCT_CISCOLINKSYS_HU200TS }, { USB_VENDOR_MELCO, USB_PRODUCT_MELCO_KG54 }, { USB_VENDOR_MELCO, USB_PRODUCT_MELCO_KG54AI }, { USB_VENDOR_MELCO, USB_PRODUCT_MELCO_KG54YB }, ==== //depot/projects/usb/src/sys/dev/usb/usbdevs#8 (text+ko) ==== @@ -65,6 +65,7 @@ vendor EGALAX2 0x0123 eGalax vendor NETGEAR3 0x1385 Netgear vendor WISTRONNEWEB 0x1435 Wistron NeWeb +vendor OQO 0x1557 OQO vendor UMEDIA 0x157e U-MEDIA Communications vendor LTS 0x0386 LTS vendor AOX 0x03e8 AOX @@ -525,7 +526,7 @@ vendor WISTRONNEWEB 0x1435 Wistron NeWeb vendor MOBILITY 0x1342 Mobility vendor RADIOSHACK 0x1453 Radio Shack -vendor LINKSYS4 0x13b1 Linksys +vendor CISCOLINKSYS 0x13b1 Linksys vendor SHARK 0x13d2 Shark vendor NOVATEL2 0x1410 Novatel vendor SILICOM 0x1485 Silicom @@ -539,12 +540,14 @@ vendor SOHOWARE 0x15e8 SOHOware vendor UMAX 0x1606 UMAX vendor INSIDEOUT 0x1608 Inside Out Networks +vendor GOODWAY 0x1631 Good Way Technology vendor ENTREGA 0x1645 Entrega vendor ACTIONTEC 0x1668 Actiontec vendor ATHEROS 0x168c Atheros Communications vendor GIGASET 0x1690 Gigaset vendor GLOBALSUN 0x16ab Global Sun Technology vendor CMOTECH 0x16d8 CMOTECH CO., LTD. +vendor LINKSYS4 0x1737 Linksys vendor LINKSYS3 0x1915 Linksys vendor DLINK 0x2001 D-Link vendor PLANEX2 0x2019 Planex Communications @@ -607,6 +610,7 @@ product ABOCOM XX7 0x400c XX7 product ABOCOM XX8 0x4102 XX8 product ABOCOM XX9 0x4104 XX9 +product ABOCOM UF200 0x420a UF200 Ethernet product ABOCOM WL54 0x6001 WL54 product ABOCOM XX10 0xabc1 XX10 @@ -718,6 +722,8 @@ /* ASIX Electronics products */ product ASIX AX88172 0x1720 10/100 ethernet +product ASIX AX88178 0x1780 10/100 ethernet +product ASIX AX88772 0x7720 10/100 ethernet /* ASUS products */ product ASUS WL167G 0x1707 WL-167g wireless adapter @@ -727,6 +733,7 @@ product ATEN UC1284 0x2001 Parallel printer product ATEN UC10T 0x2002 10Mbps ethernet product ATEN UC232A 0x2008 Serial +product ATEN UC210T 0x2009 UC210T Ethernet /* Atheros Communications products */ product ATHEROS AR5523 0x0001 AR5523 @@ -761,6 +768,7 @@ product BELKIN F5U409 0x0409 F5U409 Serial product BELKIN F6C550AVR 0x0551 F6C550-AVR UPS product BELKIN F5U120 0x1203 F5U120-PC Hub +product BELKIN F5D5055 0x5055 F5D5055 ethernet product BELKIN F5D7050 0x7050 F5D7050 wireless adapter product BELKIN F5D7050C 0x705c F5D705C 54g USB Network Adapter @@ -769,6 +777,7 @@ product BILLIONTON USBLP100 0x0987 USB100LP product BILLIONTON USBEL100 0x0988 USB100EL product BILLIONTON USBE100 0x8511 USBE100 +product BILLIONTON USB2AR 0x90ff USB2AR/SNAPPORT Ethernet /* Broadcom products */ product BROADCOM BCM2033 0x2033 BCM2033 Bluetooth USB dongle @@ -812,6 +821,12 @@ /* Chicony products */ product CHICONY KB8933 0x0001 KB-8933 keyboard +/* Cisco Linksys products */ +product CISCOLINKSYS WUSB54G 0x000d WUSB54G wireless adapter +product CISCOLINKSYS WUSB54GP 0x0011 WUSB54GP wireless adapter +product CISCOLINKSYS USB200MV2 0x0018 USB 2.0 10/100 ethernet v2.0 +product CISCOLINKSYS HU200TS 0x001a HU200TS wireless adapter + /* CMOTECH products */ product CMOTECH CDMA_MODEM0 0x5141 CMOTECH CDMA Technologies USB modem product CMOTECH CDMA_MODEM1 0x6280 CMOTECH CDMA Technologies USB modem @@ -828,6 +843,7 @@ product COREGA ETHER_USB_T 0x0001 Ether USB-T product COREGA FETHER_USB_TX 0x0004 FEther USB-TX product COREGA FETHER_USB_TXS 0x000d FEther USB-TXS +product COREGA FETHER_USB2_TX 0x0017 FEther USB2-TX product COREGA FETHER_USB_TXC 0x9601 FEther USB-TXC /* Creative products */ @@ -897,6 +913,7 @@ product DLINK DUBE100 0x1a00 10/100 ethernet product DLINK DSB650TX4 0x200c 10/100 ethernet product DLINK DWLG122 0x3c00 DWL-G122 b1 wireless adapter +product DLINK DUBE100B1 0x3c05 DUB-E100 rev B1 product DLINK DWLAG122 0x3a04 DWL-AG122 product DLINK DWLAG122_NF 0x3a05 DWL-AG122 (no firmware) product DLINK DWLAG132 0x3a00 DWL-AG132 @@ -1042,6 +1059,9 @@ /* G.Mate, Inc products */ product GMATE YP3X00 0x1001 YP3X00 PDA +/* Good Way Technology products */ +product GOODWAY GWUSB2E 0x6200 GWUSB2E + /* Guillemot Corporation */ product GUILLEMOT DALEADER 0xa300 DA Leader product GUILLEMOT HWGUSB254 0xe000 HWGUSB2-54 WLAN @@ -1147,6 +1167,7 @@ product IODATA USBETT 0x0901 USB ETT product IODATA USBETTX 0x0904 USB ETTX product IODATA USBETTXS 0x0913 USB ETTX +product IODATA ETGUS2 0x0930 ETG-US2 product IODATA USBRSAQ 0x0a03 Serial USB-RSAQ1 /* Iomega products */ @@ -1244,6 +1265,7 @@ product LEXMARK S2450 0x0009 Optra S 2450 /* Linksys products */ +product LINKSYS4 USB1000 0x0039 USB1000 product LINKSYS MAUSB2 0x0105 Camedia MAUSB-2 product LINKSYS USB10TX1 0x200c USB10TX product LINKSYS USB10T 0x2202 USB10T Ethernet @@ -1254,9 +1276,6 @@ product LINKSYS2 WUSB11 0x2219 WUSB11 Wireless adapter product LINKSYS2 USB200M 0x2226 USB 2.0 10/100 ethernet product LINKSYS3 WUSB11v28 0x2233 WUSB11 v2.8 wireless adapter -product LINKSYS4 WUSB54G 0x000d WUSB54G wireless adapter -product LINKSYS4 WUSB54GP 0x0011 WUSB54GP wireless adapter -product LINKSYS4 HU200TS 0x001a HU200TS wireless adapter /* Logitech products */ product LOGITECH M2452 0x0203 M2452 keyboard @@ -1453,6 +1472,9 @@ /* OnSpec Electronic, Inc. */ product ONSPEC UCF100 0xa400 FlashLink UCF-100 CompactFlash Reader +/* OQO */ +product OQO ETHER01PLUS 0x7720 model 01+ Ethernet + /* Palm Computing, Inc. product */ product PALM SERIAL 0x0080 USB Serial product PALM M500 0x0001 Palm m500 @@ -1496,6 +1518,7 @@ product PIENGINEERING PS2USB 0x020b PS2 to Mac USB Adapter /* Planex Communications products */ +product PLANEX3 GU1000T 0xab11 GU-1000T product PLANEX3 GWUS54MINI 0xab13 GW-US54Mini product PLANEX2 GWUS54GZL 0xc007 GW-US54GZL @@ -1651,6 +1674,7 @@ product SITECOM SERIAL 0x2068 USB to serial cable (v2) /* Sitecom Europe products */ +product SITECOMEU LN028 0x061c LN-028 product SITECOMEU WL113 0x9071 WL-113 /* SmartBridges products */ @@ -1721,6 +1745,9 @@ /* Sweex products */ product SWEEX ZD1211 0x1809 ZD1211 +/* Surecom products */ +product ACERCM EP1427X2 0x0893 EP-1427X-2 Ethernet + /* System TALKS, Inc. */ product SYSTEMTALKS SGCX2UL 0x1920 SGC-X2UL From owner-p4-projects@FreeBSD.ORG Mon Apr 2 20:55:33 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D9B9516A409; Mon, 2 Apr 2007 20:55:32 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id A9BCB16A407 for ; Mon, 2 Apr 2007 20:55:32 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 9A84F13C480 for ; Mon, 2 Apr 2007 20:55:32 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l32KtWNf077302 for ; Mon, 2 Apr 2007 20:55:32 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l32KtWuM077299 for perforce@freebsd.org; Mon, 2 Apr 2007 20:55:32 GMT (envelope-from rdivacky@FreeBSD.org) Date: Mon, 2 Apr 2007 20:55:32 GMT Message-Id: <200704022055.l32KtWuM077299@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 117220 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 02 Apr 2007 20:55:33 -0000 http://perforce.freebsd.org/chv.cgi?CH=117220 Change 117220 by rdivacky@rdivacky_witten on 2007/04/02 20:55:01 Use kern_close instead of close(). Pointed out by: jhb Affected files ... .. //depot/projects/linuxolator/src/sys/compat/linux/linux_stats.c#9 edit Differences ... ==== //depot/projects/linuxolator/src/sys/compat/linux/linux_stats.c#9 (text+ko) ==== @@ -601,7 +601,6 @@ int error; char *newpath, *oldpath, *freebuf = NULL, *path; int fd; - struct close_args cargs; struct stat buf; /* open the file */ @@ -637,8 +636,7 @@ error = stat64_copyout(&buf, args->statbuf); /* close the opened file */ - cargs.fd = fd; - close(td, &cargs); + kern_close(td, fd); return (0); } From owner-p4-projects@FreeBSD.ORG Mon Apr 2 21:04:45 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 11AE316A40B; Mon, 2 Apr 2007 21:04:45 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id C446116A401 for ; Mon, 2 Apr 2007 21:04:44 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 9CBB113C455 for ; Mon, 2 Apr 2007 21:04:44 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l32L4i4U079968 for ; Mon, 2 Apr 2007 21:04:44 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l32L4iFh079964 for perforce@freebsd.org; Mon, 2 Apr 2007 21:04:44 GMT (envelope-from rdivacky@FreeBSD.org) Date: Mon, 2 Apr 2007 21:04:44 GMT Message-Id: <200704022104.l32L4iFh079964@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 117221 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 02 Apr 2007 21:04:45 -0000 http://perforce.freebsd.org/chv.cgi?CH=117221 Change 117221 by rdivacky@rdivacky_witten on 2007/04/02 21:04:04 Check return value of copyinstr(). Point hat: rdivacky Affected files ... .. //depot/projects/linuxolator/src/sys/compat/linux/linux_file.c#21 edit Differences ... ==== //depot/projects/linuxolator/src/sys/compat/linux/linux_file.c#21 (text+ko) ==== @@ -246,6 +246,8 @@ oldpath = malloc(MAXPATHLEN, M_TEMP, M_WAITOK); error = copyinstr(args->filename, oldpath, MAXPATHLEN, NULL); + if (error) + return (error); #ifdef DEBUG if (ldebug(openat)) From owner-p4-projects@FreeBSD.ORG Mon Apr 2 22:24:28 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7D6C216A406; Mon, 2 Apr 2007 22:24:28 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 50DC216A404 for ; Mon, 2 Apr 2007 22:24:28 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 3FBCC13C483 for ; Mon, 2 Apr 2007 22:24:28 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l32MOSPJ094551 for ; Mon, 2 Apr 2007 22:24:28 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l32MORGH094548 for perforce@freebsd.org; Mon, 2 Apr 2007 22:24:27 GMT (envelope-from marcel@freebsd.org) Date: Mon, 2 Apr 2007 22:24:27 GMT Message-Id: <200704022224.l32MORGH094548@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Cc: Subject: PERFORCE change 117227 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 02 Apr 2007 22:24:28 -0000 http://perforce.freebsd.org/chv.cgi?CH=117227 Change 117227 by marcel@marcel_xcllnt on 2007/04/02 22:24:22 IFC @117225 Affected files ... .. //depot/projects/uart/amd64/linux32/linux32_sysvec.c#15 integrate .. //depot/projects/uart/arm/at91/uart_cpu_at91rm9200usart.c#3 integrate .. //depot/projects/uart/arm/at91/uart_dev_at91usart.c#9 integrate .. //depot/projects/uart/arm/sa11x0/uart_cpu_sa1110.c#6 integrate .. //depot/projects/uart/arm/sa11x0/uart_dev_sa1110.c#7 integrate .. //depot/projects/uart/arm/xscale/i80321/uart_cpu_i80321.c#5 integrate .. //depot/projects/uart/arm/xscale/ixp425/uart_cpu_ixp425.c#2 integrate .. //depot/projects/uart/boot/arm/at91/boot2/boot2.c#4 integrate .. //depot/projects/uart/compat/linux/linux_emul.c#5 integrate .. //depot/projects/uart/compat/linux/linux_emul.h#4 integrate .. //depot/projects/uart/dev/bge/if_bge.c#33 integrate .. //depot/projects/uart/dev/sound/midi/midi.c#6 integrate .. //depot/projects/uart/dev/sound/pcm/mixer.c#13 integrate .. //depot/projects/uart/dev/uart/uart.h#13 integrate .. //depot/projects/uart/dev/uart/uart_bus.h#49 integrate .. //depot/projects/uart/dev/uart/uart_core.c#59 integrate .. //depot/projects/uart/dev/uart/uart_cpu.h#24 integrate .. //depot/projects/uart/dev/uart/uart_cpu_amd64.c#13 integrate .. //depot/projects/uart/dev/uart/uart_cpu_i386.c#14 integrate .. //depot/projects/uart/dev/uart/uart_cpu_ia64.c#15 integrate .. //depot/projects/uart/dev/uart/uart_cpu_pc98.c#15 integrate .. //depot/projects/uart/dev/uart/uart_cpu_powerpc.c#4 integrate .. //depot/projects/uart/dev/uart/uart_cpu_sparc64.c#27 integrate .. //depot/projects/uart/dev/uart/uart_dev_ns8250.c#50 integrate .. //depot/projects/uart/dev/uart/uart_dev_sab82532.c#44 integrate .. //depot/projects/uart/dev/uart/uart_dev_z8530.c#37 integrate .. //depot/projects/uart/dev/uart/uart_kbd_sun.c#13 integrate .. //depot/projects/uart/dev/uart/uart_subr.c#9 integrate .. //depot/projects/uart/i386/linux/linux_sysvec.c#14 integrate .. //depot/projects/uart/kern/uipc_syscalls.c#26 integrate .. //depot/projects/uart/kern/vfs_syscalls.c#32 integrate .. //depot/projects/uart/nfsserver/nfs_srvsubs.c#14 integrate .. //depot/projects/uart/sys/sysent.h#9 integrate Differences ... ==== //depot/projects/uart/amd64/linux32/linux32_sysvec.c#15 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_sysvec.c,v 1.27 2007/03/30 00:06:21 jkim Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_sysvec.c,v 1.28 2007/04/02 18:38:12 jkim Exp $"); #include "opt_compat.h" #ifndef COMPAT_IA32 @@ -1081,7 +1081,7 @@ linux_ioctl_register_handler(*lihp); SET_FOREACH(ldhp, linux_device_handler_set) linux_device_register_handler(*ldhp); - sx_init(&emul_lock, "emuldata lock"); + mtx_init(&emul_lock, "emuldata lock", NULL, MTX_DEF); sx_init(&emul_shared_lock, "emuldata->shared lock"); LIST_INIT(&futex_list); sx_init(&futex_sx, "futex protection lock"); @@ -1112,7 +1112,7 @@ linux_ioctl_unregister_handler(*lihp); SET_FOREACH(ldhp, linux_device_handler_set) linux_device_unregister_handler(*ldhp); - sx_destroy(&emul_lock); + mtx_destroy(&emul_lock); sx_destroy(&emul_shared_lock); sx_destroy(&futex_sx); EVENTHANDLER_DEREGISTER(process_exit, linux_exit_tag); ==== //depot/projects/uart/arm/at91/uart_cpu_at91rm9200usart.c#3 (text) ==== @@ -27,7 +27,7 @@ #include "opt_uart.h" #include -__FBSDID("$FreeBSD: src/sys/arm/at91/uart_cpu_at91rm9200usart.c,v 1.2 2006/05/13 23:41:16 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/at91/uart_cpu_at91rm9200usart.c,v 1.3 2007/04/02 22:00:21 marcel Exp $"); #include #include @@ -43,7 +43,7 @@ bus_space_tag_t uart_bus_space_io; bus_space_tag_t uart_bus_space_mem; -extern struct uart_ops at91_usart_ops; +extern struct uart_class at91_usart_class; extern struct bus_space at91_bs_tag; int @@ -55,7 +55,10 @@ int uart_cpu_getdev(int devtype, struct uart_devinfo *di) { - di->ops = at91_usart_ops; + struct uart_class *class; + + class = &at91_usart_class; + di->ops = uart_getops(class); di->bas.chan = 0; di->bas.bst = &at91_bs_tag; /* @@ -77,7 +80,5 @@ uart_bus_space_io = &at91_bs_tag; uart_bus_space_mem = NULL; /* Check the environment for overrides */ - if (uart_getenv(devtype, di) == 0) - return (0); - return (0); + return (uart_getenv(devtype, di, class)); } ==== //depot/projects/uart/arm/at91/uart_dev_at91usart.c#9 (text) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/at91/uart_dev_at91usart.c,v 1.11 2007/01/18 22:01:19 marius Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/at91/uart_dev_at91usart.c,v 1.12 2007/04/02 22:00:21 marcel Exp $"); #include "opt_comconsole.h" @@ -196,7 +196,7 @@ return (0); } -struct uart_ops at91_usart_ops = { +static struct uart_ops at91_usart_ops = { .probe = at91_usart_probe, .init = at91_usart_init, .term = at91_usart_term, @@ -662,10 +662,12 @@ } return (EINVAL); } + struct uart_class at91_usart_class = { - "at91_usart class", + "at91_usart", at91_usart_methods, sizeof(struct at91_usart_softc), + .uc_ops = &at91_usart_ops, .uc_range = 8, .uc_rclk = DEFAULT_RCLK }; ==== //depot/projects/uart/arm/sa11x0/uart_cpu_sa1110.c#6 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/sa11x0/uart_cpu_sa1110.c,v 1.6 2006/06/21 10:56:59 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/sa11x0/uart_cpu_sa1110.c,v 1.7 2007/04/02 22:00:21 marcel Exp $"); #include #include @@ -42,7 +42,7 @@ bus_space_tag_t uart_bus_space_io; bus_space_tag_t uart_bus_space_mem; -extern struct uart_ops uart_sa1110_ops; +extern struct uart_class uart_sa1110_class; vm_offset_t sa1110_uart_vaddr; @@ -55,7 +55,8 @@ int uart_cpu_getdev(int devtype, struct uart_devinfo *di) { - di->ops = uart_sa1110_ops; + + di->ops = uart_getops(&uart_sa1110_class); di->bas.chan = 0; di->bas.bst = &sa11x0_bs_tag; di->bas.bsh = sa1110_uart_vaddr; ==== //depot/projects/uart/arm/sa11x0/uart_dev_sa1110.c#7 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/sa11x0/uart_dev_sa1110.c,v 1.7 2007/01/18 22:01:19 marius Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/sa11x0/uart_dev_sa1110.c,v 1.8 2007/04/02 22:00:21 marcel Exp $"); #include #include @@ -57,7 +57,7 @@ extern SLIST_HEAD(uart_devinfo_list, uart_devinfo) uart_sysdevs; -struct uart_ops uart_sa1110_ops = { +static struct uart_ops uart_sa1110_ops = { .probe = sa1110_probe, .init = sa1110_init, .term = sa1110_term, @@ -272,10 +272,12 @@ { return (EINVAL); } + struct uart_class uart_sa1110_class = { - "sa1110 class", + "sa1110", sa1110_methods, 1, + .uc_ops = &uart_sa1110_ops, .uc_range = 8, .uc_rclk = 3686400 }; ==== //depot/projects/uart/arm/xscale/i80321/uart_cpu_i80321.c#5 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/xscale/i80321/uart_cpu_i80321.c,v 1.4 2005/01/20 22:23:26 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/xscale/i80321/uart_cpu_i80321.c,v 1.5 2007/04/02 22:00:22 marcel Exp $"); #include #include @@ -51,7 +51,7 @@ int uart_cpu_getdev(int devtype, struct uart_devinfo *di) { - di->ops = uart_ns8250_ops; + di->ops = uart_getops(&uart_ns8250_class); di->bas.chan = 0; di->bas.bst = &obio_bs_tag; di->bas.regshft = 0; ==== //depot/projects/uart/arm/xscale/ixp425/uart_cpu_ixp425.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/xscale/ixp425/uart_cpu_ixp425.c,v 1.1 2006/11/19 23:55:23 sam Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/xscale/ixp425/uart_cpu_ixp425.c,v 1.2 2007/04/02 22:00:22 marcel Exp $"); #include #include @@ -51,7 +51,7 @@ int uart_cpu_getdev(int devtype, struct uart_devinfo *di) { - di->ops = uart_ns8250_ops; + di->ops = uart_getops(&uart_ns8250_class); di->bas.chan = 0; di->bas.bst = &ixp425_a4x_bs_tag; di->bas.regshft = 0; ==== //depot/projects/uart/boot/arm/at91/boot2/boot2.c#4 (text+ko) ==== @@ -14,7 +14,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/boot/arm/at91/boot2/boot2.c,v 1.4 2007/03/28 21:18:45 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/arm/at91/boot2/boot2.c,v 1.5 2007/04/02 20:26:04 imp Exp $"); #include #include @@ -148,8 +148,9 @@ board_init(); EMAC_Init(); - sdcard_init(); EMAC_SetMACAddress(mac); + while (sdcard_init() == 0) + printf("Looking for SD card\n"); dmadat = (void *)(0x20000000 + (16 << 20)); /* Process configuration file */ ==== //depot/projects/uart/compat/linux/linux_emul.c#5 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/linux/linux_emul.c,v 1.19 2007/03/02 00:08:47 jkim Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linux/linux_emul.c,v 1.20 2007/04/02 18:38:13 jkim Exp $"); #include "opt_compat.h" @@ -55,8 +55,8 @@ #include #endif -struct sx emul_shared_lock; -struct sx emul_lock; +struct sx emul_shared_lock; +struct mtx emul_lock; /* this returns locked reference to the emuldata entry (if found) */ struct linux_emuldata * ==== //depot/projects/uart/compat/linux/linux_emul.h#4 (text+ko) ==== @@ -25,11 +25,11 @@ * (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/compat/linux/linux_emul.h,v 1.6 2007/01/07 19:00:38 netchild Exp $ + * $FreeBSD: src/sys/compat/linux/linux_emul.h,v 1.7 2007/04/02 18:38:13 jkim Exp $ */ #ifndef _LINUX_EMUL_H_ -#define _LINUX_EMUL_H_ +#define _LINUX_EMUL_H_ struct linux_emuldata_shared { int refs; @@ -55,26 +55,26 @@ LIST_ENTRY(linux_emuldata) threads; /* list of linux threads */ }; -struct linux_emuldata *em_find(struct proc *, int locked); +struct linux_emuldata *em_find(struct proc *, int locked); -#define EMUL_LOCK(l) sx_xlock(l) -#define EMUL_UNLOCK(l) sx_xunlock(l) +#define EMUL_LOCK(l) mtx_lock(l) +#define EMUL_UNLOCK(l) mtx_unlock(l) -#define EMUL_SHARED_RLOCK(l) sx_slock(l) -#define EMUL_SHARED_RUNLOCK(l) sx_sunlock(l) -#define EMUL_SHARED_WLOCK(l) sx_xlock(l) -#define EMUL_SHARED_WUNLOCK(l) sx_xunlock(l) +#define EMUL_SHARED_RLOCK(l) sx_slock(l) +#define EMUL_SHARED_RUNLOCK(l) sx_sunlock(l) +#define EMUL_SHARED_WLOCK(l) sx_xlock(l) +#define EMUL_SHARED_WUNLOCK(l) sx_xunlock(l) /* for em_find use */ -#define EMUL_DOLOCK 1 -#define EMUL_DONTLOCK 0 +#define EMUL_DOLOCK 1 +#define EMUL_DONTLOCK 0 int linux_proc_init(struct thread *, pid_t, int); void linux_proc_exit(void *, struct proc *); void linux_schedtail(void *, struct proc *); void linux_proc_exec(void *, struct proc *, struct image_params *); -extern struct sx emul_shared_lock; -extern struct sx emul_lock; +extern struct sx emul_shared_lock; +extern struct mtx emul_lock; #endif /* !_LINUX_EMUL_H_ */ ==== //depot/projects/uart/dev/bge/if_bge.c#33 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/bge/if_bge.c,v 1.186 2007/03/13 00:41:55 scottl Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/bge/if_bge.c,v 1.187 2007/04/02 19:09:06 jkim Exp $"); /* * Broadcom BCM570x family gigabit ethernet driver for FreeBSD. @@ -2114,7 +2114,7 @@ return (0); } -#if __FreeBSD_version > 700025 +#if __FreeBSD_version > 602105 /* * Return true if this device has more than one port. */ @@ -2277,7 +2277,7 @@ } #endif -#if __FreeBSD_version > 700025 +#if __FreeBSD_version > 602105 { int msicount; @@ -2596,7 +2596,7 @@ bus_release_resource(dev, SYS_RES_IRQ, sc->bge_flags & BGE_FLAG_MSI ? 1 : 0, sc->bge_irq); -#if __FreeBSD_version > 700025 +#if __FreeBSD_version > 602105 if (sc->bge_flags & BGE_FLAG_MSI) pci_release_msi(dev); #endif ==== //depot/projects/uart/dev/sound/midi/midi.c#6 (text) ==== @@ -42,7 +42,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/sound/midi/midi.c,v 1.23 2007/03/15 14:57:54 ariff Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/sound/midi/midi.c,v 1.24 2007/04/02 06:03:47 ariff Exp $"); #include #include @@ -1453,14 +1453,18 @@ switch (type) { case MOD_LOAD: retval = midi_load(); +#if 0 if (retval == 0) retval = seq_modevent(mod, type, data); +#endif break; case MOD_UNLOAD: retval = midi_unload(); +#if 0 if (retval == 0) retval = seq_modevent(mod, type, data); +#endif break; default: ==== //depot/projects/uart/dev/sound/pcm/mixer.c#13 (text+ko) ==== @@ -28,7 +28,7 @@ #include "mixer_if.h" -SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pcm/mixer.c,v 1.57 2007/04/02 03:46:25 ariff Exp $"); +SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pcm/mixer.c,v 1.58 2007/04/02 10:24:15 ariff Exp $"); MALLOC_DEFINE(M_MIXER, "mixer", "mixer"); @@ -37,7 +37,7 @@ KOBJ_FIELDS; const char *type; void *devinfo; - int busy:1; + int busy; int hwvol_muted; int hwvol_mixer; int hwvol_step; ==== //depot/projects/uart/dev/uart/uart.h#13 (text+ko) ==== @@ -23,7 +23,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/uart/uart.h,v 1.5 2006/05/23 22:33:44 marcel Exp $ + * $FreeBSD: src/sys/dev/uart/uart.h,v 1.6 2007/04/02 22:00:22 marcel Exp $ */ #ifndef _DEV_UART_H_ ==== //depot/projects/uart/dev/uart/uart_bus.h#49 (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/uart/uart_bus.h,v 1.14 2006/04/28 18:29:23 marcel Exp $ + * $FreeBSD: src/sys/dev/uart/uart_bus.h,v 1.15 2007/04/02 22:00:22 marcel Exp $ */ #ifndef _DEV_UART_BUS_H_ ==== //depot/projects/uart/dev/uart/uart_core.c#59 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/uart/uart_core.c,v 1.21 2007/03/28 18:26:12 marcel Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/uart/uart_core.c,v 1.22 2007/04/02 22:00:22 marcel Exp $"); #ifndef KLD_MODULE #include "opt_comconsole.h" ==== //depot/projects/uart/dev/uart/uart_cpu.h#24 (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/uart/uart_cpu.h,v 1.11 2007/01/18 22:01:19 marius Exp $ + * $FreeBSD: src/sys/dev/uart/uart_cpu.h,v 1.12 2007/04/02 22:00:22 marcel Exp $ */ #ifndef _DEV_UART_CPU_H_ ==== //depot/projects/uart/dev/uart/uart_cpu_amd64.c#13 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/uart/uart_cpu_amd64.c,v 1.11 2005/12/12 21:00:58 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/uart/uart_cpu_amd64.c,v 1.12 2007/04/02 22:00:22 marcel Exp $"); #include #include ==== //depot/projects/uart/dev/uart/uart_cpu_i386.c#14 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/uart/uart_cpu_i386.c,v 1.11 2005/12/12 21:00:58 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/uart/uart_cpu_i386.c,v 1.12 2007/04/02 22:00:22 marcel Exp $"); #include #include ==== //depot/projects/uart/dev/uart/uart_cpu_ia64.c#15 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/uart/uart_cpu_ia64.c,v 1.12 2005/12/12 21:00:58 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/uart/uart_cpu_ia64.c,v 1.13 2007/04/02 22:00:22 marcel Exp $"); #include #include ==== //depot/projects/uart/dev/uart/uart_cpu_pc98.c#15 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/uart/uart_cpu_pc98.c,v 1.16 2005/12/12 21:00:58 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/uart/uart_cpu_pc98.c,v 1.17 2007/04/02 22:00:22 marcel Exp $"); #include #include ==== //depot/projects/uart/dev/uart/uart_cpu_powerpc.c#4 (text) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/uart/uart_cpu_powerpc.c,v 1.2 2006/07/26 17:17:23 marcel Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/uart/uart_cpu_powerpc.c,v 1.3 2007/04/02 22:00:22 marcel Exp $"); #include #include ==== //depot/projects/uart/dev/uart/uart_cpu_sparc64.c#27 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/uart/uart_cpu_sparc64.c,v 1.22 2006/02/04 23:27:16 marius Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/uart/uart_cpu_sparc64.c,v 1.23 2007/04/02 22:00:22 marcel Exp $"); #include #include ==== //depot/projects/uart/dev/uart/uart_dev_ns8250.c#50 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/uart/uart_dev_ns8250.c,v 1.25 2007/03/28 18:34:59 marcel Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/uart/uart_dev_ns8250.c,v 1.26 2007/04/02 22:00:22 marcel Exp $"); #include #include ==== //depot/projects/uart/dev/uart/uart_dev_sab82532.c#44 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/uart/uart_dev_sab82532.c,v 1.15 2007/01/18 22:01:19 marius Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/uart/uart_dev_sab82532.c,v 1.16 2007/04/02 22:00:22 marcel Exp $"); #include #include ==== //depot/projects/uart/dev/uart/uart_dev_z8530.c#37 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/uart/uart_dev_z8530.c,v 1.21 2007/01/18 22:01:19 marius Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/uart/uart_dev_z8530.c,v 1.22 2007/04/02 22:00:22 marcel Exp $"); #include #include ==== //depot/projects/uart/dev/uart/uart_kbd_sun.c#13 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/uart/uart_kbd_sun.c,v 1.11 2007/01/18 22:01:19 marius Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/uart/uart_kbd_sun.c,v 1.12 2007/04/02 22:00:22 marcel Exp $"); #include "opt_compat.h" #include "opt_kbd.h" ==== //depot/projects/uart/dev/uart/uart_subr.c#9 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/uart/uart_subr.c,v 1.5 2005/12/12 21:00:58 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/uart/uart_subr.c,v 1.6 2007/04/02 22:00:22 marcel Exp $"); #include #include ==== //depot/projects/uart/i386/linux/linux_sysvec.c#14 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/i386/linux/linux_sysvec.c,v 1.148 2006/09/09 16:25:25 netchild Exp $"); +__FBSDID("$FreeBSD: src/sys/i386/linux/linux_sysvec.c,v 1.149 2007/04/02 18:38:13 jkim Exp $"); #include #include @@ -917,7 +917,7 @@ linux_ioctl_register_handler(*lihp); SET_FOREACH(ldhp, linux_device_handler_set) linux_device_register_handler(*ldhp); - sx_init(&emul_lock, "emuldata lock"); + mtx_init(&emul_lock, "emuldata lock", NULL, MTX_DEF); sx_init(&emul_shared_lock, "emuldata->shared lock"); LIST_INIT(&futex_list); sx_init(&futex_sx, "futex protection lock"); @@ -948,7 +948,7 @@ linux_ioctl_unregister_handler(*lihp); SET_FOREACH(ldhp, linux_device_handler_set) linux_device_unregister_handler(*ldhp); - sx_destroy(&emul_lock); + mtx_destroy(&emul_lock); sx_destroy(&emul_shared_lock); sx_destroy(&futex_sx); EVENTHANDLER_DEREGISTER(process_exit, linux_exit_tag); ==== //depot/projects/uart/kern/uipc_syscalls.c#26 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/uipc_syscalls.c,v 1.248 2007/03/05 13:10:58 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/uipc_syscalls.c,v 1.249 2007/04/02 19:15:47 jhb Exp $"); #include "opt_sctp.h" #include "opt_compat.h" @@ -664,7 +664,10 @@ fp2->f_ops = &socketops; fp2->f_type = DTYPE_SOCKET; FILE_UNLOCK(fp2); + so1 = so2 = NULL; error = copyout(sv, uap->rsv, 2 * sizeof (int)); + if (error) + goto free4; fdrop(fp1, td); fdrop(fp2, td); goto done2; @@ -675,9 +678,11 @@ fdclose(fdp, fp1, sv[0], td); fdrop(fp1, td); free2: - (void)soclose(so2); + if (so2 != NULL) + (void)soclose(so2); free1: - (void)soclose(so1); + if (so1 != NULL) + (void)soclose(so1); done2: NET_UNLOCK_GIANT(); return (error); ==== //depot/projects/uart/kern/vfs_syscalls.c#32 (text+ko) ==== @@ -35,7 +35,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/vfs_syscalls.c,v 1.434 2007/03/21 19:32:08 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/vfs_syscalls.c,v 1.435 2007/04/02 13:40:38 jhb Exp $"); #include "opt_compat.h" #include "opt_mac.h" @@ -1024,31 +1024,8 @@ NDFREE(&nd, NDF_ONLY_PNBUF); vp = nd.ni_vp; - /* - * There should be 2 references on the file, one from the descriptor - * table, and one for us. - * - * Handle the case where someone closed the file (via its file - * descriptor) while we were blocked. The end result should look - * like opening the file succeeded but it was immediately closed. - * We call vn_close() manually because we haven't yet hooked up - * the various 'struct file' fields. - */ - FILEDESC_LOCK(fdp); + FILEDESC_LOCK_FAST(fdp); FILE_LOCK(fp); - if (fp->f_count == 1) { - mp = vp->v_mount; - KASSERT(fdp->fd_ofiles[indx] != fp, - ("Open file descriptor lost all refs")); - FILE_UNLOCK(fp); - FILEDESC_UNLOCK(fdp); - VOP_UNLOCK(vp, 0, td); - vn_close(vp, flags & FMASK, fp->f_cred, td); - VFS_UNLOCK_GIANT(vfslocked); - fdrop(fp, td); - td->td_retval[0] = indx; - return (0); - } fp->f_vnode = vp; if (fp->f_data == NULL) fp->f_data = vp; @@ -1058,7 +1035,7 @@ fp->f_seqcount = 1; fp->f_type = (vp->v_type == VFIFO ? DTYPE_FIFO : DTYPE_VNODE); FILE_UNLOCK(fp); - FILEDESC_UNLOCK(fdp); + FILEDESC_UNLOCK_FAST(fdp); VOP_UNLOCK(vp, 0, td); if (flags & (O_EXLOCK | O_SHLOCK)) { ==== //depot/projects/uart/nfsserver/nfs_srvsubs.c#14 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/nfsserver/nfs_srvsubs.c,v 1.146 2007/03/17 18:18:08 jeff Exp $"); +__FBSDID("$FreeBSD: src/sys/nfsserver/nfs_srvsubs.c,v 1.147 2007/04/02 13:53:26 jhb Exp $"); /* * These functions support the macros and help fiddle mbuf chains for @@ -98,8 +98,9 @@ struct nfsd_head nfsd_head; int nfsd_head_flag; -static int nfs_prev_nfssvc_sy_narg; -static sy_call_t *nfs_prev_nfssvc_sy_call; +static int nfssvc_offset = SYS_nfssvc; +static struct sysent nfssvc_prev_sysent; +MAKE_SYSENT(nfssvc); struct mtx nfsd_mtx; @@ -522,6 +523,7 @@ static int nfsrv_modevent(module_t mod, int type, void *data) { + static int registered; int error = 0; NET_LOCK_GIANT(); @@ -554,11 +556,11 @@ NFSD_UNLOCK(); nfsrv_timer(0); - /* XXX: Should use SYSCALL_MODULE() */ - nfs_prev_nfssvc_sy_narg = sysent[SYS_nfssvc].sy_narg; - sysent[SYS_nfssvc].sy_narg = 2; - nfs_prev_nfssvc_sy_call = sysent[SYS_nfssvc].sy_call; - sysent[SYS_nfssvc].sy_call = (sy_call_t *)nfssvc; + error = syscall_register(&nfssvc_offset, &nfssvc_sysent, + &nfssvc_prev_sysent); + if (error) + break; + registered = 1; break; case MOD_UNLOAD: @@ -567,9 +569,10 @@ break; } + if (registered) + syscall_deregister(&nfssvc_offset, &nfssvc_prev_sysent); callout_drain(&nfsrv_callout); - sysent[SYS_nfssvc].sy_narg = nfs_prev_nfssvc_sy_narg; - sysent[SYS_nfssvc].sy_call = nfs_prev_nfssvc_sy_call; + nfsrv_destroycache(); /* Free the server request cache */ nfsrv_destroycache(); /* Free the server request cache */ mtx_destroy(&nfsd_mtx); break; ==== //depot/projects/uart/sys/sysent.h#9 (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/sys/sysent.h,v 1.52 2006/12/20 19:00:52 jkim Exp $ + * $FreeBSD: src/sys/sys/sysent.h,v 1.53 2007/04/02 13:53:26 jhb Exp $ */ #ifndef _SYS_SYSENT_H_ @@ -119,6 +119,14 @@ struct sysent old_sysent; /* old sysent */ }; +#define MAKE_SYSENT(syscallname) \ +static struct sysent syscallname##_sysent = { \ + (sizeof(struct syscallname ## _args ) \ + / sizeof(register_t)), \ + (sy_call_t *)& syscallname, \ + SYS_AUE_##syscallname \ +} + #define SYSCALL_MODULE(name, offset, new_sysent, evh, arg) \ static struct syscall_module_data name##_syscall_mod = { \ evh, arg, offset, new_sysent, { 0, NULL, AUE_NULL } \ @@ -133,12 +141,7 @@ #define SYSCALL_MODULE_HELPER(syscallname) \ static int syscallname##_syscall = SYS_##syscallname; \ -static struct sysent syscallname##_sysent = { \ - (sizeof(struct syscallname ## _args ) \ - / sizeof(register_t)), \ - (sy_call_t *)& syscallname, \ - SYS_AUE_##syscallname \ -}; \ +MAKE_SYSENT(syscallname); \ SYSCALL_MODULE(syscallname, \ & syscallname##_syscall, & syscallname##_sysent, \ NULL, NULL); From owner-p4-projects@FreeBSD.ORG Tue Apr 3 01:36:45 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7851A16A408; Tue, 3 Apr 2007 01:36:45 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 3C1A816A406 for ; Tue, 3 Apr 2007 01:36:45 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 136E713C46A for ; Tue, 3 Apr 2007 01:36:45 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l331aig9037132 for ; Tue, 3 Apr 2007 01:36:44 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l331ai0x037129 for perforce@freebsd.org; Tue, 3 Apr 2007 01:36:44 GMT (envelope-from marcel@freebsd.org) Date: Tue, 3 Apr 2007 01:36:44 GMT Message-Id: <200704030136.l331ai0x037129@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Cc: Subject: PERFORCE change 117245 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 03 Apr 2007 01:36:45 -0000 http://perforce.freebsd.org/chv.cgi?CH=117245 Change 117245 by marcel@marcel_cluster on 2007/04/03 01:35:59 IFC @117244 Affected files ... .. //depot/projects/uart/dev/uart/uart_dev_ns8250.c#51 integrate Differences ... ==== //depot/projects/uart/dev/uart/uart_dev_ns8250.c#51 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/uart/uart_dev_ns8250.c,v 1.26 2007/04/02 22:00:22 marcel Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/uart/uart_dev_ns8250.c,v 1.27 2007/04/03 01:21:10 marcel Exp $"); #include #include From owner-p4-projects@FreeBSD.ORG Tue Apr 3 07:17:10 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BB27E16A405; Tue, 3 Apr 2007 07:17:10 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 71FBC16A403 for ; Tue, 3 Apr 2007 07:17:10 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 6179E13C468 for ; Tue, 3 Apr 2007 07:17:10 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l337HAOu009833 for ; Tue, 3 Apr 2007 07:17:10 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l337H9WJ009830 for perforce@freebsd.org; Tue, 3 Apr 2007 07:17:09 GMT (envelope-from hselasky@FreeBSD.org) Date: Tue, 3 Apr 2007 07:17:09 GMT Message-Id: <200704030717.l337H9WJ009830@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 117254 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 03 Apr 2007 07:17:11 -0000 http://perforce.freebsd.org/chv.cgi?CH=117254 Change 117254 by hselasky@hselasky_mini_itx on 2007/04/03 07:16:39 Increase modem buffer sizes where possible, like suggested by PR usb/74609 . Affected files ... .. //depot/projects/usb/src/sys/dev/usb/uark.c#3 edit .. //depot/projects/usb/src/sys/dev/usb/ubsa.c#16 edit .. //depot/projects/usb/src/sys/dev/usb/ucycom.c#11 edit .. //depot/projects/usb/src/sys/dev/usb/ufoma.c#15 edit .. //depot/projects/usb/src/sys/dev/usb/uftdi.c#15 edit .. //depot/projects/usb/src/sys/dev/usb/umodem.c#17 edit .. //depot/projects/usb/src/sys/dev/usb/umoscom.c#3 edit .. //depot/projects/usb/src/sys/dev/usb/uplcom.c#18 edit .. //depot/projects/usb/src/sys/dev/usb/uvscom.c#18 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/uark.c#3 (text+ko) ==== @@ -40,7 +40,7 @@ #define DPRINTF(...) { } -#define UARK_BUF_SIZE 512 +#define UARK_BUF_SIZE 1024 /* bytes */ #define UARK_N_TRANSFER 4 /* units */ ==== //depot/projects/usb/src/sys/dev/usb/ubsa.c#16 (text+ko) ==== @@ -93,7 +93,7 @@ #endif #define UBSA_N_TRANSFER 6 /* units */ -#define UBSA_BSIZE 256 /* bytes */ +#define UBSA_BSIZE 1024 /* bytes */ #define UBSA_CONFIG_INDEX 1 #define UBSA_IFACE_INDEX 0 @@ -632,7 +632,8 @@ return; } - if(ucom_get_data(&(sc->sc_ucom), xfer->buffer, UBSA_BSIZE, &actlen)) { + if(ucom_get_data(&(sc->sc_ucom), xfer->buffer, + UBSA_BSIZE, &actlen)) { xfer->length = actlen; ==== //depot/projects/usb/src/sys/dev/usb/ucycom.c#11 (text+ko) ==== @@ -52,7 +52,7 @@ __FBSDID("$FreeBSD: src/sys/dev/usb/ucycom.c,v 1.4 2005/10/16 20:22:56 phk Exp $"); -#define UCYCOM_MAX_IOLEN (256 + 2) /* bytes */ +#define UCYCOM_MAX_IOLEN (1024 + 2) /* bytes */ #define UCYCOM_ENDPT_MAX 3 /* units */ #define UCYCOM_IFACE_INDEX 0 ==== //depot/projects/usb/src/sys/dev/usb/ufoma.c#15 (text+ko) ==== @@ -136,8 +136,7 @@ #define UFOMA_MAX_TIMEOUT 15 /* standard says 10 seconds */ #define UFOMA_CMD_BUF_SIZE 64 /* bytes */ -#define UFOMA_BULK_IBUFSIZE 64 /* bytes */ -#define UFOMA_BULK_OBUFSIZE 256 /* bytes */ +#define UFOMA_BULK_BUF_SIZE 1024 /* bytes */ #define UFOMA_CTRL_ENDPT_MAX 4 /* units */ #define UFOMA_BULK_ENDPT_MAX 4 /* units */ @@ -261,7 +260,7 @@ .type = UE_BULK, .endpoint = -1, /* any */ .direction = UE_DIR_OUT, - .bufsize = UFOMA_BULK_OBUFSIZE, + .bufsize = UFOMA_BULK_BUF_SIZE, .flags = 0, .callback = &ufoma_bulk_write_callback, }, @@ -270,7 +269,7 @@ .type = UE_BULK, .endpoint = -1, /* any */ .direction = UE_DIR_IN, - .bufsize = UFOMA_BULK_IBUFSIZE, + .bufsize = UFOMA_BULK_BUF_SIZE, .flags = USBD_SHORT_XFER_OK, .callback = &ufoma_bulk_read_callback, }, @@ -812,7 +811,7 @@ } if (ucom_get_data(&(sc->sc_ucom), xfer->buffer, - UFOMA_BULK_OBUFSIZE, &actlen)) { + UFOMA_BULK_BUF_SIZE, &actlen)) { xfer->length = actlen; usbd_start_hardware(xfer); } ==== //depot/projects/usb/src/sys/dev/usb/uftdi.c#15 (text+ko) ==== @@ -83,12 +83,8 @@ #define UFTDI_IFACE_INDEX 0 #define UFTDI_ENDPT_MAX 4 -/* - * These are the maximum number of bytes transferred per frame. - * The output buffer size cannot be increased due to the size encoding. - */ -#define UFTDI_IBUFSIZE 64 -#define UFTDI_OBUFSIZE 64 +#define UFTDI_IBUFSIZE 64 /* bytes, maximum number of bytes per frame */ +#define UFTDI_OBUFSIZE 64 /* bytes, cannot be increased due to do size encoding */ struct uftdi_softc { struct ucom_super_softc sc_super_ucom; ==== //depot/projects/usb/src/sys/dev/usb/umodem.c#17 (text+ko) ==== @@ -120,13 +120,7 @@ { 0, 0, 0 }, }; -/* - * These are the maximum number of bytes transferred per frame. - * If some really high speed devices should use this driver they - * may need to be increased, but this is good enough for normal modems. - */ -#define UMODEM_IBUFSIZE 64 -#define UMODEM_OBUFSIZE 256 +#define UMODEM_BUF_SIZE 1024 #define UMODEM_N_DATA_TRANSFER 4 #define UMODEM_N_INTR_TRANSFER 2 @@ -190,7 +184,7 @@ .type = UE_BULK, .endpoint = -1, /* any */ .direction = UE_DIR_OUT, - .bufsize = UMODEM_OBUFSIZE, + .bufsize = UMODEM_BUF_SIZE, .flags = 0, .callback = &umodem_write_callback, }, @@ -199,7 +193,7 @@ .type = UE_BULK, .endpoint = -1, /* any */ .direction = UE_DIR_IN, - .bufsize = UMODEM_IBUFSIZE, + .bufsize = UMODEM_BUF_SIZE, .flags = USBD_SHORT_XFER_OK, .callback = &umodem_read_callback, }, @@ -820,7 +814,8 @@ return; } - if(ucom_get_data(&(sc->sc_ucom), xfer->buffer, UMODEM_OBUFSIZE, &actlen)) { + if(ucom_get_data(&(sc->sc_ucom), xfer->buffer, + UMODEM_BUF_SIZE, &actlen)) { xfer->length = actlen; ==== //depot/projects/usb/src/sys/dev/usb/umoscom.c#3 (text+ko) ==== @@ -42,7 +42,7 @@ #define DPRINTF(...) { } #endif -#define UMOSCOM_BUFSIZE 256 /* bytes */ +#define UMOSCOM_BUFSIZE 1024 /* bytes */ #define UMOSCOM_N_DATA_TRANSFER 6 /* units */ #define UMOSCOM_CONFIG_NO 0 ==== //depot/projects/usb/src/sys/dev/usb/uplcom.c#18 (text+ko) ==== @@ -125,8 +125,7 @@ #define UPLCOM_INTR_INTERVAL 0 /* default */ #endif -#define UPLCOM_IBUFSIZE 256 -#define UPLCOM_OBUFSIZE 256 +#define UPLCOM_BULK_BUF_SIZE 1024 /* bytes */ #define UPLCOM_N_DATA_TRANSFER 4 #define UPLCOM_N_INTR_TRANSFER 2 @@ -200,7 +199,7 @@ .type = UE_BULK, .endpoint = -1, /* any */ .direction = UE_DIR_OUT, - .bufsize = UPLCOM_OBUFSIZE, + .bufsize = UPLCOM_BULK_BUF_SIZE, .flags = 0, .callback = &uplcom_write_callback, }, @@ -209,7 +208,7 @@ .type = UE_BULK, .endpoint = -1, /* any */ .direction = UE_DIR_IN, - .bufsize = UPLCOM_IBUFSIZE, + .bufsize = UPLCOM_BULK_BUF_SIZE, .flags = USBD_SHORT_XFER_OK, .callback = &uplcom_read_callback, }, @@ -907,7 +906,8 @@ return; } - if(ucom_get_data(&(sc->sc_ucom), xfer->buffer, UPLCOM_OBUFSIZE, &actlen)) { + if(ucom_get_data(&(sc->sc_ucom), xfer->buffer, + UPLCOM_BULK_BUF_SIZE, &actlen)) { xfer->length = actlen; ==== //depot/projects/usb/src/sys/dev/usb/uvscom.c#18 (text+ko) ==== @@ -125,8 +125,7 @@ #define UVSCOM_CTS 0x01 #define UVSCOM_USTAT_MASK (UVSCOM_NOCARD | UVSCOM_DSR | UVSCOM_CTS) -#define UVSCOM_IBUFSIZE 512 /* bytes */ -#define UVSCOM_OBUFSIZE 512 /* bytes */ +#define UVSCOM_BULK_BUF_SIZE 1024 /* bytes */ #define UVSCOM_N_TRANSFER 6 /* units */ @@ -186,7 +185,7 @@ .type = UE_BULK, .endpoint = -1, /* any */ .direction = UE_DIR_OUT, - .bufsize = UVSCOM_OBUFSIZE, + .bufsize = UVSCOM_BULK_BUF_SIZE, .flags = 0, .callback = &uvscom_write_callback, }, @@ -195,7 +194,7 @@ .type = UE_BULK, .endpoint = -1, /* any */ .direction = UE_DIR_IN, - .bufsize = UVSCOM_IBUFSIZE, + .bufsize = UVSCOM_BULK_BUF_SIZE, .flags = USBD_SHORT_XFER_OK, .callback = &uvscom_read_callback, }, @@ -419,7 +418,8 @@ return; } - if(ucom_get_data(&(sc->sc_ucom), xfer->buffer, UVSCOM_OBUFSIZE, &actlen)) { + if(ucom_get_data(&(sc->sc_ucom), xfer->buffer, + UVSCOM_BULK_BUF_SIZE, &actlen)) { xfer->length = actlen; From owner-p4-projects@FreeBSD.ORG Tue Apr 3 08:27:40 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9386216A404; Tue, 3 Apr 2007 08:27:40 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 4E37916A401 for ; Tue, 3 Apr 2007 08:27:40 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 3DB6D13C45D for ; Tue, 3 Apr 2007 08:27:40 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l338ReSA022593 for ; Tue, 3 Apr 2007 08:27:40 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l338ReQO022590 for perforce@freebsd.org; Tue, 3 Apr 2007 08:27:40 GMT (envelope-from hselasky@FreeBSD.org) Date: Tue, 3 Apr 2007 08:27:40 GMT Message-Id: <200704030827.l338ReQO022590@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 117258 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 03 Apr 2007 08:27:41 -0000 http://perforce.freebsd.org/chv.cgi?CH=117258 Change 117258 by hselasky@hselasky_mini_itx on 2007/04/03 08:26:40 Updated ugensa to handle multiple interfaces. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/ugensa.c#4 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/ugensa.c#4 (text+ko) ==== @@ -62,18 +62,25 @@ #define UGENSA_N_TRANSFER 4 /* units */ #define UGENSA_CONFIG_INDEX 0 #define UGENSA_IFACE_INDEX 0 +#define UGENSA_IFACE_MAX 8 /* exclusivly */ -struct ugensa_softc { - struct ucom_super_softc sc_super_ucom; - struct ucom_softc sc_ucom; +struct ugensa_sub_softc { + struct ucom_softc *sc_ucom_ptr; + struct usbd_xfer *sc_xfer[UGENSA_N_TRANSFER]; - struct usbd_xfer *sc_xfer[UGENSA_N_TRANSFER]; - uint8_t sc_flags; #define UGENSA_FLAG_BULK_READ_STALL 0x01 #define UGENSA_FLAG_BULK_WRITE_STALL 0x02 }; +struct ugensa_softc { + struct ucom_super_softc sc_super_ucom; + struct ucom_softc sc_ucom[UGENSA_IFACE_MAX]; + struct ugensa_sub_softc sc_sub[UGENSA_IFACE_MAX]; + + uint8_t sc_ifaces; +}; + /* prototypes */ static device_probe_t ugensa_probe; @@ -161,11 +168,11 @@ static const struct usb_devno ugensa_devs[] = { { USB_VENDOR_AIRPRIME, USB_PRODUCT_AIRPRIME_PC5220 }, + { USB_VENDOR_CMOTECH, USB_PRODUCT_CMOTECH_CDMA_MODEM1 }, { USB_VENDOR_NOVATEL, USB_PRODUCT_NOVATEL_FLEXPACKGPS }, + { USB_VENDOR_NOVATEL2, USB_PRODUCT_NOVATEL2_CDMA_MODEM }, { USB_VENDOR_QUALCOMM_K, USB_PRODUCT_QUALCOMM_K_CDMA_MSM_K }, { USB_VENDOR_SIERRA, USB_PRODUCT_SIERRA_AIRCARD580 }, - { USB_VENDOR_NOVATEL2, USB_PRODUCT_NOVATEL2_CDMA_MODEM }, - { USB_VENDOR_CMOTECH, USB_PRODUCT_CMOTECH_CDMA_MODEM1 }, }; #define ugensa_lookup(v, p) usb_lookup(ugensa_devs, v, p) @@ -179,7 +186,8 @@ return UMATCH_NONE; } - return (ugensa_lookup(uaa->vendor, uaa->product) ? UMATCH_VENDOR_PRODUCT : UMATCH_NONE); + return (ugensa_lookup(uaa->vendor, uaa->product) ? + UMATCH_VENDOR_PRODUCT : UMATCH_NONE); } static int @@ -187,7 +195,9 @@ { struct usb_attach_arg *uaa = device_get_ivars(dev); struct ugensa_softc *sc = device_get_softc(dev); + struct ugensa_sub_softc *ssc; int32_t error; + uint8_t x; if (sc == NULL) { return ENOMEM; @@ -203,22 +213,49 @@ goto detach; } - error = usbd_transfer_setup - (uaa->device, UGENSA_IFACE_INDEX, - sc->sc_xfer, ugensa_xfer_config, UGENSA_N_TRANSFER, - sc, &Giant); + /* Figure out how many interfaces this device has got */ + for (x = 0; x < UGENSA_IFACE_MAX; x++) { + if ((usbd_get_pipe(uaa->device, x, ugensa_xfer_config+0) == NULL) || + (usbd_get_pipe(uaa->device, x, ugensa_xfer_config+1) == NULL)) { + /* we have reached the end */ + break; + } + } - if (error) { - device_printf(dev, "allocating control USB " - "transfers failed!\n"); + if (x == 0) { + device_printf(dev, "No interfaces!\n"); goto detach; + } else { + device_printf(dev, "Found %d interfaces.\n", x); + sc->sc_ifaces = x; } - /* clear stall at first run */ - sc->sc_flags |= (UGENSA_FLAG_BULK_WRITE_STALL| - UGENSA_FLAG_BULK_READ_STALL); + for (x = 0; x < sc->sc_ifaces; x++) { + + ssc = sc->sc_sub + x; + + ssc->sc_ucom_ptr = sc->sc_ucom + x; + + error = usbd_transfer_setup + (uaa->device, UGENSA_IFACE_INDEX + x, + ssc->sc_xfer, ugensa_xfer_config, UGENSA_N_TRANSFER, + ssc, &Giant); + + if (error) { + device_printf(dev, "allocating USB " + "transfers failed!\n"); + goto detach; + } + + /* clear stall at first run */ + ssc->sc_flags |= (UGENSA_FLAG_BULK_WRITE_STALL| + UGENSA_FLAG_BULK_READ_STALL); + + /* initialize port number */ + ssc->sc_ucom_ptr->sc_portno = x; + } - error = ucom_attach(&(sc->sc_super_ucom), &(sc->sc_ucom), 1, sc, + error = ucom_attach(&(sc->sc_super_ucom), sc->sc_ucom, sc->sc_ifaces, sc, &ugensa_callback, &Giant); if (error) { DPRINTF(0, "ucom_attach failed\n"); @@ -236,10 +273,13 @@ ugensa_detach(device_t dev) { struct ugensa_softc *sc = device_get_softc(dev); + uint8_t x; - ucom_detach(&(sc->sc_super_ucom), &(sc->sc_ucom), 1); + ucom_detach(&(sc->sc_super_ucom), sc->sc_ucom, sc->sc_ifaces); - usbd_transfer_unsetup(sc->sc_xfer, UGENSA_N_TRANSFER); + for (x = 0; x < sc->sc_ifaces; x++) { + usbd_transfer_unsetup(sc->sc_sub[x].sc_xfer, UGENSA_N_TRANSFER); + } return 0; } @@ -247,26 +287,26 @@ static void ugensa_bulk_write_callback(struct usbd_xfer *xfer) { - struct ugensa_softc *sc = xfer->priv_sc; + struct ugensa_sub_softc *ssc = xfer->priv_sc; u_int32_t actlen; USBD_CHECK_STATUS(xfer); tr_error: if (xfer->error != USBD_CANCELLED) { - sc->sc_flags |= UGENSA_FLAG_BULK_WRITE_STALL; - usbd_transfer_start(sc->sc_xfer[2]); + ssc->sc_flags |= UGENSA_FLAG_BULK_WRITE_STALL; + usbd_transfer_start(ssc->sc_xfer[2]); } return; tr_setup: tr_transferred: - if (sc->sc_flags & UGENSA_FLAG_BULK_WRITE_STALL) { - usbd_transfer_start(sc->sc_xfer[2]); + if (ssc->sc_flags & UGENSA_FLAG_BULK_WRITE_STALL) { + usbd_transfer_start(ssc->sc_xfer[2]); return; } - if (ucom_get_data(&(sc->sc_ucom), xfer->buffer, + if (ucom_get_data(ssc->sc_ucom_ptr, xfer->buffer, UGENSA_BUF_SIZE, &actlen)) { xfer->length = actlen; usbd_start_hardware(xfer); @@ -277,8 +317,8 @@ static void ugensa_bulk_write_clear_stall_callback(struct usbd_xfer *xfer) { - struct ugensa_softc *sc = xfer->priv_sc; - struct usbd_xfer *xfer_other = sc->sc_xfer[0]; + struct ugensa_sub_softc *ssc = xfer->priv_sc; + struct usbd_xfer *xfer_other = ssc->sc_xfer[0]; USBD_CHECK_STATUS(xfer); @@ -289,12 +329,12 @@ tr_transferred: usbd_clear_stall_tr_transferred(xfer, xfer_other); - sc->sc_flags &= ~UGENSA_FLAG_BULK_WRITE_STALL; + ssc->sc_flags &= ~UGENSA_FLAG_BULK_WRITE_STALL; usbd_transfer_start(xfer_other); return; tr_error: - sc->sc_flags &= ~UGENSA_FLAG_BULK_WRITE_STALL; + ssc->sc_flags &= ~UGENSA_FLAG_BULK_WRITE_STALL; DPRINTF(sc, 0, "clear stall failed, error=%s\n", usbd_errstr(xfer->error)); return; @@ -303,24 +343,24 @@ static void ugensa_bulk_read_callback(struct usbd_xfer *xfer) { - struct ugensa_softc *sc = xfer->priv_sc; + struct ugensa_sub_softc *ssc = xfer->priv_sc; USBD_CHECK_STATUS(xfer); tr_error: if (xfer->error != USBD_CANCELLED) { - sc->sc_flags |= UGENSA_FLAG_BULK_READ_STALL; - usbd_transfer_start(sc->sc_xfer[3]); + ssc->sc_flags |= UGENSA_FLAG_BULK_READ_STALL; + usbd_transfer_start(ssc->sc_xfer[3]); } return; tr_transferred: - ucom_put_data(&(sc->sc_ucom), xfer->buffer, + ucom_put_data(ssc->sc_ucom_ptr, xfer->buffer, xfer->actlen); tr_setup: - if (sc->sc_flags & UGENSA_FLAG_BULK_READ_STALL) { - usbd_transfer_start(sc->sc_xfer[3]); + if (ssc->sc_flags & UGENSA_FLAG_BULK_READ_STALL) { + usbd_transfer_start(ssc->sc_xfer[3]); } else { usbd_start_hardware(xfer); } @@ -330,8 +370,8 @@ static void ugensa_bulk_read_clear_stall_callback(struct usbd_xfer *xfer) { - struct ugensa_softc *sc = xfer->priv_sc; - struct usbd_xfer *xfer_other = sc->sc_xfer[1]; + struct ugensa_sub_softc *ssc = xfer->priv_sc; + struct usbd_xfer *xfer_other = ssc->sc_xfer[1]; USBD_CHECK_STATUS(xfer); @@ -342,12 +382,12 @@ tr_transferred: usbd_clear_stall_tr_transferred(xfer, xfer_other); - sc->sc_flags &= ~UGENSA_FLAG_BULK_READ_STALL; + ssc->sc_flags &= ~UGENSA_FLAG_BULK_READ_STALL; usbd_transfer_start(xfer_other); return; tr_error: - sc->sc_flags &= ~UGENSA_FLAG_BULK_READ_STALL; + ssc->sc_flags &= ~UGENSA_FLAG_BULK_READ_STALL; DPRINTF(sc, 0, "clear stall failed, error=%s\n", usbd_errstr(xfer->error)); return; @@ -356,33 +396,37 @@ static void ugensa_start_read(struct ucom_softc *ucom) { - struct ugensa_softc *sc = ucom->sc_parent; - usbd_transfer_start(sc->sc_xfer[1]); - return; + struct ugensa_softc *sc = ucom->sc_parent; + struct ugensa_sub_softc *ssc = sc->sc_sub + ucom->sc_portno; + usbd_transfer_start(ssc->sc_xfer[1]); + return; } static void ugensa_stop_read(struct ucom_softc *ucom) { - struct ugensa_softc *sc = ucom->sc_parent; - usbd_transfer_stop(sc->sc_xfer[3]); - usbd_transfer_stop(sc->sc_xfer[1]); - return; + struct ugensa_softc *sc = ucom->sc_parent; + struct ugensa_sub_softc *ssc = sc->sc_sub + ucom->sc_portno; + usbd_transfer_stop(ssc->sc_xfer[3]); + usbd_transfer_stop(ssc->sc_xfer[1]); + return; } static void ugensa_start_write(struct ucom_softc *ucom) { - struct ugensa_softc *sc = ucom->sc_parent; - usbd_transfer_start(sc->sc_xfer[0]); - return; + struct ugensa_softc *sc = ucom->sc_parent; + struct ugensa_sub_softc *ssc = sc->sc_sub + ucom->sc_portno; + usbd_transfer_start(ssc->sc_xfer[0]); + return; } static void ugensa_stop_write(struct ucom_softc *ucom) { - struct ugensa_softc *sc = ucom->sc_parent; - usbd_transfer_stop(sc->sc_xfer[2]); - usbd_transfer_stop(sc->sc_xfer[0]); - return; + struct ugensa_softc *sc = ucom->sc_parent; + struct ugensa_sub_softc *ssc = sc->sc_sub + ucom->sc_portno; + usbd_transfer_stop(ssc->sc_xfer[2]); + usbd_transfer_stop(ssc->sc_xfer[0]); + return; } From owner-p4-projects@FreeBSD.ORG Tue Apr 3 11:16:12 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 81C5316A406; Tue, 3 Apr 2007 11:16:12 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 4B51B16A404 for ; Tue, 3 Apr 2007 11:16:12 +0000 (UTC) (envelope-from sephe@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 3CBFB13C469 for ; Tue, 3 Apr 2007 11:16:12 +0000 (UTC) (envelope-from sephe@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l33BGCsN064241 for ; Tue, 3 Apr 2007 11:16:12 GMT (envelope-from sephe@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l33BGCe2064238 for perforce@freebsd.org; Tue, 3 Apr 2007 11:16:12 GMT (envelope-from sephe@FreeBSD.org) Date: Tue, 3 Apr 2007 11:16:12 GMT Message-Id: <200704031116.l33BGCe2064238@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sephe@FreeBSD.org using -f From: Sepherosa Ziehau To: Perforce Change Reviews Cc: Subject: PERFORCE change 117266 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 03 Apr 2007 11:16:12 -0000 http://perforce.freebsd.org/chv.cgi?CH=117266 Change 117266 by sephe@sephe_zealot:sam_wifi on 2007/04/03 11:15:38 RSSI correction value is in lower byte, not upper. Affected files ... .. //depot/projects/wifi/sys/dev/ral/rt2560.c#15 edit Differences ... ==== //depot/projects/wifi/sys/dev/ral/rt2560.c#15 (text) ==== @@ -2559,10 +2559,10 @@ } val = rt2560_eeprom_read(sc, RT2560_EEPROM_CALIBRATE); - if ((val & 0xff00) == 0xff00) + if ((val & 0xff) == 0xff) sc->rssi_corr = RT2560_DEFAULT_RSSI_CORR; else - sc->rssi_corr = val >> 8; + sc->rssi_corr = val & 0xff; DPRINTF(("rssi correction %d, calibrate 0x%02x\n", sc->rssi_corr, val)); } From owner-p4-projects@FreeBSD.ORG Tue Apr 3 11:24:24 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B621B16A406; Tue, 3 Apr 2007 11:24:24 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 66E2816A404 for ; Tue, 3 Apr 2007 11:24:24 +0000 (UTC) (envelope-from sephe@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 5833C13C4C1 for ; Tue, 3 Apr 2007 11:24:24 +0000 (UTC) (envelope-from sephe@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l33BOOpx065778 for ; Tue, 3 Apr 2007 11:24:24 GMT (envelope-from sephe@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l33BOOZl065775 for perforce@freebsd.org; Tue, 3 Apr 2007 11:24:24 GMT (envelope-from sephe@FreeBSD.org) Date: Tue, 3 Apr 2007 11:24:24 GMT Message-Id: <200704031124.l33BOOZl065775@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sephe@FreeBSD.org using -f From: Sepherosa Ziehau To: Perforce Change Reviews Cc: Subject: PERFORCE change 117268 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 03 Apr 2007 11:24:25 -0000 http://perforce.freebsd.org/chv.cgi?CH=117268 Change 117268 by sephe@sephe_zealot:sam_wifi on 2007/04/03 11:24:16 Prevent node refcnt leakage on error handling path. Affected files ... .. //depot/projects/wifi/sys/dev/ral/rt2560.c#16 edit .. //depot/projects/wifi/sys/dev/ral/rt2661.c#10 edit Differences ... ==== //depot/projects/wifi/sys/dev/ral/rt2560.c#16 (text) ==== @@ -1983,9 +1983,10 @@ if (bpf_peers_present(ic->ic_rawbpf)) bpf_mtap(ic->ic_rawbpf, m0); - if (rt2560_tx_mgt(sc, m0, ni) != 0) + if (rt2560_tx_mgt(sc, m0, ni) != 0) { + ieee80211_free_node(ni); break; - + } } else { if (ic->ic_state != IEEE80211_S_RUN) break; ==== //depot/projects/wifi/sys/dev/ral/rt2661.c#10 (text) ==== @@ -1751,9 +1751,10 @@ if (bpf_peers_present(ic->ic_rawbpf)) bpf_mtap(ic->ic_rawbpf, m0); - if (rt2661_tx_mgt(sc, m0, ni) != 0) + if (rt2661_tx_mgt(sc, m0, ni) != 0) { + ieee80211_free_node(ni); break; - + } } else { if (ic->ic_state != IEEE80211_S_RUN) break; @@ -1790,6 +1791,7 @@ /* there is no place left in this ring */ IFQ_DRV_PREPEND(&ifp->if_snd, m0); ifp->if_drv_flags |= IFF_DRV_OACTIVE; + ieee80211_free_node(ni); break; } From owner-p4-projects@FreeBSD.ORG Tue Apr 3 11:30:32 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B907316A404; Tue, 3 Apr 2007 11:30:32 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 6FCFA16A402 for ; Tue, 3 Apr 2007 11:30:32 +0000 (UTC) (envelope-from sephe@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 6121B13C46E for ; Tue, 3 Apr 2007 11:30:32 +0000 (UTC) (envelope-from sephe@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l33BUWIo066075 for ; Tue, 3 Apr 2007 11:30:32 GMT (envelope-from sephe@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l33BUWom066072 for perforce@freebsd.org; Tue, 3 Apr 2007 11:30:32 GMT (envelope-from sephe@FreeBSD.org) Date: Tue, 3 Apr 2007 11:30:32 GMT Message-Id: <200704031130.l33BUWom066072@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sephe@FreeBSD.org using -f From: Sepherosa Ziehau To: Perforce Change Reviews Cc: Subject: PERFORCE change 117269 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 03 Apr 2007 11:30:33 -0000 http://perforce.freebsd.org/chv.cgi?CH=117269 Change 117269 by sephe@sephe_zealot:sam_wifi on 2007/04/03 11:29:44 Nuke unnecessary NULL checks. Affected files ... .. //depot/projects/wifi/sys/dev/wi/if_wi.c#31 edit Differences ... ==== //depot/projects/wifi/sys/dev/wi/if_wi.c#31 (text+ko) ==== @@ -998,8 +998,7 @@ k = ieee80211_crypto_encap(ic, ni, m0); if (k == NULL) { - if (ni != NULL) - ieee80211_free_node(ni); + ieee80211_free_node(ni); m_freem(m0); continue; } @@ -1019,8 +1018,7 @@ frmhdr.wi_dat_len = htole16(m0->m_pkthdr.len); if (IFF_DUMPPKTS(ifp)) wi_dump_pkt(&frmhdr, NULL, -1); - if (ni != NULL) - ieee80211_free_node(ni); + ieee80211_free_node(ni); if (wi_start_tx(ifp, &frmhdr, m0)) continue; sc->sc_txnext = cur = (cur + 1) % sc->sc_ntxbuf; From owner-p4-projects@FreeBSD.ORG Tue Apr 3 17:59:56 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A1D2516A405; Tue, 3 Apr 2007 17:59:56 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 67B3216A485 for ; Tue, 3 Apr 2007 17:59:56 +0000 (UTC) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 0A64E13C4CC for ; Tue, 3 Apr 2007 17:59:56 +0000 (UTC) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l33Hxpok058033 for ; Tue, 3 Apr 2007 17:59:51 GMT (envelope-from mjacob@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l33HxlaV058030 for perforce@freebsd.org; Tue, 3 Apr 2007 17:59:47 GMT (envelope-from mjacob@freebsd.org) Date: Tue, 3 Apr 2007 17:59:47 GMT Message-Id: <200704031759.l33HxlaV058030@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 117285 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 03 Apr 2007 17:59:57 -0000 http://perforce.freebsd.org/chv.cgi?CH=117285 Change 117285 by mjacob@mjexp on 2007/04/03 17:58:45 IFC Affected files ... .. //depot/projects/mjexp/Makefile#4 integrate .. //depot/projects/mjexp/UPDATING#11 integrate .. //depot/projects/mjexp/contrib/bzip2/FREEBSD-upgrade#3 integrate .. //depot/projects/mjexp/etc/defaults/rc.conf#9 integrate .. //depot/projects/mjexp/etc/rc#2 integrate .. //depot/projects/mjexp/etc/rc.d/FILESYSTEMS#1 branch .. //depot/projects/mjexp/etc/rc.d/Makefile#3 integrate .. //depot/projects/mjexp/etc/rc.d/addswap#2 integrate .. //depot/projects/mjexp/etc/rc.d/adjkerntz#2 integrate .. //depot/projects/mjexp/etc/rc.d/bootconf.sh#3 integrate .. //depot/projects/mjexp/etc/rc.d/cleanvar#2 integrate .. //depot/projects/mjexp/etc/rc.d/geli2#2 integrate .. //depot/projects/mjexp/etc/rc.d/hostname#3 integrate .. //depot/projects/mjexp/etc/rc.d/ip6addrctl#2 integrate .. //depot/projects/mjexp/etc/rc.d/ip6fw#3 integrate .. //depot/projects/mjexp/etc/rc.d/ipfilter#4 integrate .. //depot/projects/mjexp/etc/rc.d/ipfw#3 integrate .. //depot/projects/mjexp/etc/rc.d/ipmon#2 integrate .. //depot/projects/mjexp/etc/rc.d/ipsec#2 integrate .. //depot/projects/mjexp/etc/rc.d/isdnd#2 integrate .. //depot/projects/mjexp/etc/rc.d/kldxref#2 integrate .. //depot/projects/mjexp/etc/rc.d/mountcritremote#3 integrate .. //depot/projects/mjexp/etc/rc.d/netif#4 integrate .. //depot/projects/mjexp/etc/rc.d/nfslocking#2 integrate .. //depot/projects/mjexp/etc/rc.d/pf#3 integrate .. //depot/projects/mjexp/etc/rc.d/pflog#3 integrate .. //depot/projects/mjexp/etc/rc.d/pfsync#3 integrate .. //depot/projects/mjexp/etc/rc.d/power_profile#3 integrate .. //depot/projects/mjexp/etc/rc.d/ppp#3 integrate .. //depot/projects/mjexp/etc/rc.d/var#3 integrate .. //depot/projects/mjexp/etc/rc.firewall#4 integrate .. //depot/projects/mjexp/lib/libarchive/archive.h.in#9 integrate .. //depot/projects/mjexp/lib/libarchive/archive_check_magic.c#4 integrate .. //depot/projects/mjexp/lib/libarchive/archive_private.h#7 integrate .. //depot/projects/mjexp/lib/libarchive/archive_read.c#9 integrate .. //depot/projects/mjexp/lib/libarchive/archive_read_data_into_fd.c#5 integrate .. //depot/projects/mjexp/lib/libarchive/archive_read_open_memory.c#4 integrate .. //depot/projects/mjexp/lib/libarchive/archive_read_private.h#2 integrate .. //depot/projects/mjexp/lib/libarchive/archive_read_support_format_ar.c#1 branch .. //depot/projects/mjexp/lib/libarchive/archive_read_support_format_iso9660.c#7 integrate .. //depot/projects/mjexp/lib/libarchive/archive_read_support_format_tar.c#6 integrate .. //depot/projects/mjexp/lib/libarchive/archive_write_disk.c#3 integrate .. //depot/projects/mjexp/lib/libarchive/archive_write_set_format_ar.c#1 branch .. //depot/projects/mjexp/lib/libarchive/archive_write_set_format_ustar.c#5 integrate .. //depot/projects/mjexp/lib/libarchive/libarchive-formats.5#3 integrate .. //depot/projects/mjexp/lib/libarchive/test/test_read_format_ar.c#1 branch .. //depot/projects/mjexp/lib/libarchive/test/test_write_format_ar.c#1 branch .. //depot/projects/mjexp/lib/libypclnt/Makefile#3 integrate .. //depot/projects/mjexp/lib/libypclnt/ypclnt.3#2 delete .. //depot/projects/mjexp/sbin/geom/class/journal/geom_journal.c#2 integrate .. //depot/projects/mjexp/sbin/ifconfig/ifieee80211.c#6 integrate .. //depot/projects/mjexp/share/man/man4/if_bridge.4#5 integrate .. //depot/projects/mjexp/share/man/man4/man4.i386/Makefile#2 integrate .. //depot/projects/mjexp/share/man/man4/man4.i386/acpi_aiboost.4#1 branch .. //depot/projects/mjexp/share/man/man7/hier.7#4 integrate .. //depot/projects/mjexp/share/man/man9/Makefile#14 integrate .. //depot/projects/mjexp/share/man/man9/condvar.9#4 integrate .. //depot/projects/mjexp/share/man/man9/lock.9#3 integrate .. //depot/projects/mjexp/share/man/man9/mtx_pool.9#3 integrate .. //depot/projects/mjexp/share/man/man9/mutex.9#5 integrate .. //depot/projects/mjexp/share/man/man9/rwlock.9#4 integrate .. //depot/projects/mjexp/share/man/man9/sema.9#2 integrate .. //depot/projects/mjexp/share/man/man9/sleep.9#7 integrate .. //depot/projects/mjexp/share/man/man9/sx.9#3 integrate .. //depot/projects/mjexp/share/man/man9/vhold.9#2 integrate .. //depot/projects/mjexp/share/misc/Makefile#2 integrate .. //depot/projects/mjexp/share/misc/committers-doc.dot#1 branch .. //depot/projects/mjexp/share/misc/committers-ports.dot#1 branch .. //depot/projects/mjexp/share/misc/committers-src.dot#1 branch .. //depot/projects/mjexp/sys/amd64/amd64/support.S#4 integrate .. //depot/projects/mjexp/sys/amd64/linux32/linux32_machdep.c#12 integrate .. //depot/projects/mjexp/sys/amd64/linux32/linux32_sysvec.c#5 integrate .. //depot/projects/mjexp/sys/arm/at91/uart_cpu_at91rm9200usart.c#2 integrate .. //depot/projects/mjexp/sys/arm/at91/uart_dev_at91usart.c#4 integrate .. //depot/projects/mjexp/sys/arm/sa11x0/uart_cpu_sa1110.c#2 integrate .. //depot/projects/mjexp/sys/arm/sa11x0/uart_dev_sa1110.c#3 integrate .. //depot/projects/mjexp/sys/arm/xscale/i80321/uart_cpu_i80321.c#2 integrate .. //depot/projects/mjexp/sys/arm/xscale/ixp425/uart_cpu_ixp425.c#2 integrate .. //depot/projects/mjexp/sys/boot/arm/at91/boot2/boot2.c#4 integrate .. //depot/projects/mjexp/sys/compat/linprocfs/linprocfs.c#8 integrate .. //depot/projects/mjexp/sys/compat/linux/linux_emul.c#11 integrate .. //depot/projects/mjexp/sys/compat/linux/linux_emul.h#5 integrate .. //depot/projects/mjexp/sys/conf/NOTES#16 integrate .. //depot/projects/mjexp/sys/conf/options#14 integrate .. //depot/projects/mjexp/sys/dev/acpica/acpi_ec.c#4 integrate .. //depot/projects/mjexp/sys/dev/ahb/ahb.c#6 integrate .. //depot/projects/mjexp/sys/dev/arcmsr/arcmsr.c#9 integrate .. //depot/projects/mjexp/sys/dev/bge/if_bge.c#12 integrate .. //depot/projects/mjexp/sys/dev/ed/if_ed_pccard.c#3 integrate .. //depot/projects/mjexp/sys/dev/firewire/firewire.c#3 integrate .. //depot/projects/mjexp/sys/dev/firewire/fwohci_pci.c#5 integrate .. //depot/projects/mjexp/sys/dev/ipmi/ipmi_pci.c#2 integrate .. //depot/projects/mjexp/sys/dev/isp/isp_freebsd.c#15 integrate .. //depot/projects/mjexp/sys/dev/isp/isp_freebsd.h#11 integrate .. //depot/projects/mjexp/sys/dev/isp/isp_library.c#7 integrate .. //depot/projects/mjexp/sys/dev/isp/isp_library.h#7 integrate .. //depot/projects/mjexp/sys/dev/isp/isp_pci.c#21 edit .. //depot/projects/mjexp/sys/dev/isp/isp_sbus.c#10 integrate .. //depot/projects/mjexp/sys/dev/mxge/if_mxge.c#10 integrate .. //depot/projects/mjexp/sys/dev/pci/pci.c#14 integrate .. //depot/projects/mjexp/sys/dev/pci/pci_pci.c#7 integrate .. //depot/projects/mjexp/sys/dev/pci/pcireg.h#8 integrate .. //depot/projects/mjexp/sys/dev/sk/if_sk.c#6 integrate .. //depot/projects/mjexp/sys/dev/sk/if_skreg.h#4 integrate .. //depot/projects/mjexp/sys/dev/sound/midi/midi.c#5 integrate .. //depot/projects/mjexp/sys/dev/sound/pcm/channel.c#5 integrate .. //depot/projects/mjexp/sys/dev/sound/pcm/mixer.c#3 integrate .. //depot/projects/mjexp/sys/dev/sound/usb/uaudio.c#6 integrate .. //depot/projects/mjexp/sys/dev/uart/uart.h#2 integrate .. //depot/projects/mjexp/sys/dev/uart/uart_bus.h#2 integrate .. //depot/projects/mjexp/sys/dev/uart/uart_core.c#4 integrate .. //depot/projects/mjexp/sys/dev/uart/uart_cpu.h#3 integrate .. //depot/projects/mjexp/sys/dev/uart/uart_cpu_amd64.c#2 integrate .. //depot/projects/mjexp/sys/dev/uart/uart_cpu_i386.c#2 integrate .. //depot/projects/mjexp/sys/dev/uart/uart_cpu_ia64.c#2 integrate .. //depot/projects/mjexp/sys/dev/uart/uart_cpu_pc98.c#2 integrate .. //depot/projects/mjexp/sys/dev/uart/uart_cpu_powerpc.c#2 integrate .. //depot/projects/mjexp/sys/dev/uart/uart_cpu_sparc64.c#2 integrate .. //depot/projects/mjexp/sys/dev/uart/uart_dev_ns8250.c#4 integrate .. //depot/projects/mjexp/sys/dev/uart/uart_dev_sab82532.c#3 integrate .. //depot/projects/mjexp/sys/dev/uart/uart_dev_z8530.c#3 integrate .. //depot/projects/mjexp/sys/dev/uart/uart_kbd_sun.c#4 integrate .. //depot/projects/mjexp/sys/dev/uart/uart_subr.c#2 integrate .. //depot/projects/mjexp/sys/dev/usb/if_aue.c#7 integrate .. //depot/projects/mjexp/sys/dev/usb/if_axe.c#3 integrate .. //depot/projects/mjexp/sys/dev/usb/if_ural.c#6 integrate .. //depot/projects/mjexp/sys/dev/usb/ubser.c#2 integrate .. //depot/projects/mjexp/sys/geom/geom_ctl.c#2 integrate .. //depot/projects/mjexp/sys/gnu/fs/xfs/FreeBSD/support/mrlock.c#2 integrate .. //depot/projects/mjexp/sys/gnu/fs/xfs/FreeBSD/support/mrlock.h#2 integrate .. //depot/projects/mjexp/sys/i386/acpica/acpi_machdep.c#3 integrate .. //depot/projects/mjexp/sys/i386/i386/support.s#4 integrate .. //depot/projects/mjexp/sys/i386/linux/linux_sysvec.c#2 integrate .. //depot/projects/mjexp/sys/i4b/layer1/ifpnp/i4b_ifpnp_avm.c#3 integrate .. //depot/projects/mjexp/sys/i4b/layer1/ihfc/i4b_ihfc_pnp.c#3 integrate .. //depot/projects/mjexp/sys/i4b/layer1/isic/i4b_avm_a1.c#3 integrate .. //depot/projects/mjexp/sys/i4b/layer1/isic/i4b_isic_pnp.c#3 integrate .. //depot/projects/mjexp/sys/i4b/layer1/isic/i4b_itk_ix1.c#3 integrate .. //depot/projects/mjexp/sys/i4b/layer1/isic/i4b_tel_s016.c#3 integrate .. //depot/projects/mjexp/sys/i4b/layer1/isic/i4b_tel_s0163.c#3 integrate .. //depot/projects/mjexp/sys/kern/kern_lock.c#7 integrate .. //depot/projects/mjexp/sys/kern/kern_rwlock.c#6 integrate .. //depot/projects/mjexp/sys/kern/kern_sx.c#6 integrate .. //depot/projects/mjexp/sys/kern/subr_witness.c#8 integrate .. //depot/projects/mjexp/sys/kern/uipc_syscalls.c#7 integrate .. //depot/projects/mjexp/sys/kern/vfs_lookup.c#5 integrate .. //depot/projects/mjexp/sys/kern/vfs_mount.c#9 integrate .. //depot/projects/mjexp/sys/kern/vfs_subr.c#6 integrate .. //depot/projects/mjexp/sys/kern/vfs_syscalls.c#10 integrate .. //depot/projects/mjexp/sys/modules/cryptodev/Makefile#2 integrate .. //depot/projects/mjexp/sys/netatm/atm_if.c#2 integrate .. //depot/projects/mjexp/sys/netgraph/ng_base.c#5 integrate .. //depot/projects/mjexp/sys/netinet/sctp_asconf.c#7 integrate .. //depot/projects/mjexp/sys/netinet/sctp_auth.c#6 integrate .. //depot/projects/mjexp/sys/netinet/sctp_bsd_addr.h#4 integrate .. //depot/projects/mjexp/sys/netinet/sctp_constants.h#6 integrate .. //depot/projects/mjexp/sys/netinet/sctp_indata.c#7 integrate .. //depot/projects/mjexp/sys/netinet/sctp_input.c#7 integrate .. //depot/projects/mjexp/sys/netinet/sctp_os_bsd.h#7 integrate .. //depot/projects/mjexp/sys/netinet/sctp_output.c#7 integrate .. //depot/projects/mjexp/sys/netinet/sctp_output.h#4 integrate .. //depot/projects/mjexp/sys/netinet/sctp_pcb.c#7 integrate .. //depot/projects/mjexp/sys/netinet/sctp_pcb.h#6 integrate .. //depot/projects/mjexp/sys/netinet/sctp_structs.h#7 integrate .. //depot/projects/mjexp/sys/netinet/sctp_sysctl.c#2 integrate .. //depot/projects/mjexp/sys/netinet/sctp_sysctl.h#2 integrate .. //depot/projects/mjexp/sys/netinet/sctp_timer.c#7 integrate .. //depot/projects/mjexp/sys/netinet/sctp_uio.h#6 integrate .. //depot/projects/mjexp/sys/netinet/sctp_usrreq.c#7 integrate .. //depot/projects/mjexp/sys/netinet/sctputil.c#7 integrate .. //depot/projects/mjexp/sys/netinet6/in6_src.c#4 integrate .. //depot/projects/mjexp/sys/netinet6/sctp6_usrreq.c#7 integrate .. //depot/projects/mjexp/sys/nfsserver/nfs_srvsubs.c#5 integrate .. //depot/projects/mjexp/sys/powerpc/conf/GENERIC#5 integrate .. //depot/projects/mjexp/sys/powerpc/conf/NOTES#4 integrate .. //depot/projects/mjexp/sys/powerpc/powermac/uninorth.c#2 integrate .. //depot/projects/mjexp/sys/powerpc/powerpc/extintr.c#2 delete .. //depot/projects/mjexp/sys/sys/_sx.h#1 branch .. //depot/projects/mjexp/sys/sys/elf_common.h#4 integrate .. //depot/projects/mjexp/sys/sys/lockmgr.h#4 integrate .. //depot/projects/mjexp/sys/sys/mount.h#8 integrate .. //depot/projects/mjexp/sys/sys/mutex.h#7 integrate .. //depot/projects/mjexp/sys/sys/sleepqueue.h#6 integrate .. //depot/projects/mjexp/sys/sys/sx.h#4 integrate .. //depot/projects/mjexp/sys/sys/sysent.h#3 integrate .. //depot/projects/mjexp/sys/sys/systm.h#11 integrate .. //depot/projects/mjexp/sys/sys/vnode.h#6 integrate .. //depot/projects/mjexp/tools/regression/sockets/accept_fd_leak/accept_fd_leak.c#2 integrate .. //depot/projects/mjexp/tools/regression/sockets/socketpair/socketpair.c#2 integrate .. //depot/projects/mjexp/tools/regression/usr.bin/sed/multitest.t#2 integrate .. //depot/projects/mjexp/tools/regression/usr.bin/sed/regress.b2a.out#1 branch .. //depot/projects/mjexp/tools/regression/usr.bin/sed/regress.c0.out#1 branch .. //depot/projects/mjexp/tools/regression/usr.bin/sed/regress.c1.out#1 branch .. //depot/projects/mjexp/tools/regression/usr.bin/sed/regress.c2.out#1 branch .. //depot/projects/mjexp/tools/regression/usr.bin/sed/regress.c3.out#1 branch .. //depot/projects/mjexp/tools/regression/usr.bin/sed/regress.multitest.out/54_5.3#2 integrate .. //depot/projects/mjexp/tools/regression/usr.bin/sed/regress.sh#3 integrate .. //depot/projects/mjexp/usr.bin/calendar/calendars/calendar.freebsd#8 integrate .. //depot/projects/mjexp/usr.bin/sed/process.c#2 integrate .. //depot/projects/mjexp/usr.bin/tar/test/test-basic.sh#2 integrate .. //depot/projects/mjexp/usr.bin/tar/write.c#8 integrate .. //depot/projects/mjexp/usr.sbin/ngctl/Makefile#4 integrate .. //depot/projects/mjexp/usr.sbin/ntp/doc/ntpd.8#2 integrate .. //depot/projects/mjexp/usr.sbin/pstat/pstat.8#2 integrate .. //depot/projects/mjexp/usr.sbin/pstat/pstat.c#3 integrate .. //depot/projects/mjexp/usr.sbin/pw/cpdir.c#2 integrate .. //depot/projects/mjexp/usr.sbin/pw/pw.8#4 integrate .. //depot/projects/mjexp/usr.sbin/pw/pw.c#3 integrate .. //depot/projects/mjexp/usr.sbin/pw/pw.conf.5#2 integrate .. //depot/projects/mjexp/usr.sbin/pw/pw.h#2 integrate .. //depot/projects/mjexp/usr.sbin/pw/pw_conf.c#2 integrate .. //depot/projects/mjexp/usr.sbin/pw/pw_user.c#3 integrate .. //depot/projects/mjexp/usr.sbin/rpc.statd/procs.c#2 integrate .. //depot/projects/mjexp/usr.sbin/sysinstall/index.c#5 integrate Differences ... ==== //depot/projects/mjexp/Makefile#4 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile,v 1.339 2006/11/28 01:03:29 ru Exp $ +# $FreeBSD: src/Makefile,v 1.340 2007/04/02 21:32:44 marcel Exp $ # # The user-driven targets are: # @@ -261,12 +261,14 @@ # existing system is. # .if make(universe) +TARGETS?=amd64 arm i386 ia64 pc98 powerpc sparc64 sun4v + universe: universe_prologue universe_prologue: @echo "--------------------------------------------------------------" @echo ">>> make universe started on ${STARTTIME}" @echo "--------------------------------------------------------------" -.for target in amd64 arm i386 ia64 pc98 powerpc sparc64 sun4v +.for target in ${TARGETS} KERNCONFS!= cd ${.CURDIR}/sys/${target}/conf && \ find [A-Z]*[A-Z] -type f -maxdepth 0 \ ! -name DEFAULTS ! -name LINT ==== //depot/projects/mjexp/UPDATING#11 (text+ko) ==== @@ -24,8 +24,9 @@ 20070302: Firmwares for ipw(4) and iwi(4) are now included in the base tree. In order to use them one must agree to the respective LICENSE in - share/doc/legal and define legal..license_ack=1 via - loader.conf(5) or kenv(1). + share/doc/legal and define legal.intel_.license_ack=1 via + loader.conf(5) or kenv(1). Make sure to deinstall the now + deprecated modules from the respective firmware ports. 20070228: The name resolution/mapping functions addr2ascii(3) and ascii2addr(3) @@ -757,4 +758,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.482 2007/03/02 14:56:15 flz Exp $ +$FreeBSD: src/UPDATING,v 1.484 2007/04/03 10:04:54 brueffer Exp $ ==== //depot/projects/mjexp/contrib/bzip2/FREEBSD-upgrade#3 (text+ko) ==== @@ -1,7 +1,7 @@ -$FreeBSD: src/contrib/bzip2/FREEBSD-upgrade,v 1.3 2007/03/28 07:56:14 delphij Exp $ +$FreeBSD: src/contrib/bzip2/FREEBSD-upgrade,v 1.4 2007/03/30 16:33:05 delphij Exp $ Julian Seward's bzip2 - originals can be found at: http://sources.redhat.com/bzip2/ + originals can be found at: http://www.bzip.org/downloads.html Imported by: ==== //depot/projects/mjexp/etc/defaults/rc.conf#9 (text+ko) ==== @@ -15,7 +15,7 @@ # For a more detailed explanation of all the rc.conf variables, please # refer to the rc.conf(5) manual page. # -# $FreeBSD: src/etc/defaults/rc.conf,v 1.308 2007/03/29 21:44:23 ache Exp $ +# $FreeBSD: src/etc/defaults/rc.conf,v 1.309 2007/04/02 22:53:06 des Exp $ ############################################################## ### Important initial Boot-time options #################### @@ -24,7 +24,7 @@ rc_debug="NO" # Set to YES to enable debugging output from rc.d rc_info="NO" # Enables display of informational messages at boot. rcshutdown_timeout="30" # Seconds to wait before terminating rc.shutdown -early_late_divider="mountcritlocal" # Script that separates early/late +early_late_divider="FILESYSTEM" # Script that separates early/late # stages of the boot process. Make sure you know # the ramifications if you change this. # See rc.conf(5) for more details. ==== //depot/projects/mjexp/etc/rc#2 (text+ko) ==== @@ -25,7 +25,7 @@ # SUCH DAMAGE. # # @(#)rc 5.27 (Berkeley) 6/5/91 -# $FreeBSD: src/etc/rc,v 1.339 2006/02/20 21:54:30 dougb Exp $ +# $FreeBSD: src/etc/rc,v 1.340 2007/04/02 22:53:06 des Exp $ # # System startup script run by init on autoboot @@ -75,7 +75,7 @@ skip="-s nostart" if [ `/sbin/sysctl -n security.jail.jailed` -eq 1 ]; then skip="$skip -s nojail" - if [ "$early_late_divider" = "mountcritlocal" ]; then + if [ "$early_late_divider" = "FILESYSTEMS" ]; then early_late_divider=NETWORKING fi fi ==== //depot/projects/mjexp/etc/rc.d/Makefile#3 (text+ko) ==== @@ -1,9 +1,9 @@ # $NetBSD: Makefile,v 1.16 2001/01/14 15:37:22 minoura Exp $ -# $FreeBSD: src/etc/rc.d/Makefile,v 1.78 2006/10/15 14:19:06 ceri Exp $ +# $FreeBSD: src/etc/rc.d/Makefile,v 1.79 2007/04/02 22:53:07 des Exp $ .include -FILES= DAEMON LOGIN NETWORKING SERVERS \ +FILES= DAEMON FILESYSTEMS LOGIN NETWORKING SERVERS \ abi accounting addswap adjkerntz amd \ apm apmd archdep atm1 atm2 atm3 auditd auto_linklocal \ bgfsck bluetooth bootparams bridge bsnmpd bthidd \ ==== //depot/projects/mjexp/etc/rc.d/addswap#2 (text+ko) ==== @@ -2,11 +2,11 @@ # # Add additional swap files # -# $FreeBSD: src/etc/rc.d/addswap,v 1.6 2006/01/17 19:29:31 philip Exp $ +# $FreeBSD: src/etc/rc.d/addswap,v 1.7 2007/04/02 22:53:07 des Exp $ # # PROVIDE: addswap -# REQUIRE: mountcritlocal +# REQUIRE: FILESYSTEMS # BEFORE: sysctl # KEYWORD: nojail ==== //depot/projects/mjexp/etc/rc.d/adjkerntz#2 (text+ko) ==== @@ -1,10 +1,10 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/adjkerntz,v 1.5 2004/10/07 13:55:25 mtm Exp $ +# $FreeBSD: src/etc/rc.d/adjkerntz,v 1.6 2007/04/02 22:53:07 des Exp $ # # PROVIDE: adjkerntz -# REQUIRE: mountcritlocal random +# REQUIRE: FILESYSTEMS random # BEFORE: netif # KEYWORD: nojail ==== //depot/projects/mjexp/etc/rc.d/bootconf.sh#3 (text+ko) ==== @@ -1,11 +1,11 @@ #!/bin/sh # # $NetBSD: bootconf.sh,v 1.5 2002/03/25 03:22:10 wiz Exp $ -# $FreeBSD: src/etc/rc.d/bootconf.sh,v 1.5 2006/12/30 22:53:20 yar Exp $ +# $FreeBSD: src/etc/rc.d/bootconf.sh,v 1.6 2007/04/02 22:53:07 des Exp $ # # PROVIDE: bootconf -# REQUIRE: mountcritlocal +# REQUIRE: FILESYSTEMS bootconf_start() { ==== //depot/projects/mjexp/etc/rc.d/cleanvar#2 (text+ko) ==== @@ -1,10 +1,10 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/cleanvar,v 1.11 2005/12/19 10:57:00 dougb Exp $ +# $FreeBSD: src/etc/rc.d/cleanvar,v 1.12 2007/04/02 22:53:07 des Exp $ # # PROVIDE: cleanvar -# REQUIRE: mountcritlocal var +# REQUIRE: FILESYSTEMS var . /etc/rc.subr ==== //depot/projects/mjexp/etc/rc.d/geli2#2 (text+ko) ==== @@ -24,11 +24,11 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/etc/rc.d/geli2,v 1.1 2005/08/14 18:02:21 pjd Exp $ +# $FreeBSD: src/etc/rc.d/geli2,v 1.2 2007/04/02 22:53:07 des Exp $ # # PROVIDE: geli2 -# REQUIRE: mountcritlocal +# REQUIRE: FILESYSTEMS # KEYWORD: nojail . /etc/rc.subr ==== //depot/projects/mjexp/etc/rc.d/hostname#3 (text+ko) ==== @@ -23,11 +23,11 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/etc/rc.d/hostname,v 1.11 2007/02/15 06:46:33 yar Exp $ +# $FreeBSD: src/etc/rc.d/hostname,v 1.12 2007/04/02 22:53:07 des Exp $ # # PROVIDE: hostname -# REQUIRE: mountcritlocal +# REQUIRE: FILESYSTEMS # BEFORE: netif . /etc/rc.subr ==== //depot/projects/mjexp/etc/rc.d/ip6addrctl#2 (text+ko) ==== @@ -1,10 +1,10 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/ip6addrctl,v 1.4 2004/10/07 13:55:26 mtm Exp $ +# $FreeBSD: src/etc/rc.d/ip6addrctl,v 1.5 2007/04/02 22:53:07 des Exp $ # # PROVIDE: ip6addrctl -# REQUIRE: mountcritlocal netif +# REQUIRE: FILESYSTEMS netif # BEFORE: network_ipv6 # KEYWORD: nojail ==== //depot/projects/mjexp/etc/rc.d/ip6fw#3 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/ip6fw,v 1.8 2006/12/31 10:37:18 yar Exp $ +# $FreeBSD: src/etc/rc.d/ip6fw,v 1.9 2007/04/02 15:38:53 mtm Exp $ # # PROVIDE: ip6fw @@ -26,7 +26,7 @@ # Load rules # if [ -r "${ipv6_firewall_script}" ]; then - . "${ipv6_firewall_script}" + /bin/sh "${ipv6_firewall_script}" echo 'IPv6 Firewall rules loaded.' elif [ "`ipfw show 65535`" = "65535 deny ip from any to any" ]; then warn 'IPv6 firewall rules have not been loaded. Default' \ ==== //depot/projects/mjexp/etc/rc.d/ipfilter#4 (text+ko) ==== @@ -1,11 +1,11 @@ #!/bin/sh # # $NetBSD: ipfilter,v 1.10 2001/02/28 17:03:50 lukem Exp $ -# $FreeBSD: src/etc/rc.d/ipfilter,v 1.26 2006/12/31 10:37:18 yar Exp $ +# $FreeBSD: src/etc/rc.d/ipfilter,v 1.27 2007/04/02 22:53:07 des Exp $ # # PROVIDE: ipfilter -# REQUIRE: root mountcritlocal +# REQUIRE: root FILESYSTEMS # BEFORE: netif # KEYWORD: nojail ==== //depot/projects/mjexp/etc/rc.d/ipfw#3 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/ipfw,v 1.14 2006/12/31 10:37:18 yar Exp $ +# $FreeBSD: src/etc/rc.d/ipfw,v 1.15 2007/04/02 15:38:53 mtm Exp $ # # PROVIDE: ipfw @@ -26,7 +26,7 @@ if [ -f /etc/rc.d/natd ] ; then /etc/rc.d/natd start fi - . "${firewall_script}" + /bin/sh "${firewall_script}" echo 'Firewall rules loaded.' elif [ "`ipfw list 65535`" = "65535 deny ip from any to any" ]; then echo 'Warning: kernel has firewall functionality, but' \ ==== //depot/projects/mjexp/etc/rc.d/ipmon#2 (text+ko) ==== @@ -1,11 +1,11 @@ #!/bin/sh # # $NetBSD: ipmon,v 1.9 2002/04/18 05:02:01 lukem Exp $ -# $FreeBSD: src/etc/rc.d/ipmon,v 1.14 2005/10/28 16:55:38 yar Exp $ +# $FreeBSD: src/etc/rc.d/ipmon,v 1.15 2007/04/02 22:53:07 des Exp $ # # PROVIDE: ipmon -# REQUIRE: mountcritlocal hostname sysctl cleanvar ipfilter +# REQUIRE: FILESYSTEMS hostname sysctl cleanvar ipfilter # BEFORE: SERVERS # KEYWORD: nojail ==== //depot/projects/mjexp/etc/rc.d/ipsec#2 (text+ko) ==== @@ -1,11 +1,11 @@ #!/bin/sh # # $NetBSD: ipsec,v 1.7 2002/03/22 04:33:58 thorpej Exp $ -# $FreeBSD: src/etc/rc.d/ipsec,v 1.16 2006/01/24 15:16:55 pjd Exp $ +# $FreeBSD: src/etc/rc.d/ipsec,v 1.17 2007/04/02 22:53:07 des Exp $ # # PROVIDE: ipsec -# REQUIRE: root mountcritlocal +# REQUIRE: root FILESYSTEMS # BEFORE: DAEMON mountcritremote # KEYWORD: nojail ==== //depot/projects/mjexp/etc/rc.d/isdnd#2 (text+ko) ==== @@ -1,13 +1,13 @@ #!/bin/sh # # $NetBSD: isdnd,v 1.9 2002/04/10 23:37:13 martin Exp $ -# $FreeBSD: src/etc/rc.d/isdnd,v 1.21 2006/05/17 09:33:06 phk Exp $ +# $FreeBSD: src/etc/rc.d/isdnd,v 1.23 2007/04/02 22:53:07 des Exp $ # # Mostly based on original script (/etc/rc.isdn) written by Hellmuth Michaelis # # PROVIDE: isdnd -# REQUIRE: netif mountcritlocal cleanvar +# REQUIRE: netif FILESYSTEMS cleanvar # KEYWORD: nojail . /etc/rc.subr @@ -15,6 +15,7 @@ name="isdnd" rcvar=`set_rcvar isdn` pidfile="/var/run/${name}.pid" +command="/usr/sbin/isdnd" start_cmd="isdnd_start" isdnd_start() ==== //depot/projects/mjexp/etc/rc.d/kldxref#2 (text+ko) ==== @@ -1,10 +1,10 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/kldxref,v 1.4 2004/10/07 13:55:26 mtm Exp $ +# $FreeBSD: src/etc/rc.d/kldxref,v 1.5 2007/04/02 22:53:07 des Exp $ # # PROVIDE: kldxref -# REQUIRE: root mountcritlocal +# REQUIRE: root FILESYSTEMS # BEFORE: netif # KEYWORD: nojail ==== //depot/projects/mjexp/etc/rc.d/mountcritremote#3 (text+ko) ==== @@ -1,11 +1,11 @@ #!/bin/sh # # $NetBSD: mountcritremote,v 1.7 2002/04/29 12:29:53 lukem Exp $ -# $FreeBSD: src/etc/rc.d/mountcritremote,v 1.14 2006/12/31 10:37:18 yar Exp $ +# $FreeBSD: src/etc/rc.d/mountcritremote,v 1.15 2007/04/02 22:53:07 des Exp $ # # PROVIDE: mountcritremote -# REQUIRE: NETWORKING root mountcritlocal cleanvar ipsec +# REQUIRE: NETWORKING root FILESYSTEMS cleanvar ipsec # KEYWORD: nojail . /etc/rc.subr ==== //depot/projects/mjexp/etc/rc.d/netif#4 (text+ko) ==== @@ -22,11 +22,11 @@ # (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/etc/rc.d/netif,v 1.22 2007/02/09 12:11:26 flz Exp $ +# $FreeBSD: src/etc/rc.d/netif,v 1.23 2007/04/02 22:53:07 des Exp $ # # PROVIDE: netif -# REQUIRE: atm1 ipfilter mountcritlocal serial sppp sysctl +# REQUIRE: atm1 ipfilter FILESYSTEMS serial sppp sysctl # KEYWORD: nojail . /etc/rc.subr ==== //depot/projects/mjexp/etc/rc.d/nfslocking#2 (text+ko) ==== @@ -1,11 +1,11 @@ #!/bin/sh # # $NetBSD: nfslocking,v 1.6 2002/03/24 15:52:41 lukem Exp $ -# $FreeBSD: src/etc/rc.d/nfslocking,v 1.11 2004/10/07 13:55:26 mtm Exp $ +# $FreeBSD: src/etc/rc.d/nfslocking,v 1.12 2007/03/30 19:08:58 mtm Exp $ # # PROVIDE: nfslocking -# REQUIRE: nfsserver nfsclient nfsd +# REQUIRE: nfsserver nfsclient nfsd rpcbind # BEFORE: DAEMON # KEYWORD: nojail @@ -17,10 +17,24 @@ # Either NFS client or server must be enabled or this must be a 'forcestart' # for either of the daemons to start. # -start_precmd='checkyesno nfs_server_enable || checkyesno nfs_client_enable || +nfslocking_precmd() +{ + if ! checkyesno nfs_server_enable && ! checkyesno nfs_client_enable && \ + [ -z "$rc_force" ] + then + return 1 + fi + if ! checkyesno rpcbind_enable && \ + ! /etc/rc.d/rpcbind forcestatus 1>/dev/null 2>&1 + then + force_depend rpcbind || return 1 + fi +} + +start_precmd="nfslocking_precmd" +stop_precmd='checkyesno nfs_server_enable || checkyesno nfs_client_enable || [ -n "$rc_force" ]' -stop_precmd=$start_precmd -status_precmd=$start_precmd +status_precmd=$stop_precmd # rpc.statd # ==== //depot/projects/mjexp/etc/rc.d/pf#3 (text+ko) ==== @@ -1,10 +1,10 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/pf,v 1.14 2006/12/31 10:37:18 yar Exp $ +# $FreeBSD: src/etc/rc.d/pf,v 1.15 2007/04/02 22:53:07 des Exp $ # # PROVIDE: pf -# REQUIRE: root mountcritlocal netif pflog pfsync +# REQUIRE: root FILESYSTEMS netif pflog pfsync # BEFORE: routing # KEYWORD: nojail ==== //depot/projects/mjexp/etc/rc.d/pflog#3 (text+ko) ==== @@ -1,10 +1,10 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/pflog,v 1.10 2006/12/31 10:37:18 yar Exp $ +# $FreeBSD: src/etc/rc.d/pflog,v 1.11 2007/04/02 22:53:07 des Exp $ # # PROVIDE: pflog -# REQUIRE: root mountcritlocal netif cleanvar +# REQUIRE: root FILESYSTEMS netif cleanvar # KEYWORD: nojail . /etc/rc.subr ==== //depot/projects/mjexp/etc/rc.d/pfsync#3 (text+ko) ==== @@ -1,10 +1,10 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/pfsync,v 1.2 2006/12/31 10:37:18 yar Exp $ +# $FreeBSD: src/etc/rc.d/pfsync,v 1.3 2007/04/02 22:53:07 des Exp $ # # PROVIDE: pfsync -# REQUIRE: root mountcritlocal netif +# REQUIRE: root FILESYSTEMS netif # KEYWORD: nojail . /etc/rc.subr ==== //depot/projects/mjexp/etc/rc.d/power_profile#3 (text+ko) ==== @@ -5,11 +5,11 @@ # # Arguments: 0x00 (AC offline, economy) or 0x01 (AC online, performance) # -# $FreeBSD: src/etc/rc.d/power_profile,v 1.10 2007/01/07 21:53:42 njl Exp $ +# $FreeBSD: src/etc/rc.d/power_profile,v 1.11 2007/04/02 22:53:07 des Exp $ # # PROVIDE: power_profile -# REQUIRE: mountcritlocal syslogd +# REQUIRE: FILESYSTEMS syslogd # KEYWORD: nojail nostart . /etc/rc.subr ==== //depot/projects/mjexp/etc/rc.d/ppp#3 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/ppp,v 1.12 2006/10/26 00:29:43 avatar Exp $ +# $FreeBSD: src/etc/rc.d/ppp,v 1.13 2007/03/31 09:03:38 mtm Exp $ # # PROVIDE: ppp @@ -12,10 +12,10 @@ name="ppp" rcvar=`set_rcvar` command="/usr/sbin/${name}" -start_precmd="ppp_precmd" -start_postcmd="ppp_postcmd" +start_precmd="ppp_prestart" +start_postcmd="ppp_poststart" -ppp_precmd() +ppp_prestart() { # Establish ppp mode. # @@ -38,7 +38,7 @@ rc_flags="$rc_flags ${ppp_profile}" } -ppp_postcmd() +ppp_poststart() { # Re-Sync ipfilter and pf so they pick up any new network interfaces # ==== //depot/projects/mjexp/etc/rc.d/var#3 (text+ko) ==== @@ -24,11 +24,11 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/etc/rc.d/var,v 1.41 2006/12/30 22:53:20 yar Exp $ +# $FreeBSD: src/etc/rc.d/var,v 1.42 2007/04/02 22:53:07 des Exp $ # # PROVIDE: var -# REQUIRE: mountcritlocal +# REQUIRE: FILESYSTEMS . /etc/rc.subr ==== //depot/projects/mjexp/etc/rc.firewall#4 (text+ko) ==== @@ -23,11 +23,11 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/etc/rc.firewall,v 1.50 2006/12/29 21:59:17 piso Exp $ +# $FreeBSD: src/etc/rc.firewall,v 1.51 2007/04/02 14:02:06 rwatson Exp $ # # -# Setup system for firewall service. +# Setup system for IPFW(4) firewall service. # # Suck in the configuration variables. ==== //depot/projects/mjexp/lib/libarchive/archive.h.in#9 (text+ko) ==== @@ -22,7 +22,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/lib/libarchive/archive.h.in,v 1.40 2007/03/11 10:29:52 kientzle Exp $ + * $FreeBSD: src/lib/libarchive/archive.h.in,v 1.41 2007/04/03 05:34:36 kientzle Exp $ */ #ifndef ARCHIVE_H_INCLUDED @@ -177,6 +177,9 @@ #define ARCHIVE_FORMAT_ISO9660_ROCKRIDGE (ARCHIVE_FORMAT_ISO9660 | 1) #define ARCHIVE_FORMAT_ZIP 0x50000 #define ARCHIVE_FORMAT_EMPTY 0x60000 +#define ARCHIVE_FORMAT_AR 0x70000 +#define ARCHIVE_FORMAT_AR_SVR4 (ARCHIVE_FORMAT_AR | 1) +#define ARCHIVE_FORMAT_AR_BSD (ARCHIVE_FORMAT_AR | 2) /*- * Basic outline for reading an archive: @@ -206,6 +209,7 @@ int archive_read_support_compression_none(struct archive *); int archive_read_support_format_all(struct archive *); +int archive_read_support_format_ar(struct archive *); int archive_read_support_format_cpio(struct archive *); int archive_read_support_format_empty(struct archive *); int archive_read_support_format_gnutar(struct archive *); @@ -374,6 +378,8 @@ int archive_write_set_format_by_name(struct archive *, const char *name); /* To minimize link pollution, use one or more of the following. */ +int archive_write_set_format_ar_bsd(struct archive *); +int archive_write_set_format_ar_svr4(struct archive *); int archive_write_set_format_cpio(struct archive *); /* TODO: int archive_write_set_format_old_tar(struct archive *); */ int archive_write_set_format_pax(struct archive *); ==== //depot/projects/mjexp/lib/libarchive/archive_check_magic.c#4 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_check_magic.c,v 1.7 2007/01/09 08:05:54 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_check_magic.c,v 1.8 2007/04/02 00:15:45 kientzle Exp $"); #ifdef HAVE_SYS_TYPES_H #include @@ -72,9 +72,9 @@ static void -write_all_states(int states) +write_all_states(unsigned int states) { - unsigned lowbit; + unsigned int lowbit; /* A trick for computing the lowest set bit. */ while ((lowbit = states & (-states)) != 0) { @@ -92,8 +92,8 @@ * the libarchive API. */ void -__archive_check_magic(struct archive *a, unsigned magic, unsigned state, - const char *function) +__archive_check_magic(struct archive *a, unsigned int magic, + unsigned int state, const char *function) { if (a->magic != magic) { errmsg("INTERNAL ERROR: Function "); ==== //depot/projects/mjexp/lib/libarchive/archive_private.h#7 (text+ko) ==== @@ -22,7 +22,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/lib/libarchive/archive_private.h,v 1.28 2007/03/03 07:37:36 kientzle Exp $ + * $FreeBSD: src/lib/libarchive/archive_private.h,v 1.29 2007/04/02 00:15:45 kientzle Exp $ */ #ifndef ARCHIVE_PRIVATE_H_INCLUDED @@ -63,8 +63,8 @@ * ridiculous time, or the client passes us an invalid * pointer, these values allow me to catch that. */ - unsigned magic; - unsigned state; + unsigned int magic; + unsigned int state; /* * Some public API functions depend on the "real" type of the @@ -89,8 +89,8 @@ }; /* Check magic value and state; exit if it isn't valid. */ -void __archive_check_magic(struct archive *, unsigned magic, - unsigned state, const char *func); +void __archive_check_magic(struct archive *, unsigned int magic, + unsigned int state, const char *func); void __archive_errx(int retvalue, const char *msg); ==== //depot/projects/mjexp/lib/libarchive/archive_read.c#9 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_read.c,v 1.30 2007/03/03 07:37:36 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_read.c,v 1.32 2007/04/02 00:41:37 kientzle Exp $"); #ifdef HAVE_ERRNO_H #include @@ -55,6 +55,7 @@ static int choose_decompressor(struct archive_read *, const void*, size_t); static int choose_format(struct archive_read *); +static off_t dummy_skip(struct archive_read *, off_t); /* * Allocate, initialize and return a struct archive object. @@ -181,16 +182,23 @@ a->client_data = client_data; /* Select a decompression routine. */ - high_bidder = choose_decompressor(a, buffer, bytes_read); + high_bidder = choose_decompressor(a, buffer, (size_t)bytes_read); if (high_bidder < 0) return (ARCHIVE_FATAL); /* Initialize decompression routine with the first block of data. */ - e = (a->decompressors[high_bidder].init)(a, buffer, bytes_read); + e = (a->decompressors[high_bidder].init)(a, buffer, (size_t)bytes_read); if (e == ARCHIVE_OK) a->archive.state = ARCHIVE_STATE_HEADER; + /* + * If the decompressor didn't register a skip function, provide a + * dummy compression-layer skip function. + */ + if (a->compression_skip == NULL) + a->compression_skip = dummy_skip; + return (e); } @@ -244,6 +252,38 @@ } /* + * Dummy skip function, for use if the compression layer doesn't provide + * one: This code just reads data and discards it. + */ +static off_t +dummy_skip(struct archive_read * a, off_t request) +{ + const void * dummy_buffer; + ssize_t bytes_read; + off_t bytes_skipped; + + for (bytes_skipped = 0; request > 0;) { + bytes_read = (a->compression_read_ahead)(a, &dummy_buffer, 1); + if (bytes_read < 0) + return (bytes_read); + if (bytes_read == 0) { + /* Premature EOF. */ + archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC, + "Truncated input file (need to skip %jd bytes)", + (intmax_t)request); + return (ARCHIVE_FATAL); + } + if (bytes_read > request) + bytes_read = request; + (a->compression_read_consume)(a, bytes_read); + request -= bytes_read; + bytes_skipped += bytes_read; + } + + return (bytes_skipped); +} + +/* * Read header of next entry. */ int @@ -399,6 +439,7 @@ { struct archive_read *a = (struct archive_read *)_a; char *dest; + const void *read_buf; size_t bytes_read; >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Apr 3 23:54:32 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5BDCD16A407; Tue, 3 Apr 2007 23:54:32 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 27E6116A401 for ; Tue, 3 Apr 2007 23:54:32 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 154D513C44B for ; Tue, 3 Apr 2007 23:54:32 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l33NsVf9060665 for ; Tue, 3 Apr 2007 23:54:31 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l33NsSIW060656 for perforce@freebsd.org; Tue, 3 Apr 2007 23:54:28 GMT (envelope-from kmacy@freebsd.org) Date: Tue, 3 Apr 2007 23:54:28 GMT Message-Id: <200704032354.l33NsSIW060656@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 117310 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 03 Apr 2007 23:54:32 -0000 http://perforce.freebsd.org/chv.cgi?CH=117310 Change 117310 by kmacy@kmacy_vt-x:opentoe_init on 2007/04/03 23:53:39 IFC Affected files ... .. //depot/projects/opentoe/Makefile#2 integrate .. //depot/projects/opentoe/UPDATING#2 integrate .. //depot/projects/opentoe/etc/defaults/rc.conf#3 integrate .. //depot/projects/opentoe/etc/rc#2 integrate .. //depot/projects/opentoe/etc/rc.d/FILESYSTEMS#1 branch .. //depot/projects/opentoe/etc/rc.d/Makefile#2 integrate .. //depot/projects/opentoe/etc/rc.d/addswap#2 integrate .. //depot/projects/opentoe/etc/rc.d/adjkerntz#2 integrate .. //depot/projects/opentoe/etc/rc.d/bootconf.sh#2 integrate .. //depot/projects/opentoe/etc/rc.d/cleanvar#2 integrate .. //depot/projects/opentoe/etc/rc.d/geli2#2 integrate .. //depot/projects/opentoe/etc/rc.d/hostname#2 integrate .. //depot/projects/opentoe/etc/rc.d/ip6addrctl#2 integrate .. //depot/projects/opentoe/etc/rc.d/ip6fw#2 integrate .. //depot/projects/opentoe/etc/rc.d/ipfilter#2 integrate .. //depot/projects/opentoe/etc/rc.d/ipfw#2 integrate .. //depot/projects/opentoe/etc/rc.d/ipmon#2 integrate .. //depot/projects/opentoe/etc/rc.d/ipsec#2 integrate .. //depot/projects/opentoe/etc/rc.d/isdnd#3 integrate .. //depot/projects/opentoe/etc/rc.d/kldxref#2 integrate .. //depot/projects/opentoe/etc/rc.d/mountcritremote#2 integrate .. //depot/projects/opentoe/etc/rc.d/netif#2 integrate .. //depot/projects/opentoe/etc/rc.d/pf#2 integrate .. //depot/projects/opentoe/etc/rc.d/pflog#2 integrate .. //depot/projects/opentoe/etc/rc.d/pfsync#2 integrate .. //depot/projects/opentoe/etc/rc.d/power_profile#2 integrate .. //depot/projects/opentoe/etc/rc.d/ppp#2 integrate .. //depot/projects/opentoe/etc/rc.d/var#2 integrate .. //depot/projects/opentoe/etc/rc.firewall#2 integrate .. //depot/projects/opentoe/lib/libarchive/archive.h.in#2 integrate .. //depot/projects/opentoe/lib/libarchive/archive_check_magic.c#2 integrate .. //depot/projects/opentoe/lib/libarchive/archive_private.h#2 integrate .. //depot/projects/opentoe/lib/libarchive/archive_read.c#2 integrate .. //depot/projects/opentoe/lib/libarchive/archive_read_data_into_fd.c#2 integrate .. //depot/projects/opentoe/lib/libarchive/archive_read_open_memory.c#2 integrate .. //depot/projects/opentoe/lib/libarchive/archive_read_private.h#2 integrate .. //depot/projects/opentoe/lib/libarchive/archive_read_support_format_ar.c#1 branch .. //depot/projects/opentoe/lib/libarchive/archive_read_support_format_iso9660.c#2 integrate .. //depot/projects/opentoe/lib/libarchive/archive_read_support_format_tar.c#2 integrate .. //depot/projects/opentoe/lib/libarchive/archive_write_disk.c#3 integrate .. //depot/projects/opentoe/lib/libarchive/archive_write_set_format_ar.c#1 branch .. //depot/projects/opentoe/lib/libarchive/archive_write_set_format_ustar.c#2 integrate .. //depot/projects/opentoe/lib/libarchive/libarchive-formats.5#2 integrate .. //depot/projects/opentoe/lib/libarchive/test/test_read_format_ar.c#1 branch .. //depot/projects/opentoe/lib/libarchive/test/test_write_format_ar.c#1 branch .. //depot/projects/opentoe/sbin/geom/class/journal/geom_journal.c#2 integrate .. //depot/projects/opentoe/share/man/man4/if_bridge.4#2 integrate .. //depot/projects/opentoe/share/man/man4/man4.i386/Makefile#2 integrate .. //depot/projects/opentoe/share/man/man4/man4.i386/acpi_aiboost.4#1 branch .. //depot/projects/opentoe/share/man/man7/hier.7#2 integrate .. //depot/projects/opentoe/share/man/man9/Makefile#3 integrate .. //depot/projects/opentoe/share/man/man9/sx.9#3 integrate .. //depot/projects/opentoe/share/man/man9/vhold.9#2 integrate .. //depot/projects/opentoe/share/misc/Makefile#3 integrate .. //depot/projects/opentoe/share/misc/committers-doc.dot#2 integrate .. //depot/projects/opentoe/share/misc/committers-ports.dot#2 integrate .. //depot/projects/opentoe/share/misc/committers-src.dot#2 integrate .. //depot/projects/opentoe/sys/amd64/linux32/linux32_sysvec.c#3 integrate .. //depot/projects/opentoe/sys/arm/at91/uart_cpu_at91rm9200usart.c#2 integrate .. //depot/projects/opentoe/sys/arm/at91/uart_dev_at91usart.c#2 integrate .. //depot/projects/opentoe/sys/arm/sa11x0/uart_cpu_sa1110.c#2 integrate .. //depot/projects/opentoe/sys/arm/sa11x0/uart_dev_sa1110.c#2 integrate .. //depot/projects/opentoe/sys/arm/xscale/i80321/uart_cpu_i80321.c#2 integrate .. //depot/projects/opentoe/sys/arm/xscale/ixp425/uart_cpu_ixp425.c#2 integrate .. //depot/projects/opentoe/sys/boot/arm/at91/boot2/boot2.c#3 integrate .. //depot/projects/opentoe/sys/compat/linux/linux_emul.c#2 integrate .. //depot/projects/opentoe/sys/compat/linux/linux_emul.h#2 integrate .. //depot/projects/opentoe/sys/conf/NOTES#3 integrate .. //depot/projects/opentoe/sys/conf/options#4 integrate .. //depot/projects/opentoe/sys/dev/acpica/acpi_ec.c#4 integrate .. //depot/projects/opentoe/sys/dev/ahb/ahb.c#2 integrate .. //depot/projects/opentoe/sys/dev/arcmsr/arcmsr.c#2 integrate .. //depot/projects/opentoe/sys/dev/bge/if_bge.c#2 integrate .. //depot/projects/opentoe/sys/dev/ed/if_ed_pccard.c#2 integrate .. //depot/projects/opentoe/sys/dev/ipmi/ipmi_pci.c#2 integrate .. //depot/projects/opentoe/sys/dev/isp/isp_freebsd.c#2 integrate .. //depot/projects/opentoe/sys/dev/isp/isp_freebsd.h#2 integrate .. //depot/projects/opentoe/sys/dev/isp/isp_library.c#3 integrate .. //depot/projects/opentoe/sys/dev/isp/isp_library.h#3 integrate .. //depot/projects/opentoe/sys/dev/isp/isp_pci.c#3 integrate .. //depot/projects/opentoe/sys/dev/isp/isp_sbus.c#3 integrate .. //depot/projects/opentoe/sys/dev/mxge/if_mxge.c#3 integrate .. //depot/projects/opentoe/sys/dev/pci/pci.c#3 integrate .. //depot/projects/opentoe/sys/dev/pci/pci_pci.c#2 integrate .. //depot/projects/opentoe/sys/dev/pci/pcireg.h#2 integrate .. //depot/projects/opentoe/sys/dev/sk/if_sk.c#2 integrate .. //depot/projects/opentoe/sys/dev/sk/if_skreg.h#2 integrate .. //depot/projects/opentoe/sys/dev/sound/midi/midi.c#2 integrate .. //depot/projects/opentoe/sys/dev/sound/pcm/channel.c#2 integrate .. //depot/projects/opentoe/sys/dev/sound/pcm/mixer.c#2 integrate .. //depot/projects/opentoe/sys/dev/sound/usb/uaudio.c#3 integrate .. //depot/projects/opentoe/sys/dev/uart/uart.h#2 integrate .. //depot/projects/opentoe/sys/dev/uart/uart_bus.h#2 integrate .. //depot/projects/opentoe/sys/dev/uart/uart_core.c#3 integrate .. //depot/projects/opentoe/sys/dev/uart/uart_cpu.h#2 integrate .. //depot/projects/opentoe/sys/dev/uart/uart_cpu_amd64.c#2 integrate .. //depot/projects/opentoe/sys/dev/uart/uart_cpu_i386.c#2 integrate .. //depot/projects/opentoe/sys/dev/uart/uart_cpu_ia64.c#2 integrate .. //depot/projects/opentoe/sys/dev/uart/uart_cpu_pc98.c#2 integrate .. //depot/projects/opentoe/sys/dev/uart/uart_cpu_powerpc.c#2 integrate .. //depot/projects/opentoe/sys/dev/uart/uart_cpu_sparc64.c#2 integrate .. //depot/projects/opentoe/sys/dev/uart/uart_dev_ns8250.c#3 integrate .. //depot/projects/opentoe/sys/dev/uart/uart_dev_sab82532.c#2 integrate .. //depot/projects/opentoe/sys/dev/uart/uart_dev_z8530.c#2 integrate .. //depot/projects/opentoe/sys/dev/uart/uart_kbd_sun.c#2 integrate .. //depot/projects/opentoe/sys/dev/uart/uart_subr.c#2 integrate .. //depot/projects/opentoe/sys/dev/usb/if_aue.c#2 integrate .. //depot/projects/opentoe/sys/dev/usb/if_axe.c#2 integrate .. //depot/projects/opentoe/sys/dev/usb/if_ural.c#2 integrate .. //depot/projects/opentoe/sys/dev/usb/ubser.c#2 integrate .. //depot/projects/opentoe/sys/gnu/fs/xfs/FreeBSD/support/mrlock.c#2 integrate .. //depot/projects/opentoe/sys/gnu/fs/xfs/FreeBSD/support/mrlock.h#2 integrate .. //depot/projects/opentoe/sys/i386/acpica/acpi_machdep.c#3 integrate .. //depot/projects/opentoe/sys/i386/linux/linux_sysvec.c#2 integrate .. //depot/projects/opentoe/sys/i4b/layer1/ifpnp/i4b_ifpnp_avm.c#2 integrate .. //depot/projects/opentoe/sys/i4b/layer1/ihfc/i4b_ihfc_pnp.c#2 integrate .. //depot/projects/opentoe/sys/i4b/layer1/isic/i4b_avm_a1.c#2 integrate .. //depot/projects/opentoe/sys/i4b/layer1/isic/i4b_isic_pnp.c#2 integrate .. //depot/projects/opentoe/sys/i4b/layer1/isic/i4b_itk_ix1.c#2 integrate .. //depot/projects/opentoe/sys/i4b/layer1/isic/i4b_tel_s016.c#2 integrate .. //depot/projects/opentoe/sys/i4b/layer1/isic/i4b_tel_s0163.c#2 integrate .. //depot/projects/opentoe/sys/kern/kern_mutex.c#3 integrate .. //depot/projects/opentoe/sys/kern/kern_sx.c#3 integrate .. //depot/projects/opentoe/sys/kern/subr_lock.c#5 integrate .. //depot/projects/opentoe/sys/kern/subr_witness.c#3 integrate .. //depot/projects/opentoe/sys/kern/uipc_syscalls.c#2 integrate .. //depot/projects/opentoe/sys/kern/vfs_mount.c#3 integrate .. //depot/projects/opentoe/sys/kern/vfs_subr.c#3 integrate .. //depot/projects/opentoe/sys/kern/vfs_syscalls.c#3 integrate .. //depot/projects/opentoe/sys/modules/cryptodev/Makefile#2 integrate .. //depot/projects/opentoe/sys/netatm/atm_if.c#2 integrate .. //depot/projects/opentoe/sys/netinet/ip_fw2.c#2 integrate .. //depot/projects/opentoe/sys/netinet/sctp_asconf.c#2 integrate .. //depot/projects/opentoe/sys/netinet/sctp_bsd_addr.h#2 integrate .. //depot/projects/opentoe/sys/netinet/sctp_constants.h#3 integrate .. //depot/projects/opentoe/sys/netinet/sctp_indata.c#4 integrate .. //depot/projects/opentoe/sys/netinet/sctp_input.c#4 integrate .. //depot/projects/opentoe/sys/netinet/sctp_os_bsd.h#4 integrate .. //depot/projects/opentoe/sys/netinet/sctp_output.c#4 integrate .. //depot/projects/opentoe/sys/netinet/sctp_output.h#2 integrate .. //depot/projects/opentoe/sys/netinet/sctp_pcb.c#4 integrate .. //depot/projects/opentoe/sys/netinet/sctp_pcb.h#4 integrate .. //depot/projects/opentoe/sys/netinet/sctp_sysctl.c#3 integrate .. //depot/projects/opentoe/sys/netinet/sctp_sysctl.h#3 integrate .. //depot/projects/opentoe/sys/netinet/sctp_timer.c#3 integrate .. //depot/projects/opentoe/sys/netinet/sctp_uio.h#3 integrate .. //depot/projects/opentoe/sys/netinet/sctp_usrreq.c#4 integrate .. //depot/projects/opentoe/sys/netinet/sctputil.c#4 integrate .. //depot/projects/opentoe/sys/netinet6/in6_src.c#2 integrate .. //depot/projects/opentoe/sys/netinet6/sctp6_usrreq.c#4 integrate .. //depot/projects/opentoe/sys/nfsserver/nfs_srvsubs.c#2 integrate .. //depot/projects/opentoe/sys/powerpc/conf/GENERIC#2 integrate .. //depot/projects/opentoe/sys/powerpc/conf/NOTES#2 integrate .. //depot/projects/opentoe/sys/powerpc/powermac/uninorth.c#2 integrate .. //depot/projects/opentoe/sys/powerpc/powerpc/extintr.c#2 delete .. //depot/projects/opentoe/sys/sys/_sx.h#1 branch .. //depot/projects/opentoe/sys/sys/elf_common.h#2 integrate .. //depot/projects/opentoe/sys/sys/link_elf.h#2 integrate .. //depot/projects/opentoe/sys/sys/lock.h#4 integrate .. //depot/projects/opentoe/sys/sys/lock_profile.h#4 integrate .. //depot/projects/opentoe/sys/sys/mount.h#3 integrate .. //depot/projects/opentoe/sys/sys/mutex.h#3 integrate .. //depot/projects/opentoe/sys/sys/sleepqueue.h#2 integrate .. //depot/projects/opentoe/sys/sys/sx.h#3 integrate .. //depot/projects/opentoe/sys/sys/sysent.h#2 integrate .. //depot/projects/opentoe/sys/sys/systm.h#3 integrate .. //depot/projects/opentoe/sys/sys/vnode.h#2 integrate .. //depot/projects/opentoe/tools/regression/sockets/accept_fd_leak/accept_fd_leak.c#2 integrate .. //depot/projects/opentoe/tools/regression/sockets/socketpair/socketpair.c#2 integrate .. //depot/projects/opentoe/tools/regression/usr.bin/sed/multitest.t#2 integrate .. //depot/projects/opentoe/tools/regression/usr.bin/sed/regress.b2a.out#1 branch .. //depot/projects/opentoe/tools/regression/usr.bin/sed/regress.c0.out#1 branch .. //depot/projects/opentoe/tools/regression/usr.bin/sed/regress.c1.out#1 branch .. //depot/projects/opentoe/tools/regression/usr.bin/sed/regress.c2.out#1 branch .. //depot/projects/opentoe/tools/regression/usr.bin/sed/regress.c3.out#1 branch .. //depot/projects/opentoe/tools/regression/usr.bin/sed/regress.multitest.out/54_5.3#2 integrate .. //depot/projects/opentoe/tools/regression/usr.bin/sed/regress.sh#2 integrate .. //depot/projects/opentoe/usr.bin/calendar/calendars/calendar.freebsd#2 integrate .. //depot/projects/opentoe/usr.bin/sed/process.c#2 integrate .. //depot/projects/opentoe/usr.bin/tar/test/test-basic.sh#2 integrate .. //depot/projects/opentoe/usr.bin/tar/write.c#3 integrate .. //depot/projects/opentoe/usr.sbin/ntp/doc/ntpd.8#2 integrate .. //depot/projects/opentoe/usr.sbin/pstat/pstat.8#2 integrate .. //depot/projects/opentoe/usr.sbin/pstat/pstat.c#2 integrate .. //depot/projects/opentoe/usr.sbin/rpc.statd/procs.c#2 integrate .. //depot/projects/opentoe/usr.sbin/sysinstall/index.c#2 integrate Differences ... ==== //depot/projects/opentoe/Makefile#2 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile,v 1.339 2006/11/28 01:03:29 ru Exp $ +# $FreeBSD: src/Makefile,v 1.340 2007/04/02 21:32:44 marcel Exp $ # # The user-driven targets are: # @@ -261,12 +261,14 @@ # existing system is. # .if make(universe) +TARGETS?=amd64 arm i386 ia64 pc98 powerpc sparc64 sun4v + universe: universe_prologue universe_prologue: @echo "--------------------------------------------------------------" @echo ">>> make universe started on ${STARTTIME}" @echo "--------------------------------------------------------------" -.for target in amd64 arm i386 ia64 pc98 powerpc sparc64 sun4v +.for target in ${TARGETS} KERNCONFS!= cd ${.CURDIR}/sys/${target}/conf && \ find [A-Z]*[A-Z] -type f -maxdepth 0 \ ! -name DEFAULTS ! -name LINT ==== //depot/projects/opentoe/UPDATING#2 (text+ko) ==== @@ -24,8 +24,9 @@ 20070302: Firmwares for ipw(4) and iwi(4) are now included in the base tree. In order to use them one must agree to the respective LICENSE in - share/doc/legal and define legal..license_ack=1 via - loader.conf(5) or kenv(1). + share/doc/legal and define legal.intel_.license_ack=1 via + loader.conf(5) or kenv(1). Make sure to deinstall the now + deprecated modules from the respective firmware ports. 20070228: The name resolution/mapping functions addr2ascii(3) and ascii2addr(3) @@ -757,4 +758,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.482 2007/03/02 14:56:15 flz Exp $ +$FreeBSD: src/UPDATING,v 1.484 2007/04/03 10:04:54 brueffer Exp $ ==== //depot/projects/opentoe/etc/defaults/rc.conf#3 (text+ko) ==== @@ -15,7 +15,7 @@ # For a more detailed explanation of all the rc.conf variables, please # refer to the rc.conf(5) manual page. # -# $FreeBSD: src/etc/defaults/rc.conf,v 1.308 2007/03/29 21:44:23 ache Exp $ +# $FreeBSD: src/etc/defaults/rc.conf,v 1.309 2007/04/02 22:53:06 des Exp $ ############################################################## ### Important initial Boot-time options #################### @@ -24,7 +24,7 @@ rc_debug="NO" # Set to YES to enable debugging output from rc.d rc_info="NO" # Enables display of informational messages at boot. rcshutdown_timeout="30" # Seconds to wait before terminating rc.shutdown -early_late_divider="mountcritlocal" # Script that separates early/late +early_late_divider="FILESYSTEM" # Script that separates early/late # stages of the boot process. Make sure you know # the ramifications if you change this. # See rc.conf(5) for more details. ==== //depot/projects/opentoe/etc/rc#2 (text+ko) ==== @@ -25,7 +25,7 @@ # SUCH DAMAGE. # # @(#)rc 5.27 (Berkeley) 6/5/91 -# $FreeBSD: src/etc/rc,v 1.339 2006/02/20 21:54:30 dougb Exp $ +# $FreeBSD: src/etc/rc,v 1.340 2007/04/02 22:53:06 des Exp $ # # System startup script run by init on autoboot @@ -75,7 +75,7 @@ skip="-s nostart" if [ `/sbin/sysctl -n security.jail.jailed` -eq 1 ]; then skip="$skip -s nojail" - if [ "$early_late_divider" = "mountcritlocal" ]; then + if [ "$early_late_divider" = "FILESYSTEMS" ]; then early_late_divider=NETWORKING fi fi ==== //depot/projects/opentoe/etc/rc.d/Makefile#2 (text+ko) ==== @@ -1,9 +1,9 @@ # $NetBSD: Makefile,v 1.16 2001/01/14 15:37:22 minoura Exp $ -# $FreeBSD: src/etc/rc.d/Makefile,v 1.78 2006/10/15 14:19:06 ceri Exp $ +# $FreeBSD: src/etc/rc.d/Makefile,v 1.79 2007/04/02 22:53:07 des Exp $ .include -FILES= DAEMON LOGIN NETWORKING SERVERS \ +FILES= DAEMON FILESYSTEMS LOGIN NETWORKING SERVERS \ abi accounting addswap adjkerntz amd \ apm apmd archdep atm1 atm2 atm3 auditd auto_linklocal \ bgfsck bluetooth bootparams bridge bsnmpd bthidd \ ==== //depot/projects/opentoe/etc/rc.d/addswap#2 (text+ko) ==== @@ -2,11 +2,11 @@ # # Add additional swap files # -# $FreeBSD: src/etc/rc.d/addswap,v 1.6 2006/01/17 19:29:31 philip Exp $ +# $FreeBSD: src/etc/rc.d/addswap,v 1.7 2007/04/02 22:53:07 des Exp $ # # PROVIDE: addswap -# REQUIRE: mountcritlocal +# REQUIRE: FILESYSTEMS # BEFORE: sysctl # KEYWORD: nojail ==== //depot/projects/opentoe/etc/rc.d/adjkerntz#2 (text+ko) ==== @@ -1,10 +1,10 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/adjkerntz,v 1.5 2004/10/07 13:55:25 mtm Exp $ +# $FreeBSD: src/etc/rc.d/adjkerntz,v 1.6 2007/04/02 22:53:07 des Exp $ # # PROVIDE: adjkerntz -# REQUIRE: mountcritlocal random +# REQUIRE: FILESYSTEMS random # BEFORE: netif # KEYWORD: nojail ==== //depot/projects/opentoe/etc/rc.d/bootconf.sh#2 (text+ko) ==== @@ -1,11 +1,11 @@ #!/bin/sh # # $NetBSD: bootconf.sh,v 1.5 2002/03/25 03:22:10 wiz Exp $ -# $FreeBSD: src/etc/rc.d/bootconf.sh,v 1.5 2006/12/30 22:53:20 yar Exp $ +# $FreeBSD: src/etc/rc.d/bootconf.sh,v 1.6 2007/04/02 22:53:07 des Exp $ # # PROVIDE: bootconf -# REQUIRE: mountcritlocal +# REQUIRE: FILESYSTEMS bootconf_start() { ==== //depot/projects/opentoe/etc/rc.d/cleanvar#2 (text+ko) ==== @@ -1,10 +1,10 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/cleanvar,v 1.11 2005/12/19 10:57:00 dougb Exp $ +# $FreeBSD: src/etc/rc.d/cleanvar,v 1.12 2007/04/02 22:53:07 des Exp $ # # PROVIDE: cleanvar -# REQUIRE: mountcritlocal var +# REQUIRE: FILESYSTEMS var . /etc/rc.subr ==== //depot/projects/opentoe/etc/rc.d/geli2#2 (text+ko) ==== @@ -24,11 +24,11 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/etc/rc.d/geli2,v 1.1 2005/08/14 18:02:21 pjd Exp $ +# $FreeBSD: src/etc/rc.d/geli2,v 1.2 2007/04/02 22:53:07 des Exp $ # # PROVIDE: geli2 -# REQUIRE: mountcritlocal +# REQUIRE: FILESYSTEMS # KEYWORD: nojail . /etc/rc.subr ==== //depot/projects/opentoe/etc/rc.d/hostname#2 (text+ko) ==== @@ -23,11 +23,11 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/etc/rc.d/hostname,v 1.11 2007/02/15 06:46:33 yar Exp $ +# $FreeBSD: src/etc/rc.d/hostname,v 1.12 2007/04/02 22:53:07 des Exp $ # # PROVIDE: hostname -# REQUIRE: mountcritlocal +# REQUIRE: FILESYSTEMS # BEFORE: netif . /etc/rc.subr ==== //depot/projects/opentoe/etc/rc.d/ip6addrctl#2 (text+ko) ==== @@ -1,10 +1,10 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/ip6addrctl,v 1.4 2004/10/07 13:55:26 mtm Exp $ +# $FreeBSD: src/etc/rc.d/ip6addrctl,v 1.5 2007/04/02 22:53:07 des Exp $ # # PROVIDE: ip6addrctl -# REQUIRE: mountcritlocal netif +# REQUIRE: FILESYSTEMS netif # BEFORE: network_ipv6 # KEYWORD: nojail ==== //depot/projects/opentoe/etc/rc.d/ip6fw#2 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/ip6fw,v 1.8 2006/12/31 10:37:18 yar Exp $ +# $FreeBSD: src/etc/rc.d/ip6fw,v 1.9 2007/04/02 15:38:53 mtm Exp $ # # PROVIDE: ip6fw @@ -26,7 +26,7 @@ # Load rules # if [ -r "${ipv6_firewall_script}" ]; then - . "${ipv6_firewall_script}" + /bin/sh "${ipv6_firewall_script}" echo 'IPv6 Firewall rules loaded.' elif [ "`ipfw show 65535`" = "65535 deny ip from any to any" ]; then warn 'IPv6 firewall rules have not been loaded. Default' \ ==== //depot/projects/opentoe/etc/rc.d/ipfilter#2 (text+ko) ==== @@ -1,11 +1,11 @@ #!/bin/sh # # $NetBSD: ipfilter,v 1.10 2001/02/28 17:03:50 lukem Exp $ -# $FreeBSD: src/etc/rc.d/ipfilter,v 1.26 2006/12/31 10:37:18 yar Exp $ +# $FreeBSD: src/etc/rc.d/ipfilter,v 1.27 2007/04/02 22:53:07 des Exp $ # # PROVIDE: ipfilter -# REQUIRE: root mountcritlocal +# REQUIRE: root FILESYSTEMS # BEFORE: netif # KEYWORD: nojail ==== //depot/projects/opentoe/etc/rc.d/ipfw#2 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/ipfw,v 1.14 2006/12/31 10:37:18 yar Exp $ +# $FreeBSD: src/etc/rc.d/ipfw,v 1.15 2007/04/02 15:38:53 mtm Exp $ # # PROVIDE: ipfw @@ -26,7 +26,7 @@ if [ -f /etc/rc.d/natd ] ; then /etc/rc.d/natd start fi - . "${firewall_script}" + /bin/sh "${firewall_script}" echo 'Firewall rules loaded.' elif [ "`ipfw list 65535`" = "65535 deny ip from any to any" ]; then echo 'Warning: kernel has firewall functionality, but' \ ==== //depot/projects/opentoe/etc/rc.d/ipmon#2 (text+ko) ==== @@ -1,11 +1,11 @@ #!/bin/sh # # $NetBSD: ipmon,v 1.9 2002/04/18 05:02:01 lukem Exp $ -# $FreeBSD: src/etc/rc.d/ipmon,v 1.14 2005/10/28 16:55:38 yar Exp $ +# $FreeBSD: src/etc/rc.d/ipmon,v 1.15 2007/04/02 22:53:07 des Exp $ # # PROVIDE: ipmon -# REQUIRE: mountcritlocal hostname sysctl cleanvar ipfilter +# REQUIRE: FILESYSTEMS hostname sysctl cleanvar ipfilter # BEFORE: SERVERS # KEYWORD: nojail ==== //depot/projects/opentoe/etc/rc.d/ipsec#2 (text+ko) ==== @@ -1,11 +1,11 @@ #!/bin/sh # # $NetBSD: ipsec,v 1.7 2002/03/22 04:33:58 thorpej Exp $ -# $FreeBSD: src/etc/rc.d/ipsec,v 1.16 2006/01/24 15:16:55 pjd Exp $ +# $FreeBSD: src/etc/rc.d/ipsec,v 1.17 2007/04/02 22:53:07 des Exp $ # # PROVIDE: ipsec -# REQUIRE: root mountcritlocal +# REQUIRE: root FILESYSTEMS # BEFORE: DAEMON mountcritremote # KEYWORD: nojail ==== //depot/projects/opentoe/etc/rc.d/isdnd#3 (text+ko) ==== @@ -1,13 +1,13 @@ #!/bin/sh # # $NetBSD: isdnd,v 1.9 2002/04/10 23:37:13 martin Exp $ -# $FreeBSD: src/etc/rc.d/isdnd,v 1.22 2007/03/30 18:36:45 mtm Exp $ +# $FreeBSD: src/etc/rc.d/isdnd,v 1.23 2007/04/02 22:53:07 des Exp $ # # Mostly based on original script (/etc/rc.isdn) written by Hellmuth Michaelis # # PROVIDE: isdnd -# REQUIRE: netif mountcritlocal cleanvar +# REQUIRE: netif FILESYSTEMS cleanvar # KEYWORD: nojail . /etc/rc.subr ==== //depot/projects/opentoe/etc/rc.d/kldxref#2 (text+ko) ==== @@ -1,10 +1,10 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/kldxref,v 1.4 2004/10/07 13:55:26 mtm Exp $ +# $FreeBSD: src/etc/rc.d/kldxref,v 1.5 2007/04/02 22:53:07 des Exp $ # # PROVIDE: kldxref -# REQUIRE: root mountcritlocal +# REQUIRE: root FILESYSTEMS # BEFORE: netif # KEYWORD: nojail ==== //depot/projects/opentoe/etc/rc.d/mountcritremote#2 (text+ko) ==== @@ -1,11 +1,11 @@ #!/bin/sh # # $NetBSD: mountcritremote,v 1.7 2002/04/29 12:29:53 lukem Exp $ -# $FreeBSD: src/etc/rc.d/mountcritremote,v 1.14 2006/12/31 10:37:18 yar Exp $ +# $FreeBSD: src/etc/rc.d/mountcritremote,v 1.15 2007/04/02 22:53:07 des Exp $ # # PROVIDE: mountcritremote -# REQUIRE: NETWORKING root mountcritlocal cleanvar ipsec +# REQUIRE: NETWORKING root FILESYSTEMS cleanvar ipsec # KEYWORD: nojail . /etc/rc.subr ==== //depot/projects/opentoe/etc/rc.d/netif#2 (text+ko) ==== @@ -22,11 +22,11 @@ # (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/etc/rc.d/netif,v 1.22 2007/02/09 12:11:26 flz Exp $ +# $FreeBSD: src/etc/rc.d/netif,v 1.23 2007/04/02 22:53:07 des Exp $ # # PROVIDE: netif -# REQUIRE: atm1 ipfilter mountcritlocal serial sppp sysctl +# REQUIRE: atm1 ipfilter FILESYSTEMS serial sppp sysctl # KEYWORD: nojail . /etc/rc.subr ==== //depot/projects/opentoe/etc/rc.d/pf#2 (text+ko) ==== @@ -1,10 +1,10 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/pf,v 1.14 2006/12/31 10:37:18 yar Exp $ +# $FreeBSD: src/etc/rc.d/pf,v 1.15 2007/04/02 22:53:07 des Exp $ # # PROVIDE: pf -# REQUIRE: root mountcritlocal netif pflog pfsync +# REQUIRE: root FILESYSTEMS netif pflog pfsync # BEFORE: routing # KEYWORD: nojail ==== //depot/projects/opentoe/etc/rc.d/pflog#2 (text+ko) ==== @@ -1,10 +1,10 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/pflog,v 1.10 2006/12/31 10:37:18 yar Exp $ +# $FreeBSD: src/etc/rc.d/pflog,v 1.11 2007/04/02 22:53:07 des Exp $ # # PROVIDE: pflog -# REQUIRE: root mountcritlocal netif cleanvar +# REQUIRE: root FILESYSTEMS netif cleanvar # KEYWORD: nojail . /etc/rc.subr ==== //depot/projects/opentoe/etc/rc.d/pfsync#2 (text+ko) ==== @@ -1,10 +1,10 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/pfsync,v 1.2 2006/12/31 10:37:18 yar Exp $ +# $FreeBSD: src/etc/rc.d/pfsync,v 1.3 2007/04/02 22:53:07 des Exp $ # # PROVIDE: pfsync -# REQUIRE: root mountcritlocal netif +# REQUIRE: root FILESYSTEMS netif # KEYWORD: nojail . /etc/rc.subr ==== //depot/projects/opentoe/etc/rc.d/power_profile#2 (text+ko) ==== @@ -5,11 +5,11 @@ # # Arguments: 0x00 (AC offline, economy) or 0x01 (AC online, performance) # -# $FreeBSD: src/etc/rc.d/power_profile,v 1.10 2007/01/07 21:53:42 njl Exp $ +# $FreeBSD: src/etc/rc.d/power_profile,v 1.11 2007/04/02 22:53:07 des Exp $ # # PROVIDE: power_profile -# REQUIRE: mountcritlocal syslogd +# REQUIRE: FILESYSTEMS syslogd # KEYWORD: nojail nostart . /etc/rc.subr ==== //depot/projects/opentoe/etc/rc.d/ppp#2 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/ppp,v 1.12 2006/10/26 00:29:43 avatar Exp $ +# $FreeBSD: src/etc/rc.d/ppp,v 1.13 2007/03/31 09:03:38 mtm Exp $ # # PROVIDE: ppp @@ -12,10 +12,10 @@ name="ppp" rcvar=`set_rcvar` command="/usr/sbin/${name}" -start_precmd="ppp_precmd" -start_postcmd="ppp_postcmd" +start_precmd="ppp_prestart" +start_postcmd="ppp_poststart" -ppp_precmd() +ppp_prestart() { # Establish ppp mode. # @@ -38,7 +38,7 @@ rc_flags="$rc_flags ${ppp_profile}" } -ppp_postcmd() +ppp_poststart() { # Re-Sync ipfilter and pf so they pick up any new network interfaces # ==== //depot/projects/opentoe/etc/rc.d/var#2 (text+ko) ==== @@ -24,11 +24,11 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/etc/rc.d/var,v 1.41 2006/12/30 22:53:20 yar Exp $ +# $FreeBSD: src/etc/rc.d/var,v 1.42 2007/04/02 22:53:07 des Exp $ # # PROVIDE: var -# REQUIRE: mountcritlocal +# REQUIRE: FILESYSTEMS . /etc/rc.subr ==== //depot/projects/opentoe/etc/rc.firewall#2 (text+ko) ==== @@ -23,11 +23,11 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/etc/rc.firewall,v 1.50 2006/12/29 21:59:17 piso Exp $ +# $FreeBSD: src/etc/rc.firewall,v 1.51 2007/04/02 14:02:06 rwatson Exp $ # # -# Setup system for firewall service. +# Setup system for IPFW(4) firewall service. # # Suck in the configuration variables. ==== //depot/projects/opentoe/lib/libarchive/archive.h.in#2 (text+ko) ==== @@ -22,7 +22,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/lib/libarchive/archive.h.in,v 1.40 2007/03/11 10:29:52 kientzle Exp $ + * $FreeBSD: src/lib/libarchive/archive.h.in,v 1.41 2007/04/03 05:34:36 kientzle Exp $ */ #ifndef ARCHIVE_H_INCLUDED @@ -177,6 +177,9 @@ #define ARCHIVE_FORMAT_ISO9660_ROCKRIDGE (ARCHIVE_FORMAT_ISO9660 | 1) #define ARCHIVE_FORMAT_ZIP 0x50000 #define ARCHIVE_FORMAT_EMPTY 0x60000 +#define ARCHIVE_FORMAT_AR 0x70000 +#define ARCHIVE_FORMAT_AR_SVR4 (ARCHIVE_FORMAT_AR | 1) +#define ARCHIVE_FORMAT_AR_BSD (ARCHIVE_FORMAT_AR | 2) /*- * Basic outline for reading an archive: @@ -206,6 +209,7 @@ int archive_read_support_compression_none(struct archive *); int archive_read_support_format_all(struct archive *); +int archive_read_support_format_ar(struct archive *); int archive_read_support_format_cpio(struct archive *); int archive_read_support_format_empty(struct archive *); int archive_read_support_format_gnutar(struct archive *); @@ -374,6 +378,8 @@ int archive_write_set_format_by_name(struct archive *, const char *name); /* To minimize link pollution, use one or more of the following. */ +int archive_write_set_format_ar_bsd(struct archive *); +int archive_write_set_format_ar_svr4(struct archive *); int archive_write_set_format_cpio(struct archive *); /* TODO: int archive_write_set_format_old_tar(struct archive *); */ int archive_write_set_format_pax(struct archive *); ==== //depot/projects/opentoe/lib/libarchive/archive_check_magic.c#2 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_check_magic.c,v 1.7 2007/01/09 08:05:54 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_check_magic.c,v 1.8 2007/04/02 00:15:45 kientzle Exp $"); #ifdef HAVE_SYS_TYPES_H #include @@ -72,9 +72,9 @@ static void -write_all_states(int states) +write_all_states(unsigned int states) { - unsigned lowbit; + unsigned int lowbit; /* A trick for computing the lowest set bit. */ while ((lowbit = states & (-states)) != 0) { @@ -92,8 +92,8 @@ * the libarchive API. */ void -__archive_check_magic(struct archive *a, unsigned magic, unsigned state, - const char *function) +__archive_check_magic(struct archive *a, unsigned int magic, + unsigned int state, const char *function) { if (a->magic != magic) { errmsg("INTERNAL ERROR: Function "); ==== //depot/projects/opentoe/lib/libarchive/archive_private.h#2 (text+ko) ==== @@ -22,7 +22,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/lib/libarchive/archive_private.h,v 1.28 2007/03/03 07:37:36 kientzle Exp $ + * $FreeBSD: src/lib/libarchive/archive_private.h,v 1.29 2007/04/02 00:15:45 kientzle Exp $ */ #ifndef ARCHIVE_PRIVATE_H_INCLUDED @@ -63,8 +63,8 @@ * ridiculous time, or the client passes us an invalid * pointer, these values allow me to catch that. */ - unsigned magic; - unsigned state; + unsigned int magic; + unsigned int state; /* * Some public API functions depend on the "real" type of the @@ -89,8 +89,8 @@ }; /* Check magic value and state; exit if it isn't valid. */ -void __archive_check_magic(struct archive *, unsigned magic, - unsigned state, const char *func); +void __archive_check_magic(struct archive *, unsigned int magic, + unsigned int state, const char *func); void __archive_errx(int retvalue, const char *msg); ==== //depot/projects/opentoe/lib/libarchive/archive_read.c#2 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_read.c,v 1.30 2007/03/03 07:37:36 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_read.c,v 1.32 2007/04/02 00:41:37 kientzle Exp $"); #ifdef HAVE_ERRNO_H #include @@ -55,6 +55,7 @@ static int choose_decompressor(struct archive_read *, const void*, size_t); static int choose_format(struct archive_read *); +static off_t dummy_skip(struct archive_read *, off_t); /* * Allocate, initialize and return a struct archive object. @@ -181,16 +182,23 @@ a->client_data = client_data; /* Select a decompression routine. */ - high_bidder = choose_decompressor(a, buffer, bytes_read); + high_bidder = choose_decompressor(a, buffer, (size_t)bytes_read); if (high_bidder < 0) return (ARCHIVE_FATAL); /* Initialize decompression routine with the first block of data. */ - e = (a->decompressors[high_bidder].init)(a, buffer, bytes_read); + e = (a->decompressors[high_bidder].init)(a, buffer, (size_t)bytes_read); if (e == ARCHIVE_OK) a->archive.state = ARCHIVE_STATE_HEADER; + /* + * If the decompressor didn't register a skip function, provide a + * dummy compression-layer skip function. + */ + if (a->compression_skip == NULL) + a->compression_skip = dummy_skip; + return (e); } @@ -244,6 +252,38 @@ } /* + * Dummy skip function, for use if the compression layer doesn't provide + * one: This code just reads data and discards it. + */ +static off_t +dummy_skip(struct archive_read * a, off_t request) +{ + const void * dummy_buffer; + ssize_t bytes_read; + off_t bytes_skipped; + + for (bytes_skipped = 0; request > 0;) { + bytes_read = (a->compression_read_ahead)(a, &dummy_buffer, 1); + if (bytes_read < 0) + return (bytes_read); + if (bytes_read == 0) { + /* Premature EOF. */ + archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC, + "Truncated input file (need to skip %jd bytes)", + (intmax_t)request); + return (ARCHIVE_FATAL); + } + if (bytes_read > request) + bytes_read = request; + (a->compression_read_consume)(a, bytes_read); + request -= bytes_read; + bytes_skipped += bytes_read; + } + + return (bytes_skipped); +} + +/* * Read header of next entry. */ int @@ -399,6 +439,7 @@ { struct archive_read *a = (struct archive_read *)_a; char *dest; + const void *read_buf; size_t bytes_read; size_t len; int r; @@ -408,10 +449,10 @@ while (s > 0) { if (a->read_data_remaining <= 0) { - r = archive_read_data_block(&a->archive, - (const void **)&a->read_data_block, - &a->read_data_remaining, - &a->read_data_offset); + read_buf = a->read_data_block; + r = archive_read_data_block(&a->archive, &read_buf, + &a->read_data_remaining, &a->read_data_offset); + a->read_data_block = read_buf; if (r == ARCHIVE_EOF) return (bytes_read); /* ==== //depot/projects/opentoe/lib/libarchive/archive_read_data_into_fd.c#2 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_data_into_fd.c,v 1.14 2007/03/03 07:37:36 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_data_into_fd.c,v 1.15 2007/04/02 00:21:46 kientzle Exp $"); #ifdef HAVE_SYS_TYPES_H #include @@ -50,8 +50,8 @@ { int r; const void *buff; - size_t size; - ssize_t bytes_to_write, bytes_written, total_written; + size_t size, bytes_to_write; + ssize_t bytes_written, total_written; off_t offset; off_t output_offset; ==== //depot/projects/opentoe/lib/libarchive/archive_read_open_memory.c#2 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_open_memory.c,v 1.3 2007/01/09 08:05:55 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_open_memory.c,v 1.4 2007/04/02 00:25:11 kientzle Exp $"); #include #include @@ -134,7 +134,7 @@ struct read_memory_data *mine = (struct read_memory_data *)client_data; (void)a; /* UNUSED */ - if (mine->buffer + skip > mine->end) + if (skip > mine->end - mine->buffer) skip = mine->end - mine->buffer; /* Round down to block size. */ skip /= mine->read_size; ==== //depot/projects/opentoe/lib/libarchive/archive_read_private.h#2 (text+ko) ==== @@ -22,7 +22,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/lib/libarchive/archive_read_private.h,v 1.1 2007/03/03 07:37:36 kientzle Exp $ + * $FreeBSD: src/lib/libarchive/archive_read_private.h,v 1.2 2007/04/02 00:11:54 kientzle Exp $ */ #ifndef ARCHIVE_READ_PRIVATE_H_INCLUDED @@ -93,9 +93,6 @@ * test, e.g., 16 if you test a 2-byte magic value. The * highest bidder will have their init function invoked, which * can set up pointers to specific handlers. - * - * On write, the client just invokes an archive_write_set function - * which sets up the data here directly. */ struct { int (*bid)(const void *buff, size_t); @@ -103,9 +100,8 @@ } decompressors[4]; /* Read/write data stream (with compression). */ void *compression_data; /* Data for (de)compressor. */ - int (*compression_init)(struct archive_read *); /* Initialize. */ int (*compression_finish)(struct archive_read *); - int (*compression_write)(struct archive_read *, const void *, size_t); + /* * Read uses a peek/consume I/O model: the decompression code * returns a pointer to the requested block and advances the >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Apr 4 06:02:36 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 15E1B16A407; Wed, 4 Apr 2007 06:02:36 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id C485916A412 for ; Wed, 4 Apr 2007 06:02:35 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id B2F6913C468 for ; Wed, 4 Apr 2007 06:02:35 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l3462ZRU042667 for ; Wed, 4 Apr 2007 06:02:35 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l3462Zka042662 for perforce@freebsd.org; Wed, 4 Apr 2007 06:02:35 GMT (envelope-from kmacy@freebsd.org) Date: Wed, 4 Apr 2007 06:02:35 GMT Message-Id: <200704040602.l3462Zka042662@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 117323 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 04 Apr 2007 06:02:36 -0000 http://perforce.freebsd.org/chv.cgi?CH=117323 Change 117323 by kmacy@kmacy_vt-x:opentoe_init on 2007/04/04 06:01:36 IFC Affected files ... .. //depot/projects/opentoe/sys/netinet/libalias/alias_ftp.c#2 integrate .. //depot/projects/opentoe/sys/netinet/libalias/alias_irc.c#2 integrate .. //depot/projects/opentoe/sys/netinet/libalias/alias_proxy.c#2 integrate Differences ... ==== //depot/projects/opentoe/sys/netinet/libalias/alias_ftp.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/netinet/libalias/alias_ftp.c,v 1.28 2006/09/26 23:26:53 piso Exp $"); +__FBSDID("$FreeBSD: src/sys/netinet/libalias/alias_ftp.c,v 1.29 2007/04/04 03:14:15 kan Exp $"); /* Alias_ftp.c performs special processing for FTP sessions under @@ -79,6 +79,7 @@ #include #include #include +#include #endif #include ==== //depot/projects/opentoe/sys/netinet/libalias/alias_irc.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/netinet/libalias/alias_irc.c,v 1.22 2006/09/26 23:26:53 piso Exp $"); +__FBSDID("$FreeBSD: src/sys/netinet/libalias/alias_irc.c,v 1.23 2007/04/04 03:16:59 kan Exp $"); /* Alias_irc.c intercepts packages contain IRC CTCP commands, and changes DCC commands to export a port on the aliasing host instead @@ -59,6 +59,7 @@ #include #include #include +#include #include #endif ==== //depot/projects/opentoe/sys/netinet/libalias/alias_proxy.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/netinet/libalias/alias_proxy.c,v 1.28 2006/12/15 12:50:06 piso Exp $"); +__FBSDID("$FreeBSD: src/sys/netinet/libalias/alias_proxy.c,v 1.29 2007/04/04 03:10:42 kan Exp $"); /* file: alias_proxy.c @@ -431,7 +431,7 @@ { int dlen; int hlen; - u_char *p; + char *p; hlen = (pip->ip_hl + tc->th_off) << 2; dlen = ntohs(pip->ip_len) - hlen; From owner-p4-projects@FreeBSD.ORG Wed Apr 4 13:26:34 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6A5D316A407; Wed, 4 Apr 2007 13:26:34 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 1F2C816A405 for ; Wed, 4 Apr 2007 13:26:34 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 0F04813C45A for ; Wed, 4 Apr 2007 13:26:34 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l34DQXOu051323 for ; Wed, 4 Apr 2007 13:26:33 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l34DQXaT051315 for perforce@freebsd.org; Wed, 4 Apr 2007 13:26:33 GMT (envelope-from rdivacky@FreeBSD.org) Date: Wed, 4 Apr 2007 13:26:33 GMT Message-Id: <200704041326.l34DQXaT051315@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 117345 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 04 Apr 2007 13:26:34 -0000 http://perforce.freebsd.org/chv.cgi?CH=117345 Change 117345 by rdivacky@rdivacky_witten on 2007/04/04 13:25:44 Stubs for linux sg support. More to come. Obtained from: netbsd Affected files ... .. //depot/projects/linuxolator/src/sys/compat/linux/linux_ioctl.c#2 edit .. //depot/projects/linuxolator/src/sys/compat/linux/linux_ioctl.h#2 edit .. //depot/projects/linuxolator/src/sys/modules/linux/Makefile#6 edit Differences ... ==== //depot/projects/linuxolator/src/sys/compat/linux/linux_ioctl.c#2 (text+ko) ==== @@ -59,6 +59,14 @@ #include #include #include + +/* for sg device */ +#include +#include +#include +#include +#include +#include #include "opt_compat.h" @@ -87,6 +95,7 @@ static linux_ioctl_function_t linux_ioctl_private; static linux_ioctl_function_t linux_ioctl_drm; static linux_ioctl_function_t linux_ioctl_special; +static linux_ioctl_function_t linux_ioctl_sg; static struct linux_ioctl_handler cdrom_handler = { linux_ioctl_cdrom, LINUX_IOCTL_CDROM_MIN, LINUX_IOCTL_CDROM_MAX }; @@ -108,6 +117,8 @@ { linux_ioctl_private, LINUX_IOCTL_PRIVATE_MIN, LINUX_IOCTL_PRIVATE_MAX }; static struct linux_ioctl_handler drm_handler = { linux_ioctl_drm, LINUX_IOCTL_DRM_MIN, LINUX_IOCTL_DRM_MAX }; +static struct linux_ioctl_handler sg_handler = +{ linux_ioctl_sg, LINUX_IOCTL_SG_MIN, LINUX_IOCTL_SG_MAX }; DATA_SET(linux_ioctl_handler_set, cdrom_handler); DATA_SET(linux_ioctl_handler_set, vfat_handler); @@ -119,6 +130,7 @@ DATA_SET(linux_ioctl_handler_set, termio_handler); DATA_SET(linux_ioctl_handler_set, private_handler); DATA_SET(linux_ioctl_handler_set, drm_handler); +DATA_SET(linux_ioctl_handler_set, sg_handler); struct handler_element { @@ -2550,6 +2562,254 @@ return (error); } +int linux_sg_version = 30125; + +#ifdef LINUX_SG_DEBUG +#define DPRINTF(a) do { \ + if (ldebug(ioctl)) \ + printf(a); \ +} while (0) +#else +#define DPRINTF(a) +#endif + +#ifdef LINUX_SG_DEBUG +static void dump_sg_io(struct linux_sg_io_hdr *); +static void dump_scsireq(struct scsireq *); +#endif + +//static int bsd_to_linux_host_status(int); +//static int bsd_to_linux_driver_status(int); + +/* + * Sg ioctl handler + */ +static int +linux_ioctl_sg(struct thread *td, struct linux_ioctl_args *args) +{ + struct file *fp; + u_long com = args->cmd; + int error = 0; + //struct linux_sg_io_hdr lreq; + //union ccb req; + + if ((error = fget(td, args->fd, &fp)) != 0) + return (error); + + td->td_retval[0] = 0; + DPRINTF(("Command = %lx\n", com)); + switch (com) { + case LINUX_SG_GET_VERSION_NUM: + error = copyout(&version, (void *)args->arg, sizeof(linux_sg_version)); + break; +#if 0 + case LINUX_SG_IO: + error = copyin((void *)args->arg, &lreq, sizeof(lreq)); + if (error) { + DPRINTF(("failed to copy in request data %d\n", error)); + break; + } + +#ifdef LINUX_SG_DEBUG + dump_sg_io(&lreq); +#endif + (void)memset(&req, 0, sizeof(req)); + switch (lreq.dxfer_direction) { + case SG_DXFER_TO_DEV: + req.flags = SCCMD_WRITE; + break; + case SG_DXFER_FROM_DEV: + req.flags = SCCMD_READ; + break; + default: + DPRINTF(("unknown direction %d\n", + lreq.dxfer_direction)); + error = EINVAL; + goto done; + } + if (lreq.iovec_count != 0) { + /* XXX: Not yet */ + error = EOPNOTSUPP; + DPRINTF(("scatter/gather not supported\n")); + break; + } + + if (lreq.cmd_len > sizeof(req.cmd)) { + DPRINTF(("invalid command length %d\n", lreq.cmd_len)); + error = EINVAL; + break; + } + + error = copyin(lreq.cmdp, req.cmd, lreq.cmd_len); + if (error) { + DPRINTF(("failed to copy in cmd data %d\n", error)); + break; + } + + req.timeout = lreq.timeout; + req.cmdlen = lreq.cmd_len; + req.datalen = lreq.dxfer_len; + req.databuf = lreq.dxferp; + + error = fo_ioctl(fp, CAMIOCOMMAND, (void *)&req, td->td_ucred, td); + if (error) { + DPRINTF(("SCIOCCOMMAND failed %d\n", error)); + break; + } +#ifdef LINUX_SG_DEBUG + dump_scsireq(&req); +#endif + if (req.senselen_used) { + if (req.senselen > lreq.mx_sb_len) + req.senselen = lreq.mx_sb_len; + lreq.sb_len_wr = req.senselen; + error = copyout(req.sense, lreq.sbp, req.senselen); + if (error) { + DPRINTF(("sense copyout failed %d\n", error)); + break; + } + } else { + lreq.sb_len_wr = 0; + } + + lreq.status = req.status; + lreq.masked_status = 0; /* XXX */ + lreq.host_status = bsd_to_linux_host_status(req.retsts); + lreq.sb_len_wr = req.datalen_used; + lreq.driver_status = bsd_to_linux_driver_status(req.error); + lreq.resid = req.datalen - req.datalen_used; + lreq.duration = req.timeout; /* XXX */ + lreq.info = 0; /* XXX */ + error = copyout(&lreq, args->data, sizeof(lreq)); + if (error) { + DPRINTF(("failed to copy out req data %d\n", error)); + } + break; +#endif + case LINUX_SG_EMULATED_HOST: + case LINUX_SG_SET_TRANSFORM: + case LINUX_SG_GET_TRANSFORM: + case LINUX_SG_GET_NUM_WAITING: + case LINUX_SG_SCSI_RESET: + case LINUX_SG_GET_REQUEST_TABLE: + case LINUX_SG_SET_KEEP_ORPHAN: + case LINUX_SG_GET_KEEP_ORPHAN: + case LINUX_SG_GET_ACCESS_COUNT: + case LINUX_SG_SET_FORCE_LOW_DMA: + case LINUX_SG_GET_LOW_DMA: + case LINUX_SG_GET_SG_TABLESIZE: + case LINUX_SG_GET_SCSI_ID: + case LINUX_SG_SET_FORCE_PACK_ID: + case LINUX_SG_GET_PACK_ID: + case LINUX_SG_SET_RESERVED_SIZE: + case LINUX_SG_GET_RESERVED_SIZE: + error = ENODEV; + break; + + /* version 2 interfaces */ + case LINUX_SG_SET_TIMEOUT: + break; + case LINUX_SG_GET_TIMEOUT: + /* ioctl returns value..., grr. */ + td->td_retval[0] = 60; + break; + case LINUX_SG_GET_COMMAND_Q: + case LINUX_SG_SET_COMMAND_Q: + case LINUX_SG_SET_DEBUG: + case LINUX_SG_NEXT_CMD_LEN: + error = ENODEV; + break; + } + +//done: + fdrop(fp, td); + + DPRINTF(("Return=%d\n", error)); + return error; +} + +#if 0 +static int +bsd_to_linux_driver_status(int bs) +{ + switch (bs) { + default: + case XS_NOERROR: + return 0; + case XS_SENSE: + case XS_SHORTSENSE: + return LINUX_DRIVER_SENSE; + case XS_RESOURCE_SHORTAGE: + return LINUX_DRIVER_SOFT; + case XS_DRIVER_STUFFUP: + return LINUX_DRIVER_ERROR; + case XS_SELTIMEOUT: + case XS_TIMEOUT: + return LINUX_DRIVER_TIMEOUT; + case XS_BUSY: + return LINUX_DRIVER_BUSY; + case XS_RESET: + return LINUX_SUGGEST_ABORT; + case XS_REQUEUE: + return LINUX_SUGGEST_RETRY; + } +} + +static int +bsd_to_linux_host_status(int bs) +{ + switch (bs) { + case SCCMD_OK: + case SCCMD_SENSE: + return LINUX_DID_OK; + case SCCMD_TIMEOUT: + return LINUX_DID_TIME_OUT; + case SCCMD_BUSY: + return LINUX_DID_BUS_BUSY; + case SCCMD_UNKNOWN: + default: + return LINUX_DID_ERROR; + } +} +#endif + +#ifdef LINUX_SG_DEBUG +static void +dump_sg_io(struct linux_sg_io_hdr *lr) +{ + printf("linuxreq [interface_id=%x, dxfer_direction=%d, cmd_len=%d, " + "mx_sb_len=%d, iovec_count=%d, dxfer_len=%d, dxferp=%p, " + "cmdp=%p, sbp=%p, timeout=%u, flags=%d, pack_id=%d, " + "usr_ptr=%p, status=%u, masked_status=%u, sb_len_wr=%u, " + "host_status=%u, driver_status=%u, resid=%d, duration=%u, " + "info=%u]\n", + lr->interface_id, lr->dxfer_direction, lr->cmd_len, + lr->mx_sb_len, lr->iovec_count, lr->dxfer_len, lr->dxferp, + lr->cmdp, lr->sbp, lr->timeout, lr->flags, lr->pack_id, + lr->usr_ptr, lr->status, lr->masked_status, lr->sb_len_wr, + lr->host_status, lr->driver_status, lr->resid, lr->duration, + lr->info); +} + +static void +dump_scsireq(struct scsireq *br) +{ + int i; + printf("bsdreq [flags=%lx, timeout=%lu, cmd=[ ", + br->flags, br->timeout); + for (i = 0; i < sizeof(br->cmd) / sizeof(br->cmd[0]); i++) + printf("%.2u ", br->cmd[i]); + printf("], cmdlen=%u, databuf=%p, datalen=%lu, datalen_used=%lu, " + "sense=[ ", + br->cmdlen, br->databuf, br->datalen, br->datalen_used); + for (i = 0; i < sizeof(br->sense) / sizeof(br->sense[0]); i++) + printf("%.2u ", br->sense[i]); + printf("], senselen=%u, senselen_used=%u, status=%u, retsts=%u, " + "error=%d]\n", + br->senselen, br->senselen_used, br->status, br->retsts, br->error); +} +#endif + /* * main ioctl syscall function */ ==== //depot/projects/linuxolator/src/sys/compat/linux/linux_ioctl.h#2 (text+ko) ==== @@ -51,6 +51,111 @@ #define LINUX_IOCTL_DISK_MAX LINUX_BLKSSZGET /* + * sg + */ +#define LINUX_SG_SET_TIMEOUT 0x2201 +#define LINUX_SG_GET_TIMEOUT 0x2202 +#define LINUX_SG_EMULATED_HOST 0x2203 +#define LINUX_SG_SET_TRANSFORM 0x2204 +#define LINUX_SG_GET_TRANSFORM 0x2205 +#define LINUX_SG_GET_COMMAND_Q 0x2270 +#define LINUX_SG_SET_COMMAND_Q 0x2271 +#define LINUX_SG_SET_RESERVED_SIZE 0x2275 +#define LINUX_SG_GET_RESERVED_SIZE 0x2272 +#define LINUX_SG_GET_SCSI_ID 0x2276 +#define LINUX_SG_SET_FORCE_LOW_DMA 0x2279 +#define LINUX_SG_GET_LOW_DMA 0x227a +#define LINUX_SG_SET_FORCE_PACK_ID 0x227b +#define LINUX_SG_GET_PACK_ID 0x227c +#define LINUX_SG_GET_NUM_WAITING 0x227d +#define LINUX_SG_SET_DEBUG 0x227e +#define LINUX_SG_GET_SG_TABLESIZE 0x227f +#define LINUX_SG_GET_VERSION_NUM 0x2282 +#define LINUX_SG_NEXT_CMD_LEN 0x2283 +#define LINUX_SG_SCSI_RESET 0x2284 +#define LINUX_SG_IO 0x2285 +#define LINUX_SG_GET_REQUEST_TABLE 0x2286 +#define LINUX_SG_SET_KEEP_ORPHAN 0x2287 +#define LINUX_SG_GET_KEEP_ORPHAN 0x2288 +#define LINUX_SG_GET_ACCESS_COUNT 0x2289 + +#define LINUX_IOCTL_SG_MIN LINUX_SG_GET_TIMEOUT +#define LINUX_IOCTL_SG_MAX LINUX_SG_GET_ACCESS_COUNT + +struct linux_sg_io_hdr { + int interface_id; +#define SG_DXFER_NONE -1 +#define SG_DXFER_TO_DEV -2 +#define SG_DXFER_FROM_DEV -3 +#define SG_DXFER_TO_FROM_DEV -4 +#define SG_DXFER_UNKNOWN -5 + int dxfer_direction; + unsigned char cmd_len; + unsigned char mx_sb_len; + unsigned short iovec_count; + unsigned int dxfer_len; + void *dxferp; + unsigned char *cmdp; + unsigned char *sbp; + unsigned int timeout; + unsigned int flags; + int pack_id; + void *usr_ptr; + unsigned char status; + unsigned char masked_status; + unsigned char msg_status; + unsigned char sb_len_wr; + unsigned short host_status; + unsigned short driver_status; + int resid; + unsigned int duration; + unsigned int info; +}; + +#define SG_MAX_SENSE 16 + +/* + * Host codes + */ +#define LINUX_DID_OK 0x00 /* OK */ +#define LINUX_DID_NO_CONNECT 0x01 /* timeout during connect */ +#define LINUX_DID_BUS_BUSY 0x02 /* timeout during command */ +#define LINUX_DID_TIME_OUT 0x03 /* other timeout */ +#define LINUX_DID_BAD_TARGET 0x04 /* bad target */ +#define LINUX_DID_ABORT 0x05 /* abort */ +#define LINUX_DID_PARITY 0x06 /* parity error */ +#define LINUX_DID_ERROR 0x07 /* internal error */ +#define LINUX_DID_RESET 0x08 /* reset by somebody */ +#define LINUX_DID_BAD_INTR 0x09 /* unexpected interrupt */ +#define LINUX_DID_PASSTHROUGH 0x0a /* passthrough */ +#define LINUX_DID_SOFT_ERROR 0x0b /* low driver wants retry */ +#define LINUX_DID_IMM_RETRY 0x0c /* retry without decreasing retrycnt */ + +/* + * Driver codes + */ +#define LINUX_DRIVER_BUSY 0x01 +#define LINUX_DRIVER_SOFT 0x02 +#define LINUX_DRIVER_MEDIA 0x03 +#define LINUX_DRIVER_ERROR 0x04 + +#define LINUX_DRIVER_INVALID 0x05 +#define LINUX_DRIVER_TIMEOUT 0x06 +#define LINUX_DRIVER_HARD 0x07 +#define LINUX_DRIVER_SENSE 0x08 + +#define LINUX_SUGGEST_RETRY 0x10 +#define LINUX_SUGGEST_ABORT 0x20 +#define LINUX_SUGGEST_REMAP 0x30 +#define LINUX_SUGGEST_DIE 0x40 +#define LINUX_SUGGEST_SENSE 0x80 +#define LINUX_SUGGEST_IS_OK 0xff + +#define LINUX_DRIVER_MASK 0x0f +#define LINUX_SUGGEST_MASK 0xf0 + + +/* * hdio */ #define LINUX_HDIO_GET_GEO 0x0301 ==== //depot/projects/linuxolator/src/sys/modules/linux/Makefile#6 (text+ko) ==== @@ -14,7 +14,7 @@ linux_socket.c linux_stats.c linux_sysctl.c linux${SFX}_sysent.c \ linux${SFX}_sysvec.c linux_uid16.c linux_util.c linux_time.c \ opt_inet6.h opt_mac.h opt_compat.h opt_posix.h vnode_if.h \ - device_if.h bus_if.h + device_if.h bus_if.h opt_cam.h OBJS= linux${SFX}_locore.o .if ${MACHINE_ARCH} == "i386" From owner-p4-projects@FreeBSD.ORG Wed Apr 4 14:29:35 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6D13116A402; Wed, 4 Apr 2007 14:29:35 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id DA27916A406 for ; Wed, 4 Apr 2007 14:29:34 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id C5F8013C4AD for ; Wed, 4 Apr 2007 14:29:34 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l34ETYW2061874 for ; Wed, 4 Apr 2007 14:29:34 GMT (envelope-from gonzo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l34EN1BG060481 for perforce@freebsd.org; Wed, 4 Apr 2007 14:23:01 GMT (envelope-from gonzo@FreeBSD.org) Date: Wed, 4 Apr 2007 14:23:01 GMT Message-Id: <200704041423.l34EN1BG060481@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gonzo@FreeBSD.org using -f From: Oleksandr Tymoshenko To: Perforce Change Reviews Cc: Subject: PERFORCE change 117350 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 04 Apr 2007 14:29:35 -0000 http://perforce.freebsd.org/chv.cgi?CH=117350 Change 117350 by gonzo@gonzo_jeeves on 2007/04/04 14:17:03 IFC Affected files ... .. //depot/projects/mips2/src/COPYRIGHT#2 integrate .. //depot/projects/mips2/src/MAINTAINERS#4 integrate .. //depot/projects/mips2/src/Makefile#2 integrate .. //depot/projects/mips2/src/Makefile.inc1#2 integrate .. //depot/projects/mips2/src/ObsoleteFiles.inc#3 integrate .. //depot/projects/mips2/src/UPDATING#3 integrate .. //depot/projects/mips2/src/bin/cat/cat.1#2 integrate .. //depot/projects/mips2/src/bin/chmod/chmod.1#2 integrate .. //depot/projects/mips2/src/bin/cp/cp.1#2 integrate .. //depot/projects/mips2/src/bin/cp/cp.c#3 integrate .. //depot/projects/mips2/src/bin/cp/extern.h#2 integrate .. //depot/projects/mips2/src/bin/cp/utils.c#2 integrate .. //depot/projects/mips2/src/bin/csh/config.h#2 integrate .. //depot/projects/mips2/src/bin/csh/config_p.h#2 integrate .. //depot/projects/mips2/src/bin/date/netdate.c#2 integrate .. //depot/projects/mips2/src/bin/df/df.1#2 integrate .. //depot/projects/mips2/src/bin/df/df.c#2 integrate .. //depot/projects/mips2/src/bin/domainname/domainname.1#2 integrate .. //depot/projects/mips2/src/bin/ed/main.c#2 integrate .. //depot/projects/mips2/src/bin/expr/expr.1#2 integrate .. //depot/projects/mips2/src/bin/expr/expr.y#2 integrate .. //depot/projects/mips2/src/bin/getfacl/getfacl.1#2 integrate .. //depot/projects/mips2/src/bin/hostname/hostname.1#2 integrate .. //depot/projects/mips2/src/bin/hostname/hostname.c#2 integrate .. //depot/projects/mips2/src/bin/kill/kill.1#2 integrate .. //depot/projects/mips2/src/bin/ls/ls.1#2 integrate .. //depot/projects/mips2/src/bin/ls/print.c#2 integrate .. //depot/projects/mips2/src/bin/mkdir/mkdir.1#2 integrate .. //depot/projects/mips2/src/bin/mkdir/mkdir.c#2 integrate .. //depot/projects/mips2/src/bin/pax/cpio.c#2 integrate .. //depot/projects/mips2/src/bin/pax/pax.1#2 integrate .. //depot/projects/mips2/src/bin/pax/tar.c#2 integrate .. //depot/projects/mips2/src/bin/ps/ps.1#2 integrate .. //depot/projects/mips2/src/bin/rcp/rcp.1#2 integrate .. //depot/projects/mips2/src/bin/rm/rm.1#2 integrate .. //depot/projects/mips2/src/bin/rm/rm.c#2 integrate .. //depot/projects/mips2/src/bin/rmdir/rmdir.1#2 integrate .. //depot/projects/mips2/src/bin/setfacl/setfacl.1#2 integrate .. //depot/projects/mips2/src/bin/setfacl/setfacl.c#2 integrate .. //depot/projects/mips2/src/bin/sh/exec.c#2 integrate .. //depot/projects/mips2/src/bin/sh/expand.c#2 integrate .. //depot/projects/mips2/src/bin/sh/histedit.c#2 integrate .. //depot/projects/mips2/src/bin/sh/jobs.c#2 integrate .. //depot/projects/mips2/src/bin/sh/jobs.h#2 integrate .. //depot/projects/mips2/src/bin/sh/main.c#2 integrate .. //depot/projects/mips2/src/bin/sh/parser.c#2 integrate .. //depot/projects/mips2/src/bin/sh/parser.h#2 integrate .. //depot/projects/mips2/src/bin/sh/sh.1#3 integrate .. //depot/projects/mips2/src/bin/test/test.1#3 integrate .. //depot/projects/mips2/src/contrib/bind9/CHANGES#2 integrate .. //depot/projects/mips2/src/contrib/bind9/COPYRIGHT#2 integrate .. //depot/projects/mips2/src/contrib/bind9/FAQ#2 integrate .. //depot/projects/mips2/src/contrib/bind9/FAQ.xml#2 integrate .. //depot/projects/mips2/src/contrib/bind9/Makefile.in#2 integrate .. //depot/projects/mips2/src/contrib/bind9/README#2 integrate .. //depot/projects/mips2/src/contrib/bind9/bin/check/named-checkconf.8#2 integrate .. //depot/projects/mips2/src/contrib/bind9/bin/check/named-checkconf.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/bin/check/named-checkconf.html#2 integrate .. //depot/projects/mips2/src/contrib/bind9/bin/check/named-checkzone.8#2 integrate .. //depot/projects/mips2/src/contrib/bind9/bin/check/named-checkzone.docbook#2 integrate .. //depot/projects/mips2/src/contrib/bind9/bin/check/named-checkzone.html#2 integrate .. //depot/projects/mips2/src/contrib/bind9/bin/dig/dig.1#2 integrate .. //depot/projects/mips2/src/contrib/bind9/bin/dig/dig.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/bin/dig/dig.html#2 integrate .. //depot/projects/mips2/src/contrib/bind9/bin/dig/dighost.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/bin/dig/host.1#2 integrate .. //depot/projects/mips2/src/contrib/bind9/bin/dig/host.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/bin/dig/host.html#2 integrate .. //depot/projects/mips2/src/contrib/bind9/bin/dig/include/dig/dig.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/bin/dig/nslookup.1#2 integrate .. //depot/projects/mips2/src/contrib/bind9/bin/dig/nslookup.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/bin/dig/nslookup.docbook#2 integrate .. //depot/projects/mips2/src/contrib/bind9/bin/dig/nslookup.html#2 integrate .. //depot/projects/mips2/src/contrib/bind9/bin/dnssec/dnssec-keygen.8#2 integrate .. //depot/projects/mips2/src/contrib/bind9/bin/dnssec/dnssec-keygen.html#2 integrate .. //depot/projects/mips2/src/contrib/bind9/bin/dnssec/dnssec-signzone.8#2 integrate .. //depot/projects/mips2/src/contrib/bind9/bin/dnssec/dnssec-signzone.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/bin/dnssec/dnssec-signzone.html#2 integrate .. //depot/projects/mips2/src/contrib/bind9/bin/named/aclconf.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/bin/named/client.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/bin/named/config.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/bin/named/controlconf.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/bin/named/include/named/aclconf.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/bin/named/include/named/client.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/bin/named/include/named/config.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/bin/named/include/named/control.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/bin/named/include/named/globals.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/bin/named/include/named/logconf.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/bin/named/include/named/lwresd.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/bin/named/include/named/server.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/bin/named/include/named/sortlist.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/bin/named/include/named/tkeyconf.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/bin/named/include/named/tsigconf.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/bin/named/include/named/zoneconf.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/bin/named/interfacemgr.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/bin/named/logconf.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/bin/named/lwdgabn.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/bin/named/lwdgrbn.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/bin/named/lwresd.8#2 integrate .. //depot/projects/mips2/src/contrib/bind9/bin/named/lwresd.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/bin/named/lwresd.html#2 integrate .. //depot/projects/mips2/src/contrib/bind9/bin/named/main.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/bin/named/named.8#2 integrate .. //depot/projects/mips2/src/contrib/bind9/bin/named/named.conf.5#2 integrate .. //depot/projects/mips2/src/contrib/bind9/bin/named/named.conf.docbook#2 integrate .. //depot/projects/mips2/src/contrib/bind9/bin/named/named.conf.html#2 integrate .. //depot/projects/mips2/src/contrib/bind9/bin/named/named.docbook#2 integrate .. //depot/projects/mips2/src/contrib/bind9/bin/named/named.html#2 integrate .. //depot/projects/mips2/src/contrib/bind9/bin/named/query.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/bin/named/server.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/bin/named/sortlist.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/bin/named/tkeyconf.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/bin/named/tsigconf.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/bin/named/unix/os.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/bin/named/update.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/bin/named/zoneconf.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/bin/nsupdate/nsupdate.8#2 integrate .. //depot/projects/mips2/src/contrib/bind9/bin/nsupdate/nsupdate.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/bin/nsupdate/nsupdate.html#2 integrate .. //depot/projects/mips2/src/contrib/bind9/bin/rndc/rndc-confgen.8#2 integrate .. //depot/projects/mips2/src/contrib/bind9/bin/rndc/rndc-confgen.html#2 integrate .. //depot/projects/mips2/src/contrib/bind9/bin/rndc/rndc.8#2 integrate .. //depot/projects/mips2/src/contrib/bind9/bin/rndc/rndc.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/bin/rndc/rndc.conf.5#2 integrate .. //depot/projects/mips2/src/contrib/bind9/bin/rndc/rndc.conf.html#2 integrate .. //depot/projects/mips2/src/contrib/bind9/bin/rndc/rndc.html#2 integrate .. //depot/projects/mips2/src/contrib/bind9/config.threads.in#2 integrate .. //depot/projects/mips2/src/contrib/bind9/configure.in#2 integrate .. //depot/projects/mips2/src/contrib/bind9/doc/arm/Bv9ARM-book.xml#2 integrate .. //depot/projects/mips2/src/contrib/bind9/doc/arm/Bv9ARM.ch01.html#2 integrate .. //depot/projects/mips2/src/contrib/bind9/doc/arm/Bv9ARM.ch02.html#2 integrate .. //depot/projects/mips2/src/contrib/bind9/doc/arm/Bv9ARM.ch03.html#2 integrate .. //depot/projects/mips2/src/contrib/bind9/doc/arm/Bv9ARM.ch04.html#2 integrate .. //depot/projects/mips2/src/contrib/bind9/doc/arm/Bv9ARM.ch05.html#2 integrate .. //depot/projects/mips2/src/contrib/bind9/doc/arm/Bv9ARM.ch06.html#2 integrate .. //depot/projects/mips2/src/contrib/bind9/doc/arm/Bv9ARM.ch07.html#2 integrate .. //depot/projects/mips2/src/contrib/bind9/doc/arm/Bv9ARM.ch08.html#2 integrate .. //depot/projects/mips2/src/contrib/bind9/doc/arm/Bv9ARM.ch09.html#2 integrate .. //depot/projects/mips2/src/contrib/bind9/doc/arm/Bv9ARM.html#2 integrate .. //depot/projects/mips2/src/contrib/bind9/doc/arm/Bv9ARM.pdf#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/Makefile.in#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/api#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/config.h.in#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/configure#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/configure.in#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/dst/dst_api.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/dst/hmac_link.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/include/arpa/nameser_compat.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/include/isc/list.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/include/netdb.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/inet/inet_cidr_ntop.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/inet/inet_net_ntop.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/irs/dns.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/irs/dns_ho.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/irs/gai_strerror.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/irs/gen_ho.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/irs/getaddrinfo.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/irs/gethostent.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/irs/getnameinfo.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/irs/getprotoent_r.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/irs/getservent_r.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/irs/irp.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/irs/irp_nw.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/irs/irpmarshall.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/irs/irs_data.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/irs/lcl_ho.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/irs/lcl_pr.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/isc/ev_connects.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/isc/eventlib.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/isc/eventlib_p.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/isc/heap.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/isc/hex.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/isc/memcluster.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/nameser/ns_sign.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/nameser/ns_verify.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/port_after.h.in#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/port_before.h.in#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/resolv/mtctxres.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/resolv/res_init.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/resolv/res_send.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/resolv/res_sendsigned.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind9/api#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind9/check.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind9/include/bind9/check.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/Makefile.in#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/acl.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/adb.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/api#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/cache.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/compress.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/dispatch.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/dnssec.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/dst_api.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/gen.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/include/dns/acl.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/include/dns/cache.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/include/dns/compress.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/include/dns/keytable.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/include/dns/message.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/include/dns/name.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/include/dns/peer.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/include/dns/rdataset.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/include/dns/resolver.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/include/dns/types.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/include/dns/validator.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/include/dns/xfrin.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/include/dns/zone.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/keytable.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/lookup.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/masterdump.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/message.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/name.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/openssl_link.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/openssldh_link.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/openssldsa_link.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/opensslrsa_link.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/peer.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/portlist.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/rbtdb.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/rdata.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/rdata/generic/dlv_32769.c#1 branch .. //depot/projects/mips2/src/contrib/bind9/lib/dns/rdata/generic/dlv_32769.h#1 branch .. //depot/projects/mips2/src/contrib/bind9/lib/dns/rdata/generic/dlv_65323.c#2 delete .. //depot/projects/mips2/src/contrib/bind9/lib/dns/rdata/generic/dlv_65323.h#2 delete .. //depot/projects/mips2/src/contrib/bind9/lib/dns/rdataset.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/request.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/resolver.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/tcpmsg.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/tkey.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/tsig.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/validator.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/xfrin.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/zone.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/isc/api#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/isc/hash.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/isc/heap.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/isc/hmacmd5.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/isc/include/isc/heap.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/isc/include/isc/list.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/isc/include/isc/sockaddr.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/isc/include/isc/symtab.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/isc/lex.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/isc/log.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/isc/netscope.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/isc/nothreads/condition.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/isc/nothreads/mutex.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/isc/print.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/isc/sockaddr.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/isc/taskpool.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/isc/timer.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/isc/unix/entropy.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/isc/unix/fsaccess.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/isc/unix/ifiter_ioctl.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/isc/unix/ipv6.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/isc/unix/socket.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/isccc/api#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/isccfg/include/isccfg/cfg.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/isccfg/include/isccfg/grammar.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/isccfg/namedconf.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/isccfg/parser.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/lwres/api#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/lwres/gai_strerror.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/lwres/getaddrinfo.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/lwres/lwconfig.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/lwres/man/lwres.3#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/lwres/man/lwres.html#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/lwres/man/lwres_buffer.3#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/lwres/man/lwres_buffer.html#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/lwres/man/lwres_config.3#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/lwres/man/lwres_config.html#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/lwres/man/lwres_context.3#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/lwres/man/lwres_context.html#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/lwres/man/lwres_gabn.3#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/lwres/man/lwres_gabn.html#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/lwres/man/lwres_gai_strerror.3#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/lwres/man/lwres_gai_strerror.html#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/lwres/man/lwres_getaddrinfo.3#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/lwres/man/lwres_getaddrinfo.html#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/lwres/man/lwres_gethostent.3#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/lwres/man/lwres_gethostent.html#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/lwres/man/lwres_getipnode.3#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/lwres/man/lwres_getipnode.html#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/lwres/man/lwres_getnameinfo.3#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/lwres/man/lwres_getnameinfo.html#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/lwres/man/lwres_getrrsetbyname.3#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/lwres/man/lwres_getrrsetbyname.html#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/lwres/man/lwres_gnba.3#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/lwres/man/lwres_gnba.html#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/lwres/man/lwres_hstrerror.3#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/lwres/man/lwres_hstrerror.html#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/lwres/man/lwres_inetntop.3#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/lwres/man/lwres_inetntop.html#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/lwres/man/lwres_noop.3#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/lwres/man/lwres_noop.html#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/lwres/man/lwres_packet.3#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/lwres/man/lwres_packet.html#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/lwres/man/lwres_resutil.3#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/lwres/man/lwres_resutil.html#2 integrate .. //depot/projects/mips2/src/contrib/bind9/libtool.m4#2 integrate .. //depot/projects/mips2/src/contrib/bind9/ltmain.sh#2 integrate .. //depot/projects/mips2/src/contrib/bind9/make/rules.in#2 integrate .. //depot/projects/mips2/src/contrib/bind9/version#2 integrate .. //depot/projects/mips2/src/contrib/bsnmp/snmp_mibII/mibII.c#2 integrate .. //depot/projects/mips2/src/contrib/bsnmp/snmpd/action.c#2 integrate .. //depot/projects/mips2/src/contrib/bsnmp/snmpd/tree.def#2 integrate .. //depot/projects/mips2/src/contrib/bzip2/CHANGES#2 integrate .. //depot/projects/mips2/src/contrib/bzip2/FREEBSD-upgrade#2 integrate .. //depot/projects/mips2/src/contrib/bzip2/LICENSE#2 integrate .. //depot/projects/mips2/src/contrib/bzip2/Makefile#2 integrate .. //depot/projects/mips2/src/contrib/bzip2/Makefile-libbz2_so#2 integrate .. //depot/projects/mips2/src/contrib/bzip2/README#2 integrate .. //depot/projects/mips2/src/contrib/bzip2/README.COMPILATION.PROBLEMS#2 integrate .. //depot/projects/mips2/src/contrib/bzip2/Y2K_INFO#2 delete .. //depot/projects/mips2/src/contrib/bzip2/blocksort.c#2 integrate .. //depot/projects/mips2/src/contrib/bzip2/bzip2.1#2 integrate .. //depot/projects/mips2/src/contrib/bzip2/bzip2.c#2 integrate .. //depot/projects/mips2/src/contrib/bzip2/bzip2recover.c#2 integrate .. //depot/projects/mips2/src/contrib/bzip2/bzlib.c#2 integrate .. //depot/projects/mips2/src/contrib/bzip2/bzlib.h#2 integrate .. //depot/projects/mips2/src/contrib/bzip2/bzlib_private.h#2 integrate .. //depot/projects/mips2/src/contrib/bzip2/compress.c#2 integrate .. //depot/projects/mips2/src/contrib/bzip2/crctable.c#2 integrate .. //depot/projects/mips2/src/contrib/bzip2/decompress.c#2 integrate .. //depot/projects/mips2/src/contrib/bzip2/dlltest.c#2 integrate .. //depot/projects/mips2/src/contrib/bzip2/huffman.c#2 integrate .. //depot/projects/mips2/src/contrib/bzip2/manual.texi#2 delete .. //depot/projects/mips2/src/contrib/bzip2/randtable.c#2 integrate .. //depot/projects/mips2/src/contrib/bzip2/sample1.bz2.uu#2 integrate .. //depot/projects/mips2/src/contrib/bzip2/sample1.ref.gz.uu#2 integrate .. //depot/projects/mips2/src/contrib/bzip2/sample2.bz2.uu#2 integrate .. //depot/projects/mips2/src/contrib/bzip2/sample2.ref.gz.uu#2 integrate .. //depot/projects/mips2/src/contrib/bzip2/sample3.bz2.uu#2 integrate .. //depot/projects/mips2/src/contrib/bzip2/sample3.ref.gz.uu#2 integrate .. //depot/projects/mips2/src/contrib/bzip2/spewG.c#2 integrate .. //depot/projects/mips2/src/contrib/bzip2/unzcrash.c#2 integrate .. //depot/projects/mips2/src/contrib/bzip2/words0#2 integrate .. //depot/projects/mips2/src/contrib/bzip2/words2#2 integrate .. //depot/projects/mips2/src/contrib/bzip2/words3#2 integrate .. //depot/projects/mips2/src/contrib/com_err/compile_et.1#2 integrate .. //depot/projects/mips2/src/contrib/cvs/src/log.c#2 integrate .. //depot/projects/mips2/src/contrib/gcc/ChangeLog#2 integrate .. //depot/projects/mips2/src/contrib/gcc/ansidecl.h#2 integrate .. //depot/projects/mips2/src/contrib/gcc/builtins.c#2 integrate .. //depot/projects/mips2/src/contrib/gcc/c-common.c#2 integrate .. //depot/projects/mips2/src/contrib/gcc/c-common.h#2 integrate .. //depot/projects/mips2/src/contrib/gcc/c-decl.c#2 integrate .. //depot/projects/mips2/src/contrib/gcc/c-objc-common.c#2 integrate .. //depot/projects/mips2/src/contrib/gcc/c-pch.c#2 integrate .. //depot/projects/mips2/src/contrib/gcc/c-typeck.c#2 integrate .. //depot/projects/mips2/src/contrib/gcc/cccp.1#2 delete .. //depot/projects/mips2/src/contrib/gcc/cfgcleanup.c#2 integrate .. //depot/projects/mips2/src/contrib/gcc/combine.c#2 integrate .. //depot/projects/mips2/src/contrib/gcc/config.gcc#2 integrate .. //depot/projects/mips2/src/contrib/gcc/config.host#2 integrate .. //depot/projects/mips2/src/contrib/gcc/config.in#2 integrate .. //depot/projects/mips2/src/contrib/gcc/config/alpha/alpha.c#2 integrate .. //depot/projects/mips2/src/contrib/gcc/config/alpha/alpha.md#2 integrate .. //depot/projects/mips2/src/contrib/gcc/config/arm/arm-protos.h#2 integrate .. //depot/projects/mips2/src/contrib/gcc/config/arm/arm.c#2 integrate .. //depot/projects/mips2/src/contrib/gcc/config/arm/arm.md#2 integrate .. //depot/projects/mips2/src/contrib/gcc/config/host-linux.c#1 branch .. //depot/projects/mips2/src/contrib/gcc/config/host-solaris.c#1 branch .. //depot/projects/mips2/src/contrib/gcc/config/i386/i386.c#2 integrate .. //depot/projects/mips2/src/contrib/gcc/config/i386/i386.md#2 integrate .. //depot/projects/mips2/src/contrib/gcc/config/ia64/hpux.h#2 integrate .. //depot/projects/mips2/src/contrib/gcc/config/rs6000/aix51.h#2 integrate .. //depot/projects/mips2/src/contrib/gcc/config/rs6000/host-darwin.c#2 integrate .. //depot/projects/mips2/src/contrib/gcc/config/rs6000/linux64.h#2 integrate .. //depot/projects/mips2/src/contrib/gcc/config/rs6000/rs6000-protos.h#2 integrate .. //depot/projects/mips2/src/contrib/gcc/config/rs6000/rs6000.c#2 integrate .. //depot/projects/mips2/src/contrib/gcc/config/rs6000/rs6000.h#2 integrate .. //depot/projects/mips2/src/contrib/gcc/config/rs6000/rs6000.md#2 integrate .. //depot/projects/mips2/src/contrib/gcc/config/rs6000/sysv4.h#2 integrate .. //depot/projects/mips2/src/contrib/gcc/config/sparc/gmon-sol2.c#2 integrate .. //depot/projects/mips2/src/contrib/gcc/config/sparc/sol2-gas-bi.h#2 integrate .. //depot/projects/mips2/src/contrib/gcc/config/sparc/sol2.h#2 integrate .. //depot/projects/mips2/src/contrib/gcc/config/sparc/sparc.c#2 integrate .. //depot/projects/mips2/src/contrib/gcc/config/sparc/sparc.h#2 integrate .. //depot/projects/mips2/src/contrib/gcc/config/x-linux#1 branch .. //depot/projects/mips2/src/contrib/gcc/config/x-solaris#1 branch .. //depot/projects/mips2/src/contrib/gcc/configure#2 integrate .. //depot/projects/mips2/src/contrib/gcc/configure.ac#2 integrate .. //depot/projects/mips2/src/contrib/gcc/coverage.c#2 integrate .. //depot/projects/mips2/src/contrib/gcc/cp/ChangeLog#2 integrate .. //depot/projects/mips2/src/contrib/gcc/cp/call.c#2 integrate .. //depot/projects/mips2/src/contrib/gcc/cp/class.c#2 integrate .. //depot/projects/mips2/src/contrib/gcc/cp/cp-tree.def#2 integrate .. //depot/projects/mips2/src/contrib/gcc/cp/cp-tree.h#2 integrate .. //depot/projects/mips2/src/contrib/gcc/cp/cvt.c#2 integrate .. //depot/projects/mips2/src/contrib/gcc/cp/decl.c#2 integrate .. //depot/projects/mips2/src/contrib/gcc/cp/decl2.c#2 integrate .. //depot/projects/mips2/src/contrib/gcc/cp/error.c#2 integrate .. //depot/projects/mips2/src/contrib/gcc/cp/init.c#2 integrate .. //depot/projects/mips2/src/contrib/gcc/cp/lex.c#2 integrate .. //depot/projects/mips2/src/contrib/gcc/cp/method.c#2 integrate .. //depot/projects/mips2/src/contrib/gcc/cp/name-lookup.c#2 integrate .. //depot/projects/mips2/src/contrib/gcc/cp/name-lookup.h#2 integrate .. //depot/projects/mips2/src/contrib/gcc/cp/parser.c#2 integrate .. //depot/projects/mips2/src/contrib/gcc/cp/pt.c#2 integrate .. //depot/projects/mips2/src/contrib/gcc/cp/search.c#2 integrate .. //depot/projects/mips2/src/contrib/gcc/cp/semantics.c#2 integrate .. //depot/projects/mips2/src/contrib/gcc/cp/typeck.c#2 integrate .. //depot/projects/mips2/src/contrib/gcc/cpp.1#2 delete .. //depot/projects/mips2/src/contrib/gcc/cppfiles.c#2 integrate .. //depot/projects/mips2/src/contrib/gcc/cpphash.h#2 integrate .. //depot/projects/mips2/src/contrib/gcc/cppinit.c#2 integrate .. //depot/projects/mips2/src/contrib/gcc/cse.c#2 integrate .. //depot/projects/mips2/src/contrib/gcc/doc/contrib.texi#2 integrate .. //depot/projects/mips2/src/contrib/gcc/doc/cpp.1#2 integrate .. //depot/projects/mips2/src/contrib/gcc/doc/gcc.1#2 integrate .. //depot/projects/mips2/src/contrib/gcc/doc/gcov.1#2 integrate .. //depot/projects/mips2/src/contrib/gcc/doc/hostconfig.texi#2 integrate .. //depot/projects/mips2/src/contrib/gcc/doc/include/gcc-common.texi#2 integrate .. //depot/projects/mips2/src/contrib/gcc/doc/invoke.texi#2 integrate .. //depot/projects/mips2/src/contrib/gcc/expmed.c#2 integrate .. //depot/projects/mips2/src/contrib/gcc/f/ChangeLog#2 integrate .. //depot/projects/mips2/src/contrib/gcc/f/g77.texi#2 integrate .. //depot/projects/mips2/src/contrib/gcc/f/g77spec.c#2 integrate .. //depot/projects/mips2/src/contrib/gcc/flow.c#2 integrate .. //depot/projects/mips2/src/contrib/gcc/fold-const.c#2 integrate .. //depot/projects/mips2/src/contrib/gcc/function.c#2 integrate .. //depot/projects/mips2/src/contrib/gcc/gcc.1#2 delete .. //depot/projects/mips2/src/contrib/gcc/gcc.c#2 integrate .. //depot/projects/mips2/src/contrib/gcc/gcov-dump.c#2 integrate .. //depot/projects/mips2/src/contrib/gcc/gcov.c#2 integrate .. //depot/projects/mips2/src/contrib/gcc/gcse.c#2 integrate .. //depot/projects/mips2/src/contrib/gcc/ggc-common.c#2 integrate .. //depot/projects/mips2/src/contrib/gcc/global.c#2 integrate .. //depot/projects/mips2/src/contrib/gcc/hooks.c#2 integrate .. //depot/projects/mips2/src/contrib/gcc/hooks.h#2 integrate .. //depot/projects/mips2/src/contrib/gcc/hosthooks-def.h#2 integrate .. //depot/projects/mips2/src/contrib/gcc/hosthooks.h#2 integrate .. //depot/projects/mips2/src/contrib/gcc/local-alloc.c#2 integrate .. //depot/projects/mips2/src/contrib/gcc/longlong.h#2 integrate .. //depot/projects/mips2/src/contrib/gcc/loop.c#2 integrate .. //depot/projects/mips2/src/contrib/gcc/md5.c#2 integrate .. //depot/projects/mips2/src/contrib/gcc/md5.h#2 integrate .. //depot/projects/mips2/src/contrib/gcc/mips-tdump.c#2 integrate .. //depot/projects/mips2/src/contrib/gcc/mips-tfile.c#2 integrate .. //depot/projects/mips2/src/contrib/gcc/mklibgcc.in#2 integrate .. //depot/projects/mips2/src/contrib/gcc/optabs.c#2 integrate .. //depot/projects/mips2/src/contrib/gcc/pretty-print.c#2 integrate .. //depot/projects/mips2/src/contrib/gcc/reg-stack.c#2 integrate .. //depot/projects/mips2/src/contrib/gcc/regrename.c#2 integrate .. //depot/projects/mips2/src/contrib/gcc/regs.h#2 integrate .. //depot/projects/mips2/src/contrib/gcc/rtl.h#2 integrate .. //depot/projects/mips2/src/contrib/gcc/sched-rgn.c#2 integrate .. //depot/projects/mips2/src/contrib/gcc/simplify-rtx.c#2 integrate .. //depot/projects/mips2/src/contrib/gcc/stmt.c#2 integrate .. //depot/projects/mips2/src/contrib/gcc/toplev.c#2 integrate .. //depot/projects/mips2/src/contrib/gcc/tree.c#2 integrate .. //depot/projects/mips2/src/contrib/gcc/unroll.c#2 integrate .. //depot/projects/mips2/src/contrib/gcc/version.c#2 integrate .. //depot/projects/mips2/src/contrib/gdb/FREEBSD-Xlist#2 integrate .. //depot/projects/mips2/src/contrib/gdb/gdb/config/powerpc/fbsd.mh#1 branch .. //depot/projects/mips2/src/contrib/gdb/gdb/config/powerpc/fbsd.mt#1 branch .. //depot/projects/mips2/src/contrib/gdb/gdb/config/powerpc/nm-fbsd.h#1 branch .. //depot/projects/mips2/src/contrib/gdb/gdb/config/rs6000/nm-rs6000.h#1 branch .. //depot/projects/mips2/src/contrib/gdb/gdb/config/rs6000/nm-rs6000ly.h#1 branch .. //depot/projects/mips2/src/contrib/gdb/gdb/config/rs6000/rs6000.mh#1 branch .. //depot/projects/mips2/src/contrib/gdb/gdb/config/rs6000/rs6000.mt#1 branch .. //depot/projects/mips2/src/contrib/gdb/gdb/config/rs6000/rs6000lynx.mh#1 branch .. //depot/projects/mips2/src/contrib/gdb/gdb/config/rs6000/rs6000lynx.mt#1 branch .. //depot/projects/mips2/src/contrib/gdb/gdb/config/rs6000/tm-rs6000.h#1 branch .. //depot/projects/mips2/src/contrib/gdb/gdb/config/rs6000/tm-rs6000ly.h#1 branch .. //depot/projects/mips2/src/contrib/gdb/gdb/config/rs6000/xm-rs6000.h#1 branch .. //depot/projects/mips2/src/contrib/gdb/gdb/ppcfbsd-nat.c#1 branch .. //depot/projects/mips2/src/contrib/gdb/gdb/ppcfbsd-tdep.c#1 branch .. //depot/projects/mips2/src/contrib/gdb/gdb/ppcfbsd-tdep.h#1 branch .. //depot/projects/mips2/src/contrib/gdb/gdb/rs6000-nat.c#1 branch .. //depot/projects/mips2/src/contrib/gdb/gdb/rs6000-tdep.c#1 branch .. //depot/projects/mips2/src/contrib/gdtoa/README#2 integrate .. //depot/projects/mips2/src/contrib/gdtoa/arithchk.c#2 integrate .. //depot/projects/mips2/src/contrib/gdtoa/dmisc.c#2 integrate .. //depot/projects/mips2/src/contrib/gdtoa/dtoa.c#2 integrate .. //depot/projects/mips2/src/contrib/gdtoa/g_Qfmt.c#2 integrate .. //depot/projects/mips2/src/contrib/gdtoa/g__fmt.c#2 integrate .. //depot/projects/mips2/src/contrib/gdtoa/g_ddfmt.c#2 integrate .. //depot/projects/mips2/src/contrib/gdtoa/g_dfmt.c#2 integrate .. //depot/projects/mips2/src/contrib/gdtoa/g_ffmt.c#2 integrate .. //depot/projects/mips2/src/contrib/gdtoa/g_xLfmt.c#2 integrate .. //depot/projects/mips2/src/contrib/gdtoa/g_xfmt.c#2 integrate .. //depot/projects/mips2/src/contrib/gdtoa/gdtoa.c#2 integrate .. //depot/projects/mips2/src/contrib/gdtoa/gdtoa.h#2 integrate .. //depot/projects/mips2/src/contrib/gdtoa/gdtoaimp.h#2 integrate .. //depot/projects/mips2/src/contrib/gdtoa/gethex.c#2 integrate .. //depot/projects/mips2/src/contrib/gdtoa/gmisc.c#2 integrate .. //depot/projects/mips2/src/contrib/gdtoa/hd_init.c#2 integrate .. //depot/projects/mips2/src/contrib/gdtoa/hexnan.c#2 integrate .. //depot/projects/mips2/src/contrib/gdtoa/makefile#2 integrate .. //depot/projects/mips2/src/contrib/gdtoa/misc.c#2 integrate .. //depot/projects/mips2/src/contrib/gdtoa/qnan.c#1 branch .. //depot/projects/mips2/src/contrib/gdtoa/smisc.c#2 integrate .. //depot/projects/mips2/src/contrib/gdtoa/strtoIQ.c#2 integrate .. //depot/projects/mips2/src/contrib/gdtoa/strtoId.c#2 integrate .. //depot/projects/mips2/src/contrib/gdtoa/strtoIdd.c#2 integrate .. //depot/projects/mips2/src/contrib/gdtoa/strtoIf.c#2 integrate .. //depot/projects/mips2/src/contrib/gdtoa/strtoIg.c#2 integrate .. //depot/projects/mips2/src/contrib/gdtoa/strtoIx.c#2 integrate .. //depot/projects/mips2/src/contrib/gdtoa/strtoIxL.c#2 integrate .. //depot/projects/mips2/src/contrib/gdtoa/strtod.c#2 integrate .. //depot/projects/mips2/src/contrib/gdtoa/strtodI.c#2 integrate .. //depot/projects/mips2/src/contrib/gdtoa/strtodg.c#2 integrate .. //depot/projects/mips2/src/contrib/gdtoa/strtodnrp.c#1 branch .. //depot/projects/mips2/src/contrib/gdtoa/strtof.c#2 integrate .. //depot/projects/mips2/src/contrib/gdtoa/strtopQ.c#2 integrate .. //depot/projects/mips2/src/contrib/gdtoa/strtopd.c#2 integrate .. //depot/projects/mips2/src/contrib/gdtoa/strtopdd.c#2 integrate .. //depot/projects/mips2/src/contrib/gdtoa/strtopf.c#2 integrate .. //depot/projects/mips2/src/contrib/gdtoa/strtopx.c#2 integrate .. //depot/projects/mips2/src/contrib/gdtoa/strtopxL.c#2 integrate .. //depot/projects/mips2/src/contrib/gdtoa/strtorQ.c#2 integrate .. //depot/projects/mips2/src/contrib/gdtoa/strtord.c#2 integrate .. //depot/projects/mips2/src/contrib/gdtoa/strtordd.c#2 integrate .. //depot/projects/mips2/src/contrib/gdtoa/strtorf.c#2 integrate .. //depot/projects/mips2/src/contrib/gdtoa/strtorx.c#2 integrate .. //depot/projects/mips2/src/contrib/gdtoa/strtorxL.c#2 integrate .. //depot/projects/mips2/src/contrib/gdtoa/sum.c#2 integrate .. //depot/projects/mips2/src/contrib/gdtoa/test/Qtest.c#2 integrate .. //depot/projects/mips2/src/contrib/gdtoa/test/dItest.c#2 integrate .. //depot/projects/mips2/src/contrib/gdtoa/test/ddtest.c#2 integrate .. //depot/projects/mips2/src/contrib/gdtoa/test/dt.c#2 integrate .. //depot/projects/mips2/src/contrib/gdtoa/test/dtest.c#2 integrate .. //depot/projects/mips2/src/contrib/gdtoa/test/dtst.out#2 integrate .. //depot/projects/mips2/src/contrib/gdtoa/test/ftest.c#2 integrate .. //depot/projects/mips2/src/contrib/gdtoa/test/getround.c#2 integrate .. //depot/projects/mips2/src/contrib/gdtoa/test/makefile#2 integrate .. //depot/projects/mips2/src/contrib/gdtoa/test/strtodt.c#2 integrate .. //depot/projects/mips2/src/contrib/gdtoa/test/x.ou0#2 integrate .. //depot/projects/mips2/src/contrib/gdtoa/test/x.ou1#2 integrate .. //depot/projects/mips2/src/contrib/gdtoa/test/xL.ou1#2 integrate .. //depot/projects/mips2/src/contrib/gdtoa/test/xLtest.c#2 integrate .. //depot/projects/mips2/src/contrib/gdtoa/test/xsum0.out#2 integrate .. //depot/projects/mips2/src/contrib/gdtoa/test/xtest.c#2 integrate .. //depot/projects/mips2/src/contrib/gdtoa/ulp.c#2 integrate .. //depot/projects/mips2/src/contrib/gdtoa/xsum0.out#2 integrate .. //depot/projects/mips2/src/contrib/groff/tmac/doc-common#2 integrate .. //depot/projects/mips2/src/contrib/groff/tmac/doc-syms#2 integrate .. //depot/projects/mips2/src/contrib/groff/tmac/groff_mdoc.man#2 integrate .. //depot/projects/mips2/src/contrib/ipfilter/BSD/Makefile#2 integrate .. //depot/projects/mips2/src/contrib/ipfilter/HISTORY#2 integrate .. //depot/projects/mips2/src/contrib/ipfilter/Makefile#2 integrate .. //depot/projects/mips2/src/contrib/ipfilter/bpf_filter.c#2 integrate .. //depot/projects/mips2/src/contrib/ipfilter/ip_fil.c#2 integrate .. //depot/projects/mips2/src/contrib/ipfilter/ipf.h#2 integrate .. //depot/projects/mips2/src/contrib/ipfilter/iplang/iplang_y.y#2 integrate .. //depot/projects/mips2/src/contrib/ipfilter/ipmon.h#2 integrate .. //depot/projects/mips2/src/contrib/ipfilter/ipsd/sbpf.c#2 integrate .. //depot/projects/mips2/src/contrib/ipfilter/ipsend/ipsend.c#2 integrate .. //depot/projects/mips2/src/contrib/ipfilter/ipsend/iptests.c#2 integrate .. //depot/projects/mips2/src/contrib/ipfilter/ipsend/lsock.c#2 integrate .. //depot/projects/mips2/src/contrib/ipfilter/ipsend/resend.c#2 integrate .. //depot/projects/mips2/src/contrib/ipfilter/ipsend/sbpf.c#2 integrate .. //depot/projects/mips2/src/contrib/ipfilter/ipsend/sock.c#2 integrate .. //depot/projects/mips2/src/contrib/ipfilter/ipt.h#2 integrate .. //depot/projects/mips2/src/contrib/ipfilter/lib/Makefile#2 integrate .. //depot/projects/mips2/src/contrib/ipfilter/lib/addicmp.c#2 integrate .. //depot/projects/mips2/src/contrib/ipfilter/lib/addkeep.c#2 delete .. //depot/projects/mips2/src/contrib/ipfilter/lib/facpri.c#2 integrate .. //depot/projects/mips2/src/contrib/ipfilter/lib/getport.c#2 integrate .. //depot/projects/mips2/src/contrib/ipfilter/lib/icmpcode.c#2 integrate .. //depot/projects/mips2/src/contrib/ipfilter/lib/ipft_tx.c#2 integrate .. //depot/projects/mips2/src/contrib/ipfilter/lib/make_range.c#2 delete .. //depot/projects/mips2/src/contrib/ipfilter/lib/optprint.c#2 integrate .. //depot/projects/mips2/src/contrib/ipfilter/lib/printfr.c#2 integrate .. //depot/projects/mips2/src/contrib/ipfilter/lib/printlog.c#2 integrate .. //depot/projects/mips2/src/contrib/ipfilter/man/ipmon.8#2 integrate .. //depot/projects/mips2/src/contrib/ipfilter/radix.c#2 integrate .. //depot/projects/mips2/src/contrib/ipfilter/samples/proxy.c#2 integrate .. //depot/projects/mips2/src/contrib/ipfilter/test/Makefile#2 integrate .. //depot/projects/mips2/src/contrib/ipfilter/test/expected/f20#1 branch .. //depot/projects/mips2/src/contrib/ipfilter/test/expected/i1#2 integrate .. //depot/projects/mips2/src/contrib/ipfilter/test/expected/i10#2 integrate .. //depot/projects/mips2/src/contrib/ipfilter/test/expected/i11#2 integrate .. //depot/projects/mips2/src/contrib/ipfilter/test/expected/i18#2 integrate .. //depot/projects/mips2/src/contrib/ipfilter/test/expected/i5#2 integrate .. //depot/projects/mips2/src/contrib/ipfilter/test/expected/i8#2 integrate .. //depot/projects/mips2/src/contrib/ipfilter/test/expected/i9#2 integrate .. //depot/projects/mips2/src/contrib/ipfilter/test/expected/in2#2 integrate .. //depot/projects/mips2/src/contrib/ipfilter/test/expected/in5#2 integrate .. //depot/projects/mips2/src/contrib/ipfilter/test/expected/ni19#1 branch .. //depot/projects/mips2/src/contrib/ipfilter/test/expected/ni20#1 branch .. //depot/projects/mips2/src/contrib/ipfilter/test/expected/ni21#1 branch .. //depot/projects/mips2/src/contrib/ipfilter/test/input/f2#2 integrate .. //depot/projects/mips2/src/contrib/ipfilter/test/input/f20#1 branch .. //depot/projects/mips2/src/contrib/ipfilter/test/input/ni19#1 branch .. //depot/projects/mips2/src/contrib/ipfilter/test/input/ni20#1 branch .. //depot/projects/mips2/src/contrib/ipfilter/test/input/ni21#1 branch .. //depot/projects/mips2/src/contrib/ipfilter/test/regress/f20#1 branch .. //depot/projects/mips2/src/contrib/ipfilter/test/regress/i1#2 integrate .. //depot/projects/mips2/src/contrib/ipfilter/test/regress/i10#2 integrate .. //depot/projects/mips2/src/contrib/ipfilter/test/regress/i11#2 integrate .. //depot/projects/mips2/src/contrib/ipfilter/test/regress/i15#2 integrate .. //depot/projects/mips2/src/contrib/ipfilter/test/regress/i17#2 integrate .. //depot/projects/mips2/src/contrib/ipfilter/test/regress/i18#2 integrate .. //depot/projects/mips2/src/contrib/ipfilter/test/regress/i5#2 integrate .. //depot/projects/mips2/src/contrib/ipfilter/test/regress/i8#2 integrate .. //depot/projects/mips2/src/contrib/ipfilter/test/regress/i9#2 integrate .. //depot/projects/mips2/src/contrib/ipfilter/test/regress/in2#2 integrate .. //depot/projects/mips2/src/contrib/ipfilter/test/regress/in5#2 integrate .. //depot/projects/mips2/src/contrib/ipfilter/test/regress/ni19.ipf#1 branch .. //depot/projects/mips2/src/contrib/ipfilter/test/regress/ni19.nat#1 branch .. //depot/projects/mips2/src/contrib/ipfilter/test/regress/ni20.ipf#1 branch .. //depot/projects/mips2/src/contrib/ipfilter/test/regress/ni20.nat#1 branch .. //depot/projects/mips2/src/contrib/ipfilter/test/regress/ni21.ipf#1 branch .. //depot/projects/mips2/src/contrib/ipfilter/test/regress/ni21.nat#1 branch .. //depot/projects/mips2/src/contrib/ipfilter/test/test.format#2 integrate .. //depot/projects/mips2/src/contrib/ipfilter/todo#1 branch .. //depot/projects/mips2/src/contrib/ipfilter/tools/ipf.c#2 integrate .. //depot/projects/mips2/src/contrib/ipfilter/tools/ipf_y.y#2 integrate .. //depot/projects/mips2/src/contrib/ipfilter/tools/ipfcomp.c#2 integrate .. //depot/projects/mips2/src/contrib/ipfilter/tools/ipfs.c#2 integrate .. //depot/projects/mips2/src/contrib/ipfilter/tools/ipfstat.c#2 integrate .. //depot/projects/mips2/src/contrib/ipfilter/tools/ipftest.c#2 integrate .. //depot/projects/mips2/src/contrib/ipfilter/tools/ipmon.c#2 integrate .. //depot/projects/mips2/src/contrib/ipfilter/tools/ipnat_y.y#2 integrate .. //depot/projects/mips2/src/contrib/ipfilter/tools/ipsyncm.c#2 integrate .. //depot/projects/mips2/src/contrib/ipfilter/tools/ipsyncs.c#2 integrate .. //depot/projects/mips2/src/contrib/ipfilter/tools/lexer.c#2 integrate .. //depot/projects/mips2/src/contrib/less/LICENSE#2 integrate .. //depot/projects/mips2/src/contrib/less/Makefile.aut#2 integrate .. //depot/projects/mips2/src/contrib/less/Makefile.in#2 integrate .. //depot/projects/mips2/src/contrib/less/Makefile.wnb#2 integrate .. //depot/projects/mips2/src/contrib/less/NEWS#2 integrate .. //depot/projects/mips2/src/contrib/less/README#2 integrate .. //depot/projects/mips2/src/contrib/less/brac.c#2 integrate .. //depot/projects/mips2/src/contrib/less/ch.c#2 integrate .. //depot/projects/mips2/src/contrib/less/charset.c#2 integrate .. //depot/projects/mips2/src/contrib/less/charset.h#1 branch .. //depot/projects/mips2/src/contrib/less/cmd.h#2 integrate .. //depot/projects/mips2/src/contrib/less/cmdbuf.c#2 integrate .. //depot/projects/mips2/src/contrib/less/command.c#2 integrate .. //depot/projects/mips2/src/contrib/less/configure#2 integrate .. //depot/projects/mips2/src/contrib/less/configure.ac#2 integrate .. //depot/projects/mips2/src/contrib/less/decode.c#2 integrate .. //depot/projects/mips2/src/contrib/less/defines.ds#2 integrate .. //depot/projects/mips2/src/contrib/less/defines.h.in#2 integrate .. //depot/projects/mips2/src/contrib/less/defines.o2#2 integrate .. //depot/projects/mips2/src/contrib/less/defines.o9#2 integrate .. //depot/projects/mips2/src/contrib/less/defines.wn#2 integrate .. //depot/projects/mips2/src/contrib/less/edit.c#2 integrate .. //depot/projects/mips2/src/contrib/less/filename.c#2 integrate .. //depot/projects/mips2/src/contrib/less/forwback.c#2 integrate .. //depot/projects/mips2/src/contrib/less/funcs.h#2 integrate .. //depot/projects/mips2/src/contrib/less/ifile.c#2 integrate .. //depot/projects/mips2/src/contrib/less/input.c#2 integrate .. //depot/projects/mips2/src/contrib/less/jump.c#2 integrate .. //depot/projects/mips2/src/contrib/less/less.h#2 integrate .. //depot/projects/mips2/src/contrib/less/less.man#2 integrate .. //depot/projects/mips2/src/contrib/less/less.nro#2 integrate .. //depot/projects/mips2/src/contrib/less/lessecho.c#2 integrate .. //depot/projects/mips2/src/contrib/less/lessecho.man#1 branch .. //depot/projects/mips2/src/contrib/less/lessecho.nro#1 branch .. //depot/projects/mips2/src/contrib/less/lesskey.c#2 integrate .. //depot/projects/mips2/src/contrib/less/lesskey.h#2 integrate .. //depot/projects/mips2/src/contrib/less/lesskey.man#2 integrate .. //depot/projects/mips2/src/contrib/less/lesskey.nro#2 integrate .. //depot/projects/mips2/src/contrib/less/lglob.h#2 integrate .. //depot/projects/mips2/src/contrib/less/line.c#2 integrate .. //depot/projects/mips2/src/contrib/less/linenum.c#2 integrate .. //depot/projects/mips2/src/contrib/less/lsystem.c#2 integrate .. //depot/projects/mips2/src/contrib/less/main.c#2 integrate .. //depot/projects/mips2/src/contrib/less/mark.c#2 integrate .. //depot/projects/mips2/src/contrib/less/mkhelp.c#2 integrate .. //depot/projects/mips2/src/contrib/less/optfunc.c#2 integrate .. //depot/projects/mips2/src/contrib/less/option.c#2 integrate .. //depot/projects/mips2/src/contrib/less/option.h#2 integrate .. //depot/projects/mips2/src/contrib/less/opttbl.c#2 integrate .. //depot/projects/mips2/src/contrib/less/os.c#2 integrate .. //depot/projects/mips2/src/contrib/less/output.c#2 integrate .. //depot/projects/mips2/src/contrib/less/pckeys.h#2 integrate .. //depot/projects/mips2/src/contrib/less/position.c#2 integrate .. //depot/projects/mips2/src/contrib/less/position.h#2 integrate .. //depot/projects/mips2/src/contrib/less/prompt.c#2 integrate .. //depot/projects/mips2/src/contrib/less/screen.c#2 integrate .. //depot/projects/mips2/src/contrib/less/scrsize.c#2 integrate .. //depot/projects/mips2/src/contrib/less/search.c#2 integrate .. //depot/projects/mips2/src/contrib/less/signal.c#2 integrate .. //depot/projects/mips2/src/contrib/less/tags.c#2 integrate .. //depot/projects/mips2/src/contrib/less/ttyin.c#2 integrate .. //depot/projects/mips2/src/contrib/less/version.c#2 integrate .. //depot/projects/mips2/src/contrib/libbegemot/rpoll.c#2 integrate .. //depot/projects/mips2/src/contrib/libbegemot/rpoll.h#2 integrate .. //depot/projects/mips2/src/contrib/libbegemot/rpoll.man#2 integrate .. //depot/projects/mips2/src/contrib/libf2c/ChangeLog#2 integrate .. //depot/projects/mips2/src/contrib/libobjc/ChangeLog#2 integrate .. //depot/projects/mips2/src/contrib/libobjc/README#2 integrate .. //depot/projects/mips2/src/contrib/libpcap/CHANGES#2 integrate .. //depot/projects/mips2/src/contrib/libpcap/CREDITS#2 integrate .. //depot/projects/mips2/src/contrib/libpcap/FREEBSD-upgrade#2 integrate .. //depot/projects/mips2/src/contrib/libpcap/README.dag#2 integrate .. //depot/projects/mips2/src/contrib/libpcap/VERSION#2 integrate .. //depot/projects/mips2/src/contrib/libpcap/config.h.in#2 integrate .. //depot/projects/mips2/src/contrib/libpcap/configure#2 integrate .. //depot/projects/mips2/src/contrib/libpcap/configure.in#2 integrate .. //depot/projects/mips2/src/contrib/libpcap/doc/pcap.html#1 branch .. //depot/projects/mips2/src/contrib/libpcap/doc/pcap.txt#1 branch .. //depot/projects/mips2/src/contrib/libpcap/doc/pcap.xml#1 branch .. //depot/projects/mips2/src/contrib/libpcap/ethertype.h#2 integrate .. //depot/projects/mips2/src/contrib/libpcap/fad-win32.c#2 integrate .. //depot/projects/mips2/src/contrib/libpcap/gencode.c#2 integrate .. //depot/projects/mips2/src/contrib/libpcap/gencode.h#2 integrate .. //depot/projects/mips2/src/contrib/libpcap/grammar.y#2 integrate .. //depot/projects/mips2/src/contrib/libpcap/pcap-bpf.c#2 integrate .. //depot/projects/mips2/src/contrib/libpcap/pcap-bpf.h#2 integrate .. //depot/projects/mips2/src/contrib/libpcap/pcap-dag.c#2 integrate .. //depot/projects/mips2/src/contrib/libpcap/pcap-dag.h#2 integrate .. //depot/projects/mips2/src/contrib/libpcap/pcap-dlpi.c#2 integrate .. //depot/projects/mips2/src/contrib/libpcap/pcap-int.h#2 integrate .. //depot/projects/mips2/src/contrib/libpcap/pcap-linux.c#2 integrate .. //depot/projects/mips2/src/contrib/libpcap/pcap-stdinc.h#2 integrate .. //depot/projects/mips2/src/contrib/libpcap/pcap-win32.c#2 integrate .. //depot/projects/mips2/src/contrib/libpcap/pcap.3#2 integrate .. //depot/projects/mips2/src/contrib/libpcap/pcap.c#2 integrate .. //depot/projects/mips2/src/contrib/libpcap/pcap.h#2 integrate .. //depot/projects/mips2/src/contrib/libpcap/savefile.c#2 integrate .. //depot/projects/mips2/src/contrib/libpcap/scanner.l#2 integrate .. //depot/projects/mips2/src/contrib/libreadline/CHANGELOG#2 integrate .. //depot/projects/mips2/src/contrib/libreadline/CHANGES#2 integrate .. //depot/projects/mips2/src/contrib/libreadline/FREEBSD-upgrade#2 integrate .. //depot/projects/mips2/src/contrib/libreadline/INSTALL#2 integrate .. //depot/projects/mips2/src/contrib/libreadline/NEWS#2 integrate .. //depot/projects/mips2/src/contrib/libreadline/README#2 integrate .. //depot/projects/mips2/src/contrib/libreadline/aclocal.m4#2 integrate .. //depot/projects/mips2/src/contrib/libreadline/bind.c#2 integrate .. //depot/projects/mips2/src/contrib/libreadline/callback.c#2 integrate .. //depot/projects/mips2/src/contrib/libreadline/complete.c#2 integrate .. //depot/projects/mips2/src/contrib/libreadline/config.h.in#2 integrate .. //depot/projects/mips2/src/contrib/libreadline/configure#2 integrate .. //depot/projects/mips2/src/contrib/libreadline/configure.in#2 integrate .. //depot/projects/mips2/src/contrib/libreadline/display.c#2 integrate .. //depot/projects/mips2/src/contrib/libreadline/doc/history.texi#2 integrate .. //depot/projects/mips2/src/contrib/libreadline/doc/hstech.texi#2 integrate .. //depot/projects/mips2/src/contrib/libreadline/doc/hsuser.texi#2 integrate .. //depot/projects/mips2/src/contrib/libreadline/doc/readline.3#2 integrate .. //depot/projects/mips2/src/contrib/libreadline/doc/rlman.texi#2 integrate .. //depot/projects/mips2/src/contrib/libreadline/doc/rltech.texi#2 integrate .. //depot/projects/mips2/src/contrib/libreadline/doc/rluser.texi#2 integrate .. //depot/projects/mips2/src/contrib/libreadline/doc/rluserman.texi#2 integrate .. //depot/projects/mips2/src/contrib/libreadline/doc/version.texi#2 integrate .. //depot/projects/mips2/src/contrib/libreadline/examples/excallback.c#2 integrate .. //depot/projects/mips2/src/contrib/libreadline/examples/rlfe/Makefile.in#2 integrate .. //depot/projects/mips2/src/contrib/libreadline/histexpand.c#2 integrate .. //depot/projects/mips2/src/contrib/libreadline/histfile.c#2 integrate .. //depot/projects/mips2/src/contrib/libreadline/history.c#2 integrate .. //depot/projects/mips2/src/contrib/libreadline/input.c#2 integrate .. //depot/projects/mips2/src/contrib/libreadline/isearch.c#2 integrate .. //depot/projects/mips2/src/contrib/libreadline/kill.c#2 integrate .. //depot/projects/mips2/src/contrib/libreadline/macro.c#2 integrate .. //depot/projects/mips2/src/contrib/libreadline/misc.c#2 integrate .. //depot/projects/mips2/src/contrib/libreadline/readline.c#2 integrate .. //depot/projects/mips2/src/contrib/libreadline/readline.h#2 integrate .. //depot/projects/mips2/src/contrib/libreadline/rlconf.h#2 integrate .. //depot/projects/mips2/src/contrib/libreadline/rlmbutil.h#2 integrate .. //depot/projects/mips2/src/contrib/libreadline/rlprivate.h#2 integrate .. //depot/projects/mips2/src/contrib/libreadline/rltty.c#2 integrate .. //depot/projects/mips2/src/contrib/libreadline/search.c#2 integrate .. //depot/projects/mips2/src/contrib/libreadline/signals.c#2 integrate .. //depot/projects/mips2/src/contrib/libreadline/support/shlib-install#2 integrate .. //depot/projects/mips2/src/contrib/libreadline/support/shobj-conf#2 integrate .. //depot/projects/mips2/src/contrib/libreadline/terminal.c#2 integrate .. //depot/projects/mips2/src/contrib/libreadline/text.c#2 integrate .. //depot/projects/mips2/src/contrib/libreadline/tilde.c#2 integrate .. //depot/projects/mips2/src/contrib/libreadline/undo.c#2 integrate .. //depot/projects/mips2/src/contrib/libreadline/vi_mode.c#2 integrate .. //depot/projects/mips2/src/contrib/libstdc++/ChangeLog#2 integrate .. //depot/projects/mips2/src/contrib/libstdc++/include/bits/c++config#2 integrate .. //depot/projects/mips2/src/contrib/libstdc++/include/bits/fstream.tcc#2 integrate .. //depot/projects/mips2/src/contrib/libstdc++/include/c_std/std_cmath.h#2 integrate .. //depot/projects/mips2/src/contrib/libstdc++/include/ext/demangle.h#2 delete .. //depot/projects/mips2/src/contrib/libstdc++/include/ext/hashtable.h#2 integrate .. //depot/projects/mips2/src/contrib/lukemftpd/src/Makefile#2 integrate .. //depot/projects/mips2/src/contrib/lukemftpd/src/cmds.c#2 integrate .. //depot/projects/mips2/src/contrib/lukemftpd/src/conf.c#2 integrate .. //depot/projects/mips2/src/contrib/lukemftpd/src/extern.h#2 integrate .. //depot/projects/mips2/src/contrib/lukemftpd/src/ftpcmd.y#2 integrate .. //depot/projects/mips2/src/contrib/lukemftpd/src/ftpd.8#2 integrate .. //depot/projects/mips2/src/contrib/lukemftpd/src/ftpd.c#2 integrate .. //depot/projects/mips2/src/contrib/lukemftpd/src/ftpd.conf.5#2 integrate .. //depot/projects/mips2/src/contrib/lukemftpd/src/logutmp.c#2 integrate .. //depot/projects/mips2/src/contrib/lukemftpd/src/logwtmp.c#2 integrate .. //depot/projects/mips2/src/contrib/lukemftpd/src/pathnames.h#2 integrate .. //depot/projects/mips2/src/contrib/lukemftpd/src/popen.c#2 integrate .. //depot/projects/mips2/src/contrib/lukemftpd/src/version.h#2 integrate .. //depot/projects/mips2/src/contrib/ncurses/ANNOUNCE#2 integrate .. //depot/projects/mips2/src/contrib/ncurses/AUTHORS#1 branch .. //depot/projects/mips2/src/contrib/ncurses/FREEBSD-Xlist#1 branch .. //depot/projects/mips2/src/contrib/ncurses/FREEBSD-upgrade#1 branch .. //depot/projects/mips2/src/contrib/ncurses/INSTALL#2 integrate .. //depot/projects/mips2/src/contrib/ncurses/MANIFEST#2 integrate .. //depot/projects/mips2/src/contrib/ncurses/Makefile.glibc#2 delete .. //depot/projects/mips2/src/contrib/ncurses/Makefile.in#2 integrate .. //depot/projects/mips2/src/contrib/ncurses/Makefile.os2#2 integrate .. //depot/projects/mips2/src/contrib/ncurses/NEWS#2 integrate .. //depot/projects/mips2/src/contrib/ncurses/README#2 integrate .. //depot/projects/mips2/src/contrib/ncurses/README.emx#2 integrate .. //depot/projects/mips2/src/contrib/ncurses/README.glibc#2 delete .. //depot/projects/mips2/src/contrib/ncurses/TO-DO#2 integrate .. //depot/projects/mips2/src/contrib/ncurses/aclocal.m4#2 integrate .. //depot/projects/mips2/src/contrib/ncurses/announce.html.in#2 integrate .. //depot/projects/mips2/src/contrib/ncurses/c++/Makefile.in#2 delete .. //depot/projects/mips2/src/contrib/ncurses/c++/NEWS#2 delete .. //depot/projects/mips2/src/contrib/ncurses/c++/PROBLEMS#2 delete .. //depot/projects/mips2/src/contrib/ncurses/c++/README-first#2 delete .. //depot/projects/mips2/src/contrib/ncurses/c++/cursesapp.cc#2 delete .. //depot/projects/mips2/src/contrib/ncurses/c++/cursesapp.h#2 delete .. //depot/projects/mips2/src/contrib/ncurses/c++/cursesf.cc#2 delete .. //depot/projects/mips2/src/contrib/ncurses/c++/cursesf.h#2 delete .. //depot/projects/mips2/src/contrib/ncurses/c++/cursesm.cc#2 delete .. //depot/projects/mips2/src/contrib/ncurses/c++/cursesm.h#2 delete .. //depot/projects/mips2/src/contrib/ncurses/c++/cursesmain.cc#2 delete .. //depot/projects/mips2/src/contrib/ncurses/c++/cursesp.cc#2 delete .. //depot/projects/mips2/src/contrib/ncurses/c++/cursesp.h#2 delete .. //depot/projects/mips2/src/contrib/ncurses/c++/cursespad.cc#2 delete .. //depot/projects/mips2/src/contrib/ncurses/c++/cursesw.cc#2 delete .. //depot/projects/mips2/src/contrib/ncurses/c++/cursesw.h#2 delete .. //depot/projects/mips2/src/contrib/ncurses/c++/cursslk.cc#2 delete .. //depot/projects/mips2/src/contrib/ncurses/c++/cursslk.h#2 delete .. //depot/projects/mips2/src/contrib/ncurses/c++/demo.cc#2 delete .. //depot/projects/mips2/src/contrib/ncurses/c++/edit_cfg.sh#2 delete .. //depot/projects/mips2/src/contrib/ncurses/c++/etip.h.in#2 delete .. //depot/projects/mips2/src/contrib/ncurses/c++/headers#2 delete .. //depot/projects/mips2/src/contrib/ncurses/c++/internal.h#2 delete .. //depot/projects/mips2/src/contrib/ncurses/c++/modules#2 delete .. //depot/projects/mips2/src/contrib/ncurses/config.guess#2 integrate .. //depot/projects/mips2/src/contrib/ncurses/config.sub#2 integrate .. //depot/projects/mips2/src/contrib/ncurses/configure#2 integrate .. //depot/projects/mips2/src/contrib/ncurses/configure.in#2 integrate .. //depot/projects/mips2/src/contrib/ncurses/convert_configure.pl#2 integrate .. //depot/projects/mips2/src/contrib/ncurses/dist.mk#2 integrate .. //depot/projects/mips2/src/contrib/ncurses/doc/hackguide.doc#2 integrate .. //depot/projects/mips2/src/contrib/ncurses/doc/html/NCURSES-Programming-HOWTO.html#1 branch .. //depot/projects/mips2/src/contrib/ncurses/doc/html/announce.html#2 integrate .. //depot/projects/mips2/src/contrib/ncurses/doc/html/hackguide.html#2 integrate .. //depot/projects/mips2/src/contrib/ncurses/doc/html/ncurses-intro.html#2 integrate .. //depot/projects/mips2/src/contrib/ncurses/doc/ncurses-intro.doc#2 integrate .. //depot/projects/mips2/src/contrib/ncurses/form/Makefile.in#2 integrate .. //depot/projects/mips2/src/contrib/ncurses/form/READ.ME#2 integrate .. //depot/projects/mips2/src/contrib/ncurses/form/f_trace.c#1 branch .. //depot/projects/mips2/src/contrib/ncurses/form/fld_arg.c#2 integrate .. //depot/projects/mips2/src/contrib/ncurses/form/fld_attr.c#2 integrate .. //depot/projects/mips2/src/contrib/ncurses/form/fld_current.c#2 integrate .. //depot/projects/mips2/src/contrib/ncurses/form/fld_def.c#2 integrate .. //depot/projects/mips2/src/contrib/ncurses/form/fld_dup.c#2 integrate .. //depot/projects/mips2/src/contrib/ncurses/form/fld_ftchoice.c#2 integrate .. //depot/projects/mips2/src/contrib/ncurses/form/fld_ftlink.c#2 integrate .. //depot/projects/mips2/src/contrib/ncurses/form/fld_info.c#2 integrate .. //depot/projects/mips2/src/contrib/ncurses/form/fld_just.c#2 integrate .. //depot/projects/mips2/src/contrib/ncurses/form/fld_link.c#2 integrate .. //depot/projects/mips2/src/contrib/ncurses/form/fld_max.c#2 integrate .. //depot/projects/mips2/src/contrib/ncurses/form/fld_move.c#2 integrate .. //depot/projects/mips2/src/contrib/ncurses/form/fld_newftyp.c#2 integrate .. //depot/projects/mips2/src/contrib/ncurses/form/fld_opts.c#2 integrate .. //depot/projects/mips2/src/contrib/ncurses/form/fld_pad.c#2 integrate .. //depot/projects/mips2/src/contrib/ncurses/form/fld_page.c#2 integrate .. //depot/projects/mips2/src/contrib/ncurses/form/fld_stat.c#2 integrate .. //depot/projects/mips2/src/contrib/ncurses/form/fld_type.c#2 integrate .. //depot/projects/mips2/src/contrib/ncurses/form/fld_user.c#2 integrate .. //depot/projects/mips2/src/contrib/ncurses/form/form.h#2 integrate .. //depot/projects/mips2/src/contrib/ncurses/form/form.priv.h#2 integrate .. //depot/projects/mips2/src/contrib/ncurses/form/frm_cursor.c#2 integrate .. //depot/projects/mips2/src/contrib/ncurses/form/frm_data.c#2 integrate .. //depot/projects/mips2/src/contrib/ncurses/form/frm_def.c#2 integrate .. //depot/projects/mips2/src/contrib/ncurses/form/frm_driver.c#2 integrate .. //depot/projects/mips2/src/contrib/ncurses/form/frm_hook.c#2 integrate .. //depot/projects/mips2/src/contrib/ncurses/form/frm_opts.c#2 integrate .. //depot/projects/mips2/src/contrib/ncurses/form/frm_page.c#2 integrate .. //depot/projects/mips2/src/contrib/ncurses/form/frm_post.c#2 integrate .. //depot/projects/mips2/src/contrib/ncurses/form/frm_req_name.c#2 integrate .. //depot/projects/mips2/src/contrib/ncurses/form/frm_scale.c#2 integrate .. //depot/projects/mips2/src/contrib/ncurses/form/frm_sub.c#2 integrate .. //depot/projects/mips2/src/contrib/ncurses/form/frm_user.c#2 integrate .. //depot/projects/mips2/src/contrib/ncurses/form/frm_win.c#2 integrate .. //depot/projects/mips2/src/contrib/ncurses/form/fty_alnum.c#2 integrate .. //depot/projects/mips2/src/contrib/ncurses/form/fty_alpha.c#2 integrate .. //depot/projects/mips2/src/contrib/ncurses/form/fty_enum.c#2 integrate .. //depot/projects/mips2/src/contrib/ncurses/form/fty_int.c#2 integrate .. //depot/projects/mips2/src/contrib/ncurses/form/fty_ipv4.c#2 integrate .. //depot/projects/mips2/src/contrib/ncurses/form/fty_num.c#2 integrate .. //depot/projects/mips2/src/contrib/ncurses/form/fty_regex.c#2 integrate .. //depot/projects/mips2/src/contrib/ncurses/form/llib-lform#2 integrate .. //depot/projects/mips2/src/contrib/ncurses/form/llib-lformw#1 branch .. //depot/projects/mips2/src/contrib/ncurses/form/modules#2 integrate .. //depot/projects/mips2/src/contrib/ncurses/include/Caps#2 integrate .. //depot/projects/mips2/src/contrib/ncurses/include/Caps.aix4#2 integrate .. //depot/projects/mips2/src/contrib/ncurses/include/Caps.hpux11#1 branch .. //depot/projects/mips2/src/contrib/ncurses/include/Caps.keys#2 integrate .. //depot/projects/mips2/src/contrib/ncurses/include/Caps.osf1r5#2 integrate .. //depot/projects/mips2/src/contrib/ncurses/include/Caps.uwin#2 integrate .. //depot/projects/mips2/src/contrib/ncurses/include/MKhashsize.sh#2 integrate .. //depot/projects/mips2/src/contrib/ncurses/include/MKkey_defs.sh#2 integrate .. //depot/projects/mips2/src/contrib/ncurses/include/MKncurses_def.sh#2 integrate .. //depot/projects/mips2/src/contrib/ncurses/include/MKparametrized.sh#2 integrate .. //depot/projects/mips2/src/contrib/ncurses/include/MKterm.h.awk.in#2 integrate .. //depot/projects/mips2/src/contrib/ncurses/include/curses.h.in#2 integrate .. //depot/projects/mips2/src/contrib/ncurses/include/curses.tail#2 integrate .. //depot/projects/mips2/src/contrib/ncurses/include/curses.wide#2 integrate .. //depot/projects/mips2/src/contrib/ncurses/include/hashed_db.h#1 branch .. //depot/projects/mips2/src/contrib/ncurses/include/nc_alloc.h#2 integrate .. //depot/projects/mips2/src/contrib/ncurses/include/nc_tparm.h#1 branch .. //depot/projects/mips2/src/contrib/ncurses/include/ncurses_cfg.hin#2 integrate .. //depot/projects/mips2/src/contrib/ncurses/include/ncurses_defs#2 integrate .. //depot/projects/mips2/src/contrib/ncurses/include/ncurses_dll.h#2 integrate .. //depot/projects/mips2/src/contrib/ncurses/include/term_entry.h#2 integrate .. //depot/projects/mips2/src/contrib/ncurses/include/tic.h#2 integrate .. //depot/projects/mips2/src/contrib/ncurses/install-sh#2 integrate .. //depot/projects/mips2/src/contrib/ncurses/man/MKterminfo.sh#2 integrate .. //depot/projects/mips2/src/contrib/ncurses/man/Makefile.in#2 integrate .. //depot/projects/mips2/src/contrib/ncurses/man/captoinfo.1m#2 integrate .. //depot/projects/mips2/src/contrib/ncurses/man/clear.1#2 integrate .. //depot/projects/mips2/src/contrib/ncurses/man/curs_add_wch.3x#2 integrate .. //depot/projects/mips2/src/contrib/ncurses/man/curs_add_wchstr.3x#2 integrate .. //depot/projects/mips2/src/contrib/ncurses/man/curs_addch.3x#2 integrate .. //depot/projects/mips2/src/contrib/ncurses/man/curs_addchstr.3x#2 integrate .. //depot/projects/mips2/src/contrib/ncurses/man/curs_addstr.3x#2 integrate .. //depot/projects/mips2/src/contrib/ncurses/man/curs_addwstr.3x#2 integrate .. //depot/projects/mips2/src/contrib/ncurses/man/curs_attr.3x#2 integrate .. //depot/projects/mips2/src/contrib/ncurses/man/curs_beep.3x#2 integrate .. //depot/projects/mips2/src/contrib/ncurses/man/curs_bkgd.3x#2 integrate .. //depot/projects/mips2/src/contrib/ncurses/man/curs_bkgrnd.3x#2 integrate .. //depot/projects/mips2/src/contrib/ncurses/man/curs_border.3x#2 integrate .. //depot/projects/mips2/src/contrib/ncurses/man/curs_border_set.3x#2 integrate .. //depot/projects/mips2/src/contrib/ncurses/man/curs_clear.3x#2 integrate .. //depot/projects/mips2/src/contrib/ncurses/man/curs_color.3x#2 integrate .. //depot/projects/mips2/src/contrib/ncurses/man/curs_delch.3x#2 integrate .. //depot/projects/mips2/src/contrib/ncurses/man/curs_deleteln.3x#2 integrate .. //depot/projects/mips2/src/contrib/ncurses/man/curs_extend.3x#2 integrate .. //depot/projects/mips2/src/contrib/ncurses/man/curs_get_wch.3x#2 integrate .. //depot/projects/mips2/src/contrib/ncurses/man/curs_get_wstr.3x#2 integrate .. //depot/projects/mips2/src/contrib/ncurses/man/curs_getcchar.3x#2 integrate .. //depot/projects/mips2/src/contrib/ncurses/man/curs_getch.3x#2 integrate .. //depot/projects/mips2/src/contrib/ncurses/man/curs_getstr.3x#2 integrate .. //depot/projects/mips2/src/contrib/ncurses/man/curs_getyx.3x#2 integrate .. //depot/projects/mips2/src/contrib/ncurses/man/curs_in_wch.3x#2 integrate .. //depot/projects/mips2/src/contrib/ncurses/man/curs_in_wchstr.3x#2 integrate .. //depot/projects/mips2/src/contrib/ncurses/man/curs_inch.3x#2 integrate .. //depot/projects/mips2/src/contrib/ncurses/man/curs_inchstr.3x#2 integrate .. //depot/projects/mips2/src/contrib/ncurses/man/curs_initscr.3x#2 integrate .. //depot/projects/mips2/src/contrib/ncurses/man/curs_inopts.3x#2 integrate .. //depot/projects/mips2/src/contrib/ncurses/man/curs_ins_wch.3x#2 integrate .. //depot/projects/mips2/src/contrib/ncurses/man/curs_ins_wstr.3x#2 integrate .. //depot/projects/mips2/src/contrib/ncurses/man/curs_insch.3x#2 integrate .. //depot/projects/mips2/src/contrib/ncurses/man/curs_insstr.3x#2 integrate .. //depot/projects/mips2/src/contrib/ncurses/man/curs_instr.3x#2 integrate .. //depot/projects/mips2/src/contrib/ncurses/man/curs_inwstr.3x#2 integrate .. //depot/projects/mips2/src/contrib/ncurses/man/curs_kernel.3x#2 integrate .. //depot/projects/mips2/src/contrib/ncurses/man/curs_mouse.3x#2 integrate .. //depot/projects/mips2/src/contrib/ncurses/man/curs_move.3x#2 integrate .. //depot/projects/mips2/src/contrib/ncurses/man/curs_outopts.3x#2 integrate .. //depot/projects/mips2/src/contrib/ncurses/man/curs_overlay.3x#2 integrate .. //depot/projects/mips2/src/contrib/ncurses/man/curs_pad.3x#2 integrate .. //depot/projects/mips2/src/contrib/ncurses/man/curs_print.3x#2 integrate .. //depot/projects/mips2/src/contrib/ncurses/man/curs_printw.3x#2 integrate .. //depot/projects/mips2/src/contrib/ncurses/man/curs_refresh.3x#2 integrate .. //depot/projects/mips2/src/contrib/ncurses/man/curs_scanw.3x#2 integrate .. //depot/projects/mips2/src/contrib/ncurses/man/curs_scr_dump.3x#2 integrate .. //depot/projects/mips2/src/contrib/ncurses/man/curs_scroll.3x#2 integrate .. //depot/projects/mips2/src/contrib/ncurses/man/curs_slk.3x#2 integrate .. //depot/projects/mips2/src/contrib/ncurses/man/curs_termattrs.3x#2 integrate .. //depot/projects/mips2/src/contrib/ncurses/man/curs_termcap.3x#2 integrate .. //depot/projects/mips2/src/contrib/ncurses/man/curs_terminfo.3x#2 integrate .. //depot/projects/mips2/src/contrib/ncurses/man/curs_touch.3x#2 integrate .. //depot/projects/mips2/src/contrib/ncurses/man/curs_trace.3x#2 integrate .. //depot/projects/mips2/src/contrib/ncurses/man/curs_util.3x#2 integrate .. //depot/projects/mips2/src/contrib/ncurses/man/curs_window.3x#2 integrate .. //depot/projects/mips2/src/contrib/ncurses/man/default_colors.3x#2 integrate .. //depot/projects/mips2/src/contrib/ncurses/man/define_key.3x#2 integrate .. //depot/projects/mips2/src/contrib/ncurses/man/form.3x#2 integrate .. //depot/projects/mips2/src/contrib/ncurses/man/form_cursor.3x#2 integrate .. //depot/projects/mips2/src/contrib/ncurses/man/form_data.3x#2 integrate .. //depot/projects/mips2/src/contrib/ncurses/man/form_driver.3x#2 integrate .. //depot/projects/mips2/src/contrib/ncurses/man/form_field.3x#2 integrate .. //depot/projects/mips2/src/contrib/ncurses/man/form_field_attributes.3x#2 integrate .. //depot/projects/mips2/src/contrib/ncurses/man/form_field_buffer.3x#2 integrate .. //depot/projects/mips2/src/contrib/ncurses/man/form_field_info.3x#2 integrate .. //depot/projects/mips2/src/contrib/ncurses/man/form_field_just.3x#2 integrate .. //depot/projects/mips2/src/contrib/ncurses/man/form_field_new.3x#2 integrate .. //depot/projects/mips2/src/contrib/ncurses/man/form_field_opts.3x#2 integrate .. //depot/projects/mips2/src/contrib/ncurses/man/form_field_userptr.3x#2 integrate .. //depot/projects/mips2/src/contrib/ncurses/man/form_field_validation.3x#2 integrate .. //depot/projects/mips2/src/contrib/ncurses/man/form_fieldtype.3x#2 integrate .. //depot/projects/mips2/src/contrib/ncurses/man/form_hook.3x#2 integrate .. //depot/projects/mips2/src/contrib/ncurses/man/form_new.3x#2 integrate .. //depot/projects/mips2/src/contrib/ncurses/man/form_new_page.3x#2 integrate .. //depot/projects/mips2/src/contrib/ncurses/man/form_opts.3x#2 integrate .. //depot/projects/mips2/src/contrib/ncurses/man/form_page.3x#2 integrate .. //depot/projects/mips2/src/contrib/ncurses/man/form_post.3x#2 integrate .. //depot/projects/mips2/src/contrib/ncurses/man/form_requestname.3x#2 integrate .. //depot/projects/mips2/src/contrib/ncurses/man/form_userptr.3x#2 integrate .. //depot/projects/mips2/src/contrib/ncurses/man/form_win.3x#2 integrate .. //depot/projects/mips2/src/contrib/ncurses/man/infocmp.1m#2 integrate .. //depot/projects/mips2/src/contrib/ncurses/man/infotocap.1m#2 integrate .. //depot/projects/mips2/src/contrib/ncurses/man/key_defined.3x#1 branch .. //depot/projects/mips2/src/contrib/ncurses/man/keybound.3x#2 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Apr 4 15:00:20 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D43C216A404; Wed, 4 Apr 2007 15:00:19 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 8F38316A401 for ; Wed, 4 Apr 2007 15:00:19 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 6866213C480 for ; Wed, 4 Apr 2007 15:00:19 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l34F0JM9067909 for ; Wed, 4 Apr 2007 15:00:19 GMT (envelope-from gonzo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l34F0Jqc067906 for perforce@freebsd.org; Wed, 4 Apr 2007 15:00:19 GMT (envelope-from gonzo@FreeBSD.org) Date: Wed, 4 Apr 2007 15:00:19 GMT Message-Id: <200704041500.l34F0Jqc067906@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gonzo@FreeBSD.org using -f From: Oleksandr Tymoshenko To: Perforce Change Reviews Cc: Subject: PERFORCE change 117360 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 04 Apr 2007 15:00:20 -0000 http://perforce.freebsd.org/chv.cgi?CH=117360 Change 117360 by gonzo@gonzo_jeeves on 2007/04/04 14:59:22 o Add mips to KNOWN_ARCHES list. Affected files ... .. //depot/projects/mips2/src/Makefile.inc1#3 edit Differences ... ==== //depot/projects/mips2/src/Makefile.inc1#3 (text+ko) ==== @@ -110,7 +110,7 @@ TARGET?= ${MACHINE} TARGET_ARCH?= ${MACHINE_ARCH} -KNOWN_ARCHES?= amd64 arm i386 i386/pc98 ia64 powerpc sparc64 sparc64/sun4v +KNOWN_ARCHES?= amd64 arm i386 i386/pc98 ia64 mips powerpc sparc64 sparc64/sun4v .if ${TARGET} == ${TARGET_ARCH} _t= ${TARGET} .else From owner-p4-projects@FreeBSD.ORG Wed Apr 4 15:11:34 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6097616A403; Wed, 4 Apr 2007 15:11:34 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 16EB916A408 for ; Wed, 4 Apr 2007 15:11:34 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 07DE313C487 for ; Wed, 4 Apr 2007 15:11:34 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l34FBXRq071874 for ; Wed, 4 Apr 2007 15:11:33 GMT (envelope-from gonzo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l34FBXwr071856 for perforce@freebsd.org; Wed, 4 Apr 2007 15:11:33 GMT (envelope-from gonzo@FreeBSD.org) Date: Wed, 4 Apr 2007 15:11:33 GMT Message-Id: <200704041511.l34FBXwr071856@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gonzo@FreeBSD.org using -f From: Oleksandr Tymoshenko To: Perforce Change Reviews Cc: Subject: PERFORCE change 117361 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 04 Apr 2007 15:11:34 -0000 http://perforce.freebsd.org/chv.cgi?CH=117361 Change 117361 by gonzo@gonzo_jeeves on 2007/04/04 15:10:43 o Resolve conflict: still "NO GDB" for mips Affected files ... .. //depot/projects/mips2/src/gnu/usr.bin/Makefile#4 edit Differences ... ==== //depot/projects/mips2/src/gnu/usr.bin/Makefile#4 (text+ko) ==== @@ -23,19 +23,10 @@ sort \ ${_texinfo} ->>>> ORIGINAL Makefile#35 -.if ${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "powerpc" +.if ${MACHINE_ARCH} == "mips" MK_GDB= no # not yet .endif -==== THEIRS Makefile#39 -==== YOURS Makefile -.if ${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "powerpc" || \ - ${MACHINE_ARCH} == "mips" -MK_GDB= no # not yet -.endif - -<<<< .if ${MK_CXX} != "no" _gperf= gperf .if ${MK_GROFF} != "no" From owner-p4-projects@FreeBSD.ORG Wed Apr 4 15:12:36 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2B95916A410; Wed, 4 Apr 2007 15:12:36 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 08B6E16A40D for ; Wed, 4 Apr 2007 15:12:36 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id D5A0C13C4B0 for ; Wed, 4 Apr 2007 15:12:35 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l34FCZtd072176 for ; Wed, 4 Apr 2007 15:12:35 GMT (envelope-from gonzo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l34FCZMH072173 for perforce@freebsd.org; Wed, 4 Apr 2007 15:12:35 GMT (envelope-from gonzo@FreeBSD.org) Date: Wed, 4 Apr 2007 15:12:35 GMT Message-Id: <200704041512.l34FCZMH072173@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gonzo@FreeBSD.org using -f From: Oleksandr Tymoshenko To: Perforce Change Reviews Cc: Subject: PERFORCE change 117362 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 04 Apr 2007 15:12:36 -0000 http://perforce.freebsd.org/chv.cgi?CH=117362 Change 117362 by gonzo@gonzo_jeeves on 2007/04/04 15:12:30 o Add .endif missed during conflict resolution. Affected files ... .. //depot/projects/mips2/src/sys/Makefile#5 edit Differences ... ==== //depot/projects/mips2/src/sys/Makefile#5 (text+ko) ==== @@ -7,6 +7,7 @@ .if ${MACHINE_ARCH} != "mips" SUBDIR= boot .endif +.endif # Directories to include in cscope name file and TAGS. CSCOPEDIRS= cam coda compat conf contrib crypto ddb dev fs geom gnu i4b \ From owner-p4-projects@FreeBSD.ORG Wed Apr 4 15:32:01 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4BD7316A407; Wed, 4 Apr 2007 15:32:01 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id DB55716A405 for ; Wed, 4 Apr 2007 15:32:00 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id CC74313C458 for ; Wed, 4 Apr 2007 15:32:00 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l34FW0n1075863 for ; Wed, 4 Apr 2007 15:32:00 GMT (envelope-from gonzo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l34FW0He075860 for perforce@freebsd.org; Wed, 4 Apr 2007 15:32:00 GMT (envelope-from gonzo@FreeBSD.org) Date: Wed, 4 Apr 2007 15:32:00 GMT Message-Id: <200704041532.l34FW0He075860@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gonzo@FreeBSD.org using -f From: Oleksandr Tymoshenko To: Perforce Change Reviews Cc: Subject: PERFORCE change 117363 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 04 Apr 2007 15:32:01 -0000 http://perforce.freebsd.org/chv.cgi?CH=117363 Change 117363 by gonzo@gonzo_jeeves on 2007/04/04 15:30:59 o Include sys/lock.h before sys/sx.h Affected files ... .. //depot/projects/mips2/src/sys/mips/mips/pmap.c#26 edit .. //depot/projects/mips2/src/sys/mips/mips/tlb.c#14 edit Differences ... ==== //depot/projects/mips2/src/sys/mips/mips/pmap.c#26 (text+ko) ==== @@ -79,6 +79,7 @@ #include #include #include +#include #include #include #include ==== //depot/projects/mips2/src/sys/mips/mips/tlb.c#14 (text+ko) ==== @@ -29,6 +29,7 @@ #include #include #include +#include #include #include #include From owner-p4-projects@FreeBSD.ORG Wed Apr 4 15:36:08 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0B2C616A409; Wed, 4 Apr 2007 15:36:08 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id B69E616A407 for ; Wed, 4 Apr 2007 15:36:07 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id A82BF13C44C for ; Wed, 4 Apr 2007 15:36:07 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l34Fa7N4076721 for ; Wed, 4 Apr 2007 15:36:07 GMT (envelope-from gonzo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l34Fa7WM076718 for perforce@freebsd.org; Wed, 4 Apr 2007 15:36:07 GMT (envelope-from gonzo@FreeBSD.org) Date: Wed, 4 Apr 2007 15:36:07 GMT Message-Id: <200704041536.l34Fa7WM076718@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gonzo@FreeBSD.org using -f From: Oleksandr Tymoshenko To: Perforce Change Reviews Cc: Subject: PERFORCE change 117366 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 04 Apr 2007 15:36:08 -0000 http://perforce.freebsd.org/chv.cgi?CH=117366 Change 117366 by gonzo@gonzo_jeeves on 2007/04/04 15:35:37 o Add PCPU_LAZY_INC macro Affected files ... .. //depot/projects/mips2/src/sys/mips/include/pcpu.h#4 edit Differences ... ==== //depot/projects/mips2/src/sys/mips/include/pcpu.h#4 (text+ko) ==== @@ -40,9 +40,14 @@ #define PCPUP (pcpup) +/* + * XXX The implementation of this operation should be made atomic + * with respect to preemption. + */ #define PCPU_GET(member) (PCPUP->pc_ ## member) #define PCPU_PTR(member) (&PCPUP->pc_ ## member) #define PCPU_SET(member,value) (PCPUP->pc_ ## member = (value)) +#define PCPU_LAZY_INC(member) (++PCPUP->pc_ ## member) extern struct pcpu *pcpup; From owner-p4-projects@FreeBSD.ORG Wed Apr 4 15:54:32 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D632C16A408; Wed, 4 Apr 2007 15:54:31 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 7EE8C16A401 for ; Wed, 4 Apr 2007 15:54:31 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 6FB0513C44C for ; Wed, 4 Apr 2007 15:54:31 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l34FsVqb079920 for ; Wed, 4 Apr 2007 15:54:31 GMT (envelope-from gonzo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l34FsV3b079917 for perforce@freebsd.org; Wed, 4 Apr 2007 15:54:31 GMT (envelope-from gonzo@FreeBSD.org) Date: Wed, 4 Apr 2007 15:54:31 GMT Message-Id: <200704041554.l34FsV3b079917@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gonzo@FreeBSD.org using -f From: Oleksandr Tymoshenko To: Perforce Change Reviews Cc: Subject: PERFORCE change 117368 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 04 Apr 2007 15:54:32 -0000 http://perforce.freebsd.org/chv.cgi?CH=117368 Change 117368 by gonzo@gonzo_jeeves on 2007/04/04 15:54:15 o Add casuword and casuword32 stubs. Affected files ... .. //depot/projects/mips2/src/sys/mips/mips/support.S#10 edit Differences ... ==== //depot/projects/mips2/src/sys/mips/mips/support.S#10 (text+ko) ==== @@ -272,6 +272,29 @@ END(fuword32) /* + * casuword(9) + * u_long casuword(u_long *p, u_long oldval, u_long newval) + */ +ENTRY(casuword) + break + li v0, -1 + jr ra + nop +END(casuword) + +/* + * casuword32(9) + * uint32_t casuword(uint32_t *p, uint32_t oldval, + * uint32_t newval) + */ +ENTRY(casuword32) + break + li v0, -1 + jr ra + nop +END(casuword32) + +/* * Stubs for copy(9) XXX copyin() Copies len bytes of data from the user-space address uaddr to the kernel-space address kaddr. From owner-p4-projects@FreeBSD.ORG Wed Apr 4 15:55:33 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9810A16A40A; Wed, 4 Apr 2007 15:55:33 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 5C31116A402 for ; Wed, 4 Apr 2007 15:55:33 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 4BB9113C487 for ; Wed, 4 Apr 2007 15:55:33 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l34FtXSc080171 for ; Wed, 4 Apr 2007 15:55:33 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l34FtWLl080167 for perforce@freebsd.org; Wed, 4 Apr 2007 15:55:32 GMT (envelope-from rdivacky@FreeBSD.org) Date: Wed, 4 Apr 2007 15:55:32 GMT Message-Id: <200704041555.l34FtWLl080167@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 117369 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 04 Apr 2007 15:55:33 -0000 http://perforce.freebsd.org/chv.cgi?CH=117369 Change 117369 by rdivacky@rdivacky_witten on 2007/04/04 15:54:32 Rewrite *at() in a proper way: o change vn_open/kern_open to take dfd argument o rename namei to namei1 and create namei that wraps namei1 o add dfd arugment to namei1 which specifies starting point of the name search, -1 meaning CWD (ie. no change from current behaviour) o change all consumers of vn_open/kern_open to the new prototype o implement linux_openat() using the new kern_open o implement linux_fstatat64() using the new kern_open linux_openat passes all LTP tests and linux_fstatat64 passes all but one where it should fail but it succeeds in our implementation. Affected files ... .. //depot/projects/linuxolator/src/sys/compat/linux/linux_file.c#22 edit .. //depot/projects/linuxolator/src/sys/compat/linux/linux_misc.c#64 edit .. //depot/projects/linuxolator/src/sys/compat/linux/linux_stats.c#10 edit .. //depot/projects/linuxolator/src/sys/compat/ndis/subr_ndis.c#2 edit .. //depot/projects/linuxolator/src/sys/compat/svr4/svr4_fcntl.c#4 edit .. //depot/projects/linuxolator/src/sys/dev/md/md.c#4 edit .. //depot/projects/linuxolator/src/sys/dev/streams/streams.c#2 edit .. //depot/projects/linuxolator/src/sys/i386/ibcs2/ibcs2_fcntl.c#2 edit .. //depot/projects/linuxolator/src/sys/kern/kern_acct.c#7 edit .. //depot/projects/linuxolator/src/sys/kern/kern_alq.c#4 edit .. //depot/projects/linuxolator/src/sys/kern/kern_descrip.c#9 edit .. //depot/projects/linuxolator/src/sys/kern/kern_ktrace.c#8 edit .. //depot/projects/linuxolator/src/sys/kern/kern_linker.c#7 edit .. //depot/projects/linuxolator/src/sys/kern/kern_sig.c#11 edit .. //depot/projects/linuxolator/src/sys/kern/link_elf.c#4 edit .. //depot/projects/linuxolator/src/sys/kern/tty_cons.c#4 edit .. //depot/projects/linuxolator/src/sys/kern/vfs_lookup.c#8 edit .. //depot/projects/linuxolator/src/sys/kern/vfs_syscalls.c#13 edit .. //depot/projects/linuxolator/src/sys/kern/vfs_vnops.c#6 edit .. //depot/projects/linuxolator/src/sys/security/audit/audit_syscalls.c#8 edit .. //depot/projects/linuxolator/src/sys/sys/namei.h#2 edit .. //depot/projects/linuxolator/src/sys/sys/syscallsubr.h#4 edit .. //depot/projects/linuxolator/src/sys/sys/vnode.h#8 edit .. //depot/projects/linuxolator/src/sys/ufs/ufs/ufs_quota.c#10 edit Differences ... ==== //depot/projects/linuxolator/src/sys/compat/linux/linux_file.c#22 (text+ko) ==== @@ -68,68 +68,7 @@ #endif #include -/* - * common code for linux *at set of syscalls - * - * works like this: - * if filename is absolute - * ignore dirfd - * else - * if dirfd == AT_FDCWD - * return CWD/filename - * else - * return DIRFD/filename - */ int -linux_at(struct thread *td, int dirfd, char *filename, char **newpath, char **freebuf) -{ - struct file *fp; - int error = 0; - struct vnode *dvp; - struct filedesc *fdp = td->td_proc->p_fd; - char *fullpath = "unknown"; - char *freepath = NULL; - - /* don't do anything if the pathname is absolute */ - if (*filename == '/') { - *newpath= filename; - return (0); - } - - /* check for AT_FDWCD */ - if (dirfd == LINUX_AT_FDCWD) { - FILEDESC_LOCK(fdp); - dvp = fdp->fd_cdir; - FILEDESC_UNLOCK(fdp); - } else { - error = fget(td, dirfd, &fp); - if (error) - return (error); - if (fp->f_type != DTYPE_VNODE) { - fdrop(fp, td); - return (EBADF); - } - dvp = fp->f_vnode; - /* only a dir can be dfd */ - if (dvp->v_type != VDIR) { - fdrop(fp, td); - return (ENOTDIR); - } - fdrop(fp, td); - } - - error = vn_fullpath(td, dvp, &fullpath, &freepath); - if (!error) { - *newpath = malloc(strlen(fullpath) + strlen(filename) + 2, - M_TEMP, M_WAITOK | M_ZERO); - *freebuf = freepath; - sprintf(*newpath, "%s/%s", fullpath, filename); - } - - return (error); -} - -int linux_creat(struct thread *td, struct linux_creat_args *args) { char *path; @@ -142,14 +81,14 @@ printf(ARGS(creat, "%s, %d"), path, args->mode); #endif error = kern_open(td, path, UIO_SYSSPACE, O_WRONLY | O_CREAT | O_TRUNC, - args->mode); + args->mode, -1); LFREEPATH(path); return (error); } int -linux_common_open(struct thread *td, char *path, int l_flags, int mode, int openat) +linux_common_open(struct thread *td, char *path, int l_flags, int mode, int dirfd) { struct proc *p = td->td_proc; struct file *fp; @@ -191,7 +130,7 @@ bsd_flags |= O_NOFOLLOW; /* XXX LINUX_O_NOATIME: unable to be easily implemented. */ - error = kern_open(td, path, UIO_SYSSPACE, bsd_flags, mode); + error = kern_open(td, path, UIO_SYSSPACE, bsd_flags, mode, dirfd); if (!error) { fd = td->td_retval[0]; /* @@ -233,46 +172,40 @@ if (ldebug(open)) printf(LMSG("open returns error %d"), error); #endif - if (!openat) - LFREEPATH(path); + LFREEPATH(path); return error; } int linux_openat(struct thread *td, struct linux_openat_args *args) { - char *newpath, *oldpath, *freebuf = NULL, *path; - int error; + char *path, *newpath; + int error, dfd; + + path = malloc(MAXPATHLEN, M_TEMP, M_WAITOK); + error = copyinstr(args->filename, path, MAXPATHLEN, NULL); + if (error) { + free(path, M_TEMP); + return (EFAULT); + } - oldpath = malloc(MAXPATHLEN, M_TEMP, M_WAITOK); - error = copyinstr(args->filename, oldpath, MAXPATHLEN, NULL); - if (error) - return (error); + if (args->flags & LINUX_O_CREAT) + LCONVPATH_SEG(td, path, &newpath, 1, UIO_SYSSPACE); + else + LCONVPATH_SEG(td, path, &newpath, 0, UIO_SYSSPACE); + free(path, M_TEMP); #ifdef DEBUG if (ldebug(openat)) printf(ARGS(openat, "%i, %s, 0x%x, 0x%x"), args->dfd, - oldpath, args->flags, args->mode); + newpath, args->flags, args->mode); #endif - - error = linux_at(td, args->dfd, oldpath, &newpath, &freebuf); - if (error) - return (error); -#ifdef DEBUG - printf(LMSG("newpath: %s"), newpath); -#endif - if (args->flags & LINUX_O_CREAT) - LCONVPATH_SEG(td, newpath, &path, 1, UIO_SYSSPACE); + if (args->dfd == LINUX_AT_FDCWD) + dfd = -1; else - LCONVPATH_SEG(td, newpath, &path, 0, UIO_SYSSPACE); - if (freebuf) - free(freebuf, M_TEMP); - if (*oldpath != '/') - free(newpath, M_TEMP); + dfd = args->dfd; - error = linux_common_open(td, path, args->flags, args->mode, 1); - free(oldpath, M_TEMP); - return (error); + return linux_common_open(td, newpath, args->flags, args->mode, dfd); } int @@ -291,7 +224,7 @@ path, args->flags, args->mode); #endif - return linux_common_open(td, path, args->flags, args->mode, 0); + return linux_common_open(td, path, args->flags, args->mode, -1); } int ==== //depot/projects/linuxolator/src/sys/compat/linux/linux_misc.c#64 (text+ko) ==== @@ -960,7 +960,7 @@ /* FALLTHROUGH */ case S_IFREG: error = kern_open(td, path, UIO_SYSSPACE, - O_WRONLY | O_CREAT | O_TRUNC, args->mode); + O_WRONLY | O_CREAT | O_TRUNC, args->mode, -1); break; default: ==== //depot/projects/linuxolator/src/sys/compat/linux/linux_stats.c#10 (text+ko) ==== @@ -125,7 +125,7 @@ if (!S_ISCHR(buf->st_mode) && !S_ISBLK(buf->st_mode)) return; temp = td->td_retval[0]; - if (kern_open(td, path, UIO_SYSSPACE, O_RDONLY, 0) != 0) + if (kern_open(td, path, UIO_SYSSPACE, O_RDONLY, 0, -1) != 0) return; fd = td->td_retval[0]; td->td_retval[0] = temp; @@ -599,31 +599,36 @@ linux_fstatat64(struct thread *td, struct linux_fstatat64_args *args) { int error; - char *newpath, *oldpath, *freebuf = NULL, *path; - int fd; + char *path, *newpath; + int fd, dfd; struct stat buf; /* open the file */ - oldpath = malloc(MAXPATHLEN, M_TEMP, M_WAITOK); - error = copyinstr(args->pathname, oldpath, MAXPATHLEN, NULL); + path = malloc(MAXPATHLEN, M_TEMP, M_WAITOK); + error = copyinstr(args->pathname, path, MAXPATHLEN, NULL); + if (error) { + free(path, M_TEMP); + return (EFAULT); + } + + LCONVPATH_SEG(td, path, &newpath, 0, UIO_SYSSPACE); + free(path, M_TEMP); + #ifdef DEBUG if (ldebug(fstatat64)) - printf(ARGS(fstatat64, "%i, %s, %i"), args->dfd, args->pathname, args->flag); + printf(ARGS(fstatat64, "%i, %s, %i"), args->dfd, newpath, args->flag); #endif - error = linux_at(td, args->dfd, oldpath, &newpath, &freebuf); - if (error) - return (error); - LCONVPATH_SEG(td, newpath, &path, 0, UIO_SYSSPACE); - if (freebuf) - free(freebuf, M_TEMP); - if (*oldpath != '/') - free(newpath, M_TEMP); + if (args->dfd == LINUX_AT_FDCWD) + dfd = -1; + else + dfd = args->dfd; - error = linux_common_open(td, path, O_RDONLY, 0, 1); - free(oldpath, M_TEMP); - if (error) + error = kern_open(td, newpath, UIO_SYSSPACE, O_RDONLY, 0, dfd); + if (error) { + LFREEPATH(newpath); return (error); + } /* file opened */ fd = td->td_retval[0]; td->td_retval[0] = 0; @@ -637,6 +642,7 @@ /* close the opened file */ kern_close(td, fd); + LFREEPATH(newpath); return (0); } ==== //depot/projects/linuxolator/src/sys/compat/ndis/subr_ndis.c#2 (text+ko) ==== @@ -3008,7 +3008,7 @@ NDINIT(&nd, LOOKUP, FOLLOW | MPSAFE, UIO_SYSSPACE, path, td); flags = FREAD; - error = vn_open(&nd, &flags, 0, -1); + error = vn_open(&nd, &flags, 0, -1, -1); if (error) { *status = NDIS_STATUS_FILE_NOT_FOUND; ExFreePool(fh); ==== //depot/projects/linuxolator/src/sys/compat/svr4/svr4_fcntl.c#4 (text+ko) ==== @@ -376,7 +376,7 @@ CHECKALTEXIST(td, uap->path, &newpath); bsd_flags = svr4_to_bsd_flags(uap->flags); - error = kern_open(td, newpath, UIO_SYSSPACE, bsd_flags, uap->mode); + error = kern_open(td, newpath, UIO_SYSSPACE, bsd_flags, uap->mode, -1); free(newpath, M_TEMP); if (error) { @@ -435,7 +435,7 @@ CHECKALTEXIST(td, uap->path, &newpath); error = kern_open(td, newpath, UIO_SYSSPACE, O_WRONLY | O_CREAT | - O_TRUNC, uap->mode); + O_TRUNC, uap->mode, -1); free(newpath, M_TEMP); return (error); } ==== //depot/projects/linuxolator/src/sys/dev/md/md.c#4 (text+ko) ==== @@ -913,7 +913,7 @@ if ((mdio->md_options & MD_READONLY) != 0) flags &= ~FWRITE; NDINIT(&nd, LOOKUP, FOLLOW | MPSAFE, UIO_SYSSPACE, sc->file, td); - error = vn_open(&nd, &flags, 0, -1); + error = vn_open(&nd, &flags, 0, -1, -1); if (error != 0) return (error); vfslocked = NDHASGIANT(&nd); ==== //depot/projects/linuxolator/src/sys/dev/streams/streams.c#2 (text+ko) ==== @@ -310,7 +310,7 @@ ptyname[8] = ttyletters[l]; ptyname[9] = ttynumbers[n]; - error = kern_open(td, ptyname, UIO_SYSSPACE, O_RDWR, 0); + error = kern_open(td, ptyname, UIO_SYSSPACE, O_RDWR, 0, -1); switch (error) { case ENOENT: case ENXIO: ==== //depot/projects/linuxolator/src/sys/i386/ibcs2/ibcs2_fcntl.c#2 (text+ko) ==== @@ -187,7 +187,7 @@ CHECKALTCREAT(td, uap->path, &path); else CHECKALTEXIST(td, uap->path, &path); - ret = kern_open(td, path, UIO_SYSSPACE, flags, uap->mode); + ret = kern_open(td, path, UIO_SYSSPACE, flags, uap->mode, -1); #ifdef SPX_HACK if (ret == ENXIO) { @@ -227,7 +227,7 @@ CHECKALTCREAT(td, uap->path, &path); error = kern_open(td, path, UIO_SYSSPACE, O_WRONLY | O_CREAT | O_TRUNC, - uap->mode); + uap->mode, -1); free(path, M_TEMP); return (error); } ==== //depot/projects/linuxolator/src/sys/kern/kern_acct.c#7 (text+ko) ==== @@ -203,7 +203,7 @@ NDINIT(&nd, LOOKUP, NOFOLLOW | MPSAFE | AUDITVNODE1, UIO_USERSPACE, uap->path, td); flags = FWRITE | O_APPEND; - error = vn_open(&nd, &flags, 0, -1); + error = vn_open(&nd, &flags, 0, -1, -1); if (error) return (error); vfslocked = NDHASGIANT(&nd); ==== //depot/projects/linuxolator/src/sys/kern/kern_alq.c#4 (text+ko) ==== @@ -356,7 +356,7 @@ NDINIT(&nd, LOOKUP, NOFOLLOW | MPSAFE, UIO_SYSSPACE, file, td); flags = FWRITE | O_NOFOLLOW | O_CREAT; - error = vn_open_cred(&nd, &flags, cmode, cred, -1); + error = vn_open_cred(&nd, &flags, cmode, cred, -1, -1); if (error) return (error); ==== //depot/projects/linuxolator/src/sys/kern/kern_descrip.c#9 (text+ko) ==== @@ -1833,7 +1833,7 @@ NDINIT(&nd, LOOKUP, FOLLOW | MPSAFE, UIO_SYSSPACE, "/dev/null", td); flags = FREAD | FWRITE; - error = vn_open(&nd, &flags, 0, fd); + error = vn_open(&nd, &flags, 0, fd, -1); if (error != 0) { /* * Someone may have closed the entry in the ==== //depot/projects/linuxolator/src/sys/kern/kern_ktrace.c#8 (text+ko) ==== @@ -596,7 +596,7 @@ NDINIT(&nd, LOOKUP, NOFOLLOW | MPSAFE, UIO_USERSPACE, uap->fname, td); flags = FREAD | FWRITE | O_NOFOLLOW; - error = vn_open(&nd, &flags, 0, -1); + error = vn_open(&nd, &flags, 0, -1, -1); if (error) { ktrace_exit(td); return (error); ==== //depot/projects/linuxolator/src/sys/kern/kern_linker.c#7 (text+ko) ==== @@ -1515,7 +1515,7 @@ */ NDINIT(&nd, LOOKUP, FOLLOW | MPSAFE, UIO_SYSSPACE, result, td); flags = FREAD; - error = vn_open(&nd, &flags, 0, -1); + error = vn_open(&nd, &flags, 0, -1, -1); if (error == 0) { vfslocked = NDHASGIANT(&nd); NDFREE(&nd, NDF_ONLY_PNBUF); @@ -1566,7 +1566,7 @@ NDINIT(&nd, LOOKUP, NOFOLLOW | MPSAFE, UIO_SYSSPACE, pathbuf, td); flags = FREAD; - error = vn_open(&nd, &flags, 0, -1); + error = vn_open(&nd, &flags, 0, -1, -1); if (error) goto bad; vfslocked = NDHASGIANT(&nd); ==== //depot/projects/linuxolator/src/sys/kern/kern_sig.c#11 (text+ko) ==== @@ -3068,7 +3068,7 @@ return (EINVAL); NDINIT(&nd, LOOKUP, NOFOLLOW | MPSAFE, UIO_SYSSPACE, name, td); flags = O_CREAT | FWRITE | O_NOFOLLOW; - error = vn_open(&nd, &flags, S_IRUSR | S_IWUSR, -1); + error = vn_open(&nd, &flags, S_IRUSR | S_IWUSR, -1, -1); free(name, M_TEMP); if (error) return (error); ==== //depot/projects/linuxolator/src/sys/kern/link_elf.c#4 (text+ko) ==== @@ -566,7 +566,7 @@ NDINIT(&nd, LOOKUP, FOLLOW | MPSAFE, UIO_SYSSPACE, filename, td); flags = FREAD; - error = vn_open(&nd, &flags, 0, -1); + error = vn_open(&nd, &flags, 0, -1, -1); if (error) return error; vfslocked = NDHASGIANT(&nd); ==== //depot/projects/linuxolator/src/sys/kern/tty_cons.c#4 (text+ko) ==== @@ -407,7 +407,7 @@ } snprintf(path, sizeof(path), "/dev/%s", cnd->cnd_cn->cn_name); NDINIT(&nd, LOOKUP, FOLLOW, UIO_SYSSPACE, path, td); - error = vn_open(&nd, &openflag, 0, -1); + error = vn_open(&nd, &openflag, 0, -1, -1); if (error == 0) { NDFREE(&nd, NDF_ONLY_PNBUF); VOP_UNLOCK(nd.ni_vp, 0, td); ==== //depot/projects/linuxolator/src/sys/kern/vfs_lookup.c#8 (text+ko) ==== @@ -96,6 +96,12 @@ SYSCTL_INT(_vfs, OID_AUTO, lookup_shared, CTLFLAG_RW, &lookup_shared, 0, "Enables/Disables shared locks for path name translation"); +int +namei(struct nameidata *ndp) +{ + return namei1(ndp, -1); +} + /* * Convert a pathname into a pointer to a locked vnode. * @@ -115,9 +121,11 @@ * call lookup to search path. * if symbolic link, massage name in buffer and continue * } + * + * The dirfd parameter determines the starting point, -1 means CWD. */ int -namei(struct nameidata *ndp) +namei1(struct nameidata *ndp, int dirfd) { struct filedesc *fdp; /* pointer to file descriptor state */ char *cp; /* pointer into pathname argument */ @@ -192,9 +200,40 @@ ndp->ni_rootdir = fdp->fd_rdir; ndp->ni_topdir = fdp->fd_jdir; - dp = fdp->fd_cdir; + if (dirfd == -1) { + dp = fdp->fd_cdir; + VREF(dp); + } else { + struct file *fp; + + /* XXX: */ + if (fdp == NULL) { + FILEDESC_UNLOCK(fdp); + return (EBADF); + } + fp = fget_locked(fdp, dirfd); + if (fp == NULL || fp->f_ops == &badfileops) { + FILEDESC_UNLOCK(fdp); + return (EBADF); + } + fhold(fp); + if (fp->f_type != DTYPE_VNODE) { + fdrop(fp, td); + FILEDESC_UNLOCK(fdp); + return (EBADF); + } + + dp = fp->f_vnode; + + if (dp->v_type != VDIR) { + fdrop(fp, td); + FILEDESC_UNLOCK(fdp); + return (ENOTDIR); + } + VREF(dp); + fdrop(fp, td); + } vfslocked = VFS_LOCK_GIANT(dp->v_mount); - VREF(dp); FILEDESC_UNLOCK(fdp); for (;;) { /* ==== //depot/projects/linuxolator/src/sys/kern/vfs_syscalls.c#13 (text+ko) ==== @@ -949,12 +949,12 @@ } */ *uap; { - return kern_open(td, uap->path, UIO_USERSPACE, uap->flags, uap->mode); + return kern_open(td, uap->path, UIO_USERSPACE, uap->flags, uap->mode, -1); } int kern_open(struct thread *td, char *path, enum uio_seg pathseg, int flags, - int mode) + int mode, int dirfd) { struct proc *p = td->td_proc; struct filedesc *fdp = p->p_fd; @@ -982,7 +982,7 @@ cmode = ((mode &~ fdp->fd_cmask) & ALLPERMS) &~ S_ISTXT; NDINIT(&nd, LOOKUP, FOLLOW | AUDITVNODE1 | MPSAFE, pathseg, path, td); td->td_dupfd = -1; /* XXX check for fdopen */ - error = vn_open(&nd, &flags, cmode, indx); + error = vn_open(&nd, &flags, cmode, indx, dirfd); if (error) { /* * If the vn_open replaced the method vector, something @@ -1105,8 +1105,8 @@ } */ *uap; { - return (kern_open(td, uap->path, UIO_USERSPACE, - O_WRONLY | O_CREAT | O_TRUNC, uap->mode)); + return kern_open(td, uap->path, UIO_USERSPACE, + O_WRONLY | O_CREAT | O_TRUNC, uap->mode, -1); } #endif /* COMPAT_43 */ ==== //depot/projects/linuxolator/src/sys/kern/vfs_vnops.c#6 (text+ko) ==== @@ -84,13 +84,11 @@ }; int -vn_open(ndp, flagp, cmode, fdidx) - struct nameidata *ndp; - int *flagp, cmode, fdidx; +vn_open(struct nameidata *ndp, int *flagp, int cmode, int fdidx, int dirfd) { struct thread *td = ndp->ni_cnd.cn_thread; - return (vn_open_cred(ndp, flagp, cmode, td->td_ucred, fdidx)); + return vn_open_cred(ndp, flagp, cmode, td->td_ucred, fdidx, dirfd); } /* @@ -101,11 +99,8 @@ * due to the NDINIT being done elsewhere. */ int -vn_open_cred(ndp, flagp, cmode, cred, fdidx) - struct nameidata *ndp; - int *flagp, cmode; - struct ucred *cred; - int fdidx; +vn_open_cred(struct nameidata *ndp, int *flagp, int cmode, struct ucred *cred, + int fdidx, int dirfd) { struct vnode *vp; struct mount *mp; @@ -126,7 +121,7 @@ if ((fmode & O_EXCL) == 0 && (fmode & O_NOFOLLOW) == 0) ndp->ni_cnd.cn_flags |= FOLLOW; bwillwrite(); - if ((error = namei(ndp)) != 0) + if ((error = namei1(ndp, dirfd)) != 0) return (error); vfslocked = NDHASGIANT(ndp); if (!mpsafe) @@ -184,7 +179,7 @@ ndp->ni_cnd.cn_flags = ISOPEN | ((fmode & O_NOFOLLOW) ? NOFOLLOW : FOLLOW) | LOCKSHARED | LOCKLEAF | MPSAFE | AUDITVNODE1; - if ((error = namei(ndp)) != 0) + if ((error = namei1(ndp, dirfd)) != 0) return (error); if (!mpsafe) ndp->ni_cnd.cn_flags &= ~MPSAFE; ==== //depot/projects/linuxolator/src/sys/security/audit/audit_syscalls.c#8 (text) ==== @@ -567,7 +567,7 @@ NDINIT(&nd, LOOKUP, FOLLOW | LOCKLEAF | MPSAFE | AUDITVNODE1, UIO_USERSPACE, uap->path, td); flags = AUDIT_OPEN_FLAGS; - error = vn_open(&nd, &flags, 0, -1); + error = vn_open(&nd, &flags, 0, -1, -1); if (error) return (error); vfslocked = NDHASGIANT(&nd); ==== //depot/projects/linuxolator/src/sys/sys/namei.h#2 (text+ko) ==== @@ -177,6 +177,7 @@ void NDFREE(struct nameidata *, const u_int); int namei(struct nameidata *ndp); +int namei1(struct nameidata *ndp, int dirfd); int lookup(struct nameidata *ndp); int relookup(struct vnode *dvp, struct vnode **vpp, struct componentname *cnp); ==== //depot/projects/linuxolator/src/sys/sys/syscallsubr.h#4 (text+ko) ==== @@ -119,7 +119,7 @@ int kern_nanosleep(struct thread *td, struct timespec *rqt, struct timespec *rmt); int kern_open(struct thread *td, char *path, enum uio_seg pathseg, - int flags, int mode); + int flags, int mode, int dirfd); int kern_pathconf(struct thread *td, char *path, enum uio_seg pathseg, int name); int kern_preadv(struct thread *td, int fd, struct uio *auio, off_t offset); ==== //depot/projects/linuxolator/src/sys/sys/vnode.h#8 (text+ko) ==== @@ -613,9 +613,9 @@ int vn_isdisk(struct vnode *vp, int *errp); int _vn_lock(struct vnode *vp, int flags, struct thread *td, char *file, int line); #define vn_lock(vp, flags, td) _vn_lock(vp, flags, td, __FILE__, __LINE__) -int vn_open(struct nameidata *ndp, int *flagp, int cmode, int fdidx); +int vn_open(struct nameidata *ndp, int *flagp, int cmode, int fdidx, int dirfd); int vn_open_cred(struct nameidata *ndp, int *flagp, int cmode, - struct ucred *cred, int fdidx); + struct ucred *cred, int fdidx, int dirfd); int vn_pollrecord(struct vnode *vp, struct thread *p, int events); int vn_rdwr(enum uio_rw rw, struct vnode *vp, void *base, int len, off_t offset, enum uio_seg segflg, int ioflg, ==== //depot/projects/linuxolator/src/sys/ufs/ufs/ufs_quota.c#10 (text+ko) ==== @@ -524,7 +524,7 @@ NDINIT(&nd, LOOKUP, FOLLOW | MPSAFE, UIO_USERSPACE, fname, td); flags = FREAD | FWRITE; - error = vn_open(&nd, &flags, 0, -1); + error = vn_open(&nd, &flags, 0, -1, -1); if (error) return (error); vfslocked = NDHASGIANT(&nd); From owner-p4-projects@FreeBSD.ORG Wed Apr 4 15:56:36 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3BF6816A40A; Wed, 4 Apr 2007 15:56:36 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id C348C16A407 for ; Wed, 4 Apr 2007 15:56:35 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id B475313C4BA for ; Wed, 4 Apr 2007 15:56:35 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l34FuZaX080449 for ; Wed, 4 Apr 2007 15:56:35 GMT (envelope-from gonzo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l34FuZ0t080441 for perforce@freebsd.org; Wed, 4 Apr 2007 15:56:35 GMT (envelope-from gonzo@FreeBSD.org) Date: Wed, 4 Apr 2007 15:56:35 GMT Message-Id: <200704041556.l34FuZ0t080441@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gonzo@FreeBSD.org using -f From: Oleksandr Tymoshenko To: Perforce Change Reviews Cc: Subject: PERFORCE change 117370 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 04 Apr 2007 15:56:36 -0000 http://perforce.freebsd.org/chv.cgi?CH=117370 Change 117370 by gonzo@gonzo_jeeves on 2007/04/04 15:55:51 o Remove reference to ksegrp0. o Remove obsoleted casuptr stub. Affected files ... .. //depot/projects/mips2/src/sys/mips/mips/machdep.c#27 edit Differences ... ==== //depot/projects/mips2/src/sys/mips/mips/machdep.c#27 (text+ko) ==== @@ -181,7 +181,7 @@ mips_cpu_init(); pmap_bootstrap(); - proc_linkup(&proc0, &ksegrp0, &thread0); + proc_linkup(&proc0, &thread0); thread0.td_kstack = kstack0; pcpu_init(pcpup, 0, sizeof(struct pcpu)); pcpup->pc_curthread = &thread0; @@ -412,13 +412,6 @@ tf->tf_regs[TF_T9] = (register_t)entry; /* Used by PIC code */ } -intptr_t -casuptr(intptr_t *p, intptr_t old, intptr_t new) -{ - - return (-1); -} - void spinlock_enter(void) { From owner-p4-projects@FreeBSD.ORG Wed Apr 4 15:58:39 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6500516A408; Wed, 4 Apr 2007 15:58:39 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 358DC16A406 for ; Wed, 4 Apr 2007 15:58:39 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 2644813C489 for ; Wed, 4 Apr 2007 15:58:39 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l34Fwd4v080983 for ; Wed, 4 Apr 2007 15:58:39 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l34FwdRZ080980 for perforce@freebsd.org; Wed, 4 Apr 2007 15:58:39 GMT (envelope-from rdivacky@FreeBSD.org) Date: Wed, 4 Apr 2007 15:58:39 GMT Message-Id: <200704041558.l34FwdRZ080980@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 117371 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 04 Apr 2007 15:58:39 -0000 http://perforce.freebsd.org/chv.cgi?CH=117371 Change 117371 by rdivacky@rdivacky_witten on 2007/04/04 15:57:49 Whitespace fixes. Affected files ... .. //depot/projects/linuxolator/src/sys/kern/vfs_lookup.c#9 edit Differences ... ==== //depot/projects/linuxolator/src/sys/kern/vfs_lookup.c#9 (text+ko) ==== @@ -204,16 +204,16 @@ dp = fdp->fd_cdir; VREF(dp); } else { - struct file *fp; + struct file *fp; /* XXX: */ if (fdp == NULL) { - FILEDESC_UNLOCK(fdp); + FILEDESC_UNLOCK(fdp); return (EBADF); } fp = fget_locked(fdp, dirfd); if (fp == NULL || fp->f_ops == &badfileops) { - FILEDESC_UNLOCK(fdp); + FILEDESC_UNLOCK(fdp); return (EBADF); } fhold(fp); @@ -227,7 +227,7 @@ if (dp->v_type != VDIR) { fdrop(fp, td); - FILEDESC_UNLOCK(fdp); + FILEDESC_UNLOCK(fdp); return (ENOTDIR); } VREF(dp); From owner-p4-projects@FreeBSD.ORG Wed Apr 4 16:11:57 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9B56D16A53C; Wed, 4 Apr 2007 16:11:57 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 68C6E16A50D for ; Wed, 4 Apr 2007 16:11:56 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 7FE7413C44C for ; Wed, 4 Apr 2007 16:11:56 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l34GBunG085384 for ; Wed, 4 Apr 2007 16:11:56 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l34GBuAf085381 for perforce@freebsd.org; Wed, 4 Apr 2007 16:11:56 GMT (envelope-from rdivacky@FreeBSD.org) Date: Wed, 4 Apr 2007 16:11:56 GMT Message-Id: <200704041611.l34GBuAf085381@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 117372 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 04 Apr 2007 16:11:58 -0000 http://perforce.freebsd.org/chv.cgi?CH=117372 Change 117372 by rdivacky@rdivacky_witten on 2007/04/04 16:11:24 FreeBSD scsi_sg driver. This will be exploited further in the emulation layer :) Submitted by: scottl Affected files ... .. //depot/projects/linuxolator/src/sys/cam/scsi/scsi_sg.c#1 add .. //depot/projects/linuxolator/src/sys/cam/scsi/scsi_sg.h#1 add .. //depot/projects/linuxolator/src/sys/modules/sg/Makefile#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Wed Apr 4 17:19:48 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 891E116A53B; Wed, 4 Apr 2007 17:19:48 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id A621216A47E for ; Wed, 4 Apr 2007 17:19:47 +0000 (UTC) (envelope-from zec@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 6591913C4C2 for ; Wed, 4 Apr 2007 17:19:44 +0000 (UTC) (envelope-from zec@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l34HJibP008071 for ; Wed, 4 Apr 2007 17:19:44 GMT (envelope-from zec@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l34HJMj0008020 for perforce@freebsd.org; Wed, 4 Apr 2007 17:19:22 GMT (envelope-from zec@FreeBSD.org) Date: Wed, 4 Apr 2007 17:19:22 GMT Message-Id: <200704041719.l34HJMj0008020@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@FreeBSD.org using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 117377 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 04 Apr 2007 17:19:49 -0000 http://perforce.freebsd.org/chv.cgi?CH=117377 Change 117377 by zec@zec_tpx32 on 2007/04/04 17:18:28 IFC @ 117275 Affected files ... .. //depot/projects/vimage/src/sys/Makefile#2 integrate .. //depot/projects/vimage/src/sys/amd64/acpica/OsdEnvironment.c#2 integrate .. //depot/projects/vimage/src/sys/amd64/acpica/madt.c#2 integrate .. //depot/projects/vimage/src/sys/amd64/amd64/busdma_machdep.c#2 integrate .. //depot/projects/vimage/src/sys/amd64/amd64/cpu_switch.S#3 integrate .. //depot/projects/vimage/src/sys/amd64/amd64/genassym.c#3 integrate .. //depot/projects/vimage/src/sys/amd64/amd64/identcpu.c#3 integrate .. //depot/projects/vimage/src/sys/amd64/amd64/intr_machdep.c#3 integrate .. //depot/projects/vimage/src/sys/amd64/amd64/io_apic.c#2 integrate .. //depot/projects/vimage/src/sys/amd64/amd64/legacy.c#2 integrate .. //depot/projects/vimage/src/sys/amd64/amd64/local_apic.c#3 integrate .. //depot/projects/vimage/src/sys/amd64/amd64/machdep.c#4 integrate .. //depot/projects/vimage/src/sys/amd64/amd64/mp_machdep.c#3 integrate .. //depot/projects/vimage/src/sys/amd64/amd64/mptable.c#2 integrate .. //depot/projects/vimage/src/sys/amd64/amd64/mptable_pci.c#3 integrate .. //depot/projects/vimage/src/sys/amd64/amd64/msi.c#2 integrate .. //depot/projects/vimage/src/sys/amd64/amd64/nexus.c#3 integrate .. //depot/projects/vimage/src/sys/amd64/amd64/pmap.c#3 integrate .. //depot/projects/vimage/src/sys/amd64/amd64/prof_machdep.c#2 integrate .. //depot/projects/vimage/src/sys/amd64/amd64/support.S#2 integrate .. //depot/projects/vimage/src/sys/amd64/amd64/trap.c#3 integrate .. //depot/projects/vimage/src/sys/amd64/amd64/tsc.c#2 integrate .. //depot/projects/vimage/src/sys/amd64/amd64/uma_machdep.c#2 integrate .. //depot/projects/vimage/src/sys/amd64/conf/GENERIC#4 integrate .. //depot/projects/vimage/src/sys/amd64/conf/NOTES#2 integrate .. //depot/projects/vimage/src/sys/amd64/include/acpica_machdep.h#2 integrate .. //depot/projects/vimage/src/sys/amd64/include/apicvar.h#3 integrate .. //depot/projects/vimage/src/sys/amd64/include/clock.h#2 integrate .. //depot/projects/vimage/src/sys/amd64/include/gdb_machdep.h#2 integrate .. //depot/projects/vimage/src/sys/amd64/include/intr_machdep.h#3 integrate .. //depot/projects/vimage/src/sys/amd64/include/pcb.h#2 integrate .. //depot/projects/vimage/src/sys/amd64/include/pcpu.h#2 integrate .. //depot/projects/vimage/src/sys/amd64/include/segments.h#2 integrate .. //depot/projects/vimage/src/sys/amd64/include/smp.h#2 integrate .. //depot/projects/vimage/src/sys/amd64/include/specialreg.h#3 integrate .. //depot/projects/vimage/src/sys/amd64/isa/clock.c#3 integrate .. //depot/projects/vimage/src/sys/amd64/isa/isa.c#2 integrate .. //depot/projects/vimage/src/sys/amd64/linux32/linux.h#3 integrate .. //depot/projects/vimage/src/sys/amd64/linux32/linux32_dummy.c#3 integrate .. //depot/projects/vimage/src/sys/amd64/linux32/linux32_locore.s#2 integrate .. //depot/projects/vimage/src/sys/amd64/linux32/linux32_machdep.c#6 integrate .. //depot/projects/vimage/src/sys/amd64/linux32/linux32_proto.h#3 integrate .. //depot/projects/vimage/src/sys/amd64/linux32/linux32_syscall.h#3 integrate .. //depot/projects/vimage/src/sys/amd64/linux32/linux32_sysent.c#3 integrate .. //depot/projects/vimage/src/sys/amd64/linux32/linux32_sysvec.c#3 integrate .. //depot/projects/vimage/src/sys/amd64/linux32/syscalls.master#3 integrate .. //depot/projects/vimage/src/sys/amd64/pci/pci_bus.c#3 integrate .. //depot/projects/vimage/src/sys/arm/arm/busdma_machdep.c#3 integrate .. //depot/projects/vimage/src/sys/arm/arm/cpufunc.c#2 integrate .. //depot/projects/vimage/src/sys/arm/arm/cpufunc_asm_arm9.S#2 integrate .. //depot/projects/vimage/src/sys/arm/arm/db_interface.c#2 integrate .. //depot/projects/vimage/src/sys/arm/arm/elf_trampoline.c#2 integrate .. //depot/projects/vimage/src/sys/arm/arm/intr.c#2 integrate .. //depot/projects/vimage/src/sys/arm/arm/locore.S#2 integrate .. //depot/projects/vimage/src/sys/arm/arm/machdep.c#2 integrate .. //depot/projects/vimage/src/sys/arm/arm/mem.c#2 integrate .. //depot/projects/vimage/src/sys/arm/arm/nexus.c#2 integrate .. //depot/projects/vimage/src/sys/arm/arm/pmap.c#3 integrate .. //depot/projects/vimage/src/sys/arm/arm/support.S#2 integrate .. //depot/projects/vimage/src/sys/arm/arm/sys_machdep.c#2 integrate .. //depot/projects/vimage/src/sys/arm/arm/trap.c#2 integrate .. //depot/projects/vimage/src/sys/arm/at91/at91.c#2 integrate .. //depot/projects/vimage/src/sys/arm/at91/at91_mci.c#3 integrate .. //depot/projects/vimage/src/sys/arm/at91/at91_pio.c#2 integrate .. //depot/projects/vimage/src/sys/arm/at91/at91_rtc.c#2 integrate .. //depot/projects/vimage/src/sys/arm/at91/at91_spi.c#2 integrate .. //depot/projects/vimage/src/sys/arm/at91/at91_ssc.c#2 integrate .. //depot/projects/vimage/src/sys/arm/at91/at91_st.c#4 integrate .. //depot/projects/vimage/src/sys/arm/at91/at91_twi.c#2 integrate .. //depot/projects/vimage/src/sys/arm/at91/at91_twireg.h#2 integrate .. //depot/projects/vimage/src/sys/arm/at91/if_ate.c#3 integrate .. //depot/projects/vimage/src/sys/arm/at91/kb920x_machdep.c#3 integrate .. //depot/projects/vimage/src/sys/arm/at91/ohci_atmelarm.c#2 integrate .. //depot/projects/vimage/src/sys/arm/at91/uart_cpu_at91rm9200usart.c#2 integrate .. //depot/projects/vimage/src/sys/arm/at91/uart_dev_at91usart.c#4 integrate .. //depot/projects/vimage/src/sys/arm/conf/AVILA#2 integrate .. //depot/projects/vimage/src/sys/arm/conf/EP80219#2 integrate .. //depot/projects/vimage/src/sys/arm/conf/IQ31244#2 integrate .. //depot/projects/vimage/src/sys/arm/conf/KB920X#2 integrate .. //depot/projects/vimage/src/sys/arm/conf/KB920X.hints#1 branch .. //depot/projects/vimage/src/sys/arm/conf/SIMICS#2 integrate .. //depot/projects/vimage/src/sys/arm/include/bootconfig.h#2 integrate .. //depot/projects/vimage/src/sys/arm/include/cpufunc.h#2 integrate .. //depot/projects/vimage/src/sys/arm/include/intr.h#2 integrate .. //depot/projects/vimage/src/sys/arm/include/pcpu.h#2 integrate .. //depot/projects/vimage/src/sys/arm/include/undefined.h#2 integrate .. //depot/projects/vimage/src/sys/arm/sa11x0/sa11x0.c#2 integrate .. //depot/projects/vimage/src/sys/arm/sa11x0/sa11x0_ost.c#2 integrate .. //depot/projects/vimage/src/sys/arm/sa11x0/uart_cpu_sa1110.c#2 integrate .. //depot/projects/vimage/src/sys/arm/sa11x0/uart_dev_sa1110.c#3 integrate .. //depot/projects/vimage/src/sys/arm/xscale/i80321/i80321_pci.c#2 integrate .. //depot/projects/vimage/src/sys/arm/xscale/i80321/i80321_timer.c#2 integrate .. //depot/projects/vimage/src/sys/arm/xscale/i80321/i80321_wdog.c#3 integrate .. //depot/projects/vimage/src/sys/arm/xscale/i80321/iq80321.c#2 integrate .. //depot/projects/vimage/src/sys/arm/xscale/i80321/uart_cpu_i80321.c#2 integrate .. //depot/projects/vimage/src/sys/arm/xscale/ixp425/avila_ata.c#2 integrate .. //depot/projects/vimage/src/sys/arm/xscale/ixp425/avila_machdep.c#3 integrate .. //depot/projects/vimage/src/sys/arm/xscale/ixp425/if_npe.c#3 integrate .. //depot/projects/vimage/src/sys/arm/xscale/ixp425/ixp425.c#3 integrate .. //depot/projects/vimage/src/sys/arm/xscale/ixp425/ixp425_mem.c#2 integrate .. //depot/projects/vimage/src/sys/arm/xscale/ixp425/ixp425_npe.c#2 integrate .. //depot/projects/vimage/src/sys/arm/xscale/ixp425/ixp425_pci.c#3 integrate .. //depot/projects/vimage/src/sys/arm/xscale/ixp425/ixp425_qmgr.c#2 integrate .. //depot/projects/vimage/src/sys/arm/xscale/ixp425/ixp425_timer.c#2 integrate .. //depot/projects/vimage/src/sys/arm/xscale/ixp425/ixp425_wdog.c#2 integrate .. //depot/projects/vimage/src/sys/arm/xscale/ixp425/ixp425reg.h#2 integrate .. //depot/projects/vimage/src/sys/arm/xscale/ixp425/uart_cpu_ixp425.c#2 integrate .. //depot/projects/vimage/src/sys/boot/arm/at91/boot2/boot2.c#2 integrate .. //depot/projects/vimage/src/sys/boot/arm/at91/bootspi/loader_prompt.c#2 integrate .. //depot/projects/vimage/src/sys/boot/arm/at91/libat91/Makefile#2 integrate .. //depot/projects/vimage/src/sys/boot/arm/at91/libat91/at91rm9200_lowlevel.c#2 integrate .. //depot/projects/vimage/src/sys/boot/arm/at91/libat91/at91rm9200_lowlevel.h#3 integrate .. //depot/projects/vimage/src/sys/boot/arm/at91/libat91/emac.c#3 integrate .. //depot/projects/vimage/src/sys/boot/arm/at91/libat91/getc.c#2 integrate .. //depot/projects/vimage/src/sys/boot/arm/at91/libat91/memcmp.c#2 integrate .. //depot/projects/vimage/src/sys/boot/arm/at91/libat91/sd-card.c#2 integrate .. //depot/projects/vimage/src/sys/boot/arm/at91/libat91/spi_flash.c#3 integrate .. //depot/projects/vimage/src/sys/boot/arm/at91/libat91/strlen.c#2 integrate .. //depot/projects/vimage/src/sys/boot/common/loader.8#2 integrate .. //depot/projects/vimage/src/sys/boot/ficl/ficl.h#2 integrate .. //depot/projects/vimage/src/sys/boot/ficl/float.c#2 integrate .. //depot/projects/vimage/src/sys/boot/ficl/softwords/fileaccess.fr#2 integrate .. //depot/projects/vimage/src/sys/boot/ficl/softwords/jhlocal.fr#2 integrate .. //depot/projects/vimage/src/sys/boot/ficl/softwords/oo.fr#2 integrate .. //depot/projects/vimage/src/sys/boot/ficl/softwords/prefix.fr#2 integrate .. //depot/projects/vimage/src/sys/boot/ficl/softwords/softcore.awk#2 integrate .. //depot/projects/vimage/src/sys/boot/ficl/tools.c#2 integrate .. //depot/projects/vimage/src/sys/boot/ficl/unix.c#2 integrate .. //depot/projects/vimage/src/sys/boot/ficl/vm.c#2 integrate .. //depot/projects/vimage/src/sys/boot/ficl/words.c#2 integrate .. //depot/projects/vimage/src/sys/boot/forth/loader.conf#4 integrate .. //depot/projects/vimage/src/sys/boot/i386/boot0/boot0.S#2 integrate .. //depot/projects/vimage/src/sys/boot/i386/cdboot/cdboot.s#2 integrate .. //depot/projects/vimage/src/sys/boot/i386/libi386/biosacpi.c#2 integrate .. //depot/projects/vimage/src/sys/boot/ia64/ski/acpi_stub.c#2 integrate .. //depot/projects/vimage/src/sys/boot/pc98/boot0.5/boot.s#2 integrate .. //depot/projects/vimage/src/sys/boot/pc98/boot0.5/boot0.5.s#2 integrate .. //depot/projects/vimage/src/sys/boot/pc98/boot0.5/disk.s#2 integrate .. //depot/projects/vimage/src/sys/boot/pc98/cdboot/cdboot.s#2 integrate .. //depot/projects/vimage/src/sys/cam/cam_xpt.c#4 integrate .. //depot/projects/vimage/src/sys/cam/cam_xpt.h#3 integrate .. //depot/projects/vimage/src/sys/cam/scsi/scsi_da.c#4 integrate .. //depot/projects/vimage/src/sys/cam/scsi/scsi_target.c#3 integrate .. //depot/projects/vimage/src/sys/coda/coda_vfsops.h#2 integrate .. //depot/projects/vimage/src/sys/coda/coda_vnops.c#2 integrate .. //depot/projects/vimage/src/sys/compat/linprocfs/linprocfs.c#4 integrate .. //depot/projects/vimage/src/sys/compat/linsysfs/linsysfs.c#3 integrate .. //depot/projects/vimage/src/sys/compat/linux/linux_emul.c#5 integrate .. //depot/projects/vimage/src/sys/compat/linux/linux_emul.h#4 integrate .. //depot/projects/vimage/src/sys/compat/linux/linux_file.c#3 integrate .. //depot/projects/vimage/src/sys/compat/linux/linux_futex.c#2 integrate .. //depot/projects/vimage/src/sys/compat/linux/linux_futex.h#2 integrate .. //depot/projects/vimage/src/sys/compat/linux/linux_misc.c#5 integrate .. //depot/projects/vimage/src/sys/compat/linux/linux_socket.c#2 integrate .. //depot/projects/vimage/src/sys/compat/linux/linux_stats.c#3 integrate .. //depot/projects/vimage/src/sys/compat/linux/linux_uid16.c#2 integrate .. //depot/projects/vimage/src/sys/compat/linux/linux_util.c#2 integrate .. //depot/projects/vimage/src/sys/compat/linux/linux_util.h#2 integrate .. //depot/projects/vimage/src/sys/compat/ndis/kern_ndis.c#2 integrate .. //depot/projects/vimage/src/sys/conf/NOTES#6 integrate .. //depot/projects/vimage/src/sys/conf/files#6 integrate .. //depot/projects/vimage/src/sys/conf/files.powerpc#3 integrate .. //depot/projects/vimage/src/sys/conf/files.sparc64#4 integrate .. //depot/projects/vimage/src/sys/conf/kern.post.mk#3 integrate .. //depot/projects/vimage/src/sys/conf/kmod.mk#2 integrate .. //depot/projects/vimage/src/sys/conf/options#8 integrate .. //depot/projects/vimage/src/sys/conf/options.arm#3 integrate .. //depot/projects/vimage/src/sys/contrib/altq/altq/altq_subr.c#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/CHANGES.txt#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/acapps.h#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/acconfig.h#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/acdebug.h#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/acdisasm.h#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/acdispat.h#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/acefi.h#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/acenv.h#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/acevents.h#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/acexcep.h#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/acfreebsd.h#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/acgcc.h#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/acglobal.h#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/achware.h#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/acinterp.h#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/aclocal.h#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/acmacros.h#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/acnames.h#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/acnamesp.h#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/acobject.h#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/acopcode.h#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/acoutput.h#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/acparser.h#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/acpi.h#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/acpica_prep.sh#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/acpiosxf.h#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/acpixf.h#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/acresrc.h#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/acstruct.h#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/actables.h#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/actbl.h#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/actbl1.h#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/actbl2.h#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/actypes.h#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/acutils.h#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/aecommon.h#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/aeexec.c#2 delete .. //depot/projects/vimage/src/sys/contrib/dev/acpica/amlcode.h#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/amlresrc.h#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/common/adfile.c#1 branch .. //depot/projects/vimage/src/sys/contrib/dev/acpica/common/adisasm.c#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/common/adwalk.c#1 branch .. //depot/projects/vimage/src/sys/contrib/dev/acpica/common/dmrestag.c#1 branch .. //depot/projects/vimage/src/sys/contrib/dev/acpica/common/dmtable.c#1 branch .. //depot/projects/vimage/src/sys/contrib/dev/acpica/common/dmtbdump.c#1 branch .. //depot/projects/vimage/src/sys/contrib/dev/acpica/common/dmtbinfo.c#1 branch .. //depot/projects/vimage/src/sys/contrib/dev/acpica/common/getopt.c#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/compiler/aslanalyze.c#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/compiler/aslcodegen.c#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/compiler/aslcompile.c#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/compiler/aslcompiler.h#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/compiler/aslcompiler.l#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/compiler/aslcompiler.y#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/compiler/asldefine.h#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/compiler/aslerror.c#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/compiler/aslfiles.c#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/compiler/aslfold.c#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/compiler/aslglobal.h#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/compiler/asllength.c#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/compiler/asllisting.c#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/compiler/aslload.c#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/compiler/asllookup.c#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/compiler/aslmain.c#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/compiler/aslmap.c#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/compiler/aslopcodes.c#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/compiler/asloperands.c#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/compiler/aslopt.c#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/compiler/aslresource.c#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/compiler/aslrestype1.c#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/compiler/aslrestype2.c#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/compiler/aslstubs.c#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/compiler/asltransform.c#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/compiler/asltree.c#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/compiler/asltypes.h#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/compiler/aslutils.c#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/dbcmds.c#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/dbdisply.c#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/dbexec.c#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/dbfileio.c#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/dbhistry.c#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/dbinput.c#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/dbstats.c#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/dbutils.c#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/dbxface.c#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/dmbuffer.c#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/dmnames.c#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/dmobject.c#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/dmopcode.c#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/dmresrc.c#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/dmresrcl.c#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/dmresrcs.c#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/dmutils.c#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/dmwalk.c#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/dsfield.c#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/dsinit.c#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/dsmethod.c#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/dsmthdat.c#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/dsobject.c#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/dsopcode.c#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/dsutils.c#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/dswexec.c#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/dswload.c#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/dswscope.c#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/dswstate.c#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/evevent.c#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/evgpe.c#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/evgpeblk.c#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/evmisc.c#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/evregion.c#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/evrgnini.c#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/evsci.c#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/evxface.c#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/evxfevnt.c#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/evxfregn.c#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/exconfig.c#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/exconvrt.c#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/excreate.c#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/exdump.c#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/exfield.c#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/exfldio.c#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/exmisc.c#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/exmutex.c#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/exnames.c#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/exoparg1.c#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/exoparg2.c#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/exoparg3.c#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/exoparg6.c#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/exprep.c#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/exregion.c#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/exresnte.c#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/exresolv.c#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/exresop.c#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/exstore.c#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/exstoren.c#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/exstorob.c#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/exsystem.c#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/exutils.c#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/hwacpi.c#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/hwgpe.c#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/hwregs.c#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/hwsleep.c#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/hwtimer.c#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/nsaccess.c#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/nsalloc.c#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/nsdump.c#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/nsdumpdv.c#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/nseval.c#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/nsinit.c#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/nsload.c#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/nsnames.c#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/nsobject.c#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/nsparse.c#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/nssearch.c#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/nsutils.c#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/nswalk.c#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/nsxfeval.c#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/nsxfname.c#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/nsxfobj.c#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/osunixxf.c#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/psargs.c#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/psloop.c#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/psopcode.c#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/psparse.c#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/psscope.c#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/pstree.c#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/psutils.c#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/pswalk.c#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/psxface.c#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/rsaddr.c#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/rscalc.c#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/rscreate.c#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/rsdump.c#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/rsinfo.c#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/rsio.c#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/rsirq.c#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/rslist.c#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/rsmemory.c#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/rsmisc.c#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/rsutils.c#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/rsxface.c#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/tbconvrt.c#2 delete .. //depot/projects/vimage/src/sys/contrib/dev/acpica/tbfadt.c#1 branch .. //depot/projects/vimage/src/sys/contrib/dev/acpica/tbfind.c#1 branch .. //depot/projects/vimage/src/sys/contrib/dev/acpica/tbget.c#2 delete .. //depot/projects/vimage/src/sys/contrib/dev/acpica/tbgetall.c#2 delete .. //depot/projects/vimage/src/sys/contrib/dev/acpica/tbinstal.c#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/tbrsdt.c#2 delete .. //depot/projects/vimage/src/sys/contrib/dev/acpica/tbutils.c#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/tbxface.c#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/tbxfroot.c#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/utalloc.c#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/utcache.c#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/utclib.c#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/utcopy.c#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/utdebug.c#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/utdelete.c#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/uteval.c#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/utglobal.c#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/utinit.c#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/utmath.c#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/utmisc.c#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/utmutex.c#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/utobject.c#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/utresrc.c#1 branch .. //depot/projects/vimage/src/sys/contrib/dev/acpica/utstate.c#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/uttrack.c#1 branch .. //depot/projects/vimage/src/sys/contrib/dev/acpica/utxface.c#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/ipw/LICENSE#1 branch .. //depot/projects/vimage/src/sys/contrib/dev/ipw/ipw2100-1.3-i.fw.uu#1 branch .. //depot/projects/vimage/src/sys/contrib/dev/ipw/ipw2100-1.3-p.fw.uu#1 branch .. //depot/projects/vimage/src/sys/contrib/dev/ipw/ipw2100-1.3.fw.uu#1 branch .. //depot/projects/vimage/src/sys/contrib/dev/iwi/LICENSE#1 branch .. //depot/projects/vimage/src/sys/contrib/dev/iwi/ipw2200-bss.fw.uu#1 branch .. //depot/projects/vimage/src/sys/contrib/dev/iwi/ipw2200-ibss.fw.uu#1 branch .. //depot/projects/vimage/src/sys/contrib/dev/iwi/ipw2200-sniffer.fw.uu#1 branch .. //depot/projects/vimage/src/sys/contrib/dev/oltr/if_oltr.c#2 integrate .. //depot/projects/vimage/src/sys/contrib/pf/net/if_pfsync.c#3 integrate .. //depot/projects/vimage/src/sys/contrib/pf/net/if_pfsync.h#2 integrate .. //depot/projects/vimage/src/sys/crypto/via/padlock.c#2 integrate .. //depot/projects/vimage/src/sys/dev/aac/aac.c#2 integrate .. //depot/projects/vimage/src/sys/dev/aac/aacvar.h#2 integrate .. //depot/projects/vimage/src/sys/dev/acpi_support/acpi_asus.c#2 integrate .. //depot/projects/vimage/src/sys/dev/acpi_support/acpi_fujitsu.c#2 integrate .. //depot/projects/vimage/src/sys/dev/acpi_support/acpi_ibm.c#2 integrate .. //depot/projects/vimage/src/sys/dev/acpica/Osd/OsdDebug.c#2 integrate .. //depot/projects/vimage/src/sys/dev/acpica/Osd/OsdInterrupt.c#2 integrate .. //depot/projects/vimage/src/sys/dev/acpica/Osd/OsdMemory.c#2 integrate .. //depot/projects/vimage/src/sys/dev/acpica/Osd/OsdSchedule.c#2 integrate .. //depot/projects/vimage/src/sys/dev/acpica/Osd/OsdSynch.c#2 integrate .. //depot/projects/vimage/src/sys/dev/acpica/Osd/OsdTable.c#2 integrate .. //depot/projects/vimage/src/sys/dev/acpica/acpi.c#3 integrate .. //depot/projects/vimage/src/sys/dev/acpica/acpi_acad.c#2 integrate .. //depot/projects/vimage/src/sys/dev/acpica/acpi_button.c#2 integrate .. //depot/projects/vimage/src/sys/dev/acpica/acpi_cmbat.c#2 integrate .. //depot/projects/vimage/src/sys/dev/acpica/acpi_cpu.c#3 integrate .. //depot/projects/vimage/src/sys/dev/acpica/acpi_dock.c#2 integrate .. //depot/projects/vimage/src/sys/dev/acpica/acpi_ec.c#2 integrate .. //depot/projects/vimage/src/sys/dev/acpica/acpi_hpet.c#2 integrate .. //depot/projects/vimage/src/sys/dev/acpica/acpi_lid.c#2 integrate .. //depot/projects/vimage/src/sys/dev/acpica/acpi_pci_link.c#2 integrate .. //depot/projects/vimage/src/sys/dev/acpica/acpi_pcib_acpi.c#3 integrate .. //depot/projects/vimage/src/sys/dev/acpica/acpi_pcib_pci.c#2 integrate .. //depot/projects/vimage/src/sys/dev/acpica/acpi_perf.c#3 integrate .. //depot/projects/vimage/src/sys/dev/acpica/acpi_quirk.c#2 integrate .. //depot/projects/vimage/src/sys/dev/acpica/acpi_resource.c#2 integrate .. //depot/projects/vimage/src/sys/dev/acpica/acpi_thermal.c#2 integrate .. //depot/projects/vimage/src/sys/dev/acpica/acpi_throttle.c#3 integrate .. //depot/projects/vimage/src/sys/dev/acpica/acpi_timer.c#2 integrate .. //depot/projects/vimage/src/sys/dev/acpica/acpivar.h#3 integrate .. //depot/projects/vimage/src/sys/dev/adlink/adlink.c#2 integrate .. //depot/projects/vimage/src/sys/dev/advansys/adv_eisa.c#3 integrate .. //depot/projects/vimage/src/sys/dev/advansys/adv_isa.c#3 integrate .. //depot/projects/vimage/src/sys/dev/advansys/adv_pci.c#3 integrate .. //depot/projects/vimage/src/sys/dev/advansys/adwcam.c#3 integrate .. //depot/projects/vimage/src/sys/dev/aha/aha_isa.c#3 integrate .. //depot/projects/vimage/src/sys/dev/aha/aha_mca.c#3 integrate .. //depot/projects/vimage/src/sys/dev/ahb/ahb.c#3 integrate .. //depot/projects/vimage/src/sys/dev/aic/aic_cbus.c#2 integrate .. //depot/projects/vimage/src/sys/dev/aic/aic_isa.c#2 integrate .. //depot/projects/vimage/src/sys/dev/aic/aic_pccard.c#2 integrate .. //depot/projects/vimage/src/sys/dev/aic7xxx/aic79xx.seq#2 integrate .. //depot/projects/vimage/src/sys/dev/aic7xxx/aic79xx_osm.c#2 integrate .. //depot/projects/vimage/src/sys/dev/aic7xxx/aic7xxx_osm.c#2 integrate .. //depot/projects/vimage/src/sys/dev/amd/amd.c#3 integrate .. //depot/projects/vimage/src/sys/dev/amr/amr_pci.c#3 integrate .. //depot/projects/vimage/src/sys/dev/an/if_an_isa.c#2 integrate .. //depot/projects/vimage/src/sys/dev/an/if_an_pccard.c#2 integrate .. //depot/projects/vimage/src/sys/dev/an/if_an_pci.c#2 integrate .. //depot/projects/vimage/src/sys/dev/ar/if_ar.c#2 integrate .. //depot/projects/vimage/src/sys/dev/arcmsr/arcmsr.c#4 integrate .. //depot/projects/vimage/src/sys/dev/arcmsr/arcmsr.h#3 integrate .. //depot/projects/vimage/src/sys/dev/arl/if_arl_isa.c#2 integrate .. //depot/projects/vimage/src/sys/dev/asr/asr.c#3 integrate .. //depot/projects/vimage/src/sys/dev/ata/ata-all.c#3 integrate .. //depot/projects/vimage/src/sys/dev/ata/ata-all.h#2 integrate .. //depot/projects/vimage/src/sys/dev/ata/ata-card.c#2 integrate .. //depot/projects/vimage/src/sys/dev/ata/ata-cbus.c#2 integrate .. //depot/projects/vimage/src/sys/dev/ata/ata-chipset.c#3 integrate .. //depot/projects/vimage/src/sys/dev/ata/ata-disk.c#2 integrate .. //depot/projects/vimage/src/sys/dev/ata/ata-disk.h#2 integrate .. //depot/projects/vimage/src/sys/dev/ata/ata-dma.c#2 integrate .. //depot/projects/vimage/src/sys/dev/ata/ata-isa.c#2 integrate .. //depot/projects/vimage/src/sys/dev/ata/ata-lowlevel.c#2 integrate .. //depot/projects/vimage/src/sys/dev/ata/ata-pci.c#2 integrate .. //depot/projects/vimage/src/sys/dev/ata/ata-pci.h#3 integrate .. //depot/projects/vimage/src/sys/dev/ata/ata-queue.c#3 integrate .. //depot/projects/vimage/src/sys/dev/ata/ata-raid.c#2 integrate .. //depot/projects/vimage/src/sys/dev/ata/ata-raid.h#2 integrate .. //depot/projects/vimage/src/sys/dev/ata/ata-usb.c#2 integrate .. //depot/projects/vimage/src/sys/dev/ata/atapi-cam.c#2 integrate .. //depot/projects/vimage/src/sys/dev/ata/atapi-cd.c#2 integrate .. //depot/projects/vimage/src/sys/dev/ata/atapi-cd.h#2 integrate .. //depot/projects/vimage/src/sys/dev/ata/atapi-fd.c#2 integrate .. //depot/projects/vimage/src/sys/dev/ata/atapi-fd.h#2 integrate .. //depot/projects/vimage/src/sys/dev/ata/atapi-tape.c#2 integrate .. //depot/projects/vimage/src/sys/dev/ata/atapi-tape.h#2 integrate .. //depot/projects/vimage/src/sys/dev/ath/if_ath.c#6 integrate .. //depot/projects/vimage/src/sys/dev/ath/if_ath_pci.c#3 integrate .. //depot/projects/vimage/src/sys/dev/ath/if_athvar.h#5 integrate .. //depot/projects/vimage/src/sys/dev/atkbdc/atkbd_atkbdc.c#2 integrate .. //depot/projects/vimage/src/sys/dev/atkbdc/psm.c#3 integrate .. //depot/projects/vimage/src/sys/dev/awi/if_awi_pccard.c#2 integrate .. //depot/projects/vimage/src/sys/dev/bce/if_bce.c#5 integrate .. //depot/projects/vimage/src/sys/dev/bfe/if_bfe.c#2 integrate .. //depot/projects/vimage/src/sys/dev/bge/if_bge.c#5 integrate .. //depot/projects/vimage/src/sys/dev/bge/if_bgereg.h#5 integrate .. //depot/projects/vimage/src/sys/dev/bktr/bktr_os.c#2 integrate .. //depot/projects/vimage/src/sys/dev/buslogic/bt.c#3 integrate .. //depot/projects/vimage/src/sys/dev/ce/if_ce.c#3 integrate .. //depot/projects/vimage/src/sys/dev/ciss/ciss.c#2 integrate .. //depot/projects/vimage/src/sys/dev/cm/if_cm_isa.c#2 integrate .. //depot/projects/vimage/src/sys/dev/cm/smc90cx6.c#2 integrate .. //depot/projects/vimage/src/sys/dev/cnw/if_cnw.c#2 integrate .. //depot/projects/vimage/src/sys/dev/cp/if_cp.c#3 integrate .. //depot/projects/vimage/src/sys/dev/cs/if_cs_isa.c#2 integrate .. //depot/projects/vimage/src/sys/dev/cs/if_cs_pccard.c#2 integrate .. //depot/projects/vimage/src/sys/dev/ct/ct_isa.c#2 integrate .. //depot/projects/vimage/src/sys/dev/ctau/if_ct.c#3 integrate .. //depot/projects/vimage/src/sys/dev/cx/if_cx.c#3 integrate .. //depot/projects/vimage/src/sys/dev/cxgb/common/cxgb_ael1002.c#1 branch .. //depot/projects/vimage/src/sys/dev/cxgb/common/cxgb_common.h#1 branch .. //depot/projects/vimage/src/sys/dev/cxgb/common/cxgb_firmware_exports.h#1 branch .. //depot/projects/vimage/src/sys/dev/cxgb/common/cxgb_mc5.c#1 branch .. //depot/projects/vimage/src/sys/dev/cxgb/common/cxgb_mv88e1xxx.c#1 branch .. //depot/projects/vimage/src/sys/dev/cxgb/common/cxgb_regs.h#1 branch .. //depot/projects/vimage/src/sys/dev/cxgb/common/cxgb_sge_defs.h#1 branch .. //depot/projects/vimage/src/sys/dev/cxgb/common/cxgb_t3_cpl.h#1 branch .. //depot/projects/vimage/src/sys/dev/cxgb/common/cxgb_t3_hw.c#1 branch .. //depot/projects/vimage/src/sys/dev/cxgb/common/cxgb_tcb.h#1 branch .. //depot/projects/vimage/src/sys/dev/cxgb/common/cxgb_version.h#1 branch .. //depot/projects/vimage/src/sys/dev/cxgb/common/cxgb_vsc8211.c#1 branch .. //depot/projects/vimage/src/sys/dev/cxgb/common/cxgb_xgmac.c#1 branch .. //depot/projects/vimage/src/sys/dev/cxgb/cxgb_adapter.h#1 branch .. //depot/projects/vimage/src/sys/dev/cxgb/cxgb_config.h#1 branch .. //depot/projects/vimage/src/sys/dev/cxgb/cxgb_ioctl.h#1 branch .. //depot/projects/vimage/src/sys/dev/cxgb/cxgb_lro.c#1 branch .. //depot/projects/vimage/src/sys/dev/cxgb/cxgb_main.c#1 branch .. //depot/projects/vimage/src/sys/dev/cxgb/cxgb_osdep.h#1 branch .. //depot/projects/vimage/src/sys/dev/cxgb/cxgb_sge.c#1 branch .. //depot/projects/vimage/src/sys/dev/cxgb/t3fw-3.2.bin.gz.uu#1 branch .. //depot/projects/vimage/src/sys/dev/cy/cy.c#2 integrate .. //depot/projects/vimage/src/sys/dev/cy/cy_isa.c#3 integrate .. //depot/projects/vimage/src/sys/dev/cy/cy_pci.c#2 integrate .. //depot/projects/vimage/src/sys/dev/cy/cyvar.h#2 integrate .. //depot/projects/vimage/src/sys/dev/dc/if_dc.c#4 integrate .. //depot/projects/vimage/src/sys/dev/de/if_de.c#2 integrate .. //depot/projects/vimage/src/sys/dev/dpt/dpt_eisa.c#4 integrate .. //depot/projects/vimage/src/sys/dev/dpt/dpt_pci.c#3 integrate .. //depot/projects/vimage/src/sys/dev/drm/drm_irq.c#2 integrate .. //depot/projects/vimage/src/sys/dev/ed/if_ed.c#2 integrate .. //depot/projects/vimage/src/sys/dev/ed/if_ed_cbus.c#2 integrate .. //depot/projects/vimage/src/sys/dev/ed/if_ed_isa.c#2 integrate .. //depot/projects/vimage/src/sys/dev/ed/if_ed_pccard.c#2 integrate .. //depot/projects/vimage/src/sys/dev/ed/if_ed_pci.c#2 integrate .. //depot/projects/vimage/src/sys/dev/em/if_em.c#2 integrate .. //depot/projects/vimage/src/sys/dev/en/if_en_pci.c#2 integrate .. //depot/projects/vimage/src/sys/dev/ep/if_ep_eisa.c#2 integrate .. //depot/projects/vimage/src/sys/dev/ep/if_ep_isa.c#2 integrate .. //depot/projects/vimage/src/sys/dev/ep/if_ep_mca.c#2 integrate .. //depot/projects/vimage/src/sys/dev/ep/if_ep_pccard.c#2 integrate .. //depot/projects/vimage/src/sys/dev/esp/esp_sbus.c#4 integrate .. //depot/projects/vimage/src/sys/dev/ex/if_ex_isa.c#2 integrate .. //depot/projects/vimage/src/sys/dev/ex/if_ex_pccard.c#2 integrate .. //depot/projects/vimage/src/sys/dev/exca/exca.c#2 integrate .. //depot/projects/vimage/src/sys/dev/fatm/if_fatm.c#2 integrate .. //depot/projects/vimage/src/sys/dev/fb/creator.c#3 integrate .. //depot/projects/vimage/src/sys/dev/fdc/fdc.c#2 integrate .. //depot/projects/vimage/src/sys/dev/fe/if_fe.c#2 integrate .. //depot/projects/vimage/src/sys/dev/firewire/firewire.c#2 integrate .. //depot/projects/vimage/src/sys/dev/firewire/firewirereg.h#2 integrate .. //depot/projects/vimage/src/sys/dev/firewire/fwdev.c#3 integrate .. //depot/projects/vimage/src/sys/dev/firewire/fwmem.c#2 integrate .. //depot/projects/vimage/src/sys/dev/firewire/fwohci.c#2 integrate .. //depot/projects/vimage/src/sys/dev/firewire/fwohci_pci.c#3 integrate .. //depot/projects/vimage/src/sys/dev/firewire/fwohcivar.h#2 integrate .. //depot/projects/vimage/src/sys/dev/firewire/if_fwe.c#2 integrate .. //depot/projects/vimage/src/sys/dev/firewire/if_fwip.c#3 integrate .. //depot/projects/vimage/src/sys/dev/firewire/sbp.c#2 integrate .. //depot/projects/vimage/src/sys/dev/firewire/sbp_targ.c#2 integrate .. //depot/projects/vimage/src/sys/dev/fxp/if_fxp.c#3 integrate .. //depot/projects/vimage/src/sys/dev/gem/if_gem_pci.c#2 integrate .. //depot/projects/vimage/src/sys/dev/hatm/if_hatm.c#2 integrate .. //depot/projects/vimage/src/sys/dev/hfa/hfa_pci.c#2 integrate .. //depot/projects/vimage/src/sys/dev/hifn/hifn7751.c#2 integrate .. //depot/projects/vimage/src/sys/dev/hifn/hifn7751reg.h#2 integrate .. //depot/projects/vimage/src/sys/dev/hifn/hifn7751var.h#2 integrate .. //depot/projects/vimage/src/sys/dev/hme/if_hme_pci.c#2 integrate .. //depot/projects/vimage/src/sys/dev/hme/if_hme_sbus.c#2 integrate .. //depot/projects/vimage/src/sys/dev/hptmv/entry.c#3 integrate .. //depot/projects/vimage/src/sys/dev/hptmv/ioctl.c#2 integrate .. //depot/projects/vimage/src/sys/dev/hwpmc/hwpmc_mod.c#2 integrate .. //depot/projects/vimage/src/sys/dev/ichsmb/ichsmb.c#3 integrate .. //depot/projects/vimage/src/sys/dev/ichwd/ichwd.c#3 integrate .. //depot/projects/vimage/src/sys/dev/ida/ida_eisa.c#2 integrate .. //depot/projects/vimage/src/sys/dev/ida/ida_pci.c#2 integrate .. //depot/projects/vimage/src/sys/dev/idt/idt_pci.c#2 integrate .. //depot/projects/vimage/src/sys/dev/ie/if_ie_isa.c#2 integrate .. //depot/projects/vimage/src/sys/dev/ieee488/pcii.c#2 integrate .. //depot/projects/vimage/src/sys/dev/ieee488/tnt4882.c#2 integrate .. //depot/projects/vimage/src/sys/dev/if_ndis/if_ndis.c#3 integrate .. //depot/projects/vimage/src/sys/dev/iicbus/icee.c#1 branch .. //depot/projects/vimage/src/sys/dev/iicbus/iic.c#2 integrate .. //depot/projects/vimage/src/sys/dev/iicbus/iicbb.c#3 integrate .. //depot/projects/vimage/src/sys/dev/iicbus/iicbus.c#2 integrate .. //depot/projects/vimage/src/sys/dev/iicbus/iicbus.h#2 integrate .. //depot/projects/vimage/src/sys/dev/iicbus/iiconf.c#3 integrate .. //depot/projects/vimage/src/sys/dev/iir/iir_pci.c#3 integrate .. //depot/projects/vimage/src/sys/dev/ipmi/ipmi.c#4 integrate .. //depot/projects/vimage/src/sys/dev/ipmi/ipmi_pci.c#2 integrate .. //depot/projects/vimage/src/sys/dev/ipmi/ipmi_ssif.c#2 integrate .. //depot/projects/vimage/src/sys/dev/ips/ips_pci.c#2 integrate .. //depot/projects/vimage/src/sys/dev/ipw/if_ipw.c#2 integrate .. //depot/projects/vimage/src/sys/dev/ipw/if_ipwvar.h#2 integrate .. //depot/projects/vimage/src/sys/dev/isp/isp.c#6 integrate .. //depot/projects/vimage/src/sys/dev/isp/isp_freebsd.c#5 integrate .. //depot/projects/vimage/src/sys/dev/isp/isp_freebsd.h#4 integrate .. //depot/projects/vimage/src/sys/dev/isp/isp_ioctl.h#2 integrate .. //depot/projects/vimage/src/sys/dev/isp/isp_library.c#2 integrate .. //depot/projects/vimage/src/sys/dev/isp/isp_library.h#2 integrate .. //depot/projects/vimage/src/sys/dev/isp/isp_pci.c#5 integrate .. //depot/projects/vimage/src/sys/dev/isp/isp_sbus.c#5 integrate .. //depot/projects/vimage/src/sys/dev/isp/isp_stds.h#2 integrate .. //depot/projects/vimage/src/sys/dev/isp/isp_target.c#4 integrate .. //depot/projects/vimage/src/sys/dev/isp/isp_target.h#3 integrate .. //depot/projects/vimage/src/sys/dev/isp/isp_tpublic.h#3 integrate .. //depot/projects/vimage/src/sys/dev/isp/ispmbox.h#4 integrate .. //depot/projects/vimage/src/sys/dev/isp/ispreg.h#2 integrate .. //depot/projects/vimage/src/sys/dev/isp/ispvar.h#4 integrate .. //depot/projects/vimage/src/sys/dev/iwi/if_iwi.c#3 integrate .. //depot/projects/vimage/src/sys/dev/iwi/if_iwireg.h#2 integrate .. //depot/projects/vimage/src/sys/dev/iwi/if_iwivar.h#2 integrate .. //depot/projects/vimage/src/sys/dev/ixgb/if_ixgb.c#2 integrate .. //depot/projects/vimage/src/sys/dev/le/if_le_cbus.c#3 integrate .. //depot/projects/vimage/src/sys/dev/le/if_le_isa.c#3 integrate .. //depot/projects/vimage/src/sys/dev/le/if_le_lebuffer.c#2 integrate .. //depot/projects/vimage/src/sys/dev/le/if_le_ledma.c#3 integrate .. //depot/projects/vimage/src/sys/dev/le/if_le_pci.c#3 integrate .. //depot/projects/vimage/src/sys/dev/lge/if_lge.c#2 integrate .. //depot/projects/vimage/src/sys/dev/lmc/if_lmc.c#2 integrate .. //depot/projects/vimage/src/sys/dev/mfi/mfi.c#4 integrate .. //depot/projects/vimage/src/sys/dev/mfi/mfi_pci.c#3 integrate .. //depot/projects/vimage/src/sys/dev/mii/brgphy.c#6 integrate .. //depot/projects/vimage/src/sys/dev/mii/brgphyreg.h#2 integrate .. //depot/projects/vimage/src/sys/dev/mii/gentbi.c#2 integrate .. //depot/projects/vimage/src/sys/dev/mii/miidevs#5 integrate .. //depot/projects/vimage/src/sys/dev/mii/rlphy.c#5 integrate .. //depot/projects/vimage/src/sys/dev/mk48txx/mk48txx.c#3 integrate .. //depot/projects/vimage/src/sys/dev/mlx/mlx.c#2 integrate .. //depot/projects/vimage/src/sys/dev/mly/mly.c#3 integrate .. //depot/projects/vimage/src/sys/dev/mpt/mpt.h#4 integrate .. //depot/projects/vimage/src/sys/dev/mpt/mpt_cam.c#5 integrate .. //depot/projects/vimage/src/sys/dev/mpt/mpt_cam.h#2 integrate .. //depot/projects/vimage/src/sys/dev/mpt/mpt_pci.c#4 integrate .. //depot/projects/vimage/src/sys/dev/mse/mse.c#2 integrate .. //depot/projects/vimage/src/sys/dev/msk/if_msk.c#4 integrate .. //depot/projects/vimage/src/sys/dev/mxge/eth_z8e.dat.gz.uu#2 integrate .. //depot/projects/vimage/src/sys/dev/mxge/ethp_z8e.dat.gz.uu#2 integrate .. //depot/projects/vimage/src/sys/dev/mxge/if_mxge.c#2 integrate .. //depot/projects/vimage/src/sys/dev/mxge/if_mxge_var.h#2 integrate .. //depot/projects/vimage/src/sys/dev/my/if_my.c#3 integrate .. //depot/projects/vimage/src/sys/dev/ncv/ncr53c500_pccard.c#2 integrate .. //depot/projects/vimage/src/sys/dev/nfe/if_nfe.c#2 integrate .. //depot/projects/vimage/src/sys/dev/nge/if_nge.c#2 integrate .. //depot/projects/vimage/src/sys/dev/nsp/nsp_pccard.c#2 integrate .. //depot/projects/vimage/src/sys/dev/nve/if_nve.c#2 integrate .. //depot/projects/vimage/src/sys/dev/patm/if_patm_attach.c#2 integrate .. //depot/projects/vimage/src/sys/dev/pccard/pccard.c#2 integrate .. //depot/projects/vimage/src/sys/dev/pccard/pccard_cis.c#2 integrate .. //depot/projects/vimage/src/sys/dev/pccard/pccarddevs#2 integrate .. //depot/projects/vimage/src/sys/dev/pccard/pccardvarp.h#2 integrate .. //depot/projects/vimage/src/sys/dev/pccbb/pccbb.c#2 integrate .. //depot/projects/vimage/src/sys/dev/pccbb/pccbb_pci.c#2 integrate .. //depot/projects/vimage/src/sys/dev/pccbb/pccbbvar.h#2 integrate .. //depot/projects/vimage/src/sys/dev/pcf/envctrl.c#2 integrate .. //depot/projects/vimage/src/sys/dev/pcf/pcf_ebus.c#2 integrate .. //depot/projects/vimage/src/sys/dev/pcf/pcf_isa.c#2 integrate .. //depot/projects/vimage/src/sys/dev/pci/pci.c#6 integrate .. //depot/projects/vimage/src/sys/dev/pci/pci_if.m#2 integrate .. //depot/projects/vimage/src/sys/dev/pci/pci_pci.c#3 integrate .. //depot/projects/vimage/src/sys/dev/pci/pci_private.h#3 integrate .. //depot/projects/vimage/src/sys/dev/pci/pcib_if.m#2 integrate .. //depot/projects/vimage/src/sys/dev/pci/pcib_private.h#4 integrate .. //depot/projects/vimage/src/sys/dev/pci/pcireg.h#4 integrate .. //depot/projects/vimage/src/sys/dev/pci/pcivar.h#3 integrate .. //depot/projects/vimage/src/sys/dev/pdq/if_fea.c#2 integrate .. //depot/projects/vimage/src/sys/dev/pdq/if_fpa.c#2 integrate .. //depot/projects/vimage/src/sys/dev/ppbus/if_plip.c#3 integrate .. //depot/projects/vimage/src/sys/dev/ppbus/lpt.c#2 integrate .. //depot/projects/vimage/src/sys/dev/ppbus/ppbconf.c#2 integrate .. //depot/projects/vimage/src/sys/dev/ppbus/ppi.c#2 integrate .. //depot/projects/vimage/src/sys/dev/ppbus/pps.c#2 integrate .. //depot/projects/vimage/src/sys/dev/ppc/ppc.c#2 integrate .. //depot/projects/vimage/src/sys/dev/ppc/ppcvar.h#2 integrate .. //depot/projects/vimage/src/sys/dev/pst/pst-iop.c#2 integrate .. //depot/projects/vimage/src/sys/dev/puc/puc.c#2 integrate .. //depot/projects/vimage/src/sys/dev/puc/puc_bfe.h#2 integrate .. //depot/projects/vimage/src/sys/dev/ral/if_ral_pci.c#2 integrate .. //depot/projects/vimage/src/sys/dev/ral/rt2560.c#4 integrate .. //depot/projects/vimage/src/sys/dev/ral/rt2661.c#4 integrate .. //depot/projects/vimage/src/sys/dev/random/randomdev_soft.c#2 integrate .. //depot/projects/vimage/src/sys/dev/ray/if_ray.c#2 integrate .. //depot/projects/vimage/src/sys/dev/rc/rc.c#2 integrate .. //depot/projects/vimage/src/sys/dev/re/if_re.c#5 integrate .. //depot/projects/vimage/src/sys/dev/rr232x/osm_bsd.c#2 integrate .. //depot/projects/vimage/src/sys/dev/safe/safe.c#2 integrate .. //depot/projects/vimage/src/sys/dev/sbni/if_sbni_isa.c#2 integrate .. //depot/projects/vimage/src/sys/dev/sbni/if_sbni_pci.c#2 integrate .. //depot/projects/vimage/src/sys/dev/sbsh/if_sbsh.c#2 integrate .. //depot/projects/vimage/src/sys/dev/scc/scc_bfe.h#2 integrate .. //depot/projects/vimage/src/sys/dev/scc/scc_bfe_ebus.c#2 integrate .. //depot/projects/vimage/src/sys/dev/scc/scc_bfe_macio.c#2 integrate .. //depot/projects/vimage/src/sys/dev/scc/scc_bfe_sbus.c#2 integrate .. //depot/projects/vimage/src/sys/dev/scc/scc_core.c#2 integrate .. //depot/projects/vimage/src/sys/dev/scc/scc_if.m#2 integrate .. //depot/projects/vimage/src/sys/dev/scd/scd.c#2 integrate .. //depot/projects/vimage/src/sys/dev/si/si_eisa.c#2 integrate .. //depot/projects/vimage/src/sys/dev/si/si_isa.c#2 integrate .. //depot/projects/vimage/src/sys/dev/si/si_pci.c#2 integrate .. //depot/projects/vimage/src/sys/dev/sio/sio.c#2 integrate .. //depot/projects/vimage/src/sys/dev/sio/sio_pci.c#2 integrate .. //depot/projects/vimage/src/sys/dev/sk/if_sk.c#4 integrate .. //depot/projects/vimage/src/sys/dev/sk/if_skreg.h#3 integrate .. //depot/projects/vimage/src/sys/dev/sn/if_sn.c#2 integrate .. //depot/projects/vimage/src/sys/dev/snc/if_snc_cbus.c#2 integrate .. //depot/projects/vimage/src/sys/dev/snc/if_snc_pccard.c#2 integrate .. //depot/projects/vimage/src/sys/dev/snp/snp.c#2 integrate .. //depot/projects/vimage/src/sys/dev/sound/driver.c#2 integrate .. //depot/projects/vimage/src/sys/dev/sound/isa/ad1816.c#2 integrate .. //depot/projects/vimage/src/sys/dev/sound/isa/ad1816.h#2 integrate .. //depot/projects/vimage/src/sys/dev/sound/isa/ess.c#2 integrate .. //depot/projects/vimage/src/sys/dev/sound/isa/gusc.c#2 integrate .. //depot/projects/vimage/src/sys/dev/sound/isa/mss.c#2 integrate .. //depot/projects/vimage/src/sys/dev/sound/isa/mss.h#2 integrate .. //depot/projects/vimage/src/sys/dev/sound/isa/sb.h#2 integrate .. //depot/projects/vimage/src/sys/dev/sound/isa/sb16.c#2 integrate .. //depot/projects/vimage/src/sys/dev/sound/isa/sb8.c#2 integrate .. //depot/projects/vimage/src/sys/dev/sound/isa/sbc.c#2 integrate .. //depot/projects/vimage/src/sys/dev/sound/midi/midi.c#2 integrate .. //depot/projects/vimage/src/sys/dev/sound/midi/midi.h#2 integrate .. //depot/projects/vimage/src/sys/dev/sound/midi/midiq.h#2 integrate .. //depot/projects/vimage/src/sys/dev/sound/midi/mpu401.c#2 integrate .. //depot/projects/vimage/src/sys/dev/sound/midi/mpu401.h#2 integrate .. //depot/projects/vimage/src/sys/dev/sound/midi/mpu_if.m#2 integrate .. //depot/projects/vimage/src/sys/dev/sound/midi/mpufoi_if.m#2 integrate .. //depot/projects/vimage/src/sys/dev/sound/midi/sequencer.c#2 integrate .. //depot/projects/vimage/src/sys/dev/sound/midi/sequencer.h#2 integrate .. //depot/projects/vimage/src/sys/dev/sound/midi/synth_if.m#2 integrate .. //depot/projects/vimage/src/sys/dev/sound/pci/als4000.c#2 integrate .. //depot/projects/vimage/src/sys/dev/sound/pci/atiixp.c#2 integrate .. //depot/projects/vimage/src/sys/dev/sound/pci/au88x0.c#2 integrate .. //depot/projects/vimage/src/sys/dev/sound/pci/aureal.c#2 integrate .. //depot/projects/vimage/src/sys/dev/sound/pci/cmi.c#2 integrate .. //depot/projects/vimage/src/sys/dev/sound/pci/cs4281.c#2 integrate .. //depot/projects/vimage/src/sys/dev/sound/pci/csa.c#2 integrate .. //depot/projects/vimage/src/sys/dev/sound/pci/csapcm.c#2 integrate .. //depot/projects/vimage/src/sys/dev/sound/pci/ds1.c#2 integrate .. //depot/projects/vimage/src/sys/dev/sound/pci/emu10k1.c#2 integrate .. //depot/projects/vimage/src/sys/dev/sound/pci/emu10kx-pcm.c#3 integrate .. //depot/projects/vimage/src/sys/dev/sound/pci/emu10kx.c#3 integrate .. //depot/projects/vimage/src/sys/dev/sound/pci/envy24.c#3 integrate .. //depot/projects/vimage/src/sys/dev/sound/pci/envy24ht.c#3 integrate .. //depot/projects/vimage/src/sys/dev/sound/pci/es137x.c#3 integrate .. //depot/projects/vimage/src/sys/dev/sound/pci/fm801.c#2 integrate .. //depot/projects/vimage/src/sys/dev/sound/pci/hda/hdac.c#6 integrate .. //depot/projects/vimage/src/sys/dev/sound/pci/hda/hdac_private.h#3 integrate .. //depot/projects/vimage/src/sys/dev/sound/pci/ich.c#3 integrate .. //depot/projects/vimage/src/sys/dev/sound/pci/maestro.c#2 integrate .. //depot/projects/vimage/src/sys/dev/sound/pci/maestro3.c#2 integrate .. //depot/projects/vimage/src/sys/dev/sound/pci/solo.c#2 integrate .. //depot/projects/vimage/src/sys/dev/sound/pci/spicds.c#2 integrate .. //depot/projects/vimage/src/sys/dev/sound/pci/t4dwave.c#2 integrate .. //depot/projects/vimage/src/sys/dev/sound/pci/via8233.c#2 integrate .. //depot/projects/vimage/src/sys/dev/sound/pci/via82c686.c#2 integrate .. //depot/projects/vimage/src/sys/dev/sound/pci/vibes.c#2 integrate .. //depot/projects/vimage/src/sys/dev/sound/pcm/ac97.c#2 integrate .. //depot/projects/vimage/src/sys/dev/sound/pcm/ac97_patch.c#2 integrate .. //depot/projects/vimage/src/sys/dev/sound/pcm/ac97_patch.h#2 integrate .. //depot/projects/vimage/src/sys/dev/sound/pcm/buffer.c#2 integrate .. //depot/projects/vimage/src/sys/dev/sound/pcm/buffer.h#2 integrate .. //depot/projects/vimage/src/sys/dev/sound/pcm/channel.c#3 integrate .. //depot/projects/vimage/src/sys/dev/sound/pcm/channel_if.m#2 integrate .. //depot/projects/vimage/src/sys/dev/sound/pcm/dsp.c#3 integrate .. //depot/projects/vimage/src/sys/dev/sound/pcm/dsp.h#2 integrate .. //depot/projects/vimage/src/sys/dev/sound/pcm/fake.c#2 integrate .. //depot/projects/vimage/src/sys/dev/sound/pcm/feeder.c#3 integrate .. //depot/projects/vimage/src/sys/dev/sound/pcm/feeder.h#2 integrate .. //depot/projects/vimage/src/sys/dev/sound/pcm/feeder_fmt.c#2 integrate .. //depot/projects/vimage/src/sys/dev/sound/pcm/feeder_rate.c#2 integrate .. //depot/projects/vimage/src/sys/dev/sound/pcm/feeder_volume.c#2 integrate .. //depot/projects/vimage/src/sys/dev/sound/pcm/mixer.c#2 integrate .. //depot/projects/vimage/src/sys/dev/sound/pcm/sndstat.c#2 integrate .. //depot/projects/vimage/src/sys/dev/sound/pcm/sound.c#2 integrate .. //depot/projects/vimage/src/sys/dev/sound/pcm/sound.h#2 integrate .. //depot/projects/vimage/src/sys/dev/sound/pcm/vchan.c#2 integrate .. //depot/projects/vimage/src/sys/dev/sound/sbus/cs4231.c#3 integrate .. //depot/projects/vimage/src/sys/dev/sound/usb/uaudio.c#3 integrate .. //depot/projects/vimage/src/sys/dev/sound/usb/uaudio.h#2 integrate .. //depot/projects/vimage/src/sys/dev/sound/usb/uaudio_pcm.c#2 integrate .. //depot/projects/vimage/src/sys/dev/sr/if_sr.c#2 integrate .. //depot/projects/vimage/src/sys/dev/stg/tmc18c30_isa.c#2 integrate .. //depot/projects/vimage/src/sys/dev/stg/tmc18c30_pccard.c#2 integrate .. //depot/projects/vimage/src/sys/dev/stg/tmc18c30_pci.c#2 integrate .. //depot/projects/vimage/src/sys/dev/stge/if_stge.c#3 integrate .. //depot/projects/vimage/src/sys/dev/sym/sym_hipd.c#3 integrate .. //depot/projects/vimage/src/sys/dev/syscons/fire/fire_saver.c#2 integrate .. //depot/projects/vimage/src/sys/dev/syscons/logo/logo_saver.c#2 integrate .. //depot/projects/vimage/src/sys/dev/syscons/rain/rain_saver.c#2 integrate .. //depot/projects/vimage/src/sys/dev/syscons/warp/warp_saver.c#2 integrate .. //depot/projects/vimage/src/sys/dev/ti/if_ti.c#3 integrate .. //depot/projects/vimage/src/sys/dev/trm/trm.c#3 integrate .. //depot/projects/vimage/src/sys/dev/twa/tw_osl_freebsd.c#3 integrate .. //depot/projects/vimage/src/sys/dev/twe/twe_freebsd.c#2 integrate .. //depot/projects/vimage/src/sys/dev/tx/if_tx.c#2 integrate .. //depot/projects/vimage/src/sys/dev/txp/if_txp.c#2 integrate .. //depot/projects/vimage/src/sys/dev/uart/uart.h#2 integrate .. //depot/projects/vimage/src/sys/dev/uart/uart_bus.h#2 integrate .. //depot/projects/vimage/src/sys/dev/uart/uart_core.c#2 integrate .. //depot/projects/vimage/src/sys/dev/uart/uart_cpu.h#3 integrate .. //depot/projects/vimage/src/sys/dev/uart/uart_cpu_amd64.c#2 integrate .. //depot/projects/vimage/src/sys/dev/uart/uart_cpu_i386.c#2 integrate .. //depot/projects/vimage/src/sys/dev/uart/uart_cpu_ia64.c#2 integrate .. //depot/projects/vimage/src/sys/dev/uart/uart_cpu_pc98.c#2 integrate .. //depot/projects/vimage/src/sys/dev/uart/uart_cpu_powerpc.c#2 integrate .. //depot/projects/vimage/src/sys/dev/uart/uart_cpu_sparc64.c#2 integrate .. //depot/projects/vimage/src/sys/dev/uart/uart_dev_ns8250.c#3 integrate .. //depot/projects/vimage/src/sys/dev/uart/uart_dev_sab82532.c#3 integrate .. //depot/projects/vimage/src/sys/dev/uart/uart_dev_z8530.c#3 integrate .. //depot/projects/vimage/src/sys/dev/uart/uart_kbd_sun.c#3 integrate .. //depot/projects/vimage/src/sys/dev/uart/uart_subr.c#2 integrate .. //depot/projects/vimage/src/sys/dev/ubsec/ubsec.c#2 integrate .. //depot/projects/vimage/src/sys/dev/usb/ehci_pci.c#3 integrate .. //depot/projects/vimage/src/sys/dev/usb/if_aue.c#5 integrate .. //depot/projects/vimage/src/sys/dev/usb/if_axe.c#2 integrate .. //depot/projects/vimage/src/sys/dev/usb/if_ural.c#2 integrate .. //depot/projects/vimage/src/sys/dev/usb/ohci_pci.c#2 integrate .. //depot/projects/vimage/src/sys/dev/usb/sl811hs.c#2 integrate .. //depot/projects/vimage/src/sys/dev/usb/sl811hsvar.h#2 integrate .. //depot/projects/vimage/src/sys/dev/usb/slhci_pccard.c#2 integrate .. //depot/projects/vimage/src/sys/dev/usb/ubsa.c#2 integrate .. //depot/projects/vimage/src/sys/dev/usb/ubser.c#2 integrate .. //depot/projects/vimage/src/sys/dev/usb/uhci.c#2 integrate .. //depot/projects/vimage/src/sys/dev/usb/uhci_pci.c#3 integrate .. //depot/projects/vimage/src/sys/dev/usb/uhub.c#2 integrate .. //depot/projects/vimage/src/sys/dev/usb/uipaq.c#1 branch .. //depot/projects/vimage/src/sys/dev/usb/umass.c#2 integrate .. //depot/projects/vimage/src/sys/dev/usb/uplcom.c#3 integrate .. //depot/projects/vimage/src/sys/dev/usb/usb_quirks.c#2 integrate .. //depot/projects/vimage/src/sys/dev/usb/usb_subr.c#2 integrate .. //depot/projects/vimage/src/sys/dev/usb/usbdevs#2 integrate .. //depot/projects/vimage/src/sys/dev/usb/uvisor.c#2 integrate .. //depot/projects/vimage/src/sys/dev/usb/uvscom.c#2 integrate .. //depot/projects/vimage/src/sys/dev/vge/if_vge.c#2 integrate .. //depot/projects/vimage/src/sys/dev/vx/if_vx_eisa.c#2 integrate .. //depot/projects/vimage/src/sys/dev/vx/if_vx_pci.c#2 integrate .. //depot/projects/vimage/src/sys/dev/watchdog/watchdog.c#3 integrate .. //depot/projects/vimage/src/sys/dev/wds/wd7000.c#3 integrate .. //depot/projects/vimage/src/sys/dev/wi/if_wi.c#3 integrate .. //depot/projects/vimage/src/sys/dev/wl/if_wl.c#2 integrate .. //depot/projects/vimage/src/sys/dev/xe/if_xe.c#2 integrate .. //depot/projects/vimage/src/sys/dev/zs/z8530reg.h#2 delete .. //depot/projects/vimage/src/sys/dev/zs/z8530var.h#2 delete .. //depot/projects/vimage/src/sys/dev/zs/zs.c#2 delete .. //depot/projects/vimage/src/sys/dev/zs/zs_macio.c#2 delete .. //depot/projects/vimage/src/sys/fs/cd9660/TODO#1 branch .. //depot/projects/vimage/src/sys/fs/cd9660/TODO.hibler#1 branch .. //depot/projects/vimage/src/sys/fs/cd9660/cd9660_bmap.c#1 branch .. //depot/projects/vimage/src/sys/fs/cd9660/cd9660_iconv.c#1 branch .. //depot/projects/vimage/src/sys/fs/cd9660/cd9660_lookup.c#1 branch .. //depot/projects/vimage/src/sys/fs/cd9660/cd9660_mount.h#1 branch .. //depot/projects/vimage/src/sys/fs/cd9660/cd9660_node.c#1 branch .. //depot/projects/vimage/src/sys/fs/cd9660/cd9660_node.h#1 branch .. //depot/projects/vimage/src/sys/fs/cd9660/cd9660_rrip.c#1 branch .. //depot/projects/vimage/src/sys/fs/cd9660/cd9660_rrip.h#1 branch .. //depot/projects/vimage/src/sys/fs/cd9660/cd9660_util.c#1 branch .. //depot/projects/vimage/src/sys/fs/cd9660/cd9660_vfsops.c#1 branch .. //depot/projects/vimage/src/sys/fs/cd9660/cd9660_vnops.c#1 branch .. //depot/projects/vimage/src/sys/fs/cd9660/iso.h#1 branch .. //depot/projects/vimage/src/sys/fs/cd9660/iso_rrip.h#1 branch .. //depot/projects/vimage/src/sys/fs/devfs/devfs_vnops.c#2 integrate .. //depot/projects/vimage/src/sys/fs/fdescfs/fdesc_vnops.c#2 integrate .. //depot/projects/vimage/src/sys/fs/fifofs/fifo_vnops.c#2 integrate .. //depot/projects/vimage/src/sys/fs/hpfs/hpfs_vfsops.c#2 integrate .. //depot/projects/vimage/src/sys/fs/hpfs/hpfs_vnops.c#2 integrate .. //depot/projects/vimage/src/sys/fs/msdosfs/msdosfs_denode.c#2 integrate .. //depot/projects/vimage/src/sys/fs/msdosfs/msdosfs_fat.c#3 integrate .. //depot/projects/vimage/src/sys/fs/msdosfs/msdosfs_vfsops.c#4 integrate .. //depot/projects/vimage/src/sys/fs/msdosfs/msdosfs_vnops.c#3 integrate .. //depot/projects/vimage/src/sys/fs/ntfs/ntfs_vfsops.c#2 integrate .. //depot/projects/vimage/src/sys/fs/ntfs/ntfs_vnops.c#2 integrate .. //depot/projects/vimage/src/sys/fs/nullfs/null_subr.c#2 integrate .. //depot/projects/vimage/src/sys/fs/nullfs/null_vfsops.c#2 integrate .. //depot/projects/vimage/src/sys/fs/nullfs/null_vnops.c#2 integrate .. //depot/projects/vimage/src/sys/fs/nwfs/nwfs_node.c#2 integrate .. //depot/projects/vimage/src/sys/fs/portalfs/portal_vfsops.c#2 integrate .. //depot/projects/vimage/src/sys/fs/portalfs/portal_vnops.c#2 integrate .. //depot/projects/vimage/src/sys/fs/procfs/procfs.c#2 integrate .. //depot/projects/vimage/src/sys/fs/procfs/procfs_ioctl.c#2 integrate .. //depot/projects/vimage/src/sys/fs/pseudofs/pseudofs.c#2 integrate .. //depot/projects/vimage/src/sys/fs/pseudofs/pseudofs.h#2 integrate .. //depot/projects/vimage/src/sys/fs/pseudofs/pseudofs_vncache.c#3 integrate .. //depot/projects/vimage/src/sys/fs/smbfs/smbfs_node.c#2 integrate .. //depot/projects/vimage/src/sys/fs/smbfs/smbfs_smb.c#2 integrate .. //depot/projects/vimage/src/sys/fs/udf/udf.h#2 integrate .. //depot/projects/vimage/src/sys/fs/udf/udf_vfsops.c#3 integrate .. //depot/projects/vimage/src/sys/fs/udf/udf_vnops.c#4 integrate .. //depot/projects/vimage/src/sys/fs/umapfs/umap_subr.c#2 integrate .. //depot/projects/vimage/src/sys/fs/umapfs/umap_vfsops.c#2 integrate .. //depot/projects/vimage/src/sys/fs/umapfs/umap_vnops.c#2 integrate .. //depot/projects/vimage/src/sys/fs/unionfs/union_subr.c#4 integrate .. //depot/projects/vimage/src/sys/fs/unionfs/union_vfsops.c#3 integrate .. //depot/projects/vimage/src/sys/fs/unionfs/union_vnops.c#4 integrate .. //depot/projects/vimage/src/sys/geom/eli/g_eli.c#2 integrate .. //depot/projects/vimage/src/sys/geom/eli/g_eli_crypto.c#2 integrate .. //depot/projects/vimage/src/sys/geom/eli/g_eli_ctl.c#2 integrate .. //depot/projects/vimage/src/sys/geom/geom_apple.c#2 delete .. //depot/projects/vimage/src/sys/geom/geom_ctl.c#2 integrate .. //depot/projects/vimage/src/sys/geom/geom_dev.c#2 integrate .. //depot/projects/vimage/src/sys/geom/geom_disk.c#2 integrate .. //depot/projects/vimage/src/sys/geom/geom_gpt.c#2 delete .. //depot/projects/vimage/src/sys/geom/geom_io.c#2 integrate .. //depot/projects/vimage/src/sys/geom/geom_vfs.c#2 integrate .. //depot/projects/vimage/src/sys/geom/journal/g_journal.c#3 integrate .. //depot/projects/vimage/src/sys/geom/multipath/g_multipath.c#1 branch .. //depot/projects/vimage/src/sys/geom/multipath/g_multipath.h#1 branch .. //depot/projects/vimage/src/sys/geom/part/g_part.c#1 branch .. //depot/projects/vimage/src/sys/geom/part/g_part.h#1 branch .. //depot/projects/vimage/src/sys/geom/part/g_part_apm.c#1 branch .. //depot/projects/vimage/src/sys/geom/part/g_part_gpt.c#1 branch .. //depot/projects/vimage/src/sys/geom/part/g_part_if.m#1 branch .. //depot/projects/vimage/src/sys/gnu/fs/ext2fs/ext2_vfsops.c#2 integrate .. //depot/projects/vimage/src/sys/gnu/fs/ext2fs/ext2_vnops.c#2 integrate .. //depot/projects/vimage/src/sys/gnu/fs/reiserfs/reiserfs_inode.c#2 integrate .. //depot/projects/vimage/src/sys/gnu/fs/reiserfs/reiserfs_vfsops.c#2 integrate .. //depot/projects/vimage/src/sys/gnu/fs/reiserfs/reiserfs_vnops.c#2 integrate .. //depot/projects/vimage/src/sys/gnu/fs/xfs/FreeBSD/support/mrlock.c#2 integrate .. //depot/projects/vimage/src/sys/gnu/fs/xfs/FreeBSD/support/mrlock.h#2 integrate .. //depot/projects/vimage/src/sys/gnu/fs/xfs/FreeBSD/xfs_freebsd_iget.c#2 integrate .. //depot/projects/vimage/src/sys/gnu/fs/xfs/FreeBSD/xfs_mountops.c#2 integrate .. //depot/projects/vimage/src/sys/gnu/fs/xfs/FreeBSD/xfs_vnops.c#2 integrate .. //depot/projects/vimage/src/sys/i386/acpica/OsdEnvironment.c#2 integrate .. //depot/projects/vimage/src/sys/i386/acpica/acpi_machdep.c#2 integrate .. //depot/projects/vimage/src/sys/i386/acpica/acpi_wakeup.c#2 integrate .. //depot/projects/vimage/src/sys/i386/acpica/madt.c#2 integrate .. //depot/projects/vimage/src/sys/i386/bios/smapi.c#2 integrate .. //depot/projects/vimage/src/sys/i386/bios/smbios.c#2 integrate .. //depot/projects/vimage/src/sys/i386/bios/vpd.c#2 integrate .. //depot/projects/vimage/src/sys/i386/conf/GENERIC#6 integrate .. //depot/projects/vimage/src/sys/i386/conf/NOTES#7 integrate .. //depot/projects/vimage/src/sys/i386/cpufreq/powernow.c#2 integrate .. //depot/projects/vimage/src/sys/i386/i386/busdma_machdep.c#2 integrate .. //depot/projects/vimage/src/sys/i386/i386/db_trace.c#2 integrate .. //depot/projects/vimage/src/sys/i386/i386/elan-mmcr.c#3 integrate .. //depot/projects/vimage/src/sys/i386/i386/geode.c#2 integrate .. //depot/projects/vimage/src/sys/i386/i386/identcpu.c#3 integrate .. //depot/projects/vimage/src/sys/i386/i386/intr_machdep.c#3 integrate .. //depot/projects/vimage/src/sys/i386/i386/io_apic.c#2 integrate .. //depot/projects/vimage/src/sys/i386/i386/legacy.c#2 integrate .. //depot/projects/vimage/src/sys/i386/i386/local_apic.c#3 integrate .. //depot/projects/vimage/src/sys/i386/i386/locore.s#2 integrate .. //depot/projects/vimage/src/sys/i386/i386/machdep.c#5 integrate .. //depot/projects/vimage/src/sys/i386/i386/mp_machdep.c#3 integrate .. //depot/projects/vimage/src/sys/i386/i386/mptable.c#2 integrate .. //depot/projects/vimage/src/sys/i386/i386/mptable_pci.c#3 integrate .. //depot/projects/vimage/src/sys/i386/i386/msi.c#2 integrate .. //depot/projects/vimage/src/sys/i386/i386/nexus.c#3 integrate .. //depot/projects/vimage/src/sys/i386/i386/pmap.c#3 integrate .. //depot/projects/vimage/src/sys/i386/i386/support.s#2 integrate .. //depot/projects/vimage/src/sys/i386/i386/trap.c#3 integrate .. //depot/projects/vimage/src/sys/i386/i386/tsc.c#2 integrate .. //depot/projects/vimage/src/sys/i386/i386/vm_machdep.c#2 integrate .. //depot/projects/vimage/src/sys/i386/ibcs2/ibcs2_misc.c#2 integrate .. //depot/projects/vimage/src/sys/i386/ibcs2/ibcs2_xenix.c#2 integrate .. //depot/projects/vimage/src/sys/i386/include/acpica_machdep.h#2 integrate .. //depot/projects/vimage/src/sys/i386/include/apicvar.h#3 integrate .. //depot/projects/vimage/src/sys/i386/include/clock.h#2 integrate .. //depot/projects/vimage/src/sys/i386/include/intr_machdep.h#3 integrate .. //depot/projects/vimage/src/sys/i386/include/pcpu.h#2 integrate .. //depot/projects/vimage/src/sys/i386/include/pmap.h#2 integrate .. //depot/projects/vimage/src/sys/i386/include/smp.h#2 integrate .. //depot/projects/vimage/src/sys/i386/include/specialreg.h#3 integrate .. //depot/projects/vimage/src/sys/i386/isa/clock.c#3 integrate .. //depot/projects/vimage/src/sys/i386/isa/isa.c#2 integrate .. //depot/projects/vimage/src/sys/i386/isa/npx.c#2 integrate .. //depot/projects/vimage/src/sys/i386/isa/prof_machdep.c#2 integrate .. //depot/projects/vimage/src/sys/i386/linux/imgact_linux.c#2 integrate .. //depot/projects/vimage/src/sys/i386/linux/linux.h#3 integrate .. //depot/projects/vimage/src/sys/i386/linux/linux_dummy.c#3 integrate .. //depot/projects/vimage/src/sys/i386/linux/linux_machdep.c#4 integrate .. //depot/projects/vimage/src/sys/i386/linux/linux_proto.h#4 integrate .. //depot/projects/vimage/src/sys/i386/linux/linux_syscall.h#4 integrate .. //depot/projects/vimage/src/sys/i386/linux/linux_sysent.c#4 integrate .. //depot/projects/vimage/src/sys/i386/linux/linux_sysvec.c#2 integrate .. //depot/projects/vimage/src/sys/i386/linux/syscalls.master#4 integrate .. //depot/projects/vimage/src/sys/i386/pci/pci_bus.c#3 integrate .. //depot/projects/vimage/src/sys/i4b/capi/iavc/iavc_isa.c#2 integrate .. //depot/projects/vimage/src/sys/i4b/capi/iavc/iavc_pci.c#2 integrate .. //depot/projects/vimage/src/sys/i4b/layer1/ifpi/i4b_ifpi_pci.c#2 integrate .. //depot/projects/vimage/src/sys/i4b/layer1/ifpi2/i4b_ifpi2_pci.c#2 integrate .. //depot/projects/vimage/src/sys/i4b/layer1/ifpnp/i4b_ifpnp_avm.c#2 integrate .. //depot/projects/vimage/src/sys/i4b/layer1/ihfc/i4b_ihfc_pnp.c#2 integrate .. //depot/projects/vimage/src/sys/i4b/layer1/isic/i4b_avm_a1.c#2 integrate .. //depot/projects/vimage/src/sys/i4b/layer1/isic/i4b_elsa_pcc16.c#2 integrate .. //depot/projects/vimage/src/sys/i4b/layer1/isic/i4b_elsa_qs1p.c#2 integrate .. //depot/projects/vimage/src/sys/i4b/layer1/isic/i4b_isic_pnp.c#2 integrate .. //depot/projects/vimage/src/sys/i4b/layer1/isic/i4b_itk_ix1.c#2 integrate .. //depot/projects/vimage/src/sys/i4b/layer1/isic/i4b_tel_s016.c#2 integrate .. //depot/projects/vimage/src/sys/i4b/layer1/isic/i4b_tel_s0163.c#2 integrate .. //depot/projects/vimage/src/sys/i4b/layer1/isic/i4b_tel_s08.c#2 integrate .. //depot/projects/vimage/src/sys/i4b/layer1/isic/i4b_usr_sti.c#2 integrate .. //depot/projects/vimage/src/sys/i4b/layer1/itjc/i4b_itjc_pci.c#2 integrate .. //depot/projects/vimage/src/sys/i4b/layer1/iwic/i4b_iwic_pci.c#2 integrate .. //depot/projects/vimage/src/sys/ia64/acpica/OsdEnvironment.c#2 integrate .. //depot/projects/vimage/src/sys/ia64/acpica/madt.c#2 integrate .. //depot/projects/vimage/src/sys/ia64/conf/DEFAULTS#2 integrate .. //depot/projects/vimage/src/sys/ia64/conf/GENERIC#2 integrate .. //depot/projects/vimage/src/sys/ia64/ia64/busdma_machdep.c#2 integrate .. //depot/projects/vimage/src/sys/ia64/ia64/interrupt.c#2 integrate .. //depot/projects/vimage/src/sys/ia64/ia64/nexus.c#2 integrate .. //depot/projects/vimage/src/sys/ia64/ia64/pmap.c#2 integrate .. //depot/projects/vimage/src/sys/ia64/ia64/trap.c#2 integrate .. //depot/projects/vimage/src/sys/ia64/ia64/uma_machdep.c#2 integrate .. //depot/projects/vimage/src/sys/ia64/include/acpica_machdep.h#2 integrate .. //depot/projects/vimage/src/sys/ia64/include/intr.h#2 integrate .. //depot/projects/vimage/src/sys/ia64/include/pcpu.h#2 integrate .. //depot/projects/vimage/src/sys/ia64/isa/isa.c#2 integrate .. //depot/projects/vimage/src/sys/isa/isa_common.h#2 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Apr 4 17:24:51 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 24C6716A404; Wed, 4 Apr 2007 17:24:51 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id E9F4C16A401 for ; Wed, 4 Apr 2007 17:24:50 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id D9D9D13C45B for ; Wed, 4 Apr 2007 17:24:50 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l34HOotN013042 for ; Wed, 4 Apr 2007 17:24:50 GMT (envelope-from gonzo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l34HOocf013038 for perforce@freebsd.org; Wed, 4 Apr 2007 17:24:50 GMT (envelope-from gonzo@FreeBSD.org) Date: Wed, 4 Apr 2007 17:24:50 GMT Message-Id: <200704041724.l34HOocf013038@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gonzo@FreeBSD.org using -f From: Oleksandr Tymoshenko To: Perforce Change Reviews Cc: Subject: PERFORCE change 117378 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 04 Apr 2007 17:24:51 -0000 http://perforce.freebsd.org/chv.cgi?CH=117378 Change 117378 by gonzo@gonzo_jeeves on 2007/04/04 17:24:18 o Retire SYF_ARGMASK and remove both SYF_MPSAFE and SYF_ARGMASK. Affected files ... .. //depot/projects/mips2/src/sys/mips/mips/trap.c#18 edit Differences ... ==== //depot/projects/mips2/src/sys/mips/mips/trap.c#18 (text+ko) ==== @@ -375,7 +375,6 @@ u_int nargs, i; register_t *args, copyargs[MAXARGS]; struct sysent *callp; - int locked = 0; int args_shift = 0; int quad_syscall = 0; register_t ov0, opc; @@ -424,7 +423,7 @@ callp = &p->p_sysent->sv_table[0]; else callp = &p->p_sysent->sv_table[code]; - nargs = callp->sy_narg & SYF_ARGMASK; + nargs = callp->sy_narg; /* Copy arguments from a0..a4 */ for(i = 0; i < MIN(nargs, 4 - args_shift); i++) @@ -459,9 +458,6 @@ CTR4(KTR_SYSC, "syscall enter thread %p pid %d proc %s code %d", td, td->td_proc->p_pid, td->td_proc->p_comm, code); - if ((callp->sy_narg & SYF_MPSAFE) == 0) - mtx_lock(&Giant); - locked = 1; if (error == 0) { td->td_retval[0] = 0; td->td_retval[1] = 0; @@ -513,9 +509,6 @@ break; } - if (locked && (callp->sy_narg & SYF_MPSAFE) == 0) - mtx_unlock(&Giant); - WITNESS_WARN(WARN_PANIC, NULL, "System call %s returning", (code >= 0 && code < SYS_MAXSYSCALL) ? syscallnames[code] : "???"); KASSERT(td->td_critnest == 0, From owner-p4-projects@FreeBSD.ORG Wed Apr 4 17:25:53 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 11E3E16A407; Wed, 4 Apr 2007 17:25:53 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id C8D6416A405 for ; Wed, 4 Apr 2007 17:25:52 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id A0DC413C459 for ; Wed, 4 Apr 2007 17:25:52 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l34HPqQ6013990 for ; Wed, 4 Apr 2007 17:25:52 GMT (envelope-from gonzo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l34HPqsB013987 for perforce@freebsd.org; Wed, 4 Apr 2007 17:25:52 GMT (envelope-from gonzo@FreeBSD.org) Date: Wed, 4 Apr 2007 17:25:52 GMT Message-Id: <200704041725.l34HPqsB013987@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gonzo@FreeBSD.org using -f From: Oleksandr Tymoshenko To: Perforce Change Reviews Cc: Subject: PERFORCE change 117379 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 04 Apr 2007 17:25:53 -0000 http://perforce.freebsd.org/chv.cgi?CH=117379 Change 117379 by gonzo@gonzo_jeeves on 2007/04/04 17:25:48 o Argh, one more reference to SYF_ARGMASK Affected files ... .. //depot/projects/mips2/src/sys/mips/mips/trap.c#19 edit Differences ... ==== //depot/projects/mips2/src/sys/mips/mips/trap.c#19 (text+ko) ==== @@ -461,7 +461,7 @@ if (error == 0) { td->td_retval[0] = 0; td->td_retval[1] = 0; - STOPEVENT(p, S_SCE, (callp->sy_narg & SYF_ARGMASK)); + STOPEVENT(p, S_SCE, callp->sy_narg); PTRACESTOP_SC(p, td, S_PT_SCE); AUDIT_SYSCALL_ENTER(code, td); error = (*callp->sy_call)(td, args); From owner-p4-projects@FreeBSD.ORG Wed Apr 4 18:55:53 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C1FA116A405; Wed, 4 Apr 2007 18:55:52 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 2124916A402 for ; Wed, 4 Apr 2007 18:55:52 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 110F213C45A for ; Wed, 4 Apr 2007 18:55:52 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l34Itpno041268 for ; Wed, 4 Apr 2007 18:55:51 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l34Itppa041265 for perforce@freebsd.org; Wed, 4 Apr 2007 18:55:51 GMT (envelope-from sam@freebsd.org) Date: Wed, 4 Apr 2007 18:55:51 GMT Message-Id: <200704041855.l34Itppa041265@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 117387 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 04 Apr 2007 18:55:53 -0000 http://perforce.freebsd.org/chv.cgi?CH=117387 Change 117387 by sam@sam_ebb on 2007/04/04 18:55:30 use assigned values for HT elemid's and remove pre-draft ones for now (may be needed for compatibility support) Affected files ... .. //depot/projects/wifi/sys/net80211/ieee80211.h#17 edit Differences ... ==== //depot/projects/wifi/sys/net80211/ieee80211.h#17 (text+ko) ==== @@ -657,12 +657,10 @@ IEEE80211_ELEMID_QUIET = 40, IEEE80211_ELEMID_IBSSDFS = 41, IEEE80211_ELEMID_ERP = 42, - IEEE80211_ELEMID_HTCAP_ANA = 45, IEEE80211_ELEMID_RSN = 48, IEEE80211_ELEMID_XRATES = 50, - IEEE80211_ELEMID_HTCAP = 51, - IEEE80211_ELEMID_HTINFO = 52, - IEEE80211_ELEMID_HTINFO_ANA = 61, + IEEE80211_ELEMID_HTCAP = 45, + IEEE80211_ELEMID_HTINFO = 61, IEEE80211_ELEMID_TPC = 150, IEEE80211_ELEMID_CCKM = 156, IEEE80211_ELEMID_VENDOR = 221, /* vendor private */ From owner-p4-projects@FreeBSD.ORG Wed Apr 4 19:08:07 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C31E916A412; Wed, 4 Apr 2007 19:08:07 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 7F43F16A410 for ; Wed, 4 Apr 2007 19:08:07 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 6E7AC13C4B9 for ; Wed, 4 Apr 2007 19:08:07 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l34J87s4044174 for ; Wed, 4 Apr 2007 19:08:07 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l34J876b044171 for perforce@freebsd.org; Wed, 4 Apr 2007 19:08:07 GMT (envelope-from sam@freebsd.org) Date: Wed, 4 Apr 2007 19:08:07 GMT Message-Id: <200704041908.l34J876b044171@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 117388 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 04 Apr 2007 19:08:08 -0000 http://perforce.freebsd.org/chv.cgi?CH=117388 Change 117388 by sam@sam_ebb on 2007/04/04 19:07:11 add PLCP definitions for compatibility with netbsd code (also needed for drivers like rtw); note I have not verified the definitions Obtained from: netbsd Affected files ... .. //depot/projects/wifi/sys/net80211/ieee80211.h#18 edit Differences ... ==== //depot/projects/wifi/sys/net80211/ieee80211.h#18 (text+ko) ==== @@ -932,6 +932,42 @@ #define IEEE80211_HWBMISS_MAX 255 /* + * 802.11 frame duration definitions. + */ + +struct ieee80211_duration { + uint16_t d_rts_dur; + uint16_t d_data_dur; + uint16_t d_plcp_len; + uint8_t d_residue; /* unused octets in time slot */ +}; + +/* One Time Unit (TU) is 1Kus = 1024 microseconds. */ +#define IEEE80211_DUR_TU 1024 + +/* IEEE 802.11b durations for DSSS PHY in microseconds */ +#define IEEE80211_DUR_DS_LONG_PREAMBLE 144 +#define IEEE80211_DUR_DS_SHORT_PREAMBLE 72 + +#define IEEE80211_DUR_DS_SLOW_PLCPHDR 48 +#define IEEE80211_DUR_DS_FAST_PLCPHDR 24 +#define IEEE80211_DUR_DS_SLOW_ACK 112 +#define IEEE80211_DUR_DS_FAST_ACK 56 +#define IEEE80211_DUR_DS_SLOW_CTS 112 +#define IEEE80211_DUR_DS_FAST_CTS 56 + +#define IEEE80211_DUR_DS_SLOT 20 +#define IEEE80211_DUR_DS_SIFS 10 +#define IEEE80211_DUR_DS_PIFS (IEEE80211_DUR_DS_SIFS + IEEE80211_DUR_DS_SLOT) +#define IEEE80211_DUR_DS_DIFS (IEEE80211_DUR_DS_SIFS + \ + 2 * IEEE80211_DUR_DS_SLOT) +#define IEEE80211_DUR_DS_EIFS (IEEE80211_DUR_DS_SIFS + \ + IEEE80211_DUR_DS_SLOW_ACK + \ + IEEE80211_DUR_DS_LONG_PREAMBLE + \ + IEEE80211_DUR_DS_SLOW_PLCPHDR + \ + IEEE80211_DUR_DIFS) + +/* * Atheros fast-frame encapsulation format. * FF max payload: * 802.2 + FFHDR + HPAD + 802.3 + 802.2 + 1500 + SPAD + 802.3 + 802.2 + 1500: From owner-p4-projects@FreeBSD.ORG Wed Apr 4 19:11:12 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 22C8B16A404; Wed, 4 Apr 2007 19:11:12 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id D206516A402 for ; Wed, 4 Apr 2007 19:11:11 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id C18ED13C46C for ; Wed, 4 Apr 2007 19:11:11 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l34JBBOw044790 for ; Wed, 4 Apr 2007 19:11:11 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l34JBBwa044765 for perforce@freebsd.org; Wed, 4 Apr 2007 19:11:11 GMT (envelope-from sam@freebsd.org) Date: Wed, 4 Apr 2007 19:11:11 GMT Message-Id: <200704041911.l34JBBwa044765@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 117389 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 04 Apr 2007 19:11:12 -0000 http://perforce.freebsd.org/chv.cgi?CH=117389 Change 117389 by sam@sam_ebb on 2007/04/04 19:10:18 IFC Affected files ... .. //depot/projects/wifi/sbin/ifconfig/af_ipx.c#4 integrate .. //depot/projects/wifi/sbin/ifconfig/ifconfig.8#21 integrate .. //depot/projects/wifi/sbin/ifconfig/ifconfig.c#20 integrate .. //depot/projects/wifi/sbin/ifconfig/ifieee80211.c#63 integrate Differences ... ==== //depot/projects/wifi/sbin/ifconfig/af_ipx.c#4 (text+ko) ==== @@ -29,7 +29,7 @@ #ifndef lint static const char rcsid[] = - "$FreeBSD: src/sbin/ifconfig/af_ipx.c,v 1.2 2007/02/24 23:55:46 sam Exp $"; + "$FreeBSD: src/sbin/ifconfig/af_ipx.c,v 1.3 2007/03/09 23:28:40 sam Exp $"; #endif /* not lint */ #include @@ -66,7 +66,7 @@ printf("\tipx %s ", ipx_ntoa(sipx->sipx_addr)); if (ifa->ifa_flags & IFF_POINTOPOINT) { - sipx = (struct sockaddr_ipx *)ifa->ifa_broadaddr; + sipx = (struct sockaddr_ipx *)ifa->ifa_dstaddr; if (sipx == NULL) { memset(&null_sipx, 0, sizeof(null_sipx)); sipx = &null_sipx; ==== //depot/projects/wifi/sbin/ifconfig/ifconfig.8#21 (text+ko) ==== @@ -26,7 +26,7 @@ .\" SUCH DAMAGE. .\" .\" From: @(#)ifconfig.8 8.3 (Berkeley) 1/5/94 -.\" $FreeBSD: src/sbin/ifconfig/ifconfig.8,v 1.133 2007/02/04 16:48:56 bms Exp $ +.\" $FreeBSD: src/sbin/ifconfig/ifconfig.8,v 1.134 2007/03/29 21:30:26 thompsa Exp $ .\" .Dd February 4, 2007 .Dt IFCONFIG 8 @@ -1341,7 +1341,7 @@ Set the bridge priority for Spanning Tree. The default is 32768. The minimum is 0 and the maximum is 61440. -.It Cm protocol Ar value +.It Cm proto Ar value Set the Spanning Tree protocol. The default is rstp. The available options are stp and rstp. ==== //depot/projects/wifi/sbin/ifconfig/ifconfig.c#20 (text+ko) ==== @@ -38,7 +38,7 @@ static char sccsid[] = "@(#)ifconfig.c 8.2 (Berkeley) 2/16/94"; #endif static const char rcsid[] = - "$FreeBSD: src/sbin/ifconfig/ifconfig.c,v 1.128 2007/02/27 17:11:18 sam Exp $"; + "$FreeBSD: src/sbin/ifconfig/ifconfig.c,v 1.130 2007/03/24 20:26:54 yar Exp $"; #endif /* not lint */ #include ==== //depot/projects/wifi/sbin/ifconfig/ifieee80211.c#63 (text+ko) ==== @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sbin/ifconfig/ifieee80211.c,v 1.44 2007/02/17 18:21:52 sam Exp $ + * $FreeBSD: src/sbin/ifconfig/ifieee80211.c,v 1.45 2007/03/30 18:14:04 sam Exp $ */ /*- @@ -2280,9 +2280,9 @@ ireq.i_type = IEEE80211_IOC_HIDESSID; if (ioctl(s, SIOCG80211, &ireq) != -1) { if (ireq.i_val) - LINE_CHECK("ssid HIDE"); + LINE_CHECK("hidessid"); else if (verbose) - LINE_CHECK("ssid SHOW"); + LINE_CHECK("-hidessid"); } ireq.i_type = IEEE80211_IOC_APBRIDGE; From owner-p4-projects@FreeBSD.ORG Wed Apr 4 20:59:25 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 63F5D16A405; Wed, 4 Apr 2007 20:59:25 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 0A6D216A404 for ; Wed, 4 Apr 2007 20:59:25 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id EDFC913C480 for ; Wed, 4 Apr 2007 20:59:24 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l34KxO0b083367 for ; Wed, 4 Apr 2007 20:59:24 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l34KxOBa083362 for perforce@freebsd.org; Wed, 4 Apr 2007 20:59:24 GMT (envelope-from sam@freebsd.org) Date: Wed, 4 Apr 2007 20:59:24 GMT Message-Id: <200704042059.l34KxOBa083362@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 117391 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 04 Apr 2007 20:59:25 -0000 http://perforce.freebsd.org/chv.cgi?CH=117391 Change 117391 by sam@sam_ebb on 2007/04/04 20:58:43 rename getfmediastate to ifmedia_getstate and expose it so other modules can use it; this will be needed by the 802.11 code to do channel promotion Affected files ... .. //depot/projects/wifi/sbin/ifconfig/ifconfig.h#14 edit .. //depot/projects/wifi/sbin/ifconfig/ifmedia.c#13 edit Differences ... ==== //depot/projects/wifi/sbin/ifconfig/ifconfig.h#14 (text+ko) ==== @@ -140,3 +140,9 @@ typedef void clone_callback_func(int, struct ifreq *); void clone_setcallback(clone_callback_func *); + +/* + * XXX expose this so modules that neeed to know of any pending + * operations on ifmedia can avoid cmd line ordering confusion. + */ +struct ifmediareq *ifmedia_getstate(int s); ==== //depot/projects/wifi/sbin/ifconfig/ifmedia.c#13 (text+ko) ==== @@ -184,8 +184,8 @@ free(media_list); } -static struct ifmediareq * -getifmediastate(int s) +struct ifmediareq * +ifmedia_getstate(int s) { static struct ifmediareq *ifmr = NULL; int *mwords; @@ -249,7 +249,7 @@ struct ifmediareq *ifmr; int subtype; - ifmr = getifmediastate(s); + ifmr = ifmedia_getstate(s); /* * We are primarily concerned with the top-level type. @@ -294,7 +294,7 @@ struct ifmediareq *ifmr; int options; - ifmr = getifmediastate(s); + ifmr = ifmedia_getstate(s); options = get_media_options(IFM_TYPE(ifmr->ifm_ulist[0]), val); @@ -319,7 +319,7 @@ struct ifmediareq *ifmr; int inst; - ifmr = getifmediastate(s); + ifmr = ifmedia_getstate(s); inst = atoi(val); if (inst < 0 || inst > IFM_INST_MAX) @@ -338,7 +338,7 @@ struct ifmediareq *ifmr; int mode; - ifmr = getifmediastate(s); + ifmr = ifmedia_getstate(s); mode = get_media_mode(IFM_TYPE(ifmr->ifm_ulist[0]), val); From owner-p4-projects@FreeBSD.ORG Wed Apr 4 21:00:27 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C2ED016A405; Wed, 4 Apr 2007 21:00:26 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 9FC1216A402 for ; Wed, 4 Apr 2007 21:00:26 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 76E4913C48A for ; Wed, 4 Apr 2007 21:00:26 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l34L0QP5083496 for ; Wed, 4 Apr 2007 21:00:26 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l34L0QUh083493 for perforce@freebsd.org; Wed, 4 Apr 2007 21:00:26 GMT (envelope-from sam@freebsd.org) Date: Wed, 4 Apr 2007 21:00:26 GMT Message-Id: <200704042100.l34L0QUh083493@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 117392 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 04 Apr 2007 21:00:27 -0000 http://perforce.freebsd.org/chv.cgi?CH=117392 Change 117392 by sam@sam_ebb on 2007/04/04 21:00:10 reserve ioctl code for controlling 802.11h support Affected files ... .. //depot/projects/wifi/sys/net80211/ieee80211_ioctl.h#37 edit Differences ... ==== //depot/projects/wifi/sys/net80211/ieee80211_ioctl.h#37 (text+ko) ==== @@ -472,6 +472,7 @@ #define IEEE80211_IOC_STA_INFO 78 /* station/neighbor info */ #define IEEE80211_IOC_WPAIE2 79 /* WPA+RSN info elements */ #define IEEE80211_IOC_CURCHAN 80 /* current channel */ +#define IEEE80211_IOC_DOTH 88 /* 802.11h (on, off) */ /* * Scan result data returned for IEEE80211_IOC_SCAN_RESULTS. From owner-p4-projects@FreeBSD.ORG Wed Apr 4 21:12:42 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2EC1C16A403; Wed, 4 Apr 2007 21:12:42 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id E81D916A401 for ; Wed, 4 Apr 2007 21:12:41 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id BF8A713C465 for ; Wed, 4 Apr 2007 21:12:41 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l34LCfmM087309 for ; Wed, 4 Apr 2007 21:12:41 GMT (envelope-from gonzo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l34LCflC087306 for perforce@freebsd.org; Wed, 4 Apr 2007 21:12:41 GMT (envelope-from gonzo@FreeBSD.org) Date: Wed, 4 Apr 2007 21:12:41 GMT Message-Id: <200704042112.l34LCflC087306@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gonzo@FreeBSD.org using -f From: Oleksandr Tymoshenko To: Perforce Change Reviews Cc: Subject: PERFORCE change 117393 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 04 Apr 2007 21:12:42 -0000 http://perforce.freebsd.org/chv.cgi?CH=117393 Change 117393 by gonzo@gonzo_jeeves on 2007/04/04 21:12:14 o brace thread_user_enter call with ifdef KSE Affected files ... .. //depot/projects/mips2/src/sys/mips/mips/trap.c#20 edit Differences ... ==== //depot/projects/mips2/src/sys/mips/mips/trap.c#20 (text+ko) ==== @@ -152,8 +152,10 @@ td->td_frame = tf; if (td->td_ucred != td->td_proc->p_ucred) cred_update_thread(td); +#ifdef KSE if (td->td_pflags & TDP_SA) thread_user_enter(td); +#endif code |= TrUser; } From owner-p4-projects@FreeBSD.ORG Wed Apr 4 21:14:45 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E849116A401; Wed, 4 Apr 2007 21:14:44 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id C046E16A403 for ; Wed, 4 Apr 2007 21:14:44 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id AF7C113C455 for ; Wed, 4 Apr 2007 21:14:44 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l34LEiBZ087585 for ; Wed, 4 Apr 2007 21:14:44 GMT (envelope-from gonzo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l34LEinA087582 for perforce@freebsd.org; Wed, 4 Apr 2007 21:14:44 GMT (envelope-from gonzo@FreeBSD.org) Date: Wed, 4 Apr 2007 21:14:44 GMT Message-Id: <200704042114.l34LEinA087582@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gonzo@FreeBSD.org using -f From: Oleksandr Tymoshenko To: Perforce Change Reviews Cc: Subject: PERFORCE change 117394 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 04 Apr 2007 21:14:45 -0000 http://perforce.freebsd.org/chv.cgi?CH=117394 Change 117394 by gonzo@gonzo_jeeves on 2007/04/04 21:13:52 o Add filtering support to interrupts-related code. Affected files ... .. //depot/projects/mips2/src/sys/mips/mips/tick.c#4 edit .. //depot/projects/mips2/src/sys/mips/mips4k/malta/gt.c#3 edit .. //depot/projects/mips2/src/sys/mips/mips4k/malta/gt_pci.c#4 edit Differences ... ==== //depot/projects/mips2/src/sys/mips/mips/tick.c#4 (text+ko) ==== @@ -194,7 +194,7 @@ /* * Device section of file below */ -static void +static int clock_intr(void *arg) { struct trapframe *tf; @@ -206,7 +206,6 @@ mips_wr_compare(mips_rd_count() + counter_freq / hz); - /* * Magic. Setting up with an arg of NULL means we get passed tf. */ @@ -219,6 +218,7 @@ hardclock(usermode, pc); } + return (FILTER_HANDLED); } static int @@ -252,7 +252,7 @@ } error = bus_setup_intr(dev, irq, INTR_TYPE_CLK | INTR_MPSAFE | INTR_FAST, - clock_intr, NULL, NULL); + clock_intr, NULL, NULL, NULL); if (error != 0) { device_printf(dev, "bus_setup_intr returned %d\n", error); return (error); ==== //depot/projects/mips2/src/sys/mips/mips4k/malta/gt.c#3 (text+ko) ==== @@ -85,11 +85,11 @@ static int gt_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 *filt, + driver_intr_t *intr, void *arg, void **cookiep) { return BUS_SETUP_INTR(device_get_parent(dev), child, ires, flags, - intr, arg, cookiep); + filt, intr, arg, cookiep); } static int ==== //depot/projects/mips2/src/sys/mips/mips4k/malta/gt_pci.c#4 (text+ko) ==== @@ -352,7 +352,7 @@ } if ((bus_setup_intr(dev, sc->sc_irq, INTR_FAST | INTR_MPSAFE, - gt_pci_intr, sc, &sc->sc_ih))) { + NULL, gt_pci_intr, sc, &sc->sc_ih))) { device_printf(dev, "WARNING: unable to register interrupt handler\n"); return ENXIO; From owner-p4-projects@FreeBSD.ORG Thu Apr 5 10:54:29 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 957ED16A406; Thu, 5 Apr 2007 10:54:29 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 159FE16A401 for ; Thu, 5 Apr 2007 10:54:29 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 04E2013C465 for ; Thu, 5 Apr 2007 10:54:29 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l35AsSH4065375 for ; Thu, 5 Apr 2007 10:54:28 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l35AsSrI065368 for perforce@freebsd.org; Thu, 5 Apr 2007 10:54:28 GMT (envelope-from rdivacky@FreeBSD.org) Date: Thu, 5 Apr 2007 10:54:28 GMT Message-Id: <200704051054.l35AsSrI065368@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 117421 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 05 Apr 2007 10:54:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=117421 Change 117421 by rdivacky@rdivacky_witten on 2007/04/05 10:53:39 Sync /proc//status with linux 2.6, this is incomplete but I cannot play more because the module panics system on unload :( Affected files ... .. //depot/projects/linuxolator/src/sys/compat/linprocfs/linprocfs.c#15 edit Differences ... ==== //depot/projects/linuxolator/src/sys/compat/linprocfs/linprocfs.c#15 (text+ko) ==== @@ -668,13 +668,16 @@ fill_kinfo_proc(p, &kp); sbuf_printf(sb, "Name:\t%s\n", p->p_comm); /* XXX escape */ sbuf_printf(sb, "State:\t%s\n", state); + sbuf_printf(sb, "SleepAVG:\t%d%%\n", 98); /* seen on real Linux */ /* * Credentials */ - sbuf_printf(sb, "Pid:\t%d\n", p->p_pid); + sbuf_printf(sb, "Tgid:\t%d\n", p->p_pid); + sbuf_printf(sb, "Pid:\t%d\n", p->p_pid); /* XXX: wrong with 2.6 */ sbuf_printf(sb, "PPid:\t%d\n", p->p_pptr ? p->p_pptr->p_pid : 0); + sbuf_printf(sb, "TracerPid:\t%d\n", 0); sbuf_printf(sb, "Uid:\t%d %d %d %d\n", p->p_ucred->cr_ruid, p->p_ucred->cr_uid, p->p_ucred->cr_svuid, @@ -685,6 +688,7 @@ p->p_ucred->cr_svgid, /* FreeBSD doesn't have fsgid */ p->p_ucred->cr_gid); + sbuf_printf(sb, "FDSize:\t%d\n", 64); /* seen on real Linux */ sbuf_cat(sb, "Groups:\t"); for (i = 0; i < p->p_ucred->cr_ngroups; i++) sbuf_printf(sb, "%d ", p->p_ucred->cr_groups[i]); @@ -702,8 +706,10 @@ * could also compute VmLck, but I don't really care enough to * implement it. Submissions are welcome. */ + sbuf_printf(sb, "VmPeak:\t%8ju kB\n", B2K((uintmax_t)kp.ki_size)); sbuf_printf(sb, "VmSize:\t%8ju kB\n", B2K((uintmax_t)kp.ki_size)); sbuf_printf(sb, "VmLck:\t%8u kB\n", P2K(0)); /* XXX */ + sbuf_printf(sb, "VmHWM:\t%8ju kB\n", P2K((uintmax_t)kp.ki_rssize)); sbuf_printf(sb, "VmRss:\t%8ju kB\n", P2K((uintmax_t)kp.ki_rssize)); sbuf_printf(sb, "VmData:\t%8ju kB\n", P2K((uintmax_t)kp.ki_dsize)); sbuf_printf(sb, "VmStk:\t%8ju kB\n", P2K((uintmax_t)kp.ki_ssize)); @@ -711,6 +717,10 @@ lsize = B2P(kp.ki_size) - kp.ki_dsize - kp.ki_ssize - kp.ki_tsize - 1; sbuf_printf(sb, "VmLib:\t%8ju kB\n", P2K((uintmax_t)lsize)); + sbuf_printf(sb, "VmPTE:\t%8ju kB\n", P2K((uintmax_t)4)); + + /* Threads */ + sbuf_printf(sb, "Threads:\t%d\n", 1); /* XXX: bogus */ /* * Signal masks @@ -724,6 +734,10 @@ * running on anything but i386, so ignore that for now. */ PROC_LOCK(p); + /* XXX: bogus, should be like this + sbuf_printf(sb, "SigQ:\t%d/%d\n", sigs,p->p_limit->pl_rlimit[RLIMIT_SIGPENDING]); + */ + sbuf_printf(sb, "SigQ:\t%d/%d\n", 0, 0); sbuf_printf(sb, "SigPnd:\t%08x\n", p->p_siglist.__bits[0]); /* * I can't seem to find out where the signal mask is in From owner-p4-projects@FreeBSD.ORG Thu Apr 5 13:34:37 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 54C8716A405; Thu, 5 Apr 2007 13:34:37 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 117F816A403 for ; Thu, 5 Apr 2007 13:34:37 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id DE28A13C458 for ; Thu, 5 Apr 2007 13:34:36 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l35DYaau011055 for ; Thu, 5 Apr 2007 13:34:36 GMT (envelope-from gonzo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l35DYaq7011052 for perforce@freebsd.org; Thu, 5 Apr 2007 13:34:36 GMT (envelope-from gonzo@FreeBSD.org) Date: Thu, 5 Apr 2007 13:34:36 GMT Message-Id: <200704051334.l35DYaq7011052@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gonzo@FreeBSD.org using -f From: Oleksandr Tymoshenko To: Perforce Change Reviews Cc: Subject: PERFORCE change 117433 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 05 Apr 2007 13:34:37 -0000 http://perforce.freebsd.org/chv.cgi?CH=117433 Change 117433 by gonzo@gonzo_jeeves on 2007/04/05 13:33:40 o define TLS_TCB_ALIGN for MIPS. Affected files ... .. //depot/projects/mips2/src/lib/libc/gen/tls.c#5 edit Differences ... ==== //depot/projects/mips2/src/lib/libc/gen/tls.c#5 (text+ko) ==== @@ -60,7 +60,7 @@ #if defined(__ia64__) || defined(__amd64__) #define TLS_TCB_ALIGN 16 #elif defined(__powerpc__) || defined(__i386__) || defined(__arm__) || \ - defined(__sparc64__) + defined(__sparc64__) || defined(__mips__) #define TLS_TCB_ALIGN sizeof(void *) #else #error TLS_TCB_ALIGN undefined for target architecture From owner-p4-projects@FreeBSD.ORG Thu Apr 5 13:40:45 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4F2BA16A405; Thu, 5 Apr 2007 13:40:45 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 15E5116A402 for ; Thu, 5 Apr 2007 13:40:45 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id E2E4413C45A for ; Thu, 5 Apr 2007 13:40:44 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l35DeisQ011369 for ; Thu, 5 Apr 2007 13:40:44 GMT (envelope-from gonzo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l35Dei2f011366 for perforce@freebsd.org; Thu, 5 Apr 2007 13:40:44 GMT (envelope-from gonzo@FreeBSD.org) Date: Thu, 5 Apr 2007 13:40:44 GMT Message-Id: <200704051340.l35Dei2f011366@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gonzo@FreeBSD.org using -f From: Oleksandr Tymoshenko To: Perforce Change Reviews Cc: Subject: PERFORCE change 117434 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 05 Apr 2007 13:40:45 -0000 http://perforce.freebsd.org/chv.cgi?CH=117434 Change 117434 by gonzo@gonzo_jeeves on 2007/04/05 13:39:50 o Define ENGINESDIR for mips Affected files ... .. //depot/projects/mips2/src/secure/lib/libcrypto/opensslconf-mips.h#2 edit Differences ... ==== //depot/projects/mips2/src/secure/lib/libcrypto/opensslconf-mips.h#2 (text+ko) ==== @@ -25,6 +25,7 @@ #if !(defined(VMS) || defined(__VMS)) /* VMS uses logical names instead */ #if defined(HEADER_CRYPTLIB_H) && !defined(OPENSSLDIR) +#define ENGINESDIR "/usr/lib/engines" #define OPENSSLDIR "/etc/ssl" #endif #endif From owner-p4-projects@FreeBSD.ORG Thu Apr 5 15:46:24 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0112B16A408; Thu, 5 Apr 2007 15:46:24 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id A0F2916A406 for ; Thu, 5 Apr 2007 15:46:23 +0000 (UTC) (envelope-from ryanb@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 7A18713C45B for ; Thu, 5 Apr 2007 15:46:23 +0000 (UTC) (envelope-from ryanb@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l35FkNdS034100 for ; Thu, 5 Apr 2007 15:46:23 GMT (envelope-from ryanb@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l35FkNlO034097 for perforce@freebsd.org; Thu, 5 Apr 2007 15:46:23 GMT (envelope-from ryanb@FreeBSD.org) Date: Thu, 5 Apr 2007 15:46:23 GMT Message-Id: <200704051546.l35FkNlO034097@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 117437 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 05 Apr 2007 15:46:24 -0000 http://perforce.freebsd.org/chv.cgi?CH=117437 Change 117437 by ryanb@ryanb_yuki on 2007/04/05 15:45:50 Integrate from vendor branch (-CURRENT). Affected files ... .. //depot/projects/soundsystem/src/sys/sys/soundcard.h#1 branch Differences ... From owner-p4-projects@FreeBSD.ORG Thu Apr 5 16:10:54 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A2E7816A409; Thu, 5 Apr 2007 16:10:54 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 5C8E316A408 for ; Thu, 5 Apr 2007 16:10:54 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 4D56D13C44B for ; Thu, 5 Apr 2007 16:10:54 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l35GAsh1039929 for ; Thu, 5 Apr 2007 16:10:54 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l35GArlj039926 for perforce@freebsd.org; Thu, 5 Apr 2007 16:10:53 GMT (envelope-from sam@freebsd.org) Date: Thu, 5 Apr 2007 16:10:53 GMT Message-Id: <200704051610.l35GArlj039926@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 117438 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 05 Apr 2007 16:10:55 -0000 http://perforce.freebsd.org/chv.cgi?CH=117438 Change 117438 by sam@sam_ebb on 2007/04/05 16:10:37 o revise channel mapping to honor any media mode setting that might constrain promotion o add support for 11n channels o add channel flags specification syntax so you can specify which of several channels to use when ambiguous; syntax needs review and documentation 11n support temporarily #ifdef'd until kernel support committed. Affected files ... .. //depot/projects/wifi/sbin/ifconfig/ifieee80211.c#64 edit Differences ... ==== //depot/projects/wifi/sbin/ifconfig/ifieee80211.c#64 (text+ko) ==== @@ -94,13 +94,36 @@ #include "ifconfig.h" +/* XXX temporary compatibility shims */ +#ifndef IEEE80211_CHAN_HT +#define IEEE80211_CHAN_HT20 0x10000 /* HT 20 channel */ +#define IEEE80211_CHAN_HT40U 0x20000 /* HT 40 channel w/ ext above */ +#define IEEE80211_CHAN_HT40D 0x40000 /* HT 40 channel w/ ext below */ + +#define IEEE80211_CHAN_HT40 (IEEE80211_CHAN_HT40U | IEEE80211_CHAN_HT40D) +#define IEEE80211_CHAN_HT (IEEE80211_CHAN_HT20 | IEEE80211_CHAN_HT40) + +#define IEEE80211_CHAN_HTA \ + (IEEE80211_CHAN_A | IEEE80211_CHAN_HT) +#define IEEE80211_CHAN_HTG \ + (IEEE80211_CHAN_G | IEEE80211_CHAN_HT) + +#define IEEE80211_IS_CHAN_HT(_c) \ + (((_c)->ic_flags & IEEE80211_CHAN_HT) != 0) +#endif + static void set80211(int s, int type, int val, int len, void *data); static const char *get_string(const char *val, const char *sep, u_int8_t *buf, int *lenp); static void print_string(const u_int8_t *buf, int len); static struct ieee80211req_chaninfo chaninfo; +static struct ifmediareq *ifmr; +/* + * Collect channel info from the kernel. We use this (mostly) + * to handle mapping between frequency and IEEE channel number. + */ static void getchaninfo(int s) { @@ -115,45 +138,120 @@ ireq.i_len = sizeof(chaninfo); if (ioctl(s, SIOCG80211, &ireq) < 0) errx(1, "unable to get channel information"); + + ifmr = ifmedia_getstate(s); +} + +/* + * Given the channel at index i with attributes from, + * check if there is a channel with attributes to in + * the channel table. With suitable attributes this + * allows the caller to look for promotion; e.g. from + * 11b > 11g. + */ +static int +canpromote(int i, int from, int to) +{ + const struct ieee80211_channel *fc = &chaninfo.ic_chans[i]; + int j; + + if ((fc->ic_flags & from) != from) + return 0; + /* NB: quick check exploiting ordering of chans w/ same frequency */ + if (i+1 < chaninfo.ic_nchans && + chaninfo.ic_chans[i+1].ic_freq == fc->ic_freq && + (chaninfo.ic_chans[i+1].ic_flags & to) == to) + return 1; + /* brute force search in case channel list is not ordered */ + for (j = 0; j < chaninfo.ic_nchans; j++) { + const struct ieee80211_channel *tc = &chaninfo.ic_chans[j]; + if (j != i && + tc->ic_freq == fc->ic_freq && (tc->ic_flags & to) == to) + return 1; + } + return 0; +} + +/* + * Handle channel promotion. When a channel is specified with + * only a frequency we want to promote it to the ``best'' channel + * available. The channel list has separate entries for 11b, 11g, + * 11a, and 11n[ga] channels so specifying a frequency w/o any + * attributes requires we upgrade, e.g. from 11b -> 11g. This + * gets complicated when the channel is specified on the same + * command line with a media request that constrains the available + * channe list (e.g. mode 11a); we want to honor that to avoid + * confusing behaviour. + */ +static int +promote(int i) +{ + /* + * Query the current mode of the interface in case it's + * constrained (e.g. to 11a). We must do this carefully + * as there may be a pending ifmedia request in which case + * asking the kernel will give us the wrong answer. This + * is an unfortunate side-effect of the way ifconfig is + * structure for modularity (yech). + * + * NB: ifmr is actually setup in getchaninfo (above); we + * assume it's called coincident with to this call so + * we have a ``current setting''; otherwise we must pass + * the socket descriptor down to here so we can make + * the ifmedia_getstate call ourselves. + */ + int chanmode = ifmr != NULL ? IFM_MODE(ifmr->ifm_current) : IFM_AUTO; + + /* when ambiguous promote to ``best'' */ + if (chanmode != IFM_IEEE80211_11B && + canpromote(i, IEEE80211_CHAN_B, IEEE80211_CHAN_G)) + i++; + if (chanmode != IFM_IEEE80211_11G && + canpromote(i, IEEE80211_CHAN_G, IEEE80211_CHAN_HTG)) + i++; + if (chanmode != IFM_IEEE80211_11A && + canpromote(i, IEEE80211_CHAN_A, IEEE80211_CHAN_HTA)) + i++; + return i; } static void -mapfreq(struct ieee80211_channel *c, int freq, int flags) +mapfreq(struct ieee80211_channel *chan, int freq, int flags) { int i; - for (i = 0; i < chaninfo.ic_nchans; i++) - if (chaninfo.ic_chans[i].ic_freq == freq) { - /* when ambiguous take 11g over 11b */ - if (flags == 0 && - IEEE80211_IS_CHAN_B(&chaninfo.ic_chans[i]) && - i+1 < chaninfo.ic_nchans && - chaninfo.ic_chans[i+1].ic_freq == freq) { - i++; + for (i = 0; i < chaninfo.ic_nchans; i++) { + const struct ieee80211_channel *c = &chaninfo.ic_chans[i]; + + if (c->ic_freq == freq && (c->ic_flags & flags) == flags) { + if (flags == 0) { + /* when ambiguous promote to ``best'' */ + c = &chaninfo.ic_chans[promote(i)]; } - *c = chaninfo.ic_chans[i]; + *chan = *c; return; } + } errx(1, "unknown/undefined frequency %u/0x%x", freq, flags); } static void -mapchan(struct ieee80211_channel *c, int ieee, int flags) +mapchan(struct ieee80211_channel *chan, int ieee, int flags) { int i; - for (i = 0; i < chaninfo.ic_nchans; i++) - if (chaninfo.ic_chans[i].ic_ieee == ieee) { - /* when ambiguous take 11g over 11b */ - if (flags == 0 && - IEEE80211_IS_CHAN_B(&chaninfo.ic_chans[i]) && - i+1 < chaninfo.ic_nchans && - chaninfo.ic_chans[i+1].ic_ieee == ieee) { - i++; + for (i = 0; i < chaninfo.ic_nchans; i++) { + const struct ieee80211_channel *c = &chaninfo.ic_chans[i]; + + if (c->ic_ieee == ieee && (c->ic_flags & flags) == flags) { + if (flags == 0) { + /* when ambiguous promote to ``best'' */ + c = &chaninfo.ic_chans[promote(i)]; } - *c = chaninfo.ic_chans[i]; + *chan = *c; return; } + } errx(1, "unknown/undefined channel number %d", ieee); } @@ -207,6 +305,119 @@ set80211(s, IEEE80211_IOC_STATIONNAME, 0, len, data); } +/* + * Parse a channel specification for attributes/flags. + * The syntax is: + * freq/xx channel width (5,10,20,40,40+,40-) + * freq:mode channel mode (a,b,g,h,n,t,s,d) + * + * These can be combined in either order; e.g. 2437:ng/40. + * Modes are case insensitive. + * + * The result is not validated here; it's assumed to be + * checked against the channel table fetched from the kernel. + */ +static int +getchannelflags(const char *val) +{ +#define _CHAN_HT 0x80000000 + const char *cp; + int flags; + + flags = 0; + + cp = strchr(val, ':'); + if (cp != NULL) { + for (cp++; isalpha((int) *cp); cp++) { + /* accept mixed case */ + int c = *cp; + if (isupper(c)) + c = tolower(c); + switch (c) { + case 'a': /* 802.11a */ + flags |= IEEE80211_CHAN_A; + break; + case 'b': /* 802.11b */ + flags |= IEEE80211_CHAN_B; + break; + case 'g': /* 802.11g */ + flags |= IEEE80211_CHAN_G; + break; + case 'h': /* ht = 802.11n */ + case 'n': /* 802.11n */ + flags |= _CHAN_HT; /* NB: private */ + break; + case 'd': /* dt = Atheros Dynamic Turbo */ + flags |= IEEE80211_CHAN_TURBO; + break; + case 't': /* ht, dt, st, t */ + /* dt and unadorned t specify Dynamic Turbo */ + if ((flags & (IEEE80211_CHAN_STURBO|_CHAN_HT)) == 0) + flags |= IEEE80211_CHAN_TURBO; + break; + case 's': /* st = Atheros Static Turbo */ + flags |= IEEE80211_CHAN_STURBO; + break; + default: + errx(-1, "%s: Invalid channel attribute %c\n", + val, *cp); + } + } + } + cp = strchr(val, '/'); + if (cp != NULL) { + char *ep; + u_long cw = strtoul(cp+1, &ep, 10); + + switch (cw) { + case 5: + flags |= IEEE80211_CHAN_QUARTER; + break; + case 10: + flags |= IEEE80211_CHAN_HALF; + break; + case 20: + /* NB: this may be removed below */ + flags |= IEEE80211_CHAN_HT20; + break; + case 40: + if (ep != NULL && *ep == '+') + flags |= IEEE80211_CHAN_HT40U; + else if (ep != NULL && *ep == '-') + flags |= IEEE80211_CHAN_HT40D; + else + flags |= IEEE80211_CHAN_HT40; + break; + default: + errx(-1, "%s: Invalid channel width\n", val); + } + } + /* + * Cleanup specifications. + */ + if ((flags & _CHAN_HT) == 0) { + /* + * If user specified freq/20 or freq/40 quietly remove + * HT cw attributes depending on channel use. To give + * an explicit 20/40 width for an HT channel you must + * indicate it is an HT channel since all HT channels + * are also usable for legacy operation; e.g. freq:n/40. + */ + flags &= ~IEEE80211_CHAN_HT; + } else { + /* + * Remove private indicator that this is an HT channel + * and if no explicit channel width has been given + * provide the default settings. + */ + flags &= ~_CHAN_HT; + if ((flags & IEEE80211_CHAN_HT) == 0) + flags |= IEEE80211_CHAN_HT; + } + return flags; +#undef _CHAN_HT +} + static void set80211channel(const char *val, int d, int s, const struct afswtch *rafp) { @@ -214,14 +425,14 @@ memset(&chan, 0, sizeof(chan)); if (!isanyarg(val)) { - /* XXX freq/width */ int v = atoi(val); + int flags = getchannelflags(val); getchaninfo(s); if (v > 255) { /* treat as frequency */ - mapfreq(&chan, v, 0); + mapfreq(&chan, v, flags); } else { - mapchan(&chan, v, 0); + mapchan(&chan, v, flags); } } else { chan.ic_freq = IEEE80211_CHAN_ANY; @@ -806,6 +1017,12 @@ set80211(s, IEEE80211_IOC_BURST, d, 0, NULL); } +static void +set80211doth(const char *val, int d, int s, const struct afswtch *rafp) +{ + set80211(s, IEEE80211_IOC_DOTH, d, 0, NULL); +} + static int getmaxrate(uint8_t rates[15], uint8_t nrates) { @@ -1441,6 +1658,8 @@ strlcat(buf, " 11b", bsize); if (IEEE80211_IS_CHAN_TURBO(c)) strlcat(buf, " Turbo", bsize); + if (IEEE80211_IS_CHAN_HT(c)) + strlcat(buf, " HT", bsize); return buf; } @@ -2296,6 +2515,14 @@ ireq.i_type = IEEE80211_IOC_DTIM_PERIOD; if (ioctl(s, SIOCG80211, &ireq) != -1) LINE_CHECK("dtimperiod %u", ireq.i_val); + + ireq.i_type = IEEE80211_IOC_DOTH; + if (ioctl(s, SIOCG80211, &ireq) != -1) { + if (!ireq.i_val) + LINE_CHECK("-doth"); + else if (verbose) + LINE_CHECK("doth"); + } } else { ireq.i_type = IEEE80211_IOC_ROAMING; if (ioctl(s, SIOCG80211, &ireq) != -1) { @@ -2554,6 +2781,8 @@ DEF_CMD("-burst", 0, set80211burst), DEF_CMD_ARG("bmiss", set80211bmissthreshold), DEF_CMD_ARG("bmissthreshold", set80211bmissthreshold), + DEF_CMD("doth", 1, set80211doth), + DEF_CMD("-doth", 0, set80211doth), }; static struct afswtch af_ieee80211 = { .af_name = "af_ieee80211", From owner-p4-projects@FreeBSD.ORG Thu Apr 5 16:14:09 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4548816A421; Thu, 5 Apr 2007 16:14:09 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id EF11C16A41B for ; Thu, 5 Apr 2007 16:14:08 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id DEF5913C44B for ; Thu, 5 Apr 2007 16:14:08 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l35GE8Cq040970 for ; Thu, 5 Apr 2007 16:14:08 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l35GCvV4040810 for perforce@freebsd.org; Thu, 5 Apr 2007 16:12:57 GMT (envelope-from sam@freebsd.org) Date: Thu, 5 Apr 2007 16:12:57 GMT Message-Id: <200704051612.l35GCvV4040810@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 117439 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 05 Apr 2007 16:14:09 -0000 http://perforce.freebsd.org/chv.cgi?CH=117439 Change 117439 by sam@sam_ebb on 2007/04/05 16:12:34 IFC @ 117384 (approximately) Affected files ... .. //depot/projects/wifi/Makefile#15 integrate .. //depot/projects/wifi/Makefile.inc1#31 integrate .. //depot/projects/wifi/ObsoleteFiles.inc#12 integrate .. //depot/projects/wifi/UPDATING#26 integrate .. //depot/projects/wifi/bin/csh/config.h#7 integrate .. //depot/projects/wifi/bin/csh/config_p.h#3 integrate .. //depot/projects/wifi/bin/df/df.c#4 integrate .. //depot/projects/wifi/contrib/bzip2/CHANGES#3 integrate .. //depot/projects/wifi/contrib/bzip2/FREEBSD-upgrade#3 integrate .. //depot/projects/wifi/contrib/bzip2/LICENSE#3 integrate .. //depot/projects/wifi/contrib/bzip2/Makefile#3 integrate .. //depot/projects/wifi/contrib/bzip2/Makefile-libbz2_so#3 integrate .. //depot/projects/wifi/contrib/bzip2/README#3 integrate .. //depot/projects/wifi/contrib/bzip2/README.COMPILATION.PROBLEMS#3 integrate .. //depot/projects/wifi/contrib/bzip2/Y2K_INFO#2 delete .. //depot/projects/wifi/contrib/bzip2/blocksort.c#3 integrate .. //depot/projects/wifi/contrib/bzip2/bzip2.1#3 integrate .. //depot/projects/wifi/contrib/bzip2/bzip2.c#4 integrate .. //depot/projects/wifi/contrib/bzip2/bzip2recover.c#3 integrate .. //depot/projects/wifi/contrib/bzip2/bzlib.c#4 integrate .. //depot/projects/wifi/contrib/bzip2/bzlib.h#3 integrate .. //depot/projects/wifi/contrib/bzip2/bzlib_private.h#3 integrate .. //depot/projects/wifi/contrib/bzip2/compress.c#3 integrate .. //depot/projects/wifi/contrib/bzip2/crctable.c#3 integrate .. //depot/projects/wifi/contrib/bzip2/decompress.c#3 integrate .. //depot/projects/wifi/contrib/bzip2/dlltest.c#2 integrate .. //depot/projects/wifi/contrib/bzip2/huffman.c#3 integrate .. //depot/projects/wifi/contrib/bzip2/manual.texi#2 delete .. //depot/projects/wifi/contrib/bzip2/randtable.c#3 integrate .. //depot/projects/wifi/contrib/bzip2/sample1.bz2.uu#3 integrate .. //depot/projects/wifi/contrib/bzip2/sample1.ref.gz.uu#3 integrate .. //depot/projects/wifi/contrib/bzip2/sample2.bz2.uu#3 integrate .. //depot/projects/wifi/contrib/bzip2/sample2.ref.gz.uu#3 integrate .. //depot/projects/wifi/contrib/bzip2/sample3.bz2.uu#3 integrate .. //depot/projects/wifi/contrib/bzip2/sample3.ref.gz.uu#3 integrate .. //depot/projects/wifi/contrib/bzip2/spewG.c#2 integrate .. //depot/projects/wifi/contrib/bzip2/unzcrash.c#2 integrate .. //depot/projects/wifi/contrib/bzip2/words0#2 integrate .. //depot/projects/wifi/contrib/bzip2/words2#2 integrate .. //depot/projects/wifi/contrib/bzip2/words3#2 integrate .. //depot/projects/wifi/contrib/netcat/nc.1#4 integrate .. //depot/projects/wifi/contrib/netcat/netcat.c#3 integrate .. //depot/projects/wifi/contrib/netcat/socks.c#3 integrate .. //depot/projects/wifi/contrib/tcsh/FREEBSD-Xlist#3 integrate .. //depot/projects/wifi/contrib/tcsh/FREEBSD-upgrade#2 integrate .. //depot/projects/wifi/contrib/tcsh/Fixes#3 integrate .. //depot/projects/wifi/contrib/tcsh/Imakefile#3 integrate .. //depot/projects/wifi/contrib/tcsh/MAKEDIFFS#2 integrate .. //depot/projects/wifi/contrib/tcsh/MAKESHAR#2 integrate .. //depot/projects/wifi/contrib/tcsh/Makefile.in#3 integrate .. //depot/projects/wifi/contrib/tcsh/Makefile.std#3 integrate .. //depot/projects/wifi/contrib/tcsh/Makefile.vms#3 integrate .. //depot/projects/wifi/contrib/tcsh/README#3 integrate .. //depot/projects/wifi/contrib/tcsh/complete.tcsh#3 integrate .. //depot/projects/wifi/contrib/tcsh/config.h.in#3 integrate .. //depot/projects/wifi/contrib/tcsh/config/bsd4.4#3 integrate .. //depot/projects/wifi/contrib/tcsh/config_f.h#3 integrate .. //depot/projects/wifi/contrib/tcsh/configure#3 integrate .. //depot/projects/wifi/contrib/tcsh/configure.in#3 integrate .. //depot/projects/wifi/contrib/tcsh/ed.chared.c#3 integrate .. //depot/projects/wifi/contrib/tcsh/ed.decls.h#3 integrate .. //depot/projects/wifi/contrib/tcsh/ed.defns.c#3 integrate .. //depot/projects/wifi/contrib/tcsh/ed.h#3 integrate .. //depot/projects/wifi/contrib/tcsh/ed.init.c#3 integrate .. //depot/projects/wifi/contrib/tcsh/ed.inputl.c#3 integrate .. //depot/projects/wifi/contrib/tcsh/ed.refresh.c#3 integrate .. //depot/projects/wifi/contrib/tcsh/ed.screen.c#3 integrate .. //depot/projects/wifi/contrib/tcsh/ed.term.c#3 integrate .. //depot/projects/wifi/contrib/tcsh/ed.term.h#3 integrate .. //depot/projects/wifi/contrib/tcsh/ed.xmap.c#3 integrate .. //depot/projects/wifi/contrib/tcsh/eight-bit.me#2 integrate .. //depot/projects/wifi/contrib/tcsh/gethost.c#3 integrate .. //depot/projects/wifi/contrib/tcsh/glob.c#3 integrate .. //depot/projects/wifi/contrib/tcsh/glob.h#3 integrate .. //depot/projects/wifi/contrib/tcsh/host.defs#3 integrate .. //depot/projects/wifi/contrib/tcsh/imake.config#2 integrate .. //depot/projects/wifi/contrib/tcsh/ma.setp.c#3 integrate .. //depot/projects/wifi/contrib/tcsh/mi.termios.c#2 integrate .. //depot/projects/wifi/contrib/tcsh/mi.varargs.h#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/C/set1#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/C/set10#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/C/set11#3 integrate .. //depot/projects/wifi/contrib/tcsh/nls/C/set12#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/C/set13#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/C/set14#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/C/set15#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/C/set16#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/C/set17#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/C/set18#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/C/set19#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/C/set2#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/C/set20#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/C/set21#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/C/set22#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/C/set23#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/C/set24#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/C/set25#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/C/set26#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/C/set27#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/C/set29#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/C/set3#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/C/set30#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/C/set31#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/C/set4#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/C/set5#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/C/set6#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/C/set7#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/C/set8#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/C/set9#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/Makefile#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/et/set1#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/et/set10#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/et/set11#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/et/set12#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/et/set13#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/et/set14#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/et/set15#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/et/set16#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/et/set17#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/et/set18#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/et/set19#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/et/set2#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/et/set20#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/et/set21#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/et/set22#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/et/set23#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/et/set24#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/et/set25#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/et/set26#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/et/set27#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/et/set29#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/et/set3#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/et/set30#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/et/set31#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/et/set4#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/et/set5#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/et/set6#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/et/set7#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/et/set8#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/et/set9#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/finnish/set1#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/finnish/set10#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/finnish/set11#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/finnish/set12#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/finnish/set13#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/finnish/set14#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/finnish/set15#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/finnish/set16#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/finnish/set17#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/finnish/set18#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/finnish/set19#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/finnish/set2#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/finnish/set20#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/finnish/set21#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/finnish/set22#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/finnish/set23#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/finnish/set24#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/finnish/set25#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/finnish/set26#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/finnish/set27#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/finnish/set29#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/finnish/set3#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/finnish/set30#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/finnish/set31#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/finnish/set4#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/finnish/set5#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/finnish/set6#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/finnish/set7#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/finnish/set8#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/finnish/set9#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/french/set1#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/french/set10#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/french/set11#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/french/set12#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/french/set13#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/french/set14#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/french/set15#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/french/set16#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/french/set17#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/french/set18#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/french/set19#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/french/set2#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/french/set20#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/french/set21#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/french/set22#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/french/set23#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/french/set24#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/french/set25#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/french/set26#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/french/set27#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/french/set29#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/french/set3#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/french/set30#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/french/set31#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/french/set4#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/french/set5#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/french/set6#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/french/set7#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/french/set8#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/french/set9#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/german/set1#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/german/set10#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/german/set11#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/german/set12#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/german/set13#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/german/set14#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/german/set15#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/german/set16#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/german/set17#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/german/set18#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/german/set19#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/german/set2#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/german/set20#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/german/set21#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/german/set22#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/german/set23#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/german/set24#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/german/set25#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/german/set26#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/german/set27#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/german/set29#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/german/set3#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/german/set30#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/german/set31#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/german/set4#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/german/set5#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/german/set6#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/german/set7#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/german/set8#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/german/set9#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/greek/set1#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/greek/set10#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/greek/set11#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/greek/set12#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/greek/set13#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/greek/set14#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/greek/set15#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/greek/set16#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/greek/set17#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/greek/set18#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/greek/set19#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/greek/set2#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/greek/set20#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/greek/set21#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/greek/set22#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/greek/set23#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/greek/set24#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/greek/set25#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/greek/set26#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/greek/set27#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/greek/set29#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/greek/set3#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/greek/set30#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/greek/set31#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/greek/set4#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/greek/set5#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/greek/set6#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/greek/set7#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/greek/set8#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/greek/set9#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/italian/set1#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/italian/set10#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/italian/set11#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/italian/set12#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/italian/set13#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/italian/set14#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/italian/set15#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/italian/set16#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/italian/set17#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/italian/set18#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/italian/set19#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/italian/set2#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/italian/set20#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/italian/set21#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/italian/set22#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/italian/set23#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/italian/set24#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/italian/set25#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/italian/set26#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/italian/set27#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/italian/set29#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/italian/set3#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/italian/set30#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/italian/set31#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/italian/set4#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/italian/set5#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/italian/set6#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/italian/set7#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/italian/set8#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/italian/set9#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/ja/set1#3 integrate .. //depot/projects/wifi/contrib/tcsh/nls/ja/set10#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/ja/set11#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/ja/set12#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/ja/set13#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/ja/set15#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/ja/set16#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/ja/set17#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/ja/set18#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/ja/set2#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/ja/set21#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/ja/set24#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/ja/set29#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/ja/set3#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/ja/set30#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/ja/set4#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/ja/set5#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/ja/set6#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/ja/set7#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/ja/set8#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/pl/set1#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/pl/set10#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/pl/set11#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/pl/set12#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/pl/set13#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/pl/set14#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/pl/set15#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/pl/set16#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/pl/set17#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/pl/set18#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/pl/set19#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/pl/set2#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/pl/set20#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/pl/set21#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/pl/set22#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/pl/set23#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/pl/set24#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/pl/set25#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/pl/set26#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/pl/set27#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/pl/set29#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/pl/set3#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/pl/set30#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/pl/set31#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/pl/set4#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/pl/set5#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/pl/set6#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/pl/set7#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/pl/set8#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/pl/set9#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/russian/set1#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/russian/set10#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/russian/set11#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/russian/set12#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/russian/set13#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/russian/set14#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/russian/set15#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/russian/set16#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/russian/set17#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/russian/set18#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/russian/set19#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/russian/set2#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/russian/set20#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/russian/set21#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/russian/set22#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/russian/set23#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/russian/set24#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/russian/set25#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/russian/set26#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/russian/set27#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/russian/set29#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/russian/set3#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/russian/set30#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/russian/set31#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/russian/set4#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/russian/set5#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/russian/set6#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/russian/set7#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/russian/set8#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/russian/set9#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/spanish/set1#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/spanish/set10#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/spanish/set11#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/spanish/set12#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/spanish/set13#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/spanish/set14#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/spanish/set15#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/spanish/set16#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/spanish/set17#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/spanish/set18#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/spanish/set19#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/spanish/set2#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/spanish/set20#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/spanish/set21#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/spanish/set22#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/spanish/set23#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/spanish/set24#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/spanish/set25#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/spanish/set26#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/spanish/set27#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/spanish/set29#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/spanish/set3#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/spanish/set30#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/spanish/set31#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/spanish/set4#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/spanish/set5#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/spanish/set6#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/spanish/set7#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/spanish/set8#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/spanish/set9#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/ukrainian/set1#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/ukrainian/set10#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/ukrainian/set11#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/ukrainian/set12#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/ukrainian/set13#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/ukrainian/set14#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/ukrainian/set15#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/ukrainian/set16#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/ukrainian/set17#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/ukrainian/set18#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/ukrainian/set19#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/ukrainian/set2#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/ukrainian/set20#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/ukrainian/set21#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/ukrainian/set22#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/ukrainian/set23#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/ukrainian/set24#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/ukrainian/set25#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/ukrainian/set26#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/ukrainian/set27#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/ukrainian/set29#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/ukrainian/set3#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/ukrainian/set30#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/ukrainian/set31#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/ukrainian/set4#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/ukrainian/set5#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/ukrainian/set6#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/ukrainian/set7#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/ukrainian/set8#2 integrate .. //depot/projects/wifi/contrib/tcsh/nls/ukrainian/set9#2 integrate .. //depot/projects/wifi/contrib/tcsh/patchlevel.h#3 integrate .. //depot/projects/wifi/contrib/tcsh/pathnames.h#2 integrate .. //depot/projects/wifi/contrib/tcsh/sh.c#3 integrate .. //depot/projects/wifi/contrib/tcsh/sh.char.c#2 integrate .. //depot/projects/wifi/contrib/tcsh/sh.char.h#3 integrate .. //depot/projects/wifi/contrib/tcsh/sh.decls.h#3 integrate .. //depot/projects/wifi/contrib/tcsh/sh.dir.c#3 integrate .. //depot/projects/wifi/contrib/tcsh/sh.dir.h#2 integrate .. //depot/projects/wifi/contrib/tcsh/sh.dol.c#3 integrate .. //depot/projects/wifi/contrib/tcsh/sh.err.c#3 integrate .. //depot/projects/wifi/contrib/tcsh/sh.exec.c#3 integrate .. //depot/projects/wifi/contrib/tcsh/sh.exp.c#3 integrate .. //depot/projects/wifi/contrib/tcsh/sh.file.c#3 integrate .. //depot/projects/wifi/contrib/tcsh/sh.func.c#3 integrate .. //depot/projects/wifi/contrib/tcsh/sh.glob.c#3 integrate .. //depot/projects/wifi/contrib/tcsh/sh.h#3 integrate .. //depot/projects/wifi/contrib/tcsh/sh.hist.c#3 integrate .. //depot/projects/wifi/contrib/tcsh/sh.init.c#3 integrate .. //depot/projects/wifi/contrib/tcsh/sh.lex.c#3 integrate .. //depot/projects/wifi/contrib/tcsh/sh.misc.c#3 integrate .. //depot/projects/wifi/contrib/tcsh/sh.parse.c#3 integrate .. //depot/projects/wifi/contrib/tcsh/sh.print.c#3 integrate .. //depot/projects/wifi/contrib/tcsh/sh.proc.c#3 integrate .. //depot/projects/wifi/contrib/tcsh/sh.proc.h#3 integrate .. //depot/projects/wifi/contrib/tcsh/sh.sem.c#3 integrate .. //depot/projects/wifi/contrib/tcsh/sh.set.c#3 integrate .. //depot/projects/wifi/contrib/tcsh/sh.time.c#3 integrate .. //depot/projects/wifi/contrib/tcsh/sh.types.h#3 integrate .. //depot/projects/wifi/contrib/tcsh/snames.h#2 integrate .. //depot/projects/wifi/contrib/tcsh/tc.alloc.c#3 integrate .. //depot/projects/wifi/contrib/tcsh/tc.bind.c#3 integrate .. //depot/projects/wifi/contrib/tcsh/tc.const.c#3 integrate .. //depot/projects/wifi/contrib/tcsh/tc.decls.h#3 integrate .. //depot/projects/wifi/contrib/tcsh/tc.disc.c#3 integrate .. //depot/projects/wifi/contrib/tcsh/tc.func.c#3 integrate .. //depot/projects/wifi/contrib/tcsh/tc.h#3 integrate .. //depot/projects/wifi/contrib/tcsh/tc.nls.c#2 integrate .. //depot/projects/wifi/contrib/tcsh/tc.nls.h#2 integrate .. //depot/projects/wifi/contrib/tcsh/tc.os.c#3 integrate .. //depot/projects/wifi/contrib/tcsh/tc.os.h#3 integrate .. //depot/projects/wifi/contrib/tcsh/tc.printf.c#3 integrate .. //depot/projects/wifi/contrib/tcsh/tc.prompt.c#3 integrate .. //depot/projects/wifi/contrib/tcsh/tc.sched.c#3 integrate .. //depot/projects/wifi/contrib/tcsh/tc.sig.c#3 integrate .. //depot/projects/wifi/contrib/tcsh/tc.sig.h#3 integrate .. //depot/projects/wifi/contrib/tcsh/tc.str.c#3 integrate .. //depot/projects/wifi/contrib/tcsh/tc.vers.c#3 integrate .. //depot/projects/wifi/contrib/tcsh/tc.wait.h#3 integrate .. //depot/projects/wifi/contrib/tcsh/tc.who.c#3 integrate .. //depot/projects/wifi/contrib/tcsh/tcsh.man#3 integrate .. //depot/projects/wifi/contrib/tcsh/tcsh.man2html#3 integrate .. //depot/projects/wifi/contrib/tcsh/termcap.vms#2 integrate .. //depot/projects/wifi/contrib/tcsh/tw.color.c#3 integrate .. //depot/projects/wifi/contrib/tcsh/tw.comp.c#3 integrate .. //depot/projects/wifi/contrib/tcsh/tw.decls.h#3 integrate .. //depot/projects/wifi/contrib/tcsh/tw.h#3 integrate .. //depot/projects/wifi/contrib/tcsh/tw.help.c#3 integrate .. //depot/projects/wifi/contrib/tcsh/tw.init.c#3 integrate .. //depot/projects/wifi/contrib/tcsh/tw.parse.c#3 integrate .. //depot/projects/wifi/contrib/tcsh/tw.spell.c#3 integrate .. //depot/projects/wifi/contrib/tcsh/vms.termcap.c#3 integrate .. //depot/projects/wifi/crypto/openssl/CHANGES#5 integrate .. //depot/projects/wifi/crypto/openssl/Configure#5 integrate .. //depot/projects/wifi/crypto/openssl/FAQ#5 integrate .. //depot/projects/wifi/crypto/openssl/FREEBSD-upgrade#2 integrate .. //depot/projects/wifi/crypto/openssl/INSTALL#4 integrate .. //depot/projects/wifi/crypto/openssl/LICENSE#4 integrate .. //depot/projects/wifi/crypto/openssl/Makefile#4 integrate .. //depot/projects/wifi/crypto/openssl/NEWS#5 integrate .. //depot/projects/wifi/crypto/openssl/README#5 integrate .. //depot/projects/wifi/crypto/openssl/apps/CA.pl#5 integrate .. //depot/projects/wifi/crypto/openssl/apps/Makefile#3 integrate .. //depot/projects/wifi/crypto/openssl/apps/ca.c#4 integrate .. //depot/projects/wifi/crypto/openssl/apps/dgst.c#4 integrate .. //depot/projects/wifi/crypto/openssl/apps/ec.c#2 integrate .. //depot/projects/wifi/crypto/openssl/apps/enc.c#5 integrate .. //depot/projects/wifi/crypto/openssl/apps/ocsp.c#3 integrate .. //depot/projects/wifi/crypto/openssl/apps/pkcs12.c#4 integrate .. //depot/projects/wifi/crypto/openssl/apps/s_client.c#3 integrate .. //depot/projects/wifi/crypto/openssl/apps/s_server.c#3 integrate .. //depot/projects/wifi/crypto/openssl/certs/aol1.pem#1 branch .. //depot/projects/wifi/crypto/openssl/certs/aol2.pem#1 branch .. //depot/projects/wifi/crypto/openssl/certs/aoltw1.pem#1 branch .. //depot/projects/wifi/crypto/openssl/certs/aoltw2.pem#1 branch .. //depot/projects/wifi/crypto/openssl/config#5 integrate .. //depot/projects/wifi/crypto/openssl/crypto/aes/Makefile#4 integrate .. //depot/projects/wifi/crypto/openssl/crypto/aes/aes_misc.c#2 integrate .. //depot/projects/wifi/crypto/openssl/crypto/asn1/a_strex.c#4 integrate .. //depot/projects/wifi/crypto/openssl/crypto/asn1/asn1_err.c#3 integrate .. //depot/projects/wifi/crypto/openssl/crypto/asn1/asn1_lib.c#3 integrate .. //depot/projects/wifi/crypto/openssl/crypto/asn1/asn1t.h#3 integrate .. //depot/projects/wifi/crypto/openssl/crypto/asn1/t_x509.c#3 integrate .. //depot/projects/wifi/crypto/openssl/crypto/asn1/tasn_dec.c#4 integrate .. //depot/projects/wifi/crypto/openssl/crypto/asn1/x_x509.c#3 integrate .. //depot/projects/wifi/crypto/openssl/crypto/bf/bf_ecb.c#2 integrate .. //depot/projects/wifi/crypto/openssl/crypto/bio/bio.h#4 integrate .. //depot/projects/wifi/crypto/openssl/crypto/bio/bio_err.c#3 integrate .. //depot/projects/wifi/crypto/openssl/crypto/bio/bio_lib.c#3 integrate .. //depot/projects/wifi/crypto/openssl/crypto/bn/bn_err.c#3 integrate .. //depot/projects/wifi/crypto/openssl/crypto/bn/bn_lib.c#3 integrate .. //depot/projects/wifi/crypto/openssl/crypto/bn/bn_print.c#3 integrate .. //depot/projects/wifi/crypto/openssl/crypto/buffer/buf_err.c#3 integrate .. //depot/projects/wifi/crypto/openssl/crypto/camellia/Makefile#2 integrate .. //depot/projects/wifi/crypto/openssl/crypto/camellia/camellia.c#2 integrate .. //depot/projects/wifi/crypto/openssl/crypto/camellia/cmll_cbc.c#2 integrate .. //depot/projects/wifi/crypto/openssl/crypto/camellia/cmll_locl.h#2 integrate .. //depot/projects/wifi/crypto/openssl/crypto/camellia/cmll_misc.c#2 integrate .. //depot/projects/wifi/crypto/openssl/crypto/cast/c_ecb.c#2 integrate .. //depot/projects/wifi/crypto/openssl/crypto/comp/c_zlib.c#4 integrate .. //depot/projects/wifi/crypto/openssl/crypto/comp/comp_err.c#3 integrate .. //depot/projects/wifi/crypto/openssl/crypto/conf/conf_def.c#4 integrate .. //depot/projects/wifi/crypto/openssl/crypto/conf/conf_err.c#3 integrate .. //depot/projects/wifi/crypto/openssl/crypto/conf/conf_lib.c#3 integrate .. //depot/projects/wifi/crypto/openssl/crypto/cpt_err.c#3 integrate .. //depot/projects/wifi/crypto/openssl/crypto/cryptlib.c#4 integrate .. //depot/projects/wifi/crypto/openssl/crypto/des/INSTALL#2 integrate .. //depot/projects/wifi/crypto/openssl/crypto/des/des_ver.h#2 integrate .. //depot/projects/wifi/crypto/openssl/crypto/des/ecb_enc.c#2 integrate .. //depot/projects/wifi/crypto/openssl/crypto/dh/dh_err.c#5 integrate .. //depot/projects/wifi/crypto/openssl/crypto/dh/dh_lib.c#2 integrate .. //depot/projects/wifi/crypto/openssl/crypto/dsa/dsa_err.c#4 integrate .. //depot/projects/wifi/crypto/openssl/crypto/dsa/dsa_lib.c#3 integrate .. //depot/projects/wifi/crypto/openssl/crypto/dso/dso_err.c#3 integrate .. //depot/projects/wifi/crypto/openssl/crypto/ec/ec_asn1.c#3 integrate .. //depot/projects/wifi/crypto/openssl/crypto/ec/ec_err.c#4 integrate .. //depot/projects/wifi/crypto/openssl/crypto/ecdh/ech_err.c#2 integrate .. //depot/projects/wifi/crypto/openssl/crypto/ecdh/ech_lib.c#2 integrate .. //depot/projects/wifi/crypto/openssl/crypto/ecdsa/ecdsa.h#2 integrate .. //depot/projects/wifi/crypto/openssl/crypto/ecdsa/ecs_err.c#2 integrate .. //depot/projects/wifi/crypto/openssl/crypto/ecdsa/ecs_lib.c#2 integrate .. //depot/projects/wifi/crypto/openssl/crypto/ecdsa/ecs_ossl.c#2 integrate .. //depot/projects/wifi/crypto/openssl/crypto/engine/eng_all.c#3 integrate .. //depot/projects/wifi/crypto/openssl/crypto/engine/eng_err.c#3 integrate .. //depot/projects/wifi/crypto/openssl/crypto/engine/eng_padlock.c#3 integrate .. //depot/projects/wifi/crypto/openssl/crypto/engine/tb_ecdh.c#2 integrate .. //depot/projects/wifi/crypto/openssl/crypto/engine/tb_ecdsa.c#2 integrate .. //depot/projects/wifi/crypto/openssl/crypto/err/err_all.c#4 integrate .. //depot/projects/wifi/crypto/openssl/crypto/evp/bio_md.c#4 integrate .. //depot/projects/wifi/crypto/openssl/crypto/evp/evp.h#5 integrate .. //depot/projects/wifi/crypto/openssl/crypto/evp/evp_enc.c#3 integrate .. //depot/projects/wifi/crypto/openssl/crypto/evp/evp_err.c#5 integrate .. //depot/projects/wifi/crypto/openssl/crypto/evp/evp_lib.c#4 integrate .. //depot/projects/wifi/crypto/openssl/crypto/evp/evp_locl.h#3 integrate .. //depot/projects/wifi/crypto/openssl/crypto/idea/i_ecb.c#2 integrate .. //depot/projects/wifi/crypto/openssl/crypto/idea/idea_lcl.h#2 integrate .. //depot/projects/wifi/crypto/openssl/crypto/lhash/lhash.c#3 integrate .. //depot/projects/wifi/crypto/openssl/crypto/md2/md2.h#3 integrate .. //depot/projects/wifi/crypto/openssl/crypto/md2/md2_dgst.c#3 integrate .. //depot/projects/wifi/crypto/openssl/crypto/md4/md4.h#3 integrate .. //depot/projects/wifi/crypto/openssl/crypto/md4/md4_dgst.c#3 integrate .. //depot/projects/wifi/crypto/openssl/crypto/md5/md5.h#3 integrate .. //depot/projects/wifi/crypto/openssl/crypto/md5/md5_dgst.c#3 integrate .. //depot/projects/wifi/crypto/openssl/crypto/objects/obj_dat.h#5 integrate .. //depot/projects/wifi/crypto/openssl/crypto/objects/obj_err.c#3 integrate .. //depot/projects/wifi/crypto/openssl/crypto/objects/obj_mac.h#5 integrate .. //depot/projects/wifi/crypto/openssl/crypto/objects/obj_mac.num#5 integrate .. //depot/projects/wifi/crypto/openssl/crypto/objects/objects.txt#5 integrate .. //depot/projects/wifi/crypto/openssl/crypto/ocsp/ocsp_asn.c#2 integrate .. //depot/projects/wifi/crypto/openssl/crypto/ocsp/ocsp_err.c#3 integrate .. //depot/projects/wifi/crypto/openssl/crypto/ocsp/ocsp_vfy.c#2 integrate .. //depot/projects/wifi/crypto/openssl/crypto/opensslconf.h#4 integrate .. //depot/projects/wifi/crypto/openssl/crypto/opensslv.h#5 integrate .. //depot/projects/wifi/crypto/openssl/crypto/pem/pem.h#3 integrate .. //depot/projects/wifi/crypto/openssl/crypto/pem/pem_err.c#3 integrate .. //depot/projects/wifi/crypto/openssl/crypto/pem/pem_lib.c#3 integrate .. //depot/projects/wifi/crypto/openssl/crypto/pem/pem_pkey.c#4 integrate .. //depot/projects/wifi/crypto/openssl/crypto/pkcs12/pk12err.c#3 integrate .. //depot/projects/wifi/crypto/openssl/crypto/pkcs7/pk7_doit.c#3 integrate .. //depot/projects/wifi/crypto/openssl/crypto/pkcs7/pk7_lib.c#3 integrate .. //depot/projects/wifi/crypto/openssl/crypto/pkcs7/pk7_smime.c#4 integrate .. //depot/projects/wifi/crypto/openssl/crypto/pkcs7/pkcs7err.c#3 integrate .. //depot/projects/wifi/crypto/openssl/crypto/rand/md_rand.c#4 integrate .. //depot/projects/wifi/crypto/openssl/crypto/rand/rand_err.c#4 integrate .. //depot/projects/wifi/crypto/openssl/crypto/rc2/rc2_ecb.c#2 integrate .. //depot/projects/wifi/crypto/openssl/crypto/rc4/rc4_skey.c#3 integrate .. //depot/projects/wifi/crypto/openssl/crypto/ripemd/ripemd.h#3 integrate .. //depot/projects/wifi/crypto/openssl/crypto/ripemd/rmd_dgst.c#3 integrate .. //depot/projects/wifi/crypto/openssl/crypto/rsa/rsa_err.c#4 integrate .. //depot/projects/wifi/crypto/openssl/crypto/rsa/rsa_lib.c#3 integrate .. //depot/projects/wifi/crypto/openssl/crypto/sha/sha.h#4 integrate .. //depot/projects/wifi/crypto/openssl/crypto/sha/sha1dgst.c#4 integrate .. //depot/projects/wifi/crypto/openssl/crypto/sha/sha256.c#2 integrate .. //depot/projects/wifi/crypto/openssl/crypto/sha/sha512.c#2 integrate .. //depot/projects/wifi/crypto/openssl/crypto/sha/sha_dgst.c#3 integrate .. //depot/projects/wifi/crypto/openssl/crypto/stack/safestack.h#4 integrate .. //depot/projects/wifi/crypto/openssl/crypto/stack/stack.c#4 integrate .. //depot/projects/wifi/crypto/openssl/crypto/store/str_err.c#2 integrate .. //depot/projects/wifi/crypto/openssl/crypto/txt_db/txt_db.c#3 integrate .. //depot/projects/wifi/crypto/openssl/crypto/ui/ui_err.c#3 integrate .. //depot/projects/wifi/crypto/openssl/crypto/x509/by_dir.c#3 integrate .. //depot/projects/wifi/crypto/openssl/crypto/x509/x509.h#4 integrate .. //depot/projects/wifi/crypto/openssl/crypto/x509/x509_err.c#3 integrate .. //depot/projects/wifi/crypto/openssl/crypto/x509/x509_req.c#4 integrate .. //depot/projects/wifi/crypto/openssl/crypto/x509/x509_txt.c#3 integrate .. //depot/projects/wifi/crypto/openssl/crypto/x509/x509_vfy.c#4 integrate .. //depot/projects/wifi/crypto/openssl/crypto/x509/x509_vfy.h#3 integrate .. //depot/projects/wifi/crypto/openssl/crypto/x509v3/Makefile#3 integrate .. //depot/projects/wifi/crypto/openssl/crypto/x509v3/ext_dat.h#4 integrate .. //depot/projects/wifi/crypto/openssl/crypto/x509v3/pcy_tree.c#2 integrate .. //depot/projects/wifi/crypto/openssl/crypto/x509v3/v3_addr.c#1 branch .. //depot/projects/wifi/crypto/openssl/crypto/x509v3/v3_akey.c#3 integrate .. //depot/projects/wifi/crypto/openssl/crypto/x509v3/v3_alt.c#3 integrate .. //depot/projects/wifi/crypto/openssl/crypto/x509v3/v3_asid.c#1 branch .. //depot/projects/wifi/crypto/openssl/crypto/x509v3/v3_bcons.c#2 integrate .. //depot/projects/wifi/crypto/openssl/crypto/x509v3/v3_bitst.c#3 integrate .. //depot/projects/wifi/crypto/openssl/crypto/x509v3/v3_cpols.c#3 integrate .. //depot/projects/wifi/crypto/openssl/crypto/x509v3/v3_crld.c#2 integrate .. //depot/projects/wifi/crypto/openssl/crypto/x509v3/v3_enum.c#2 integrate .. //depot/projects/wifi/crypto/openssl/crypto/x509v3/v3_extku.c#3 integrate .. //depot/projects/wifi/crypto/openssl/crypto/x509v3/v3_ia5.c#3 integrate .. //depot/projects/wifi/crypto/openssl/crypto/x509v3/v3_info.c#3 integrate .. //depot/projects/wifi/crypto/openssl/crypto/x509v3/v3_int.c#4 integrate .. //depot/projects/wifi/crypto/openssl/crypto/x509v3/v3_ncons.c#2 integrate .. //depot/projects/wifi/crypto/openssl/crypto/x509v3/v3_ocsp.c#3 integrate .. //depot/projects/wifi/crypto/openssl/crypto/x509v3/v3_pci.c#2 integrate .. //depot/projects/wifi/crypto/openssl/crypto/x509v3/v3_pcons.c#2 integrate .. //depot/projects/wifi/crypto/openssl/crypto/x509v3/v3_pku.c#2 integrate .. //depot/projects/wifi/crypto/openssl/crypto/x509v3/v3_pmaps.c#2 integrate .. //depot/projects/wifi/crypto/openssl/crypto/x509v3/v3_purp.c#3 integrate .. //depot/projects/wifi/crypto/openssl/crypto/x509v3/v3_skey.c#3 integrate .. //depot/projects/wifi/crypto/openssl/crypto/x509v3/v3_sxnet.c#3 integrate .. //depot/projects/wifi/crypto/openssl/crypto/x509v3/v3_utl.c#3 integrate .. //depot/projects/wifi/crypto/openssl/crypto/x509v3/v3err.c#3 integrate .. //depot/projects/wifi/crypto/openssl/crypto/x509v3/x509v3.h#3 integrate .. //depot/projects/wifi/crypto/openssl/doc/apps/ciphers.pod#3 integrate .. //depot/projects/wifi/crypto/openssl/doc/apps/s_client.pod#3 integrate .. //depot/projects/wifi/crypto/openssl/doc/apps/x509.pod#3 integrate .. //depot/projects/wifi/crypto/openssl/doc/crypto/ASN1_STRING_print_ex.pod#3 integrate .. //depot/projects/wifi/crypto/openssl/doc/crypto/BIO_set_callback.pod#2 integrate .. //depot/projects/wifi/crypto/openssl/doc/crypto/CONF_modules_free.pod#2 integrate .. //depot/projects/wifi/crypto/openssl/doc/crypto/RAND_egd.pod#2 integrate .. //depot/projects/wifi/crypto/openssl/doc/crypto/RSA_get_ex_new_index.pod#2 integrate .. //depot/projects/wifi/crypto/openssl/doc/crypto/md5.pod#2 integrate .. //depot/projects/wifi/crypto/openssl/doc/crypto/mdc2.pod#2 integrate .. //depot/projects/wifi/crypto/openssl/doc/crypto/ripemd.pod#2 integrate .. //depot/projects/wifi/crypto/openssl/doc/crypto/sha.pod#2 integrate .. //depot/projects/wifi/crypto/openssl/doc/ssl/SSL_CTX_set_tmp_rsa_callback.pod#2 integrate .. //depot/projects/wifi/crypto/openssl/doc/ssl/SSL_SESSION_get_time.pod#3 integrate .. //depot/projects/wifi/crypto/openssl/openssl.spec#5 integrate .. //depot/projects/wifi/crypto/openssl/ssl/d1_lib.c#2 integrate .. //depot/projects/wifi/crypto/openssl/ssl/d1_pkt.c#3 integrate .. //depot/projects/wifi/crypto/openssl/ssl/kssl.c#3 integrate .. //depot/projects/wifi/crypto/openssl/ssl/s23_clnt.c#4 integrate .. //depot/projects/wifi/crypto/openssl/ssl/s23_srvr.c#4 integrate .. //depot/projects/wifi/crypto/openssl/ssl/s2_enc.c#3 integrate .. //depot/projects/wifi/crypto/openssl/ssl/s2_lib.c#4 integrate .. //depot/projects/wifi/crypto/openssl/ssl/s3_clnt.c#4 integrate .. //depot/projects/wifi/crypto/openssl/ssl/s3_enc.c#3 integrate .. //depot/projects/wifi/crypto/openssl/ssl/s3_lib.c#5 integrate .. //depot/projects/wifi/crypto/openssl/ssl/s3_pkt.c#4 integrate .. //depot/projects/wifi/crypto/openssl/ssl/s3_srvr.c#5 integrate .. //depot/projects/wifi/crypto/openssl/ssl/ssl.h#5 integrate .. //depot/projects/wifi/crypto/openssl/ssl/ssl_ciph.c#5 integrate .. //depot/projects/wifi/crypto/openssl/ssl/ssl_err.c#3 integrate .. //depot/projects/wifi/crypto/openssl/ssl/ssl_lib.c#5 integrate .. //depot/projects/wifi/crypto/openssl/ssl/ssl_sess.c#4 integrate .. //depot/projects/wifi/crypto/openssl/ssl/t1_enc.c#5 integrate .. //depot/projects/wifi/crypto/openssl/ssl/t1_lib.c#3 integrate .. //depot/projects/wifi/crypto/openssl/test/Makefile#4 integrate .. //depot/projects/wifi/crypto/openssl/tools/c_rehash#4 integrate .. //depot/projects/wifi/crypto/openssl/util/libeay.num#5 integrate .. //depot/projects/wifi/crypto/openssl/util/mk1mf.pl#5 integrate .. //depot/projects/wifi/crypto/openssl/util/mkdef.pl#5 integrate .. //depot/projects/wifi/crypto/openssl/util/mkerr.pl#4 integrate .. //depot/projects/wifi/crypto/openssl/util/ssleay.num#3 integrate .. //depot/projects/wifi/etc/defaults/rc.conf#27 integrate .. //depot/projects/wifi/etc/network.subr#10 integrate .. //depot/projects/wifi/etc/rc#5 integrate .. //depot/projects/wifi/etc/rc.d/FILESYSTEMS#1 branch .. //depot/projects/wifi/etc/rc.d/Makefile#17 integrate .. //depot/projects/wifi/etc/rc.d/addswap#3 integrate .. //depot/projects/wifi/etc/rc.d/adjkerntz#2 integrate .. //depot/projects/wifi/etc/rc.d/bgfsck#3 integrate .. //depot/projects/wifi/etc/rc.d/bootconf.sh#3 integrate .. //depot/projects/wifi/etc/rc.d/cleanvar#5 integrate .. //depot/projects/wifi/etc/rc.d/dhclient#10 integrate .. //depot/projects/wifi/etc/rc.d/geli2#2 integrate .. //depot/projects/wifi/etc/rc.d/hostname#3 integrate .. //depot/projects/wifi/etc/rc.d/ip6addrctl#2 integrate .. //depot/projects/wifi/etc/rc.d/ip6fw#4 integrate .. //depot/projects/wifi/etc/rc.d/ipfilter#5 integrate .. //depot/projects/wifi/etc/rc.d/ipfw#6 integrate .. //depot/projects/wifi/etc/rc.d/ipmon#3 integrate .. //depot/projects/wifi/etc/rc.d/ipsec#4 integrate .. //depot/projects/wifi/etc/rc.d/isdnd#4 integrate .. //depot/projects/wifi/etc/rc.d/kldxref#2 integrate .. //depot/projects/wifi/etc/rc.d/mountcritremote#6 integrate .. //depot/projects/wifi/etc/rc.d/netif#9 integrate .. //depot/projects/wifi/etc/rc.d/nfslocking#2 integrate .. //depot/projects/wifi/etc/rc.d/pf#8 integrate .. //depot/projects/wifi/etc/rc.d/pflog#6 integrate .. //depot/projects/wifi/etc/rc.d/pfsync#3 integrate .. //depot/projects/wifi/etc/rc.d/power_profile#7 integrate .. //depot/projects/wifi/etc/rc.d/ppp#4 integrate .. //depot/projects/wifi/etc/rc.d/syscons#6 integrate .. //depot/projects/wifi/etc/rc.d/var#5 integrate .. //depot/projects/wifi/etc/rc.firewall#5 integrate .. //depot/projects/wifi/etc/rc.subr#12 integrate .. //depot/projects/wifi/games/fortune/datfiles/fortunes#22 integrate .. //depot/projects/wifi/games/fortune/datfiles/fortunes-o.real#3 integrate .. //depot/projects/wifi/gnu/usr.bin/cc/Makefile.fe#2 integrate .. //depot/projects/wifi/gnu/usr.bin/cc/Makefile.inc#3 integrate .. //depot/projects/wifi/gnu/usr.bin/cc/c++filt/Makefile#5 integrate .. //depot/projects/wifi/gnu/usr.bin/cc/cc_int/Makefile#5 integrate .. //depot/projects/wifi/gnu/usr.bin/cc/f77/Makefile#2 integrate .. //depot/projects/wifi/lib/libarchive/Makefile#21 integrate .. //depot/projects/wifi/lib/libarchive/archive.h.in#14 integrate .. //depot/projects/wifi/lib/libarchive/archive_check_magic.c#4 integrate .. //depot/projects/wifi/lib/libarchive/archive_entry.c#13 integrate .. //depot/projects/wifi/lib/libarchive/archive_private.h#11 integrate .. //depot/projects/wifi/lib/libarchive/archive_read.c#12 integrate .. //depot/projects/wifi/lib/libarchive/archive_read_data_into_fd.c#8 integrate .. //depot/projects/wifi/lib/libarchive/archive_read_extract.c#13 integrate .. //depot/projects/wifi/lib/libarchive/archive_read_open_memory.c#3 integrate .. //depot/projects/wifi/lib/libarchive/archive_read_private.h#2 integrate .. //depot/projects/wifi/lib/libarchive/archive_read_support_compression_bzip2.c#7 integrate .. //depot/projects/wifi/lib/libarchive/archive_read_support_format_ar.c#1 branch .. //depot/projects/wifi/lib/libarchive/archive_read_support_format_iso9660.c#11 integrate .. //depot/projects/wifi/lib/libarchive/archive_read_support_format_tar.c#15 integrate .. //depot/projects/wifi/lib/libarchive/archive_write.c#9 integrate .. //depot/projects/wifi/lib/libarchive/archive_write_disk.c#2 integrate .. //depot/projects/wifi/lib/libarchive/archive_write_set_compression_none.c#7 integrate .. //depot/projects/wifi/lib/libarchive/archive_write_set_format_ar.c#1 branch .. //depot/projects/wifi/lib/libarchive/archive_write_set_format_ustar.c#8 integrate .. //depot/projects/wifi/lib/libarchive/libarchive-formats.5#11 integrate .. //depot/projects/wifi/lib/libarchive/test/Makefile#2 integrate .. //depot/projects/wifi/lib/libarchive/test/test.h#2 integrate .. //depot/projects/wifi/lib/libarchive/test/test_acl_basic.c#1 branch .. //depot/projects/wifi/lib/libarchive/test/test_acl_pax.c#1 branch .. //depot/projects/wifi/lib/libarchive/test/test_read_format_ar.c#1 branch .. //depot/projects/wifi/lib/libarchive/test/test_write_disk_perms.c#2 integrate .. //depot/projects/wifi/lib/libarchive/test/test_write_format_ar.c#1 branch .. //depot/projects/wifi/lib/libatm/cache_key.c#2 integrate .. //depot/projects/wifi/lib/libc/amd64/stdlib/Makefile.inc#1 branch .. //depot/projects/wifi/lib/libc/amd64/stdlib/div.S#1 branch .. //depot/projects/wifi/lib/libc/amd64/stdlib/ldiv.S#1 branch .. //depot/projects/wifi/lib/libc/amd64/stdlib/lldiv.S#1 branch .. //depot/projects/wifi/lib/libc/gen/Symbol.map#3 integrate .. //depot/projects/wifi/lib/libc/gen/dlfcn.c#3 integrate .. //depot/projects/wifi/lib/libc/gen/valloc.3#4 integrate .. //depot/projects/wifi/lib/libc/net/inet.3#6 integrate .. //depot/projects/wifi/lib/libc/net/sctp_sys_calls.c#3 integrate .. //depot/projects/wifi/lib/libc/regex/engine.c#7 integrate .. //depot/projects/wifi/lib/libc/regex/grot/tests#2 integrate .. //depot/projects/wifi/lib/libc/resolv/res_send.c#4 integrate .. //depot/projects/wifi/lib/libc/stdio/tmpnam.3#5 integrate .. //depot/projects/wifi/lib/libc/stdlib/malloc.3#6 integrate .. //depot/projects/wifi/lib/libc/stdlib/malloc.c#8 integrate .. //depot/projects/wifi/lib/libc/stdlib/posix_memalign.3#3 integrate .. //depot/projects/wifi/lib/libc/sys/getsockopt.2#6 integrate .. //depot/projects/wifi/lib/libc/sys/shutdown.2#3 integrate .. //depot/projects/wifi/lib/libcrypt/crypt.3#4 integrate .. //depot/projects/wifi/lib/libedit/chared.h#4 integrate .. //depot/projects/wifi/lib/libedit/common.c#4 integrate .. //depot/projects/wifi/lib/libedit/editline.3#8 integrate .. //depot/projects/wifi/lib/libedit/editrc.5#5 integrate .. //depot/projects/wifi/lib/libedit/emacs.c#4 integrate .. //depot/projects/wifi/lib/libedit/history.c#3 integrate .. //depot/projects/wifi/lib/libedit/key.c#4 integrate .. //depot/projects/wifi/lib/libedit/key.h#3 integrate .. //depot/projects/wifi/lib/libedit/map.c#4 integrate .. //depot/projects/wifi/lib/libedit/read.c#3 integrate .. //depot/projects/wifi/lib/libedit/read.h#2 integrate .. //depot/projects/wifi/lib/libedit/term.c#4 integrate .. //depot/projects/wifi/lib/libedit/term.h#3 integrate .. //depot/projects/wifi/lib/libedit/tty.c#3 integrate .. //depot/projects/wifi/lib/libedit/vi.c#4 integrate .. //depot/projects/wifi/lib/libelf/elf_data.c#2 integrate .. //depot/projects/wifi/lib/libelf/elf_getarhdr.3#2 integrate .. //depot/projects/wifi/lib/libelf/elf_rand.3#2 integrate .. //depot/projects/wifi/lib/libelf/gelf.h#2 integrate .. //depot/projects/wifi/lib/libelf/libelf_ar.c#2 integrate .. //depot/projects/wifi/lib/libgssapi/gss_accept_sec_context.c#2 integrate .. //depot/projects/wifi/lib/libgssapi/gss_add_cred.c#2 integrate .. //depot/projects/wifi/lib/libgssapi/gss_add_oid_set_member.c#2 integrate .. //depot/projects/wifi/lib/libgssapi/gss_canonicalize_name.c#2 integrate .. //depot/projects/wifi/lib/libgssapi/gss_display_name.c#2 integrate .. //depot/projects/wifi/lib/libgssapi/gss_duplicate_name.c#2 integrate .. //depot/projects/wifi/lib/libgssapi/gss_export_sec_context.c#2 integrate .. //depot/projects/wifi/lib/libgssapi/gss_import_name.c#2 integrate .. //depot/projects/wifi/lib/libgssapi/gss_init_sec_context.c#2 integrate .. //depot/projects/wifi/lib/libgssapi/gss_inquire_cred.c#2 integrate .. //depot/projects/wifi/lib/libgssapi/gss_names.c#2 integrate .. //depot/projects/wifi/lib/libgssapi/gss_utils.c#2 integrate .. //depot/projects/wifi/lib/libmemstat/memstat.h#7 integrate .. //depot/projects/wifi/lib/libpam/modules/pam_unix/pam_unix.8#4 integrate .. //depot/projects/wifi/lib/libpam/modules/pam_unix/pam_unix.c#4 integrate .. //depot/projects/wifi/lib/libpmc/pmc.3#9 integrate .. //depot/projects/wifi/lib/libpthread/thread/thr_kern.c#8 integrate .. //depot/projects/wifi/lib/libradius/radlib.c#2 integrate .. //depot/projects/wifi/lib/libstand/environment.c#2 integrate .. //depot/projects/wifi/lib/libufs/type.c#2 integrate .. //depot/projects/wifi/lib/libypclnt/Makefile#4 integrate .. //depot/projects/wifi/lib/libypclnt/ypclnt.3#2 delete .. //depot/projects/wifi/lib/ncurses/Makefile#2 integrate .. //depot/projects/wifi/lib/ncurses/Makefile.inc#2 integrate .. //depot/projects/wifi/lib/ncurses/config.mk#2 integrate .. //depot/projects/wifi/lib/ncurses/form/Makefile#2 integrate .. //depot/projects/wifi/lib/ncurses/formw/Makefile#1 branch .. //depot/projects/wifi/lib/ncurses/menu/Makefile#2 integrate .. //depot/projects/wifi/lib/ncurses/menuw/Makefile#1 branch .. //depot/projects/wifi/lib/ncurses/ncurses/Makefile#3 integrate .. //depot/projects/wifi/lib/ncurses/ncurses/ncurses_cfg.h#2 integrate .. //depot/projects/wifi/lib/ncurses/ncursesw/Makefile#1 branch .. //depot/projects/wifi/lib/ncurses/panel/Makefile#2 integrate .. //depot/projects/wifi/lib/ncurses/panelw/Makefile#1 branch .. //depot/projects/wifi/libexec/rtld-elf/Makefile#5 integrate .. //depot/projects/wifi/libexec/rtld-elf/Symbol.map#1 branch .. //depot/projects/wifi/libexec/rtld-elf/Versions.def#1 branch .. //depot/projects/wifi/libexec/rtld-elf/i386/Symbol.map#1 branch .. //depot/projects/wifi/libexec/rtld-elf/map_object.c#4 integrate .. //depot/projects/wifi/libexec/rtld-elf/rtld.c#12 integrate .. //depot/projects/wifi/libexec/rtld-elf/rtld.h#4 integrate .. //depot/projects/wifi/libexec/rtld-elf/rtld_lock.c#3 integrate .. //depot/projects/wifi/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#22 integrate .. //depot/projects/wifi/release/doc/en_US.ISO8859-1/relnotes/article.sgml#4 integrate .. //depot/projects/wifi/release/doc/share/misc/dev.archlist.txt#21 integrate .. //depot/projects/wifi/sbin/geom/class/eli/geli.8#7 integrate .. //depot/projects/wifi/sbin/geom/class/eli/geom_eli.c#8 integrate .. //depot/projects/wifi/sbin/geom/class/journal/geom_journal.c#2 integrate .. //depot/projects/wifi/sbin/geom/core/geom.c#11 integrate .. //depot/projects/wifi/sbin/mdmfs/mdmfs.c#9 integrate .. //depot/projects/wifi/sbin/mount_nfs/mount_nfs.8#6 integrate .. //depot/projects/wifi/sbin/mount_nfs/mount_nfs.c#7 integrate .. //depot/projects/wifi/sbin/restore/tape.c#6 integrate .. //depot/projects/wifi/secure/lib/libcrypto/Makefile#9 integrate .. //depot/projects/wifi/secure/lib/libcrypto/Makefile.inc#5 integrate .. //depot/projects/wifi/secure/lib/libcrypto/Makefile.man#5 integrate .. //depot/projects/wifi/secure/lib/libcrypto/man/ASN1_OBJECT_new.3#5 integrate .. //depot/projects/wifi/secure/lib/libcrypto/man/ASN1_STRING_length.3#5 integrate .. //depot/projects/wifi/secure/lib/libcrypto/man/ASN1_STRING_new.3#5 integrate .. //depot/projects/wifi/secure/lib/libcrypto/man/ASN1_STRING_print_ex.3#5 integrate .. //depot/projects/wifi/secure/lib/libcrypto/man/ASN1_generate_nconf.3#3 integrate .. //depot/projects/wifi/secure/lib/libcrypto/man/BIO_ctrl.3#5 integrate .. //depot/projects/wifi/secure/lib/libcrypto/man/BIO_f_base64.3#5 integrate .. //depot/projects/wifi/secure/lib/libcrypto/man/BIO_f_buffer.3#5 integrate .. //depot/projects/wifi/secure/lib/libcrypto/man/BIO_f_cipher.3#5 integrate .. //depot/projects/wifi/secure/lib/libcrypto/man/BIO_f_md.3#5 integrate .. //depot/projects/wifi/secure/lib/libcrypto/man/BIO_f_null.3#5 integrate .. //depot/projects/wifi/secure/lib/libcrypto/man/BIO_f_ssl.3#5 integrate .. //depot/projects/wifi/secure/lib/libcrypto/man/BIO_find_type.3#5 integrate .. //depot/projects/wifi/secure/lib/libcrypto/man/BIO_new.3#5 integrate .. //depot/projects/wifi/secure/lib/libcrypto/man/BIO_push.3#5 integrate .. //depot/projects/wifi/secure/lib/libcrypto/man/BIO_read.3#5 integrate .. //depot/projects/wifi/secure/lib/libcrypto/man/BIO_s_accept.3#5 integrate .. //depot/projects/wifi/secure/lib/libcrypto/man/BIO_s_bio.3#5 integrate .. //depot/projects/wifi/secure/lib/libcrypto/man/BIO_s_connect.3#5 integrate .. //depot/projects/wifi/secure/lib/libcrypto/man/BIO_s_fd.3#5 integrate .. //depot/projects/wifi/secure/lib/libcrypto/man/BIO_s_file.3#5 integrate .. //depot/projects/wifi/secure/lib/libcrypto/man/BIO_s_mem.3#5 integrate .. //depot/projects/wifi/secure/lib/libcrypto/man/BIO_s_null.3#5 integrate .. //depot/projects/wifi/secure/lib/libcrypto/man/BIO_s_socket.3#5 integrate .. //depot/projects/wifi/secure/lib/libcrypto/man/BIO_set_callback.3#5 integrate .. //depot/projects/wifi/secure/lib/libcrypto/man/BIO_should_retry.3#5 integrate .. //depot/projects/wifi/secure/lib/libcrypto/man/BN_BLINDING_new.3#3 integrate .. //depot/projects/wifi/secure/lib/libcrypto/man/BN_CTX_new.3#5 integrate .. //depot/projects/wifi/secure/lib/libcrypto/man/BN_CTX_start.3#5 integrate .. //depot/projects/wifi/secure/lib/libcrypto/man/BN_add.3#5 integrate .. //depot/projects/wifi/secure/lib/libcrypto/man/BN_add_word.3#5 integrate .. //depot/projects/wifi/secure/lib/libcrypto/man/BN_bn2bin.3#5 integrate .. //depot/projects/wifi/secure/lib/libcrypto/man/BN_cmp.3#5 integrate .. //depot/projects/wifi/secure/lib/libcrypto/man/BN_copy.3#5 integrate .. //depot/projects/wifi/secure/lib/libcrypto/man/BN_generate_prime.3#5 integrate .. //depot/projects/wifi/secure/lib/libcrypto/man/BN_mod_inverse.3#5 integrate .. //depot/projects/wifi/secure/lib/libcrypto/man/BN_mod_mul_montgomery.3#5 integrate .. //depot/projects/wifi/secure/lib/libcrypto/man/BN_mod_mul_reciprocal.3#5 integrate .. //depot/projects/wifi/secure/lib/libcrypto/man/BN_new.3#5 integrate .. //depot/projects/wifi/secure/lib/libcrypto/man/BN_num_bytes.3#5 integrate .. //depot/projects/wifi/secure/lib/libcrypto/man/BN_rand.3#5 integrate .. //depot/projects/wifi/secure/lib/libcrypto/man/BN_set_bit.3#5 integrate .. //depot/projects/wifi/secure/lib/libcrypto/man/BN_swap.3#5 integrate .. //depot/projects/wifi/secure/lib/libcrypto/man/BN_zero.3#5 integrate .. //depot/projects/wifi/secure/lib/libcrypto/man/CONF_modules_free.3#5 integrate .. //depot/projects/wifi/secure/lib/libcrypto/man/CONF_modules_load_file.3#5 integrate .. //depot/projects/wifi/secure/lib/libcrypto/man/CRYPTO_set_ex_data.3#5 integrate .. //depot/projects/wifi/secure/lib/libcrypto/man/DH_generate_key.3#5 integrate .. //depot/projects/wifi/secure/lib/libcrypto/man/DH_generate_parameters.3#5 integrate .. //depot/projects/wifi/secure/lib/libcrypto/man/DH_get_ex_new_index.3#5 integrate .. //depot/projects/wifi/secure/lib/libcrypto/man/DH_new.3#5 integrate .. //depot/projects/wifi/secure/lib/libcrypto/man/DH_set_method.3#5 integrate .. //depot/projects/wifi/secure/lib/libcrypto/man/DH_size.3#5 integrate .. //depot/projects/wifi/secure/lib/libcrypto/man/DSA_SIG_new.3#5 integrate .. //depot/projects/wifi/secure/lib/libcrypto/man/DSA_do_sign.3#5 integrate .. //depot/projects/wifi/secure/lib/libcrypto/man/DSA_dup_DH.3#5 integrate .. //depot/projects/wifi/secure/lib/libcrypto/man/DSA_generate_key.3#5 integrate .. //depot/projects/wifi/secure/lib/libcrypto/man/DSA_generate_parameters.3#5 integrate .. //depot/projects/wifi/secure/lib/libcrypto/man/DSA_get_ex_new_index.3#5 integrate .. //depot/projects/wifi/secure/lib/libcrypto/man/DSA_new.3#5 integrate .. //depot/projects/wifi/secure/lib/libcrypto/man/DSA_set_method.3#5 integrate .. //depot/projects/wifi/secure/lib/libcrypto/man/DSA_sign.3#5 integrate .. //depot/projects/wifi/secure/lib/libcrypto/man/DSA_size.3#5 integrate .. //depot/projects/wifi/secure/lib/libcrypto/man/ERR_GET_LIB.3#5 integrate .. //depot/projects/wifi/secure/lib/libcrypto/man/ERR_clear_error.3#5 integrate .. //depot/projects/wifi/secure/lib/libcrypto/man/ERR_error_string.3#5 integrate .. //depot/projects/wifi/secure/lib/libcrypto/man/ERR_get_error.3#5 integrate .. //depot/projects/wifi/secure/lib/libcrypto/man/ERR_load_crypto_strings.3#5 integrate .. //depot/projects/wifi/secure/lib/libcrypto/man/ERR_load_strings.3#5 integrate .. //depot/projects/wifi/secure/lib/libcrypto/man/ERR_print_errors.3#5 integrate .. //depot/projects/wifi/secure/lib/libcrypto/man/ERR_put_error.3#5 integrate .. //depot/projects/wifi/secure/lib/libcrypto/man/ERR_remove_state.3#5 integrate .. //depot/projects/wifi/secure/lib/libcrypto/man/ERR_set_mark.3#3 integrate .. //depot/projects/wifi/secure/lib/libcrypto/man/EVP_BytesToKey.3#5 integrate .. //depot/projects/wifi/secure/lib/libcrypto/man/EVP_DigestInit.3#5 integrate .. //depot/projects/wifi/secure/lib/libcrypto/man/EVP_EncryptInit.3#5 integrate .. //depot/projects/wifi/secure/lib/libcrypto/man/EVP_OpenInit.3#5 integrate .. //depot/projects/wifi/secure/lib/libcrypto/man/EVP_PKEY_new.3#5 integrate .. //depot/projects/wifi/secure/lib/libcrypto/man/EVP_PKEY_set1_RSA.3#5 integrate .. //depot/projects/wifi/secure/lib/libcrypto/man/EVP_SealInit.3#5 integrate .. //depot/projects/wifi/secure/lib/libcrypto/man/EVP_SignInit.3#5 integrate .. //depot/projects/wifi/secure/lib/libcrypto/man/EVP_VerifyInit.3#5 integrate .. //depot/projects/wifi/secure/lib/libcrypto/man/OBJ_nid2obj.3#5 integrate .. //depot/projects/wifi/secure/lib/libcrypto/man/OPENSSL_Applink.3#3 integrate .. //depot/projects/wifi/secure/lib/libcrypto/man/OPENSSL_VERSION_NUMBER.3#5 integrate .. //depot/projects/wifi/secure/lib/libcrypto/man/OPENSSL_config.3#5 integrate .. //depot/projects/wifi/secure/lib/libcrypto/man/OPENSSL_ia32cap.3#3 integrate .. //depot/projects/wifi/secure/lib/libcrypto/man/OPENSSL_load_builtin_modules.3#5 integrate .. //depot/projects/wifi/secure/lib/libcrypto/man/OpenSSL_add_all_algorithms.3#5 integrate .. //depot/projects/wifi/secure/lib/libcrypto/man/PKCS12_create.3#5 integrate .. //depot/projects/wifi/secure/lib/libcrypto/man/PKCS12_parse.3#5 integrate .. //depot/projects/wifi/secure/lib/libcrypto/man/PKCS7_decrypt.3#5 integrate .. //depot/projects/wifi/secure/lib/libcrypto/man/PKCS7_encrypt.3#5 integrate .. //depot/projects/wifi/secure/lib/libcrypto/man/PKCS7_sign.3#5 integrate .. //depot/projects/wifi/secure/lib/libcrypto/man/PKCS7_verify.3#5 integrate .. //depot/projects/wifi/secure/lib/libcrypto/man/RAND_add.3#5 integrate .. //depot/projects/wifi/secure/lib/libcrypto/man/RAND_bytes.3#5 integrate .. //depot/projects/wifi/secure/lib/libcrypto/man/RAND_cleanup.3#5 integrate .. //depot/projects/wifi/secure/lib/libcrypto/man/RAND_egd.3#5 integrate .. //depot/projects/wifi/secure/lib/libcrypto/man/RAND_load_file.3#5 integrate .. //depot/projects/wifi/secure/lib/libcrypto/man/RAND_set_rand_method.3#5 integrate .. //depot/projects/wifi/secure/lib/libcrypto/man/RSA_blinding_on.3#5 integrate .. //depot/projects/wifi/secure/lib/libcrypto/man/RSA_check_key.3#5 integrate .. //depot/projects/wifi/secure/lib/libcrypto/man/RSA_generate_key.3#5 integrate .. //depot/projects/wifi/secure/lib/libcrypto/man/RSA_get_ex_new_index.3#5 integrate .. //depot/projects/wifi/secure/lib/libcrypto/man/RSA_new.3#5 integrate .. //depot/projects/wifi/secure/lib/libcrypto/man/RSA_padding_add_PKCS1_type_1.3#5 integrate .. //depot/projects/wifi/secure/lib/libcrypto/man/RSA_print.3#5 integrate .. //depot/projects/wifi/secure/lib/libcrypto/man/RSA_private_encrypt.3#5 integrate .. //depot/projects/wifi/secure/lib/libcrypto/man/RSA_public_encrypt.3#5 integrate .. //depot/projects/wifi/secure/lib/libcrypto/man/RSA_set_method.3#5 integrate .. //depot/projects/wifi/secure/lib/libcrypto/man/RSA_sign.3#5 integrate .. //depot/projects/wifi/secure/lib/libcrypto/man/RSA_sign_ASN1_OCTET_STRING.3#5 integrate .. //depot/projects/wifi/secure/lib/libcrypto/man/RSA_size.3#5 integrate .. //depot/projects/wifi/secure/lib/libcrypto/man/SMIME_read_PKCS7.3#5 integrate .. //depot/projects/wifi/secure/lib/libcrypto/man/SMIME_write_PKCS7.3#5 integrate .. //depot/projects/wifi/secure/lib/libcrypto/man/X509_NAME_ENTRY_get_object.3#5 integrate .. //depot/projects/wifi/secure/lib/libcrypto/man/X509_NAME_add_entry_by_txt.3#5 integrate .. //depot/projects/wifi/secure/lib/libcrypto/man/X509_NAME_get_index_by_NID.3#5 integrate .. //depot/projects/wifi/secure/lib/libcrypto/man/X509_NAME_print_ex.3#5 integrate .. //depot/projects/wifi/secure/lib/libcrypto/man/X509_new.3#5 integrate .. //depot/projects/wifi/secure/lib/libcrypto/man/bio.3#5 integrate .. //depot/projects/wifi/secure/lib/libcrypto/man/blowfish.3#5 integrate .. //depot/projects/wifi/secure/lib/libcrypto/man/bn.3#5 integrate .. //depot/projects/wifi/secure/lib/libcrypto/man/bn_internal.3#5 integrate .. //depot/projects/wifi/secure/lib/libcrypto/man/buffer.3#5 integrate .. //depot/projects/wifi/secure/lib/libcrypto/man/crypto.3#5 integrate .. //depot/projects/wifi/secure/lib/libcrypto/man/d2i_ASN1_OBJECT.3#5 integrate .. //depot/projects/wifi/secure/lib/libcrypto/man/d2i_DHparams.3#5 integrate .. //depot/projects/wifi/secure/lib/libcrypto/man/d2i_DSAPublicKey.3#5 integrate .. //depot/projects/wifi/secure/lib/libcrypto/man/d2i_PKCS8PrivateKey.3#5 integrate .. //depot/projects/wifi/secure/lib/libcrypto/man/d2i_RSAPublicKey.3#5 integrate .. //depot/projects/wifi/secure/lib/libcrypto/man/d2i_X509.3#5 integrate .. //depot/projects/wifi/secure/lib/libcrypto/man/d2i_X509_ALGOR.3#5 integrate .. //depot/projects/wifi/secure/lib/libcrypto/man/d2i_X509_CRL.3#5 integrate .. //depot/projects/wifi/secure/lib/libcrypto/man/d2i_X509_NAME.3#5 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Apr 5 16:57:03 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 27AE616A408; Thu, 5 Apr 2007 16:57:03 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id F234816A404 for ; Thu, 5 Apr 2007 16:57:02 +0000 (UTC) (envelope-from ryanb@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id E385513C457 for ; Thu, 5 Apr 2007 16:57:02 +0000 (UTC) (envelope-from ryanb@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l35Gv2ku056027 for ; Thu, 5 Apr 2007 16:57:02 GMT (envelope-from ryanb@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l35Gv21S056024 for perforce@freebsd.org; Thu, 5 Apr 2007 16:57:02 GMT (envelope-from ryanb@FreeBSD.org) Date: Thu, 5 Apr 2007 16:57:02 GMT Message-Id: <200704051657.l35Gv21S056024@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 117442 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 05 Apr 2007 16:57:03 -0000 http://perforce.freebsd.org/chv.cgi?CH=117442 Change 117442 by ryanb@ryanb_yuki on 2007/04/05 16:56:47 Incorporate changes from 4Front's sys/soundcard.h w/ minor adjustments to conform to style(9). Affected files ... .. //depot/projects/soundsystem/src/sys/sys/soundcard.h#2 edit Differences ... ==== //depot/projects/soundsystem/src/sys/sys/soundcard.h#2 (text+ko) ==== @@ -1639,66 +1639,80 @@ int openedmidi[8]; /* Bit mask telling which midi devices are busy */ int numcards; /* Number of sound cards in the system */ - int filler[241]; /* For future expansion (set to -1) */ + int numaudioengines; /* Number of audio engines in the system */ + int filler[240]; /* For future expansion (set to -1) */ } oss_sysinfo; -typedef struct oss_mixext -{ - int dev; /* Mixer device number */ - int ctrl; /* Controller number */ - int type; /* Entry type */ -# define MIXT_DEVROOT 0 /* Device root entry */ -# define MIXT_GROUP 1 /* Controller group */ -# define MIXT_ONOFF 2 /* OFF (0) or ON (1) */ -# define MIXT_ENUM 3 /* Enumerated (0 to maxvalue) */ -# define MIXT_MONOSLIDER 4 /* Mono slider (0 to 100) */ -# define MIXT_STEREOSLIDER 5 /* Stereo slider (dual 0 to 100) */ -# define MIXT_MESSAGE 6 /* (Readable) textual message */ -# define MIXT_MONOVU 7 /* VU meter value (mono) */ -# define MIXT_STEREOVU 8 /* VU meter value (stereo) */ -# define MIXT_MONOPEAK 9 /* VU meter peak value (mono) */ -# define MIXT_STEREOPEAK 10 /* VU meter peak value (stereo) */ -# define MIXT_RADIOGROUP 11 /* Radio button group */ -# define MIXT_MARKER 12 /* Separator between normal and extension entries */ -# define MIXT_VALUE 13 /* Decimal value entry */ -# define MIXT_HEXVALUE 14 /* Hexadecimal value entry */ -# define MIXT_MONODB 15 /* Mono atten. slider (0 to -144) */ -# define MIXT_STEREODB 16 /* Stereo atten. slider (dual 0 to -144) */ -# define MIXT_SLIDER 17 /* Slider (mono) with full integer range */ -# define MIXT_3D 18 +typedef struct oss_mixext { + int dev; /* Mixer device number */ + int ctrl; /* Controller number */ + int type; /* Entry type */ +#define MIXT_DEVROOT 0 /* Device root entry */ +#define MIXT_GROUP 1 /* Controller group */ +#define MIXT_ONOFF 2 /* OFF (0) or ON (1) */ +#define MIXT_ENUM 3 /* Enumerated (0 to maxvalue) */ +#define MIXT_MONOSLIDER 4 /* Mono slider (0 to 255) */ +#define MIXT_STEREOSLIDER 5 /* Stereo slider (dual 0 to 255) */ +#define MIXT_MESSAGE 6 /* (Readable) textual message */ +#define MIXT_MONOVU 7 /* VU meter value (mono) */ +#define MIXT_STEREOVU 8 /* VU meter value (stereo) */ +#define MIXT_MONOPEAK 9 /* VU meter peak value (mono) */ +#define MIXT_STEREOPEAK 10 /* VU meter peak value (stereo) */ +#define MIXT_RADIOGROUP 11 /* Radio button group */ +#define MIXT_MARKER 12 /* Separator between normal and extension + entries */ +#define MIXT_VALUE 13 /* Decimal value entry */ +#define MIXT_HEXVALUE 14 /* Hexadecimal value entry */ +#define MIXT_MONODB 15 /* OBSOLETE */ +#define MIXT_STEREODB 16 /* OBSOLETE */ +#define MIXT_SLIDER 17 /* Slider (mono) with full (31 bit) positive + integer range */ +#define MIXT_3D 18 + +/* + * Sliders with range expanded to 15 bits per channel (0-32767) + */ +#define MIXT_MONOSLIDER16 19 +#define MIXT_STEREOSLIDER16 20 + + /* Possible value range (minvalue to maxvalue) */ + /* Note that maxvalue may also be smaller than minvalue */ + int maxvalue; + int minvalue; - /* Possible value range (minvalue to maxvalue) */ - /* Note that maxvalue may also be smaller than minvalue */ - int maxvalue; - int minvalue; + int flags; +#define MIXF_READABLE 0x00000001 /* Has readable value */ +#define MIXF_WRITEABLE 0x00000002 /* Has writeable value */ +#define MIXF_POLL 0x00000004 /* May change itself */ +#define MIXF_HZ 0x00000008 /* Herz scale */ +#define MIXF_STRING 0x00000010 /* Use dynamic extensions for value */ +#define MIXF_DYNAMIC 0x00000010 /* Supports dynamic extensions */ +#define MIXF_OKFAIL 0x00000020 /* Interpret value as 1=OK, 0=FAIL */ +#define MIXF_FLAT 0x00000040 /* Flat vertical space requirements */ +#define MIXF_LEGACY 0x00000080 /* Legacy mixer control group */ +#define MIXF_CENTIBEL 0x00000100 /* Centibel (0.1 dB) step size */ +#define MIXF_DECIBEL 0x00000200 /* Step size of 1 dB */ +#define MIXF_MAINVOL 0x00000400 /* Main volume control */ +#define MIXF_PCMVOL 0x00000800 /* PCM output volume control */ +#define MIXF_RECVOL 0x00001000 /* PCM recording volume control */ - int flags; -# define MIXF_READABLE 0x00000001 /* Has readable value */ -# define MIXF_WRITEABLE 0x00000002 /* Has writeable value */ -# define MIXF_POLL 0x00000004 /* May change itself */ -# define MIXF_HZ 0x00000008 /* Herz scale */ -# define MIXF_STRING 0x00000010 /* Use dynamic extensions for value */ -# define MIXF_DYNAMIC 0x00000010 /* Supports dynamic extensions */ -# define MIXF_OKFAIL 0x00000020 /* Interpret value as 1=OK, 0=FAIL */ -# define MIXF_FLAT 0x00000040 /* Flat vertical space requirements */ -# define MIXF_LEGACY 0x00000080 /* Legacy mixer control group */ - char id[16]; /* Mnemonic ID (mainly for internal use) */ - int parent; /* Entry# of parent (group) node (-1 if root) */ + char id[16]; /* Mnemonic ID (mainly for internal use) */ + int parent; /* Entry# of parent (group) node (-1 if root) */ - int dummy; /* Internal use */ + int dummy; /* Internal use */ - int timestamp; + int timestamp; - char data[64]; /* Misc data (entry type dependent) */ - unsigned char enum_present[32]; /* Mask of allowed enum values */ - int control_no; /* SOUND_MIXER_VOLUME..SOUND_MIXER_MIDI */ - /* (-1 means not indicated) */ + char data[64]; /* Misc data (entry type dependent) */ + unsigned char enum_present[32]; /* Mask of allowed enum values */ + int control_no; /* SOUND_MIXER_VOLUME..SOUND_MIXER_MIDI */ + /* (-1 means not indicated) */ -/* - * The desc field is reserved for internal purposes of OSS. It should not be - * used by applications. - */ - unsigned int desc; + /* + * The desc field is reserved for internal purposes of OSS. It should + * not be used by applications. + */ + unsigned int desc; #define MIXEXT_SCOPE_MASK 0x0000003f #define MIXEXT_SCOPE_OTHER 0x00000000 #define MIXEXT_SCOPE_INPUT 0x00000001 @@ -1706,25 +1720,23 @@ #define MIXEXT_SCOPE_MONITOR 0x00000003 #define MIXEXT_SCOPE_RECSWITCH 0x00000004 - char extname[32]; - int update_counter; - int filler[7]; + char extname[32]; + int update_counter; + int filler[7]; } oss_mixext; -typedef struct oss_mixext_root -{ - char id[16]; - char name[48]; +typedef struct oss_mixext_root { + char id[16]; + char name[48]; } oss_mixext_root; -typedef struct oss_mixer_value -{ - int dev; - int ctrl; - int value; - int flags; /* Reserved for future use. Initialize to 0 */ - int timestamp; /* Must be set to oss_mixext.timestamp */ - int filler[8]; /* Reserved for future use. Initialize to 0 */ +typedef struct oss_mixer_value { + int dev; + int ctrl; + int value; + int flags; /* Reserved for future use. Initialize to 0 */ + int timestamp; /* Must be set to oss_mixext.timestamp */ + int filler[8]; /* Reserved for future use. Initialize to 0 */ } oss_mixer_value; #define OSS_ENUM_MAXVALUE 255 @@ -1754,7 +1766,7 @@ char name[64]; int busy; /* 0, OPEN_READ, OPEN_WRITE or OPEN_READWRITE */ int pid; - int caps; /* DSP_CAP_INPUT, DSP_CAP_OUTPUT */ + int caps; /* PCM_CAP_INPUT, PCM_CAP_OUTPUT */ int iformats; int oformats; int magic; /* Reserved for internal use */ @@ -1762,11 +1774,9 @@ int card_number; int port_number; int mixer_dev; - int real_device; /* Obsolete field. Replaced by devnode */ - int enabled; /* 1=enabled, 0=device not ready at this - moment */ - int flags; /* For internal use only - no practical - meaning */ + int legacy_device; /* Obsolete field. Replaced by devnode */ + int enabled; /* 1=enabled, 0=device not ready at this moment */ + int flags; /* For internal use only - no practical meaning */ int min_rate; /* Sample rate limits */ int max_rate; int min_channels; /* Number of channels supported */ @@ -1780,75 +1790,84 @@ oss_longname_t song_name; /* Song name (if given) */ oss_label_t label; /* Device label (if given) */ int latency; /* In usecs, -1=unknown */ - oss_devnode_t devnode; /* Device special file name (inside - /dev) */ - int filler[186]; + oss_devnode_t devnode; /* Device special file name (absolute path) */ + int next_play_engine; /* Read the documentation for more info */ + int next_rec_engine; /* Read the documentation for more info */ + int filler[184]; } oss_audioinfo; -typedef struct oss_mixerinfo -{ - int dev; - char id[16]; - char name[32]; - int modify_counter; - int card_number; - int port_number; - char handle[32]; - int magic; /* Reserved */ - int enabled; /* Reserved */ - int caps; -#define MIXER_CAP_VIRTUAL 0x00000001 - int flags; /* Reserved */ - int nrext; - /* - * The priority field can be used to select the default (motherboard) - * mixer device. The mixer with the highest priority is the - * most preferred one. -2 or less means that this device cannot be used - * as the default mixer. - */ - int priority; - int filler[254]; /* Reserved */ +typedef struct oss_mixerinfo { + int dev; + char id [16]; + char name[32]; + int modify_counter; + int card_number; + int port_number; + char handle[32]; + int magic; /* Reserved */ + int enabled; /* Reserved */ + int caps; +#define MIXER_CAP_VIRTUAL 0x00000001 +#define MIXER_CAP_LAYOUT_B 0x00000002 /* For internal use only */ +#define MIXER_CAP_NARROW 0x00000004 /* Conserve horiz space */ + int flags; /* Reserved */ + int nrext; + /* + * The priority field can be used to select the default (motherboard) + * mixer device. The mixer with the highest priority is the most + * preferred one. -2 or less means that this device cannot be used as + * the default mixer. + */ + int priority; + oss_devnode_t devnode; /* Device special file name (absolute path) */ + int legacy_device; + int filler[245]; /* Reserved */ } oss_mixerinfo; -typedef struct oss_midi_info -{ - int dev; /* Midi device number */ - char name[64]; - int busy; /* 0, OPEN_READ, OPEN_WRITE or OPEN_READWRITE */ - int pid; - char cmd[64]; /* Command using the device (if known) */ - int caps; +typedef struct oss_midi_info { + int dev; /* Midi device number */ + char name[64]; + int busy; /* 0, OPEN_READ, OPEN_WRITE or OPEN_READWRITE */ + int pid; + char cmd[64]; /* Command using the device (if known) */ + int caps; #define MIDI_CAP_MPU401 0x00000001 /**** OBSOLETE ****/ #define MIDI_CAP_INPUT 0x00000002 #define MIDI_CAP_OUTPUT 0x00000004 #define MIDI_CAP_INOUT (MIDI_CAP_INPUT|MIDI_CAP_OUTPUT) #define MIDI_CAP_VIRTUAL 0x00000008 /* Pseudo device */ -#define MIDI_CAP_MTCINPUT 0x00000010 /* Supports SNDCTL_MIDI_MTCINPUT */ +#define MIDI_CAP_MTCINPUT 0x00000010 /* Supports + * SNDCTL_MIDI_MTCINPUT */ #define MIDI_CAP_CLIENT 0x00000020 /* Virtual client side device */ #define MIDI_CAP_SERVER 0x00000040 /* Virtual server side device */ #define MIDI_CAP_INTERNAL 0x00000080 /* Internal (synth) device */ -#define MIDI_CAP_EXTERNAL 0x00000100 /* external (MIDI port) device */ -#define MIDI_CAP_PTOP 0x00000200 /* Point to point link to one device */ +#define MIDI_CAP_EXTERNAL 0x00000100 /* external (MIDI port) + * device */ +#define MIDI_CAP_PTOP 0x00000200 /* Point to point link to one + * device */ #define MIDI_CAP_MTC 0x00000400 /* MTC/SMPTE (control) device */ - int magic; /* Reserved for internal use */ - int card_number; - int port_number; - int enabled; /* 1=enabled, 0=device not ready at this moment */ - int flags; /* For internal use only - no practical meaning */ - char handle[32]; - oss_longname_t song_name; /* Song name (if known) */ - oss_label_t label; /* Device label (if given) */ - int latency; /* In usecs, -1=unknown */ - int filler[244]; + int magic; /* Reserved for internal use */ + int card_number; + int port_number; + int enabled; /* 1=enabled, 0=device not ready at this + * moment */ + int flags; /* For internal use only - no practical + * meaning */ + char handle[32]; + oss_longname_t song_name; /* Song name (if known) */ + oss_label_t label; /* Device label (if given) */ + int latency; /* In usecs, -1=unknown */ + oss_devnode_t devnode; /* Device special file name (absolute path) */ + int legacy_device; + int filler[235]; } oss_midi_info; -typedef struct oss_card_info -{ - int card; - char shortname[16]; - char longname[128]; - int flags; - int filler[256]; +typedef struct oss_card_info { + int card; + char shortname[16]; + char longname[128]; + int flags; + int filler[256]; } oss_card_info; #define SNDCTL_SYSINFO _IOR ('X', 1, oss_sysinfo) @@ -1865,6 +1884,10 @@ #define SNDCTL_MIDIINFO _IOWR('X', 9, oss_midi_info) #define SNDCTL_MIXERINFO _IOWR('X',10, oss_mixerinfo) #define SNDCTL_CARDINFO _IOWR('X',11, oss_card_info) +#define SNDCTL_ENGINEINFO _IOWR('X',12, oss_audioinfo) +#define SNDCTL_AUDIOINFO_EX _IOWR('X',13, oss_audioinfo) + +/* ioctl codes 'X', 200-255 are reserved for internal (4Front) use */ /* * Few more "globally" available ioctl calls. From owner-p4-projects@FreeBSD.ORG Fri Apr 6 09:44:38 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D210316A405; Fri, 6 Apr 2007 09:44:37 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 8FD7F16A402 for ; Fri, 6 Apr 2007 09:44:37 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 676CA13C45B for ; Fri, 6 Apr 2007 09:44:37 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l369ib8n081567 for ; Fri, 6 Apr 2007 09:44:37 GMT (envelope-from gonzo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l369ia1W081564 for perforce@freebsd.org; Fri, 6 Apr 2007 09:44:36 GMT (envelope-from gonzo@FreeBSD.org) Date: Fri, 6 Apr 2007 09:44:36 GMT Message-Id: <200704060944.l369ia1W081564@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gonzo@FreeBSD.org using -f From: Oleksandr Tymoshenko To: Perforce Change Reviews Cc: Subject: PERFORCE change 117488 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 06 Apr 2007 09:44:38 -0000 http://perforce.freebsd.org/chv.cgi?CH=117488 Change 117488 by gonzo@gonzo_jeeves on 2007/04/06 09:43:40 o Replace SIZEOF_PTR with SIZEOF_PTR_2POW Affected files ... .. //depot/projects/mips2/src/lib/libc/stdlib/malloc.c#5 edit Differences ... ==== //depot/projects/mips2/src/lib/libc/stdlib/malloc.c#5 (text+ko) ==== @@ -197,7 +197,7 @@ #endif #ifdef __mips__ # define QUANTUM_2POW_MIN 3 -# define SIZEOF_PTR 4 +# define SIZEOF_PTR_2POW 2 # define USE_BRK # define NO_TLS #endif From owner-p4-projects@FreeBSD.ORG Fri Apr 6 09:48:43 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A28EC16A40A; Fri, 6 Apr 2007 09:48:43 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 786AE16A408 for ; Fri, 6 Apr 2007 09:48:43 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 6619313C487 for ; Fri, 6 Apr 2007 09:48:43 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l369mhfp081711 for ; Fri, 6 Apr 2007 09:48:43 GMT (envelope-from gonzo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l369mhET081708 for perforce@freebsd.org; Fri, 6 Apr 2007 09:48:43 GMT (envelope-from gonzo@FreeBSD.org) Date: Fri, 6 Apr 2007 09:48:43 GMT Message-Id: <200704060948.l369mhET081708@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gonzo@FreeBSD.org using -f From: Oleksandr Tymoshenko To: Perforce Change Reviews Cc: Subject: PERFORCE change 117489 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 06 Apr 2007 09:48:44 -0000 http://perforce.freebsd.org/chv.cgi?CH=117489 Change 117489 by gonzo@gonzo_jeeves on 2007/04/06 09:48:05 o Sync opensslconf-mips.h (make it just like -arm one) Affected files ... .. //depot/projects/mips2/src/secure/lib/libcrypto/opensslconf-mips.h#3 edit Differences ... ==== //depot/projects/mips2/src/secure/lib/libcrypto/opensslconf-mips.h#3 (text+ko) ==== @@ -1,17 +1,43 @@ -/* $FreeBSD$ */ +/* $FreeBSD: src/secure/lib/libcrypto/opensslconf-arm.h,v 1.3 2006/10/01 07:56:43 simon Exp $ */ /* opensslconf.h */ - /* WARNING: Generated automatically from opensslconf.h.in by Configure. */ /* OpenSSL was configured with the following options: */ +#ifndef OPENSSL_DOING_MAKEDEPEND + +/* Disabled by default in OpenSSL 0.9.8. */ +#ifndef OPENSSL_NO_CAMELLIA +# define OPENSSL_NO_CAMELLIA +#endif +/* libgmp is not in the FreeBSD base system. */ +#ifndef OPENSSL_NO_GMP +# define OPENSSL_NO_GMP +#endif +/* The Kerberos 5 support is MIT-specific. */ +#ifndef OPENSSL_NO_KRB5 +# define OPENSSL_NO_KRB5 +#endif + +#endif /* OPENSSL_DOING_MAKEDEPEND */ +#ifndef OPENSSL_THREADS +# define OPENSSL_THREADS +#endif +#ifndef OPENSSL_NO_STATIC_ENGINE +# define OPENSSL_NO_STATIC_ENGINE +#endif + +/* The OPENSSL_NO_* macros are also defined as NO_* if the application + asks for it. This is a transient feature that is provided for those + who haven't had the time to do the appropriate changes in their + applications. */ #ifdef OPENSSL_ALGORITHM_DEFINES - /* no ciphers excluded */ -#endif -#ifdef OPENSSL_THREAD_DEFINES -# ifndef THREADS -# define THREADS +# if defined(OPENSSL_NO_GMP) && !defined(NO_GMP) +# define NO_GMP +# endif +# if defined(OPENSSL_NO_KRB5) && !defined(NO_KRB5) +# define NO_KRB5 +# endif # endif -#endif #ifdef OPENSSL_OTHER_DEFINES # ifndef NO_ASM # define NO_ASM @@ -30,8 +56,11 @@ #endif #endif +#undef OPENSSL_UNISTD #define OPENSSL_UNISTD +#undef OPENSSL_EXPORT_VAR_AS_FUNCTION + #if defined(HEADER_IDEA_H) && !defined(IDEA_INT) #define IDEA_INT unsigned int #endif @@ -65,7 +94,7 @@ #endif #endif -#if (defined(HEADER_DES_H) || defined(HEADER_NEW_DES_H)) && !defined(DES_LONG) +#if (defined(HEADER_NEW_DES_H) || defined(HEADER_DES_H)) && !defined(DES_LONG) /* If this is set to 'unsigned int' on a DEC Alpha, this gives about a * %20 speed up (longs are 8 bytes, int's are 4). */ #ifndef DES_LONG @@ -115,11 +144,11 @@ * units. It reduces register dependancies at the expense of 2 more * registers */ #ifndef DES_RISC1 -#undef DES_RISC1 +#define DES_RISC1 #endif #ifndef DES_RISC2 -#define DES_RISC2 +#undef DES_RISC2 #endif #if defined(DES_RISC1) && defined(DES_RISC2) @@ -174,5 +203,3 @@ #endif /* DES_DEFAULT_OPTIONS */ #endif /* HEADER_DES_LOCL_H */ -/* The Kerberos 5 support is MIT-specific. */ -#define OPENSSL_NO_KRB5 From owner-p4-projects@FreeBSD.ORG Fri Apr 6 10:02:01 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A526F16A404; Fri, 6 Apr 2007 10:02:01 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 52D8916A401 for ; Fri, 6 Apr 2007 10:02:01 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 2A57C13C483 for ; Fri, 6 Apr 2007 10:02:01 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l36A21di084035 for ; Fri, 6 Apr 2007 10:02:01 GMT (envelope-from gonzo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l36A200h084027 for perforce@freebsd.org; Fri, 6 Apr 2007 10:02:00 GMT (envelope-from gonzo@FreeBSD.org) Date: Fri, 6 Apr 2007 10:02:00 GMT Message-Id: <200704061002.l36A200h084027@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gonzo@FreeBSD.org using -f From: Oleksandr Tymoshenko To: Perforce Change Reviews Cc: Subject: PERFORCE change 117490 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 06 Apr 2007 10:02:02 -0000 http://perforce.freebsd.org/chv.cgi?CH=117490 Change 117490 by gonzo@gonzo_jeeves on 2007/04/06 10:01:43 o Define CPU_SPINWAIT Affected files ... .. //depot/projects/mips2/src/lib/libthr/arch/mips/include/pthread_md.h#3 edit Differences ... ==== //depot/projects/mips2/src/lib/libthr/arch/mips/include/pthread_md.h#3 (text+ko) ==== @@ -36,6 +36,7 @@ #include #include +#define CPU_SPINWAIT #define DTV_OFFSET offsetof(struct tcb, tcb_dtv) /* From owner-p4-projects@FreeBSD.ORG Fri Apr 6 10:05:06 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 850A316A409; Fri, 6 Apr 2007 10:05:06 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 3F3CA16A405 for ; Fri, 6 Apr 2007 10:05:06 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 145CE13C469 for ; Fri, 6 Apr 2007 10:05:06 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l36A55oU085786 for ; Fri, 6 Apr 2007 10:05:05 GMT (envelope-from gonzo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l36A55v1085780 for perforce@freebsd.org; Fri, 6 Apr 2007 10:05:05 GMT (envelope-from gonzo@FreeBSD.org) Date: Fri, 6 Apr 2007 10:05:05 GMT Message-Id: <200704061005.l36A55v1085780@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gonzo@FreeBSD.org using -f From: Oleksandr Tymoshenko To: Perforce Change Reviews Cc: Subject: PERFORCE change 117491 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 06 Apr 2007 10:05:06 -0000 http://perforce.freebsd.org/chv.cgi?CH=117491 Change 117491 by gonzo@gonzo_jeeves on 2007/04/06 10:04:04 o Convert commets to C style. as stopped to recognize comments with # Affected files ... .. //depot/projects/mips2/src/libexec/rtld-elf/mips/rtld_start.S#3 edit Differences ... ==== //depot/projects/mips2/src/libexec/rtld-elf/mips/rtld_start.S#3 (text+ko) ==== @@ -38,39 +38,39 @@ .set noreorder .cpload t9 - addu sp, sp, -12 # adjust stack pointer - .cprestore 0 # -> 0(sp) for gp - # -> 4(sp) for atexit - # -> 8(sp) for obj_main - move s0,a0 # save stack pointer from a0 - move s1,a3 # save ps_strings pointer + addu sp, sp, -12 /* adjust stack pointer */ + .cprestore 0 /* -> 0(sp) for gp */ + /* -> 4(sp) for atexit */ + /* -> 8(sp) for obj_main */ + move s0,a0 /* save stack pointer from a0 */ + move s1,a3 /* save ps_strings pointer */ la a1, 1f bal 1f nop -1: subu a1, ra, a1 # relocbase +1: subu a1, ra, a1 /* relocbase */ la t9,_C_LABEL(_rtld_relocate_nonplt_self) move s2,a1 la a0,_DYNAMIC addu t9, a1, t9 jalr t9 - addu a0, a1, a0 # &_DYNAMIC + addu a0, a1, a0 /* &_DYNAMIC */ - addu a0, sp, 12 # sp - addu a1, sp, 4 # &exit_proc - addu a2, sp, 8 # &objp - addu sp, sp, -16 # arguments slot - jal _C_LABEL(_rtld) # v0 = _rtld(sp, exit_proc, objp) + addu a0, sp, 12 /* sp */ + addu a1, sp, 4 /* &exit_proc */ + addu a2, sp, 8 /* &objp */ + addu sp, sp, -16 /* arguments slot */ + jal _C_LABEL(_rtld) /* v0 = _rtld(sp, exit_proc, objp) */ nop - addu sp, sp, 16 # + addu sp, sp, 16 - lw a0, 4(sp) # our atexit function - lw a1, 8(sp) # obj_main entry - addu sp, sp,12 # readjust stack + lw a0, 4(sp) /* our atexit function */ + lw a1, 8(sp) /* obj_main entry */ + addu sp, sp,12 /* readjust stack */ move t9,v0 - move a2,s1 # restore ps_strings - jr t9 # _start(sp, cleanup, obj); + move a2,s1 /* restore ps_strings */ + jr t9 /* _start(sp, cleanup, obj); */ nop END(rtld_start) @@ -78,15 +78,16 @@ .globl _rtld_bind_start .ent _rtld_bind_start _rtld_bind_start: - # ABI conventions for stubs - # t8 contains symbol index - # t7 contains return address - .frame sp, 0, ra # satisfy compiler + /* ABI conventions for stubs: + * t8 contains symbol index + * t7 contains return address + */ + .frame sp, 0, ra /* satisfy compiler */ - move v1,gp # save old GP - add t9,8 # modify T9 to point at .cpload + move v1,gp /* save old GP */ + add t9,8 /* modify T9 to point at .cpload */ .cpload t9 - subu sp,44 # save arguments and sp value in stack + subu sp,44 /* save arguments and sp value */ .cprestore 36 sw a0,16(sp) sw a1,20(sp) @@ -95,16 +96,16 @@ sw s0,32(sp) sw t7,40(sp) move s0,sp - move a0,v1 # old GP - subu a0,a0,0x7ff0 # The offset of $gp from the - # beginning of the .got section: - # $gp = .got + 0x7ff0, so - # .got = $gp - 0x7ff0 - # Simple math as you can see. + move a0,v1 /* old GP */ + subu a0,a0,0x7ff0 /* The offset of $gp from the */ + /* beginning of the .got section: */ + /* $gp = .got + 0x7ff0, so */ + /* .got = $gp - 0x7ff0 */ + /* Simple math as you can see. */ - lw a0,4(a0) # object = pltgot[1] & 0x7fffffff + lw a0,4(a0) /* object = pltgot[1] & 0x7fffffff */ and a0,a0,0x7fffffff - move a1,t8 # symbol index + move a1,t8 /* symbol index */ jal _C_LABEL(_mips_rtld_bind) nop From owner-p4-projects@FreeBSD.ORG Fri Apr 6 12:29:27 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E081716A40F; Fri, 6 Apr 2007 12:29:26 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id A03A716A405 for ; Fri, 6 Apr 2007 12:29:26 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 8A51613C4C3 for ; Fri, 6 Apr 2007 12:29:26 +0000 (UTC) (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.8/8.13.8) with ESMTP id l36CTQt5010580 for ; Fri, 6 Apr 2007 12:29:26 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l36CTCBI010577 for perforce@freebsd.org; Fri, 6 Apr 2007 12:29:12 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Fri, 6 Apr 2007 12:29:12 GMT Message-Id: <200704061229.l36CTCBI010577@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 117498 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 06 Apr 2007 12:29:27 -0000 http://perforce.freebsd.org/chv.cgi?CH=117498 Change 117498 by rwatson@rwatson_zoo on 2007/04/06 12:28:15 Integrate zero-copy BPF buffer branch. Affected files ... .. //depot/projects/zcopybpf/src/contrib/tcpdump/print-stp.c#2 integrate .. //depot/projects/zcopybpf/src/sys/Makefile#2 integrate .. //depot/projects/zcopybpf/src/sys/amd64/acpica/OsdEnvironment.c#2 integrate .. //depot/projects/zcopybpf/src/sys/amd64/acpica/madt.c#2 integrate .. //depot/projects/zcopybpf/src/sys/amd64/amd64/busdma_machdep.c#2 integrate .. //depot/projects/zcopybpf/src/sys/amd64/amd64/cpu_switch.S#2 integrate .. //depot/projects/zcopybpf/src/sys/amd64/amd64/genassym.c#2 integrate .. //depot/projects/zcopybpf/src/sys/amd64/amd64/identcpu.c#2 integrate .. //depot/projects/zcopybpf/src/sys/amd64/amd64/intr_machdep.c#3 integrate .. //depot/projects/zcopybpf/src/sys/amd64/amd64/io_apic.c#2 integrate .. //depot/projects/zcopybpf/src/sys/amd64/amd64/legacy.c#2 integrate .. //depot/projects/zcopybpf/src/sys/amd64/amd64/local_apic.c#2 integrate .. //depot/projects/zcopybpf/src/sys/amd64/amd64/machdep.c#3 integrate .. //depot/projects/zcopybpf/src/sys/amd64/amd64/mp_machdep.c#3 integrate .. //depot/projects/zcopybpf/src/sys/amd64/amd64/mptable.c#2 integrate .. //depot/projects/zcopybpf/src/sys/amd64/amd64/nexus.c#3 integrate .. //depot/projects/zcopybpf/src/sys/amd64/amd64/pmap.c#3 integrate .. //depot/projects/zcopybpf/src/sys/amd64/amd64/prof_machdep.c#2 integrate .. //depot/projects/zcopybpf/src/sys/amd64/amd64/support.S#2 integrate .. //depot/projects/zcopybpf/src/sys/amd64/amd64/trap.c#2 integrate .. //depot/projects/zcopybpf/src/sys/amd64/amd64/tsc.c#2 integrate .. //depot/projects/zcopybpf/src/sys/amd64/conf/NOTES#2 integrate .. //depot/projects/zcopybpf/src/sys/amd64/include/acpica_machdep.h#2 integrate .. //depot/projects/zcopybpf/src/sys/amd64/include/apicvar.h#2 integrate .. //depot/projects/zcopybpf/src/sys/amd64/include/intr_machdep.h#3 integrate .. //depot/projects/zcopybpf/src/sys/amd64/include/pcb.h#2 integrate .. //depot/projects/zcopybpf/src/sys/amd64/include/pcpu.h#3 integrate .. //depot/projects/zcopybpf/src/sys/amd64/include/segments.h#2 integrate .. //depot/projects/zcopybpf/src/sys/amd64/include/smp.h#2 integrate .. //depot/projects/zcopybpf/src/sys/amd64/include/specialreg.h#2 integrate .. //depot/projects/zcopybpf/src/sys/amd64/linux32/linux.h#3 integrate .. //depot/projects/zcopybpf/src/sys/amd64/linux32/linux32_dummy.c#2 integrate .. //depot/projects/zcopybpf/src/sys/amd64/linux32/linux32_locore.s#2 integrate .. //depot/projects/zcopybpf/src/sys/amd64/linux32/linux32_machdep.c#3 integrate .. //depot/projects/zcopybpf/src/sys/amd64/linux32/linux32_proto.h#3 integrate .. //depot/projects/zcopybpf/src/sys/amd64/linux32/linux32_syscall.h#3 integrate .. //depot/projects/zcopybpf/src/sys/amd64/linux32/linux32_sysent.c#3 integrate .. //depot/projects/zcopybpf/src/sys/amd64/linux32/linux32_sysvec.c#2 integrate .. //depot/projects/zcopybpf/src/sys/amd64/linux32/syscalls.master#3 integrate .. //depot/projects/zcopybpf/src/sys/arm/arm/cpufunc_asm_arm9.S#2 integrate .. //depot/projects/zcopybpf/src/sys/arm/at91/at91.c#3 integrate .. //depot/projects/zcopybpf/src/sys/arm/at91/at91_st.c#3 integrate .. //depot/projects/zcopybpf/src/sys/arm/at91/at91_twi.c#3 integrate .. //depot/projects/zcopybpf/src/sys/arm/at91/at91_twireg.h#2 integrate .. //depot/projects/zcopybpf/src/sys/arm/at91/kb920x_machdep.c#2 integrate .. //depot/projects/zcopybpf/src/sys/arm/at91/uart_cpu_at91rm9200usart.c#2 integrate .. //depot/projects/zcopybpf/src/sys/arm/at91/uart_dev_at91usart.c#2 integrate .. //depot/projects/zcopybpf/src/sys/arm/conf/KB920X#2 integrate .. //depot/projects/zcopybpf/src/sys/arm/conf/KB920X.hints#1 branch .. //depot/projects/zcopybpf/src/sys/arm/include/bootconfig.h#2 integrate .. //depot/projects/zcopybpf/src/sys/arm/include/cpufunc.h#2 integrate .. //depot/projects/zcopybpf/src/sys/arm/include/pcpu.h#2 integrate .. //depot/projects/zcopybpf/src/sys/arm/include/undefined.h#2 integrate .. //depot/projects/zcopybpf/src/sys/arm/sa11x0/sa11x0.c#3 integrate .. //depot/projects/zcopybpf/src/sys/arm/sa11x0/uart_cpu_sa1110.c#2 integrate .. //depot/projects/zcopybpf/src/sys/arm/sa11x0/uart_dev_sa1110.c#2 integrate .. //depot/projects/zcopybpf/src/sys/arm/xscale/i80321/i80321_wdog.c#2 integrate .. //depot/projects/zcopybpf/src/sys/arm/xscale/i80321/uart_cpu_i80321.c#2 integrate .. //depot/projects/zcopybpf/src/sys/arm/xscale/ixp425/avila_ata.c#3 integrate .. //depot/projects/zcopybpf/src/sys/arm/xscale/ixp425/ixp425.c#3 integrate .. //depot/projects/zcopybpf/src/sys/arm/xscale/ixp425/ixp425_npe.c#3 integrate .. //depot/projects/zcopybpf/src/sys/arm/xscale/ixp425/ixp425_pci.c#3 integrate .. //depot/projects/zcopybpf/src/sys/arm/xscale/ixp425/ixp425_wdog.c#2 integrate .. //depot/projects/zcopybpf/src/sys/arm/xscale/ixp425/ixp425reg.h#2 integrate .. //depot/projects/zcopybpf/src/sys/arm/xscale/ixp425/uart_cpu_ixp425.c#2 integrate .. //depot/projects/zcopybpf/src/sys/boot/arm/at91/boot2/boot2.c#2 integrate .. //depot/projects/zcopybpf/src/sys/boot/arm/at91/bootspi/loader_prompt.c#2 integrate .. //depot/projects/zcopybpf/src/sys/boot/arm/at91/libat91/Makefile#2 integrate .. //depot/projects/zcopybpf/src/sys/boot/arm/at91/libat91/at91rm9200_lowlevel.c#2 integrate .. //depot/projects/zcopybpf/src/sys/boot/arm/at91/libat91/at91rm9200_lowlevel.h#2 integrate .. //depot/projects/zcopybpf/src/sys/boot/arm/at91/libat91/emac.c#2 integrate .. //depot/projects/zcopybpf/src/sys/boot/arm/at91/libat91/getc.c#2 integrate .. //depot/projects/zcopybpf/src/sys/boot/arm/at91/libat91/memcmp.c#2 integrate .. //depot/projects/zcopybpf/src/sys/boot/arm/at91/libat91/sd-card.c#2 integrate .. //depot/projects/zcopybpf/src/sys/boot/arm/at91/libat91/spi_flash.c#2 integrate .. //depot/projects/zcopybpf/src/sys/boot/arm/at91/libat91/strlen.c#2 integrate .. //depot/projects/zcopybpf/src/sys/boot/ficl/ficl.h#2 integrate .. //depot/projects/zcopybpf/src/sys/boot/ficl/float.c#2 integrate .. //depot/projects/zcopybpf/src/sys/boot/ficl/softwords/fileaccess.fr#2 integrate .. //depot/projects/zcopybpf/src/sys/boot/ficl/softwords/jhlocal.fr#2 integrate .. //depot/projects/zcopybpf/src/sys/boot/ficl/softwords/oo.fr#2 integrate .. //depot/projects/zcopybpf/src/sys/boot/ficl/softwords/prefix.fr#2 integrate .. //depot/projects/zcopybpf/src/sys/boot/ficl/softwords/softcore.awk#2 integrate .. //depot/projects/zcopybpf/src/sys/boot/ficl/tools.c#2 integrate .. //depot/projects/zcopybpf/src/sys/boot/ficl/unix.c#2 integrate .. //depot/projects/zcopybpf/src/sys/boot/ficl/vm.c#2 integrate .. //depot/projects/zcopybpf/src/sys/boot/ficl/words.c#2 integrate .. //depot/projects/zcopybpf/src/sys/boot/i386/boot0/boot0.S#2 integrate .. //depot/projects/zcopybpf/src/sys/boot/i386/libi386/biosacpi.c#2 integrate .. //depot/projects/zcopybpf/src/sys/boot/ia64/ski/acpi_stub.c#2 integrate .. //depot/projects/zcopybpf/src/sys/boot/pc98/boot0.5/boot.s#2 integrate .. //depot/projects/zcopybpf/src/sys/boot/pc98/boot0.5/boot0.5.s#2 integrate .. //depot/projects/zcopybpf/src/sys/boot/pc98/boot0.5/disk.s#2 integrate .. //depot/projects/zcopybpf/src/sys/boot/pc98/cdboot/cdboot.s#2 integrate .. //depot/projects/zcopybpf/src/sys/cam/cam_xpt.c#3 integrate .. //depot/projects/zcopybpf/src/sys/coda/coda_vnops.c#2 integrate .. //depot/projects/zcopybpf/src/sys/compat/linprocfs/linprocfs.c#3 integrate .. //depot/projects/zcopybpf/src/sys/compat/linsysfs/linsysfs.c#2 integrate .. //depot/projects/zcopybpf/src/sys/compat/linux/linux_emul.c#3 integrate .. //depot/projects/zcopybpf/src/sys/compat/linux/linux_emul.h#2 integrate .. //depot/projects/zcopybpf/src/sys/compat/linux/linux_file.c#2 integrate .. //depot/projects/zcopybpf/src/sys/compat/linux/linux_futex.c#3 integrate .. //depot/projects/zcopybpf/src/sys/compat/linux/linux_stats.c#2 integrate .. //depot/projects/zcopybpf/src/sys/compat/linux/linux_util.h#2 integrate .. //depot/projects/zcopybpf/src/sys/compat/ndis/kern_ndis.c#3 integrate .. //depot/projects/zcopybpf/src/sys/compat/ndis/ndis_var.h#2 integrate .. //depot/projects/zcopybpf/src/sys/compat/ndis/subr_ndis.c#2 integrate .. //depot/projects/zcopybpf/src/sys/compat/ndis/subr_pe.c#2 integrate .. //depot/projects/zcopybpf/src/sys/compat/opensolaris/kern/opensolaris_kmem.c#1 branch .. //depot/projects/zcopybpf/src/sys/compat/opensolaris/kern/opensolaris_kobj.c#1 branch .. //depot/projects/zcopybpf/src/sys/compat/opensolaris/kern/opensolaris_kstat.c#1 branch .. //depot/projects/zcopybpf/src/sys/compat/opensolaris/kern/opensolaris_policy.c#1 branch .. //depot/projects/zcopybpf/src/sys/compat/opensolaris/kern/opensolaris_string.c#1 branch .. //depot/projects/zcopybpf/src/sys/compat/opensolaris/kern/opensolaris_vfs.c#1 branch .. //depot/projects/zcopybpf/src/sys/compat/opensolaris/kern/opensolaris_zone.c#1 branch .. //depot/projects/zcopybpf/src/sys/compat/opensolaris/machine/endian.h#1 branch .. //depot/projects/zcopybpf/src/sys/compat/opensolaris/rpc/xdr.h#1 branch .. //depot/projects/zcopybpf/src/sys/compat/opensolaris/sys/acl.h#1 branch .. //depot/projects/zcopybpf/src/sys/compat/opensolaris/sys/byteorder.h#1 branch .. //depot/projects/zcopybpf/src/sys/compat/opensolaris/sys/callb.h#1 branch .. //depot/projects/zcopybpf/src/sys/compat/opensolaris/sys/cmn_err.h#1 branch .. //depot/projects/zcopybpf/src/sys/compat/opensolaris/sys/cred.h#1 branch .. //depot/projects/zcopybpf/src/sys/compat/opensolaris/sys/debug.h#1 branch .. //depot/projects/zcopybpf/src/sys/compat/opensolaris/sys/dirent.h#1 branch .. //depot/projects/zcopybpf/src/sys/compat/opensolaris/sys/dkio.h#1 branch .. //depot/projects/zcopybpf/src/sys/compat/opensolaris/sys/kcondvar.h#1 branch .. //depot/projects/zcopybpf/src/sys/compat/opensolaris/sys/kmem.h#1 branch .. //depot/projects/zcopybpf/src/sys/compat/opensolaris/sys/kobj.h#1 branch .. //depot/projects/zcopybpf/src/sys/compat/opensolaris/sys/kstat.h#1 branch .. //depot/projects/zcopybpf/src/sys/compat/opensolaris/sys/mntent.h#1 branch .. //depot/projects/zcopybpf/src/sys/compat/opensolaris/sys/mnttab.h#1 branch .. //depot/projects/zcopybpf/src/sys/compat/opensolaris/sys/mount.h#1 branch .. //depot/projects/zcopybpf/src/sys/compat/opensolaris/sys/mutex.h#1 branch .. //depot/projects/zcopybpf/src/sys/compat/opensolaris/sys/policy.h#1 branch .. //depot/projects/zcopybpf/src/sys/compat/opensolaris/sys/proc.h#1 branch .. //depot/projects/zcopybpf/src/sys/compat/opensolaris/sys/random.h#1 branch .. //depot/projects/zcopybpf/src/sys/compat/opensolaris/sys/rwlock.h#1 branch .. //depot/projects/zcopybpf/src/sys/compat/opensolaris/sys/sdt.h#1 branch .. //depot/projects/zcopybpf/src/sys/compat/opensolaris/sys/string.h#1 branch .. //depot/projects/zcopybpf/src/sys/compat/opensolaris/sys/sysmacros.h#1 branch .. //depot/projects/zcopybpf/src/sys/compat/opensolaris/sys/systm.h#1 branch .. //depot/projects/zcopybpf/src/sys/compat/opensolaris/sys/taskq.h#1 branch .. //depot/projects/zcopybpf/src/sys/compat/opensolaris/sys/taskq_impl.h#1 branch .. //depot/projects/zcopybpf/src/sys/compat/opensolaris/sys/time.h#1 branch .. //depot/projects/zcopybpf/src/sys/compat/opensolaris/sys/types.h#1 branch .. //depot/projects/zcopybpf/src/sys/compat/opensolaris/sys/uio.h#1 branch .. //depot/projects/zcopybpf/src/sys/compat/opensolaris/sys/varargs.h#1 branch .. //depot/projects/zcopybpf/src/sys/compat/opensolaris/sys/vfs.h#1 branch .. //depot/projects/zcopybpf/src/sys/compat/opensolaris/sys/vnode.h#1 branch .. //depot/projects/zcopybpf/src/sys/compat/opensolaris/sys/zone.h#1 branch .. //depot/projects/zcopybpf/src/sys/compat/svr4/svr4_filio.c#2 integrate .. //depot/projects/zcopybpf/src/sys/conf/NOTES#4 integrate .. //depot/projects/zcopybpf/src/sys/conf/files#5 integrate .. //depot/projects/zcopybpf/src/sys/conf/files.amd64#2 integrate .. //depot/projects/zcopybpf/src/sys/conf/files.i386#2 integrate .. //depot/projects/zcopybpf/src/sys/conf/files.pc98#2 integrate .. //depot/projects/zcopybpf/src/sys/conf/files.powerpc#3 integrate .. //depot/projects/zcopybpf/src/sys/conf/files.sparc64#2 integrate .. //depot/projects/zcopybpf/src/sys/conf/kern.post.mk#2 integrate .. //depot/projects/zcopybpf/src/sys/conf/kmod.mk#3 integrate .. //depot/projects/zcopybpf/src/sys/conf/options#4 integrate .. //depot/projects/zcopybpf/src/sys/contrib/altq/altq/altq_subr.c#2 integrate .. //depot/projects/zcopybpf/src/sys/contrib/dev/acpica/CHANGES.txt#2 integrate .. //depot/projects/zcopybpf/src/sys/contrib/dev/acpica/acapps.h#2 integrate .. //depot/projects/zcopybpf/src/sys/contrib/dev/acpica/acconfig.h#2 integrate .. //depot/projects/zcopybpf/src/sys/contrib/dev/acpica/acdebug.h#2 integrate .. //depot/projects/zcopybpf/src/sys/contrib/dev/acpica/acdisasm.h#2 integrate .. //depot/projects/zcopybpf/src/sys/contrib/dev/acpica/acdispat.h#2 integrate .. //depot/projects/zcopybpf/src/sys/contrib/dev/acpica/acefi.h#2 integrate .. //depot/projects/zcopybpf/src/sys/contrib/dev/acpica/acenv.h#2 integrate .. //depot/projects/zcopybpf/src/sys/contrib/dev/acpica/acevents.h#2 integrate .. //depot/projects/zcopybpf/src/sys/contrib/dev/acpica/acexcep.h#2 integrate .. //depot/projects/zcopybpf/src/sys/contrib/dev/acpica/acfreebsd.h#2 integrate .. //depot/projects/zcopybpf/src/sys/contrib/dev/acpica/acgcc.h#2 integrate .. //depot/projects/zcopybpf/src/sys/contrib/dev/acpica/acglobal.h#2 integrate .. //depot/projects/zcopybpf/src/sys/contrib/dev/acpica/achware.h#2 integrate .. //depot/projects/zcopybpf/src/sys/contrib/dev/acpica/acinterp.h#2 integrate .. //depot/projects/zcopybpf/src/sys/contrib/dev/acpica/aclocal.h#2 integrate .. //depot/projects/zcopybpf/src/sys/contrib/dev/acpica/acmacros.h#2 integrate .. //depot/projects/zcopybpf/src/sys/contrib/dev/acpica/acnames.h#2 integrate .. //depot/projects/zcopybpf/src/sys/contrib/dev/acpica/acnamesp.h#2 integrate .. //depot/projects/zcopybpf/src/sys/contrib/dev/acpica/acobject.h#2 integrate .. //depot/projects/zcopybpf/src/sys/contrib/dev/acpica/acopcode.h#2 integrate .. //depot/projects/zcopybpf/src/sys/contrib/dev/acpica/acoutput.h#2 integrate .. //depot/projects/zcopybpf/src/sys/contrib/dev/acpica/acparser.h#2 integrate .. //depot/projects/zcopybpf/src/sys/contrib/dev/acpica/acpi.h#2 integrate .. //depot/projects/zcopybpf/src/sys/contrib/dev/acpica/acpica_prep.sh#2 integrate .. //depot/projects/zcopybpf/src/sys/contrib/dev/acpica/acpiosxf.h#2 integrate .. //depot/projects/zcopybpf/src/sys/contrib/dev/acpica/acpixf.h#2 integrate .. //depot/projects/zcopybpf/src/sys/contrib/dev/acpica/acresrc.h#2 integrate .. //depot/projects/zcopybpf/src/sys/contrib/dev/acpica/acstruct.h#2 integrate .. //depot/projects/zcopybpf/src/sys/contrib/dev/acpica/actables.h#2 integrate .. //depot/projects/zcopybpf/src/sys/contrib/dev/acpica/actbl.h#2 integrate .. //depot/projects/zcopybpf/src/sys/contrib/dev/acpica/actbl1.h#2 integrate .. //depot/projects/zcopybpf/src/sys/contrib/dev/acpica/actbl2.h#2 integrate .. //depot/projects/zcopybpf/src/sys/contrib/dev/acpica/actypes.h#2 integrate .. //depot/projects/zcopybpf/src/sys/contrib/dev/acpica/acutils.h#2 integrate .. //depot/projects/zcopybpf/src/sys/contrib/dev/acpica/aecommon.h#2 integrate .. //depot/projects/zcopybpf/src/sys/contrib/dev/acpica/aeexec.c#2 delete .. //depot/projects/zcopybpf/src/sys/contrib/dev/acpica/amlcode.h#2 integrate .. //depot/projects/zcopybpf/src/sys/contrib/dev/acpica/amlresrc.h#2 integrate .. //depot/projects/zcopybpf/src/sys/contrib/dev/acpica/common/adfile.c#1 branch .. //depot/projects/zcopybpf/src/sys/contrib/dev/acpica/common/adisasm.c#2 integrate .. //depot/projects/zcopybpf/src/sys/contrib/dev/acpica/common/adwalk.c#1 branch .. //depot/projects/zcopybpf/src/sys/contrib/dev/acpica/common/dmrestag.c#1 branch .. //depot/projects/zcopybpf/src/sys/contrib/dev/acpica/common/dmtable.c#1 branch .. //depot/projects/zcopybpf/src/sys/contrib/dev/acpica/common/dmtbdump.c#1 branch .. //depot/projects/zcopybpf/src/sys/contrib/dev/acpica/common/dmtbinfo.c#1 branch .. //depot/projects/zcopybpf/src/sys/contrib/dev/acpica/common/getopt.c#2 integrate .. //depot/projects/zcopybpf/src/sys/contrib/dev/acpica/compiler/aslanalyze.c#2 integrate .. //depot/projects/zcopybpf/src/sys/contrib/dev/acpica/compiler/aslcodegen.c#2 integrate .. //depot/projects/zcopybpf/src/sys/contrib/dev/acpica/compiler/aslcompile.c#2 integrate .. //depot/projects/zcopybpf/src/sys/contrib/dev/acpica/compiler/aslcompiler.h#2 integrate .. //depot/projects/zcopybpf/src/sys/contrib/dev/acpica/compiler/aslcompiler.l#2 integrate .. //depot/projects/zcopybpf/src/sys/contrib/dev/acpica/compiler/aslcompiler.y#2 integrate .. //depot/projects/zcopybpf/src/sys/contrib/dev/acpica/compiler/asldefine.h#2 integrate .. //depot/projects/zcopybpf/src/sys/contrib/dev/acpica/compiler/aslerror.c#2 integrate .. //depot/projects/zcopybpf/src/sys/contrib/dev/acpica/compiler/aslfiles.c#2 integrate .. //depot/projects/zcopybpf/src/sys/contrib/dev/acpica/compiler/aslfold.c#2 integrate .. //depot/projects/zcopybpf/src/sys/contrib/dev/acpica/compiler/aslglobal.h#2 integrate .. //depot/projects/zcopybpf/src/sys/contrib/dev/acpica/compiler/asllength.c#2 integrate .. //depot/projects/zcopybpf/src/sys/contrib/dev/acpica/compiler/asllisting.c#2 integrate .. //depot/projects/zcopybpf/src/sys/contrib/dev/acpica/compiler/aslload.c#2 integrate .. //depot/projects/zcopybpf/src/sys/contrib/dev/acpica/compiler/asllookup.c#2 integrate .. //depot/projects/zcopybpf/src/sys/contrib/dev/acpica/compiler/aslmain.c#2 integrate .. //depot/projects/zcopybpf/src/sys/contrib/dev/acpica/compiler/aslmap.c#2 integrate .. //depot/projects/zcopybpf/src/sys/contrib/dev/acpica/compiler/aslopcodes.c#2 integrate .. //depot/projects/zcopybpf/src/sys/contrib/dev/acpica/compiler/asloperands.c#2 integrate .. //depot/projects/zcopybpf/src/sys/contrib/dev/acpica/compiler/aslopt.c#2 integrate .. //depot/projects/zcopybpf/src/sys/contrib/dev/acpica/compiler/aslresource.c#2 integrate .. //depot/projects/zcopybpf/src/sys/contrib/dev/acpica/compiler/aslrestype1.c#2 integrate .. //depot/projects/zcopybpf/src/sys/contrib/dev/acpica/compiler/aslrestype2.c#2 integrate .. //depot/projects/zcopybpf/src/sys/contrib/dev/acpica/compiler/aslstubs.c#2 integrate .. //depot/projects/zcopybpf/src/sys/contrib/dev/acpica/compiler/asltransform.c#2 integrate .. //depot/projects/zcopybpf/src/sys/contrib/dev/acpica/compiler/asltree.c#2 integrate .. //depot/projects/zcopybpf/src/sys/contrib/dev/acpica/compiler/asltypes.h#2 integrate .. //depot/projects/zcopybpf/src/sys/contrib/dev/acpica/compiler/aslutils.c#2 integrate .. //depot/projects/zcopybpf/src/sys/contrib/dev/acpica/dbcmds.c#2 integrate .. //depot/projects/zcopybpf/src/sys/contrib/dev/acpica/dbdisply.c#2 integrate .. //depot/projects/zcopybpf/src/sys/contrib/dev/acpica/dbexec.c#2 integrate .. //depot/projects/zcopybpf/src/sys/contrib/dev/acpica/dbfileio.c#2 integrate .. //depot/projects/zcopybpf/src/sys/contrib/dev/acpica/dbhistry.c#2 integrate .. //depot/projects/zcopybpf/src/sys/contrib/dev/acpica/dbinput.c#2 integrate .. //depot/projects/zcopybpf/src/sys/contrib/dev/acpica/dbstats.c#2 integrate .. //depot/projects/zcopybpf/src/sys/contrib/dev/acpica/dbutils.c#2 integrate .. //depot/projects/zcopybpf/src/sys/contrib/dev/acpica/dbxface.c#2 integrate .. //depot/projects/zcopybpf/src/sys/contrib/dev/acpica/dmbuffer.c#2 integrate .. //depot/projects/zcopybpf/src/sys/contrib/dev/acpica/dmnames.c#2 integrate .. //depot/projects/zcopybpf/src/sys/contrib/dev/acpica/dmobject.c#2 integrate .. //depot/projects/zcopybpf/src/sys/contrib/dev/acpica/dmopcode.c#2 integrate .. //depot/projects/zcopybpf/src/sys/contrib/dev/acpica/dmresrc.c#2 integrate .. //depot/projects/zcopybpf/src/sys/contrib/dev/acpica/dmresrcl.c#2 integrate .. //depot/projects/zcopybpf/src/sys/contrib/dev/acpica/dmresrcs.c#2 integrate .. //depot/projects/zcopybpf/src/sys/contrib/dev/acpica/dmutils.c#2 integrate .. //depot/projects/zcopybpf/src/sys/contrib/dev/acpica/dmwalk.c#2 integrate .. //depot/projects/zcopybpf/src/sys/contrib/dev/acpica/dsfield.c#2 integrate .. //depot/projects/zcopybpf/src/sys/contrib/dev/acpica/dsinit.c#2 integrate .. //depot/projects/zcopybpf/src/sys/contrib/dev/acpica/dsmethod.c#2 integrate .. //depot/projects/zcopybpf/src/sys/contrib/dev/acpica/dsmthdat.c#2 integrate .. //depot/projects/zcopybpf/src/sys/contrib/dev/acpica/dsobject.c#2 integrate .. //depot/projects/zcopybpf/src/sys/contrib/dev/acpica/dsopcode.c#2 integrate .. //depot/projects/zcopybpf/src/sys/contrib/dev/acpica/dsutils.c#2 integrate .. //depot/projects/zcopybpf/src/sys/contrib/dev/acpica/dswexec.c#2 integrate .. //depot/projects/zcopybpf/src/sys/contrib/dev/acpica/dswload.c#2 integrate .. //depot/projects/zcopybpf/src/sys/contrib/dev/acpica/dswscope.c#2 integrate .. //depot/projects/zcopybpf/src/sys/contrib/dev/acpica/dswstate.c#2 integrate .. //depot/projects/zcopybpf/src/sys/contrib/dev/acpica/evevent.c#2 integrate .. //depot/projects/zcopybpf/src/sys/contrib/dev/acpica/evgpe.c#2 integrate .. //depot/projects/zcopybpf/src/sys/contrib/dev/acpica/evgpeblk.c#2 integrate .. //depot/projects/zcopybpf/src/sys/contrib/dev/acpica/evmisc.c#2 integrate .. //depot/projects/zcopybpf/src/sys/contrib/dev/acpica/evregion.c#2 integrate .. //depot/projects/zcopybpf/src/sys/contrib/dev/acpica/evrgnini.c#2 integrate .. //depot/projects/zcopybpf/src/sys/contrib/dev/acpica/evsci.c#2 integrate .. //depot/projects/zcopybpf/src/sys/contrib/dev/acpica/evxface.c#2 integrate .. //depot/projects/zcopybpf/src/sys/contrib/dev/acpica/evxfevnt.c#2 integrate .. //depot/projects/zcopybpf/src/sys/contrib/dev/acpica/evxfregn.c#2 integrate .. //depot/projects/zcopybpf/src/sys/contrib/dev/acpica/exconfig.c#2 integrate .. //depot/projects/zcopybpf/src/sys/contrib/dev/acpica/exconvrt.c#2 integrate .. //depot/projects/zcopybpf/src/sys/contrib/dev/acpica/excreate.c#2 integrate .. //depot/projects/zcopybpf/src/sys/contrib/dev/acpica/exdump.c#2 integrate .. //depot/projects/zcopybpf/src/sys/contrib/dev/acpica/exfield.c#2 integrate .. //depot/projects/zcopybpf/src/sys/contrib/dev/acpica/exfldio.c#2 integrate .. //depot/projects/zcopybpf/src/sys/contrib/dev/acpica/exmisc.c#2 integrate .. //depot/projects/zcopybpf/src/sys/contrib/dev/acpica/exmutex.c#2 integrate .. //depot/projects/zcopybpf/src/sys/contrib/dev/acpica/exnames.c#2 integrate .. //depot/projects/zcopybpf/src/sys/contrib/dev/acpica/exoparg1.c#2 integrate .. //depot/projects/zcopybpf/src/sys/contrib/dev/acpica/exoparg2.c#2 integrate .. //depot/projects/zcopybpf/src/sys/contrib/dev/acpica/exoparg3.c#2 integrate .. //depot/projects/zcopybpf/src/sys/contrib/dev/acpica/exoparg6.c#2 integrate .. //depot/projects/zcopybpf/src/sys/contrib/dev/acpica/exprep.c#2 integrate .. //depot/projects/zcopybpf/src/sys/contrib/dev/acpica/exregion.c#2 integrate .. //depot/projects/zcopybpf/src/sys/contrib/dev/acpica/exresnte.c#2 integrate .. //depot/projects/zcopybpf/src/sys/contrib/dev/acpica/exresolv.c#2 integrate .. //depot/projects/zcopybpf/src/sys/contrib/dev/acpica/exresop.c#2 integrate .. //depot/projects/zcopybpf/src/sys/contrib/dev/acpica/exstore.c#2 integrate .. //depot/projects/zcopybpf/src/sys/contrib/dev/acpica/exstoren.c#2 integrate .. //depot/projects/zcopybpf/src/sys/contrib/dev/acpica/exstorob.c#2 integrate .. //depot/projects/zcopybpf/src/sys/contrib/dev/acpica/exsystem.c#2 integrate .. //depot/projects/zcopybpf/src/sys/contrib/dev/acpica/exutils.c#2 integrate .. //depot/projects/zcopybpf/src/sys/contrib/dev/acpica/hwacpi.c#2 integrate .. //depot/projects/zcopybpf/src/sys/contrib/dev/acpica/hwgpe.c#2 integrate .. //depot/projects/zcopybpf/src/sys/contrib/dev/acpica/hwregs.c#2 integrate .. //depot/projects/zcopybpf/src/sys/contrib/dev/acpica/hwsleep.c#2 integrate .. //depot/projects/zcopybpf/src/sys/contrib/dev/acpica/hwtimer.c#2 integrate .. //depot/projects/zcopybpf/src/sys/contrib/dev/acpica/nsaccess.c#2 integrate .. //depot/projects/zcopybpf/src/sys/contrib/dev/acpica/nsalloc.c#2 integrate .. //depot/projects/zcopybpf/src/sys/contrib/dev/acpica/nsdump.c#2 integrate .. //depot/projects/zcopybpf/src/sys/contrib/dev/acpica/nsdumpdv.c#2 integrate .. //depot/projects/zcopybpf/src/sys/contrib/dev/acpica/nseval.c#2 integrate .. //depot/projects/zcopybpf/src/sys/contrib/dev/acpica/nsinit.c#2 integrate .. //depot/projects/zcopybpf/src/sys/contrib/dev/acpica/nsload.c#2 integrate .. //depot/projects/zcopybpf/src/sys/contrib/dev/acpica/nsnames.c#2 integrate .. //depot/projects/zcopybpf/src/sys/contrib/dev/acpica/nsobject.c#2 integrate .. //depot/projects/zcopybpf/src/sys/contrib/dev/acpica/nsparse.c#2 integrate .. //depot/projects/zcopybpf/src/sys/contrib/dev/acpica/nssearch.c#2 integrate .. //depot/projects/zcopybpf/src/sys/contrib/dev/acpica/nsutils.c#2 integrate .. //depot/projects/zcopybpf/src/sys/contrib/dev/acpica/nswalk.c#2 integrate .. //depot/projects/zcopybpf/src/sys/contrib/dev/acpica/nsxfeval.c#2 integrate .. //depot/projects/zcopybpf/src/sys/contrib/dev/acpica/nsxfname.c#2 integrate .. //depot/projects/zcopybpf/src/sys/contrib/dev/acpica/nsxfobj.c#2 integrate .. //depot/projects/zcopybpf/src/sys/contrib/dev/acpica/osunixxf.c#2 integrate .. //depot/projects/zcopybpf/src/sys/contrib/dev/acpica/psargs.c#2 integrate .. //depot/projects/zcopybpf/src/sys/contrib/dev/acpica/psloop.c#2 integrate .. //depot/projects/zcopybpf/src/sys/contrib/dev/acpica/psopcode.c#2 integrate .. //depot/projects/zcopybpf/src/sys/contrib/dev/acpica/psparse.c#2 integrate .. //depot/projects/zcopybpf/src/sys/contrib/dev/acpica/psscope.c#2 integrate .. //depot/projects/zcopybpf/src/sys/contrib/dev/acpica/pstree.c#2 integrate .. //depot/projects/zcopybpf/src/sys/contrib/dev/acpica/psutils.c#2 integrate .. //depot/projects/zcopybpf/src/sys/contrib/dev/acpica/pswalk.c#2 integrate .. //depot/projects/zcopybpf/src/sys/contrib/dev/acpica/psxface.c#2 integrate .. //depot/projects/zcopybpf/src/sys/contrib/dev/acpica/rsaddr.c#2 integrate .. //depot/projects/zcopybpf/src/sys/contrib/dev/acpica/rscalc.c#2 integrate .. //depot/projects/zcopybpf/src/sys/contrib/dev/acpica/rscreate.c#2 integrate .. //depot/projects/zcopybpf/src/sys/contrib/dev/acpica/rsdump.c#2 integrate .. //depot/projects/zcopybpf/src/sys/contrib/dev/acpica/rsinfo.c#2 integrate .. //depot/projects/zcopybpf/src/sys/contrib/dev/acpica/rsio.c#2 integrate .. //depot/projects/zcopybpf/src/sys/contrib/dev/acpica/rsirq.c#2 integrate .. //depot/projects/zcopybpf/src/sys/contrib/dev/acpica/rslist.c#2 integrate .. //depot/projects/zcopybpf/src/sys/contrib/dev/acpica/rsmemory.c#2 integrate .. //depot/projects/zcopybpf/src/sys/contrib/dev/acpica/rsmisc.c#2 integrate .. //depot/projects/zcopybpf/src/sys/contrib/dev/acpica/rsutils.c#2 integrate .. //depot/projects/zcopybpf/src/sys/contrib/dev/acpica/rsxface.c#2 integrate .. //depot/projects/zcopybpf/src/sys/contrib/dev/acpica/tbconvrt.c#2 delete .. //depot/projects/zcopybpf/src/sys/contrib/dev/acpica/tbfadt.c#1 branch .. //depot/projects/zcopybpf/src/sys/contrib/dev/acpica/tbfind.c#1 branch .. //depot/projects/zcopybpf/src/sys/contrib/dev/acpica/tbget.c#2 delete .. //depot/projects/zcopybpf/src/sys/contrib/dev/acpica/tbgetall.c#2 delete .. //depot/projects/zcopybpf/src/sys/contrib/dev/acpica/tbinstal.c#2 integrate .. //depot/projects/zcopybpf/src/sys/contrib/dev/acpica/tbrsdt.c#2 delete .. //depot/projects/zcopybpf/src/sys/contrib/dev/acpica/tbutils.c#2 integrate .. //depot/projects/zcopybpf/src/sys/contrib/dev/acpica/tbxface.c#2 integrate .. //depot/projects/zcopybpf/src/sys/contrib/dev/acpica/tbxfroot.c#2 integrate .. //depot/projects/zcopybpf/src/sys/contrib/dev/acpica/utalloc.c#2 integrate .. //depot/projects/zcopybpf/src/sys/contrib/dev/acpica/utcache.c#2 integrate .. //depot/projects/zcopybpf/src/sys/contrib/dev/acpica/utclib.c#2 integrate .. //depot/projects/zcopybpf/src/sys/contrib/dev/acpica/utcopy.c#2 integrate .. //depot/projects/zcopybpf/src/sys/contrib/dev/acpica/utdebug.c#2 integrate .. //depot/projects/zcopybpf/src/sys/contrib/dev/acpica/utdelete.c#2 integrate .. //depot/projects/zcopybpf/src/sys/contrib/dev/acpica/uteval.c#2 integrate .. //depot/projects/zcopybpf/src/sys/contrib/dev/acpica/utglobal.c#2 integrate .. //depot/projects/zcopybpf/src/sys/contrib/dev/acpica/utinit.c#2 integrate .. //depot/projects/zcopybpf/src/sys/contrib/dev/acpica/utmath.c#2 integrate .. //depot/projects/zcopybpf/src/sys/contrib/dev/acpica/utmisc.c#2 integrate .. //depot/projects/zcopybpf/src/sys/contrib/dev/acpica/utmutex.c#2 integrate .. //depot/projects/zcopybpf/src/sys/contrib/dev/acpica/utobject.c#2 integrate .. //depot/projects/zcopybpf/src/sys/contrib/dev/acpica/utresrc.c#1 branch .. //depot/projects/zcopybpf/src/sys/contrib/dev/acpica/utstate.c#2 integrate .. //depot/projects/zcopybpf/src/sys/contrib/dev/acpica/uttrack.c#1 branch .. //depot/projects/zcopybpf/src/sys/contrib/dev/acpica/utxface.c#2 integrate .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/common/acl/acl_common.c#1 branch .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/common/acl/acl_common.h#1 branch .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/common/avl/avl.c#1 branch .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/common/nvpair/nvpair.c#1 branch .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/common/nvpair/nvpair_alloc_fixed.c#1 branch .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/common/zfs/zfs_namecheck.c#1 branch .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/common/zfs/zfs_namecheck.h#1 branch .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/common/zfs/zfs_prop.c#1 branch .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/common/zfs/zfs_prop.h#1 branch .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/Makefile.files#1 branch .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/arch/amd64/atomic.S#1 branch .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/arch/i386/atomic.S#1 branch .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/fs/dnlc.c#1 branch .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/fs/gfs.c#1 branch .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/fs/zfs/arc.c#1 branch .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/fs/zfs/bplist.c#1 branch .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/fs/zfs/dbuf.c#1 branch .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/fs/zfs/dmu.c#1 branch .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/fs/zfs/dmu_object.c#1 branch .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/fs/zfs/dmu_objset.c#1 branch .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/fs/zfs/dmu_send.c#1 branch .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/fs/zfs/dmu_traverse.c#1 branch .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/fs/zfs/dmu_tx.c#1 branch .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/fs/zfs/dmu_zfetch.c#1 branch .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/fs/zfs/dnode.c#1 branch .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/fs/zfs/dnode_sync.c#1 branch .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c#1 branch .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/fs/zfs/dsl_dir.c#1 branch .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/fs/zfs/dsl_pool.c#1 branch .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/fs/zfs/dsl_prop.c#1 branch .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/fs/zfs/dsl_synctask.c#1 branch .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/fs/zfs/fletcher.c#1 branch .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/fs/zfs/gzip.c#1 branch .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/fs/zfs/lzjb.c#1 branch .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/fs/zfs/metaslab.c#1 branch .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/fs/zfs/refcount.c#1 branch .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/fs/zfs/sha256.c#1 branch .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/fs/zfs/spa.c#1 branch .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/fs/zfs/spa_config.c#1 branch .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/fs/zfs/spa_errlog.c#1 branch .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/fs/zfs/spa_history.c#1 branch .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/fs/zfs/spa_misc.c#1 branch .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/fs/zfs/space_map.c#1 branch .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/arc.h#1 branch .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/bplist.h#1 branch .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dbuf.h#1 branch .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dmu.h#1 branch .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_impl.h#1 branch .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_objset.h#1 branch .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_traverse.h#1 branch .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_tx.h#1 branch .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_zfetch.h#1 branch .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dnode.h#1 branch .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_dataset.h#1 branch .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_dir.h#1 branch .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_pool.h#1 branch .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_prop.h#1 branch .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_synctask.h#1 branch .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/metaslab.h#1 branch .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/metaslab_impl.h#1 branch .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/refcount.h#1 branch .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/spa.h#1 branch .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/spa_impl.h#1 branch .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/space_map.h#1 branch .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/txg.h#1 branch .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/txg_impl.h#1 branch .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/uberblock.h#1 branch .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/uberblock_impl.h#1 branch .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/unique.h#1 branch .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/vdev.h#1 branch .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_disk.h#1 branch .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_file.h#1 branch .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_impl.h#1 branch .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zap.h#1 branch .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zap_impl.h#1 branch .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zap_leaf.h#1 branch .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_acl.h#1 branch .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_context.h#1 branch .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_ctldir.h#1 branch .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_debug.h#1 branch .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_dir.h#1 branch .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_ioctl.h#1 branch .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_rlock.h#1 branch .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_vfsops.h#1 branch .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_znode.h#1 branch .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zil.h#1 branch .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zil_impl.h#1 branch .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zio.h#1 branch .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zio_checksum.h#1 branch .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zio_compress.h#1 branch .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zio_impl.h#1 branch .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zvol.h#1 branch .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/fs/zfs/txg.c#1 branch .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/fs/zfs/uberblock.c#1 branch .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/fs/zfs/unique.c#1 branch .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/fs/zfs/vdev.c#1 branch .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_cache.c#1 branch .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_disk.c#1 branch .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_file.c#1 branch .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c#1 branch .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_label.c#1 branch .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_mirror.c#1 branch .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_missing.c#1 branch .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_queue.c#1 branch .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_raidz.c#1 branch .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_root.c#1 branch .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/fs/zfs/zap.c#1 branch .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/fs/zfs/zap_leaf.c#1 branch .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/fs/zfs/zap_micro.c#1 branch .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs.conf#1 branch .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_acl.c#1 branch .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_byteswap.c#1 branch .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c#1 branch .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_dir.c#1 branch .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_fm.c#1 branch .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c#1 branch .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_log.c#1 branch .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_replay.c#1 branch .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_rlock.c#1 branch .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c#1 branch .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#1 branch .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#1 branch .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/fs/zfs/zil.c#1 branch .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/fs/zfs/zio.c#1 branch .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/fs/zfs/zio_checksum.c#1 branch .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/fs/zfs/zio_compress.c#1 branch .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/fs/zfs/zio_inject.c#1 branch .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/fs/zfs/zvol.c#1 branch .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/os/callb.c#1 branch .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/os/list.c#1 branch .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/os/nvpair_alloc_system.c#1 branch .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/os/taskq.c#1 branch .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/rpc/xdr.c#1 branch .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/rpc/xdr.h#1 branch .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/rpc/xdr_array.c#1 branch .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/rpc/xdr_mem.c#1 branch .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/sys/asm_linkage.h#1 branch .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/sys/atomic.h#1 branch .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/sys/avl.h#1 branch .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/sys/avl_impl.h#1 branch .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/sys/bitmap.h#1 branch .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/sys/byteorder.h#1 branch .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/sys/callb.h#1 branch .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/sys/ccompile.h#1 branch .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/sys/compress.h#1 branch .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/sys/cred.h#1 branch .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/sys/debug.h#1 branch .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/sys/dkio.h#1 branch .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/sys/dklabel.h#1 branch .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/sys/dnlc.h#1 branch .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/sys/errorq.h#1 branch .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/sys/feature_tests.h#1 branch .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/sys/fm/fs/zfs.h#1 branch .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/sys/fm/protocol.h#1 branch .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/sys/fm/util.h#1 branch .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/sys/fs/zfs.h#1 branch .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/sys/gfs.h#1 branch .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/sys/isa_defs.h#1 branch .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/sys/list.h#1 branch .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/sys/list_impl.h#1 branch .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/sys/note.h#1 branch .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/sys/nvpair.h#1 branch .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/sys/nvpair_impl.h#1 branch .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/sys/processor.h#1 branch .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/sys/procset.h#1 branch .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/sys/sdt.h#1 branch .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/sys/synch.h#1 branch .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/sys/sysevent.h#1 branch .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/sys/sysmacros.h#1 branch .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/sys/vfs.h#1 branch .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/sys/vmem.h#1 branch .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/sys/zmod.h#1 branch .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/zmod/adler32.c#1 branch .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/zmod/crc32.c#1 branch .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/zmod/crc32.h#1 branch .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/zmod/deflate.c#1 branch .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/zmod/deflate.h#1 branch .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/zmod/inffast.c#1 branch .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/zmod/inffast.h#1 branch .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/zmod/inffixed.h#1 branch .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/zmod/inflate.c#1 branch .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/zmod/inflate.h#1 branch .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/zmod/inftrees.c#1 branch .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/zmod/inftrees.h#1 branch .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/zmod/trees.c#1 branch .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/zmod/zconf.h#1 branch .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/zmod/zlib.h#1 branch .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/zmod/zmod.c#1 branch .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/zmod/zmod_subr.c#1 branch .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/zmod/zutil.c#1 branch .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/zmod/zutil.h#1 branch .. //depot/projects/zcopybpf/src/sys/contrib/pf/net/if_pfsync.c#2 integrate .. //depot/projects/zcopybpf/src/sys/contrib/pf/net/if_pfsync.h#2 integrate .. //depot/projects/zcopybpf/src/sys/crypto/via/padlock.c#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/acpi_support/acpi_asus.c#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/acpi_support/acpi_fujitsu.c#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/acpi_support/acpi_ibm.c#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/acpica/Osd/OsdDebug.c#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/acpica/Osd/OsdMemory.c#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/acpica/Osd/OsdSchedule.c#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/acpica/Osd/OsdSynch.c#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/acpica/Osd/OsdTable.c#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/acpica/acpi.c#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/acpica/acpi_acad.c#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/acpica/acpi_button.c#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/acpica/acpi_cmbat.c#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/acpica/acpi_cpu.c#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/acpica/acpi_dock.c#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/acpica/acpi_ec.c#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/acpica/acpi_hpet.c#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/acpica/acpi_lid.c#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/acpica/acpi_pci_link.c#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/acpica/acpi_perf.c#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/acpica/acpi_quirk.c#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/acpica/acpi_resource.c#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/acpica/acpi_thermal.c#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/acpica/acpi_throttle.c#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/acpica/acpi_timer.c#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/acpica/acpivar.h#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/ahb/ahb.c#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/ar/if_ar.c#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/arcmsr/arcmsr.c#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/arcmsr/arcmsr.h#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/ata/ata-all.h#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/ata/ata-chipset.c#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/ata/ata-pci.h#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/ata/ata-queue.c#4 integrate .. //depot/projects/zcopybpf/src/sys/dev/ata/atapi-cam.c#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/ath/if_ath.c#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/ath/if_athvar.h#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/bce/if_bce.c#4 integrate .. //depot/projects/zcopybpf/src/sys/dev/bge/if_bge.c#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/bge/if_bgereg.h#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/ce/if_ce.c#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/cm/smc90cx6.c#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/cp/if_cp.c#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/ctau/if_ct.c#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/cx/if_cx.c#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/cxgb/common/cxgb_ael1002.c#1 branch .. //depot/projects/zcopybpf/src/sys/dev/cxgb/common/cxgb_common.h#1 branch .. //depot/projects/zcopybpf/src/sys/dev/cxgb/common/cxgb_firmware_exports.h#1 branch .. //depot/projects/zcopybpf/src/sys/dev/cxgb/common/cxgb_mc5.c#1 branch .. //depot/projects/zcopybpf/src/sys/dev/cxgb/common/cxgb_mv88e1xxx.c#1 branch .. //depot/projects/zcopybpf/src/sys/dev/cxgb/common/cxgb_regs.h#1 branch .. //depot/projects/zcopybpf/src/sys/dev/cxgb/common/cxgb_sge_defs.h#1 branch .. //depot/projects/zcopybpf/src/sys/dev/cxgb/common/cxgb_t3_cpl.h#1 branch .. //depot/projects/zcopybpf/src/sys/dev/cxgb/common/cxgb_t3_hw.c#1 branch .. //depot/projects/zcopybpf/src/sys/dev/cxgb/common/cxgb_tcb.h#1 branch .. //depot/projects/zcopybpf/src/sys/dev/cxgb/common/cxgb_version.h#1 branch .. //depot/projects/zcopybpf/src/sys/dev/cxgb/common/cxgb_vsc8211.c#1 branch .. //depot/projects/zcopybpf/src/sys/dev/cxgb/common/cxgb_xgmac.c#1 branch .. //depot/projects/zcopybpf/src/sys/dev/cxgb/cxgb_adapter.h#1 branch .. //depot/projects/zcopybpf/src/sys/dev/cxgb/cxgb_config.h#1 branch .. //depot/projects/zcopybpf/src/sys/dev/cxgb/cxgb_ioctl.h#1 branch .. //depot/projects/zcopybpf/src/sys/dev/cxgb/cxgb_lro.c#1 branch .. //depot/projects/zcopybpf/src/sys/dev/cxgb/cxgb_main.c#1 branch .. //depot/projects/zcopybpf/src/sys/dev/cxgb/cxgb_osdep.h#1 branch .. //depot/projects/zcopybpf/src/sys/dev/cxgb/cxgb_sge.c#1 branch .. //depot/projects/zcopybpf/src/sys/dev/cxgb/t3fw-3.2.bin.gz.uu#1 branch .. //depot/projects/zcopybpf/src/sys/dev/ed/if_ed.c#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/ed/if_ed_pccard.c#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/exca/exca.c#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/fb/creator.c#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/firewire/firewire.c#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/firewire/firewirereg.h#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/firewire/fwdev.c#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/firewire/fwmem.c#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/firewire/fwohci.c#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/firewire/fwohci_pci.c#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/firewire/fwohcivar.h#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/firewire/if_fwe.c#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/firewire/if_fwip.c#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/firewire/sbp.c#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/firewire/sbp_targ.c#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/fxp/if_fxp.c#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/hifn/hifn7751.c#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/hifn/hifn7751reg.h#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/hifn/hifn7751var.h#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/ichwd/ichwd.c#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/if_ndis/if_ndis.c#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/if_ndis/if_ndis_pccard.c#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/iicbus/icee.c#1 branch .. //depot/projects/zcopybpf/src/sys/dev/iicbus/iic.c#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/iicbus/iicbb.c#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/iicbus/iicbus.c#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/iicbus/iicbus.h#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/iicbus/iiconf.c#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/ipmi/ipmi.c#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/ipmi/ipmi_pci.c#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/ipw/if_ipw.c#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/isp/isp.c#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/isp/isp_freebsd.c#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/isp/isp_freebsd.h#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/isp/isp_ioctl.h#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/isp/isp_library.c#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/isp/isp_library.h#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/isp/isp_pci.c#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/isp/isp_sbus.c#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/isp/isp_stds.h#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/isp/isp_target.c#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/isp/isp_target.h#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/isp/isp_tpublic.h#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/isp/ispmbox.h#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/isp/ispreg.h#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/isp/ispvar.h#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/iwi/if_iwi.c#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/ixgb/if_ixgb.c#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/mii/brgphy.c#4 integrate .. //depot/projects/zcopybpf/src/sys/dev/mk48txx/mk48txx.c#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/mpt/mpt.h#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/mpt/mpt_cam.c#4 integrate .. //depot/projects/zcopybpf/src/sys/dev/msk/if_msk.c#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/mxge/eth_z8e.dat.gz.uu#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/mxge/ethp_z8e.dat.gz.uu#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/mxge/if_mxge.c#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/my/if_my.c#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/nfe/if_nfe.c#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/nge/if_nge.c#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/pccbb/pccbb.c#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/pcf/envctrl.c#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/pcf/pcf_ebus.c#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/pcf/pcf_isa.c#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/pci/pci.c#4 integrate .. //depot/projects/zcopybpf/src/sys/dev/pci/pci_pci.c#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/pci/pcireg.h#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/pci/pcivar.h#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/ppbus/ppbconf.c#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/ppc/ppc.c#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/ral/rt2560.c#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/ral/rt2661.c#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/re/if_re.c#4 integrate .. //depot/projects/zcopybpf/src/sys/dev/safe/safe.c#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/scc/scc_bfe.h#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/scc/scc_bfe_ebus.c#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/scc/scc_bfe_macio.c#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/scc/scc_bfe_sbus.c#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/scc/scc_core.c#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/scc/scc_if.m#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/sio/sio_pci.c#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/sk/if_sk.c#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/sk/if_skreg.h#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/snp/snp.c#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/sound/isa/ad1816.c#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/sound/isa/mss.c#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/sound/isa/sbc.c#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/sound/midi/midi.c#4 integrate .. //depot/projects/zcopybpf/src/sys/dev/sound/midi/sequencer.c#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/sound/pci/als4000.c#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/sound/pci/atiixp.c#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/sound/pci/cmi.c#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/sound/pci/csa.c#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/sound/pci/ds1.c#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/sound/pci/emu10k1.c#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/sound/pci/emu10kx-pcm.c#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/sound/pci/envy24.c#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/sound/pci/envy24ht.c#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/sound/pci/es137x.c#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/sound/pci/hda/hdac.c#4 integrate .. //depot/projects/zcopybpf/src/sys/dev/sound/pci/hda/hdac_private.h#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/sound/pci/ich.c#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/sound/pci/maestro.c#4 integrate .. //depot/projects/zcopybpf/src/sys/dev/sound/pci/maestro3.c#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/sound/pci/solo.c#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/sound/pci/t4dwave.c#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/sound/pci/via8233.c#4 integrate .. //depot/projects/zcopybpf/src/sys/dev/sound/pci/via82c686.c#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/sound/pcm/ac97.c#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/sound/pcm/buffer.c#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/sound/pcm/channel.c#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/sound/pcm/channel_if.m#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/sound/pcm/dsp.c#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/sound/pcm/fake.c#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/sound/pcm/feeder.c#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/sound/pcm/feeder.h#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/sound/pcm/feeder_fmt.c#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/sound/pcm/feeder_rate.c#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/sound/pcm/feeder_volume.c#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/sound/pcm/mixer.c#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/sound/pcm/sndstat.c#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/sound/pcm/sound.c#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/sound/pcm/sound.h#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/sound/pcm/vchan.c#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/sound/sbus/cs4231.c#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/sound/usb/uaudio.c#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/sound/usb/uaudio.h#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/sound/usb/uaudio_pcm.c#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/sr/if_sr.c#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/stge/if_stge.c#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/streams/streams.c#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/sym/sym_hipd.c#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/ti/if_ti.c#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/txp/if_txp.c#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/uart/uart.h#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/uart/uart_bus.h#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/uart/uart_bus_pci.c#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/uart/uart_core.c#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/uart/uart_cpu.h#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/uart/uart_cpu_amd64.c#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/uart/uart_cpu_i386.c#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/uart/uart_cpu_ia64.c#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/uart/uart_cpu_pc98.c#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/uart/uart_cpu_powerpc.c#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/uart/uart_cpu_sparc64.c#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/uart/uart_dev_ns8250.c#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/uart/uart_dev_sab82532.c#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/uart/uart_dev_z8530.c#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/uart/uart_kbd_sun.c#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/uart/uart_subr.c#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/ubsec/ubsec.c#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/usb/if_aue.c#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/usb/if_axe.c#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/usb/if_ural.c#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/usb/ubser.c#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/usb/uhci.c#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/usb/uplcom.c#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/usb/usb_quirks.c#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/usb/usbdevs#4 integrate .. //depot/projects/zcopybpf/src/sys/dev/vge/if_vge.c#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/watchdog/watchdog.c#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/wl/if_wl.c#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/zs/z8530reg.h#2 delete .. //depot/projects/zcopybpf/src/sys/dev/zs/z8530var.h#3 delete .. //depot/projects/zcopybpf/src/sys/dev/zs/zs.c#3 delete .. //depot/projects/zcopybpf/src/sys/dev/zs/zs_macio.c#3 delete .. //depot/projects/zcopybpf/src/sys/fs/cd9660/cd9660_vfsops.c#2 integrate .. //depot/projects/zcopybpf/src/sys/fs/devfs/devfs_vnops.c#2 integrate .. //depot/projects/zcopybpf/src/sys/fs/fdescfs/fdesc_vfsops.c#2 integrate .. //depot/projects/zcopybpf/src/sys/fs/fdescfs/fdesc_vnops.c#2 integrate .. //depot/projects/zcopybpf/src/sys/fs/fifofs/fifo_vnops.c#3 integrate .. //depot/projects/zcopybpf/src/sys/fs/hpfs/hpfs_vfsops.c#3 integrate .. //depot/projects/zcopybpf/src/sys/fs/msdosfs/msdosfs_denode.c#2 integrate .. //depot/projects/zcopybpf/src/sys/fs/ntfs/ntfs_vfsops.c#3 integrate .. //depot/projects/zcopybpf/src/sys/fs/nullfs/null_subr.c#2 integrate .. //depot/projects/zcopybpf/src/sys/fs/nwfs/nwfs_node.c#2 integrate .. //depot/projects/zcopybpf/src/sys/fs/portalfs/portal_vfsops.c#2 integrate .. //depot/projects/zcopybpf/src/sys/fs/portalfs/portal_vnops.c#2 integrate .. //depot/projects/zcopybpf/src/sys/fs/procfs/procfs.c#3 integrate .. //depot/projects/zcopybpf/src/sys/fs/pseudofs/pseudofs.c#2 integrate .. //depot/projects/zcopybpf/src/sys/fs/pseudofs/pseudofs.h#2 integrate .. //depot/projects/zcopybpf/src/sys/fs/pseudofs/pseudofs_vncache.c#2 integrate .. //depot/projects/zcopybpf/src/sys/fs/smbfs/smbfs_node.c#2 integrate .. //depot/projects/zcopybpf/src/sys/fs/udf/udf_vfsops.c#3 integrate .. //depot/projects/zcopybpf/src/sys/fs/udf/udf_vnops.c#3 integrate .. //depot/projects/zcopybpf/src/sys/fs/umapfs/umap_subr.c#2 integrate .. //depot/projects/zcopybpf/src/sys/fs/unionfs/union_subr.c#2 integrate .. //depot/projects/zcopybpf/src/sys/geom/eli/g_eli.c#3 integrate .. //depot/projects/zcopybpf/src/sys/geom/eli/g_eli_crypto.c#2 integrate .. //depot/projects/zcopybpf/src/sys/geom/eli/g_eli_ctl.c#2 integrate .. //depot/projects/zcopybpf/src/sys/geom/geom_ctl.c#2 integrate .. //depot/projects/zcopybpf/src/sys/geom/geom_dev.c#3 integrate .. //depot/projects/zcopybpf/src/sys/geom/journal/g_journal.c#2 integrate .. //depot/projects/zcopybpf/src/sys/gnu/fs/ext2fs/ext2_vfsops.c#3 integrate .. //depot/projects/zcopybpf/src/sys/gnu/fs/reiserfs/reiserfs_inode.c#2 integrate .. //depot/projects/zcopybpf/src/sys/gnu/fs/xfs/FreeBSD/support/mrlock.c#2 integrate .. //depot/projects/zcopybpf/src/sys/gnu/fs/xfs/FreeBSD/support/mrlock.h#2 integrate .. //depot/projects/zcopybpf/src/sys/gnu/fs/xfs/FreeBSD/xfs_freebsd_iget.c#2 integrate .. //depot/projects/zcopybpf/src/sys/i386/acpica/OsdEnvironment.c#2 integrate .. //depot/projects/zcopybpf/src/sys/i386/acpica/acpi_machdep.c#2 integrate .. //depot/projects/zcopybpf/src/sys/i386/acpica/acpi_wakeup.c#2 integrate .. //depot/projects/zcopybpf/src/sys/i386/acpica/madt.c#2 integrate .. //depot/projects/zcopybpf/src/sys/i386/bios/smapi.c#2 integrate .. //depot/projects/zcopybpf/src/sys/i386/bios/smbios.c#2 integrate .. //depot/projects/zcopybpf/src/sys/i386/bios/vpd.c#2 integrate .. //depot/projects/zcopybpf/src/sys/i386/conf/NOTES#2 integrate .. //depot/projects/zcopybpf/src/sys/i386/i386/busdma_machdep.c#2 integrate .. //depot/projects/zcopybpf/src/sys/i386/i386/elan-mmcr.c#2 integrate .. //depot/projects/zcopybpf/src/sys/i386/i386/geode.c#2 integrate .. //depot/projects/zcopybpf/src/sys/i386/i386/identcpu.c#2 integrate .. //depot/projects/zcopybpf/src/sys/i386/i386/intr_machdep.c#3 integrate .. //depot/projects/zcopybpf/src/sys/i386/i386/io_apic.c#2 integrate .. //depot/projects/zcopybpf/src/sys/i386/i386/legacy.c#2 integrate .. //depot/projects/zcopybpf/src/sys/i386/i386/local_apic.c#2 integrate .. //depot/projects/zcopybpf/src/sys/i386/i386/locore.s#2 integrate .. //depot/projects/zcopybpf/src/sys/i386/i386/machdep.c#2 integrate .. //depot/projects/zcopybpf/src/sys/i386/i386/mp_machdep.c#3 integrate .. //depot/projects/zcopybpf/src/sys/i386/i386/mptable.c#2 integrate .. //depot/projects/zcopybpf/src/sys/i386/i386/nexus.c#3 integrate .. //depot/projects/zcopybpf/src/sys/i386/i386/pmap.c#3 integrate .. //depot/projects/zcopybpf/src/sys/i386/i386/support.s#2 integrate .. //depot/projects/zcopybpf/src/sys/i386/i386/trap.c#2 integrate .. //depot/projects/zcopybpf/src/sys/i386/i386/tsc.c#2 integrate .. //depot/projects/zcopybpf/src/sys/i386/i386/vm_machdep.c#3 integrate .. //depot/projects/zcopybpf/src/sys/i386/ibcs2/ibcs2_misc.c#2 integrate .. //depot/projects/zcopybpf/src/sys/i386/include/acpica_machdep.h#2 integrate .. //depot/projects/zcopybpf/src/sys/i386/include/apicvar.h#2 integrate .. //depot/projects/zcopybpf/src/sys/i386/include/intr_machdep.h#3 integrate .. //depot/projects/zcopybpf/src/sys/i386/include/pcpu.h#3 integrate .. //depot/projects/zcopybpf/src/sys/i386/include/pmap.h#2 integrate .. //depot/projects/zcopybpf/src/sys/i386/include/smp.h#2 integrate .. //depot/projects/zcopybpf/src/sys/i386/include/specialreg.h#2 integrate .. //depot/projects/zcopybpf/src/sys/i386/isa/clock.c#3 integrate .. //depot/projects/zcopybpf/src/sys/i386/isa/prof_machdep.c#2 integrate .. //depot/projects/zcopybpf/src/sys/i386/linux/linux.h#3 integrate .. //depot/projects/zcopybpf/src/sys/i386/linux/linux_dummy.c#2 integrate .. //depot/projects/zcopybpf/src/sys/i386/linux/linux_proto.h#3 integrate .. //depot/projects/zcopybpf/src/sys/i386/linux/linux_syscall.h#3 integrate .. //depot/projects/zcopybpf/src/sys/i386/linux/linux_sysent.c#3 integrate .. //depot/projects/zcopybpf/src/sys/i386/linux/linux_sysvec.c#2 integrate .. //depot/projects/zcopybpf/src/sys/i386/linux/syscalls.master#3 integrate .. //depot/projects/zcopybpf/src/sys/i4b/layer1/ifpnp/i4b_ifpnp_avm.c#3 integrate .. //depot/projects/zcopybpf/src/sys/i4b/layer1/ihfc/i4b_ihfc_pnp.c#3 integrate .. //depot/projects/zcopybpf/src/sys/i4b/layer1/isic/i4b_avm_a1.c#3 integrate .. //depot/projects/zcopybpf/src/sys/i4b/layer1/isic/i4b_isic_pnp.c#3 integrate .. //depot/projects/zcopybpf/src/sys/i4b/layer1/isic/i4b_itk_ix1.c#3 integrate .. //depot/projects/zcopybpf/src/sys/i4b/layer1/isic/i4b_tel_s016.c#3 integrate .. //depot/projects/zcopybpf/src/sys/i4b/layer1/isic/i4b_tel_s0163.c#3 integrate .. //depot/projects/zcopybpf/src/sys/ia64/acpica/OsdEnvironment.c#2 integrate .. //depot/projects/zcopybpf/src/sys/ia64/acpica/madt.c#2 integrate .. //depot/projects/zcopybpf/src/sys/ia64/ia64/busdma_machdep.c#2 integrate .. //depot/projects/zcopybpf/src/sys/ia64/ia64/nexus.c#3 integrate .. //depot/projects/zcopybpf/src/sys/ia64/ia64/trap.c#2 integrate .. //depot/projects/zcopybpf/src/sys/ia64/include/acpica_machdep.h#2 integrate .. //depot/projects/zcopybpf/src/sys/ia64/include/pcpu.h#2 integrate .. //depot/projects/zcopybpf/src/sys/kern/init_main.c#2 integrate .. //depot/projects/zcopybpf/src/sys/kern/kern_acct.c#2 integrate .. //depot/projects/zcopybpf/src/sys/kern/kern_acl.c#2 delete .. //depot/projects/zcopybpf/src/sys/kern/kern_alq.c#2 integrate .. //depot/projects/zcopybpf/src/sys/kern/kern_clock.c#2 integrate .. //depot/projects/zcopybpf/src/sys/kern/kern_condvar.c#2 integrate .. //depot/projects/zcopybpf/src/sys/kern/kern_context.c#2 integrate .. //depot/projects/zcopybpf/src/sys/kern/kern_cpu.c#2 integrate .. //depot/projects/zcopybpf/src/sys/kern/kern_descrip.c#3 integrate .. //depot/projects/zcopybpf/src/sys/kern/kern_environment.c#2 integrate .. //depot/projects/zcopybpf/src/sys/kern/kern_event.c#2 integrate .. //depot/projects/zcopybpf/src/sys/kern/kern_exec.c#2 integrate .. //depot/projects/zcopybpf/src/sys/kern/kern_exit.c#2 integrate .. //depot/projects/zcopybpf/src/sys/kern/kern_fork.c#3 integrate .. //depot/projects/zcopybpf/src/sys/kern/kern_intr.c#3 integrate .. //depot/projects/zcopybpf/src/sys/kern/kern_jail.c#3 integrate .. //depot/projects/zcopybpf/src/sys/kern/kern_kse.c#2 integrate .. //depot/projects/zcopybpf/src/sys/kern/kern_ktrace.c#3 integrate .. //depot/projects/zcopybpf/src/sys/kern/kern_linker.c#3 integrate .. //depot/projects/zcopybpf/src/sys/kern/kern_lock.c#3 integrate .. //depot/projects/zcopybpf/src/sys/kern/kern_mbuf.c#3 integrate .. //depot/projects/zcopybpf/src/sys/kern/kern_module.c#2 integrate .. //depot/projects/zcopybpf/src/sys/kern/kern_mutex.c#3 integrate .. //depot/projects/zcopybpf/src/sys/kern/kern_ntptime.c#2 integrate .. //depot/projects/zcopybpf/src/sys/kern/kern_proc.c#2 integrate .. //depot/projects/zcopybpf/src/sys/kern/kern_prot.c#2 integrate .. //depot/projects/zcopybpf/src/sys/kern/kern_resource.c#3 integrate .. //depot/projects/zcopybpf/src/sys/kern/kern_rwlock.c#3 integrate .. //depot/projects/zcopybpf/src/sys/kern/kern_shutdown.c#2 integrate .. //depot/projects/zcopybpf/src/sys/kern/kern_sig.c#3 integrate .. //depot/projects/zcopybpf/src/sys/kern/kern_sx.c#3 integrate .. //depot/projects/zcopybpf/src/sys/kern/kern_synch.c#3 integrate .. //depot/projects/zcopybpf/src/sys/kern/kern_sysctl.c#2 integrate .. //depot/projects/zcopybpf/src/sys/kern/kern_thread.c#2 integrate .. //depot/projects/zcopybpf/src/sys/kern/kern_time.c#2 integrate .. //depot/projects/zcopybpf/src/sys/kern/kern_umtx.c#2 integrate .. //depot/projects/zcopybpf/src/sys/kern/kern_uuid.c#2 integrate .. //depot/projects/zcopybpf/src/sys/kern/kern_xxx.c#2 integrate .. //depot/projects/zcopybpf/src/sys/kern/p1003_1b.c#2 integrate .. //depot/projects/zcopybpf/src/sys/kern/sched_core.c#2 integrate .. //depot/projects/zcopybpf/src/sys/kern/sched_ule.c#4 integrate .. //depot/projects/zcopybpf/src/sys/kern/subr_lock.c#3 integrate .. //depot/projects/zcopybpf/src/sys/kern/subr_prf.c#2 integrate .. //depot/projects/zcopybpf/src/sys/kern/subr_prof.c#2 integrate .. //depot/projects/zcopybpf/src/sys/kern/subr_smp.c#2 integrate .. //depot/projects/zcopybpf/src/sys/kern/subr_trap.c#2 integrate .. //depot/projects/zcopybpf/src/sys/kern/subr_witness.c#3 integrate .. //depot/projects/zcopybpf/src/sys/kern/sys_generic.c#3 integrate .. //depot/projects/zcopybpf/src/sys/kern/sys_pipe.c#2 integrate .. //depot/projects/zcopybpf/src/sys/kern/sys_process.c#2 integrate .. //depot/projects/zcopybpf/src/sys/kern/sys_socket.c#2 integrate .. //depot/projects/zcopybpf/src/sys/kern/sysv_msg.c#3 integrate .. //depot/projects/zcopybpf/src/sys/kern/sysv_sem.c#2 integrate .. //depot/projects/zcopybpf/src/sys/kern/sysv_shm.c#3 integrate .. //depot/projects/zcopybpf/src/sys/kern/uipc_mqueue.c#2 integrate .. //depot/projects/zcopybpf/src/sys/kern/uipc_sem.c#2 integrate .. //depot/projects/zcopybpf/src/sys/kern/uipc_sockbuf.c#2 integrate .. //depot/projects/zcopybpf/src/sys/kern/uipc_socket.c#3 integrate .. //depot/projects/zcopybpf/src/sys/kern/uipc_socket2.c#2 delete .. //depot/projects/zcopybpf/src/sys/kern/uipc_syscalls.c#3 integrate .. //depot/projects/zcopybpf/src/sys/kern/uipc_usrreq.c#3 integrate .. //depot/projects/zcopybpf/src/sys/kern/vfs_acl.c#1 branch .. //depot/projects/zcopybpf/src/sys/kern/vfs_aio.c#2 integrate .. //depot/projects/zcopybpf/src/sys/kern/vfs_bio.c#3 integrate .. //depot/projects/zcopybpf/src/sys/kern/vfs_cache.c#2 integrate .. //depot/projects/zcopybpf/src/sys/kern/vfs_cluster.c#2 integrate .. //depot/projects/zcopybpf/src/sys/kern/vfs_hash.c#2 integrate .. //depot/projects/zcopybpf/src/sys/kern/vfs_lookup.c#3 integrate .. //depot/projects/zcopybpf/src/sys/kern/vfs_mount.c#3 integrate .. //depot/projects/zcopybpf/src/sys/kern/vfs_subr.c#2 integrate .. //depot/projects/zcopybpf/src/sys/kern/vfs_syscalls.c#3 integrate .. //depot/projects/zcopybpf/src/sys/libkern/memset.c#1 branch .. //depot/projects/zcopybpf/src/sys/modules/Makefile#3 integrate .. //depot/projects/zcopybpf/src/sys/modules/acpi/Makefile#2 integrate .. //depot/projects/zcopybpf/src/sys/modules/acpi/acpi/Makefile#2 integrate .. //depot/projects/zcopybpf/src/sys/modules/crypto/Makefile#2 integrate .. //depot/projects/zcopybpf/src/sys/modules/cryptodev/Makefile#2 integrate .. //depot/projects/zcopybpf/src/sys/modules/cxgb/Makefile#1 branch .. //depot/projects/zcopybpf/src/sys/modules/hifn/Makefile#2 integrate .. //depot/projects/zcopybpf/src/sys/modules/if_edsc/Makefile#1 branch .. //depot/projects/zcopybpf/src/sys/modules/if_vlan/Makefile#2 integrate .. //depot/projects/zcopybpf/src/sys/modules/my/Makefile#2 integrate .. //depot/projects/zcopybpf/src/sys/modules/padlock/Makefile#2 integrate .. //depot/projects/zcopybpf/src/sys/modules/safe/Makefile#2 integrate .. //depot/projects/zcopybpf/src/sys/modules/ubsec/Makefile#2 integrate .. //depot/projects/zcopybpf/src/sys/modules/zfs/Makefile#1 branch .. //depot/projects/zcopybpf/src/sys/net/bridgestp.c#2 integrate .. //depot/projects/zcopybpf/src/sys/net/bridgestp.h#2 integrate .. //depot/projects/zcopybpf/src/sys/net/ethernet.h#2 integrate .. //depot/projects/zcopybpf/src/sys/net/if.c#3 integrate .. //depot/projects/zcopybpf/src/sys/net/if_bridge.c#3 integrate .. //depot/projects/zcopybpf/src/sys/net/if_disc.c#2 integrate .. //depot/projects/zcopybpf/src/sys/net/if_edsc.c#1 branch .. //depot/projects/zcopybpf/src/sys/net/if_ethersubr.c#3 integrate .. //depot/projects/zcopybpf/src/sys/net/if_tap.c#4 integrate .. //depot/projects/zcopybpf/src/sys/net/if_var.h#2 integrate .. //depot/projects/zcopybpf/src/sys/net/if_vlan.c#2 integrate .. //depot/projects/zcopybpf/src/sys/net/rtsock.c#2 integrate .. //depot/projects/zcopybpf/src/sys/net80211/_ieee80211.h#3 integrate .. //depot/projects/zcopybpf/src/sys/net80211/ieee80211.c#2 integrate .. //depot/projects/zcopybpf/src/sys/net80211/ieee80211_crypto.c#2 integrate .. //depot/projects/zcopybpf/src/sys/net80211/ieee80211_crypto.h#2 integrate .. //depot/projects/zcopybpf/src/sys/net80211/ieee80211_freebsd.h#2 integrate .. //depot/projects/zcopybpf/src/sys/net80211/ieee80211_input.c#3 integrate .. //depot/projects/zcopybpf/src/sys/net80211/ieee80211_ioctl.c#2 integrate .. //depot/projects/zcopybpf/src/sys/net80211/ieee80211_node.c#2 integrate .. //depot/projects/zcopybpf/src/sys/net80211/ieee80211_node.h#2 integrate .. //depot/projects/zcopybpf/src/sys/net80211/ieee80211_output.c#2 integrate .. //depot/projects/zcopybpf/src/sys/net80211/ieee80211_proto.c#2 integrate .. //depot/projects/zcopybpf/src/sys/net80211/ieee80211_proto.h#2 integrate .. //depot/projects/zcopybpf/src/sys/net80211/ieee80211_radiotap.h#2 integrate .. //depot/projects/zcopybpf/src/sys/net80211/ieee80211_var.h#2 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Apr 6 16:17:21 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EB5BE16A403; Fri, 6 Apr 2007 16:17:20 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id A5CEC16A401 for ; Fri, 6 Apr 2007 16:17:20 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 981BB13C468 for ; Fri, 6 Apr 2007 16:17:20 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l36GHKWI060426 for ; Fri, 6 Apr 2007 16:17:20 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l36GHK3U060423 for perforce@freebsd.org; Fri, 6 Apr 2007 16:17:20 GMT (envelope-from sam@freebsd.org) Date: Fri, 6 Apr 2007 16:17:20 GMT Message-Id: <200704061617.l36GHK3U060423@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 117509 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 06 Apr 2007 16:17:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=117509 Change 117509 by sam@sam_ebb on 2007/04/06 16:16:32 o correct IEEE80211_F_BURST o reserve IEEE80211_F_DOTH for 11h stuff coming soon Affected files ... .. //depot/projects/wifi/sys/net80211/ieee80211_var.h#54 edit Differences ... ==== //depot/projects/wifi/sys/net80211/ieee80211_var.h#54 (text+ko) ==== @@ -267,7 +267,7 @@ #define IEEE80211_F_TURBOP 0x00000001 /* CONF: ATH Turbo enabled*/ #define IEEE80211_F_COMP 0x00000002 /* CONF: ATH comp enabled */ #define IEEE80211_F_FF 0x00000004 /* CONF: ATH FF enabled */ -#define IEEE80211_F_BURST 0x00000004 /* CONF: bursting enabled */ +#define IEEE80211_F_BURST 0x00000008 /* CONF: bursting enabled */ /* NB: this is intentionally setup to be IEEE80211_CAPINFO_PRIVACY */ #define IEEE80211_F_PRIVACY 0x00000010 /* CONF: privacy enabled */ #define IEEE80211_F_PUREG 0x00000020 /* CONF: 11g w/o 11b sta's */ @@ -296,6 +296,7 @@ #define IEEE80211_F_HIDESSID 0x08000000 /* CONF: hide SSID in beacon */ #define IEEE80211_F_NOBRIDGE 0x10000000 /* CONF: dis. internal bridge */ #define IEEE80211_F_WMEUPDATE 0x20000000 /* STATUS: update beacon wme */ +#define IEEE80211_F_DOTH 0x40000000 /* CONF: 11h enabled */ /* Atheros protocol-specific flags */ #define IEEE80211_F_ATHEROS \ From owner-p4-projects@FreeBSD.ORG Fri Apr 6 16:18:22 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 901EB16A406; Fri, 6 Apr 2007 16:18:22 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 6E80516A403 for ; Fri, 6 Apr 2007 16:18:22 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 60D0313C455 for ; Fri, 6 Apr 2007 16:18:22 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l36GIMMv060489 for ; Fri, 6 Apr 2007 16:18:22 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l36GIMrj060486 for perforce@freebsd.org; Fri, 6 Apr 2007 16:18:22 GMT (envelope-from sam@freebsd.org) Date: Fri, 6 Apr 2007 16:18:22 GMT Message-Id: <200704061618.l36GIMrj060486@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 117510 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 06 Apr 2007 16:18:22 -0000 http://perforce.freebsd.org/chv.cgi?CH=117510 Change 117510 by sam@sam_ebb on 2007/04/06 16:17:38 rename local "max" variable to silence gcc 4.x complaint about shadowed variable Affected files ... .. //depot/projects/wifi/sys/net80211/ieee80211_scan_sta.c#17 edit Differences ... ==== //depot/projects/wifi/sys/net80211/ieee80211_scan_sta.c#17 (text+ko) ==== @@ -602,21 +602,21 @@ static u_int8_t maxrate(const struct ieee80211_scan_entry *se) { - u_int8_t max, r; + u_int8_t rmax, r; int i; - max = 0; + rmax = 0; for (i = 0; i < se->se_rates[1]; i++) { r = se->se_rates[2+i] & IEEE80211_RATE_VAL; - if (r > max) - max = r; + if (r > rmax) + rmax = r; } for (i = 0; i < se->se_xrates[1]; i++) { r = se->se_xrates[2+i] & IEEE80211_RATE_VAL; - if (r > max) - max = r; + if (r > rmax) + rmax = r; } - return max; + return rmax; } /* From owner-p4-projects@FreeBSD.ORG Fri Apr 6 16:19:24 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8392716A505; Fri, 6 Apr 2007 16:19:24 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 3ECDB16A500 for ; Fri, 6 Apr 2007 16:19:24 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 310D013C44B for ; Fri, 6 Apr 2007 16:19:24 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l36GJOHZ060579 for ; Fri, 6 Apr 2007 16:19:24 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l36GJNtX060576 for perforce@freebsd.org; Fri, 6 Apr 2007 16:19:23 GMT (envelope-from sam@freebsd.org) Date: Fri, 6 Apr 2007 16:19:23 GMT Message-Id: <200704061619.l36GJNtX060576@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 117511 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 06 Apr 2007 16:19:24 -0000 http://perforce.freebsd.org/chv.cgi?CH=117511 Change 117511 by sam@sam_ebb on 2007/04/06 16:18:57 correct debug msgs; extra arg caused the direction param to be discarded Affected files ... .. //depot/projects/wifi/sys/net80211/ieee80211_input.c#98 edit Differences ... ==== //depot/projects/wifi/sys/net80211/ieee80211_input.c#98 (text+ko) ==== @@ -270,7 +270,7 @@ case IEEE80211_M_STA: if (dir != IEEE80211_FC1_DIR_FROMDS) { IEEE80211_DISCARD(ic, IEEE80211_MSG_INPUT, - wh, "data", "%s", "unknown dir 0x%x", dir); + wh, "data", "unknown dir 0x%x", dir); ic->ic_stats.is_rx_wrongdir++; goto out; } @@ -293,7 +293,7 @@ case IEEE80211_M_AHDEMO: if (dir != IEEE80211_FC1_DIR_NODS) { IEEE80211_DISCARD(ic, IEEE80211_MSG_INPUT, - wh, "data", "%s", "unknown dir 0x%x", dir); + wh, "data", "unknown dir 0x%x", dir); ic->ic_stats.is_rx_wrongdir++; goto out; } @@ -302,7 +302,7 @@ case IEEE80211_M_HOSTAP: if (dir != IEEE80211_FC1_DIR_TODS) { IEEE80211_DISCARD(ic, IEEE80211_MSG_INPUT, - wh, "data", "%s", "unknown dir 0x%x", dir); + wh, "data", "unknown dir 0x%x", dir); ic->ic_stats.is_rx_wrongdir++; goto out; } @@ -481,7 +481,7 @@ IEEE80211_NODE_STAT(ni, rx_mgmt); if (dir != IEEE80211_FC1_DIR_NODS) { IEEE80211_DISCARD(ic, IEEE80211_MSG_INPUT, - wh, "data", "%s", "unknown dir 0x%x", dir); + wh, "data", "unknown dir 0x%x", dir); ic->ic_stats.is_rx_wrongdir++; goto err; } From owner-p4-projects@FreeBSD.ORG Fri Apr 6 16:20:26 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 36FEC16A408; Fri, 6 Apr 2007 16:20:26 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 1564E16A407 for ; Fri, 6 Apr 2007 16:20:26 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 072D413C4C4 for ; Fri, 6 Apr 2007 16:20:26 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l36GKPli060690 for ; Fri, 6 Apr 2007 16:20:25 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l36GKP7X060687 for perforce@freebsd.org; Fri, 6 Apr 2007 16:20:25 GMT (envelope-from sam@freebsd.org) Date: Fri, 6 Apr 2007 16:20:25 GMT Message-Id: <200704061620.l36GKP7X060687@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 117512 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 06 Apr 2007 16:20:26 -0000 http://perforce.freebsd.org/chv.cgi?CH=117512 Change 117512 by sam@sam_ebb on 2007/04/06 16:19:30 rename max/min variables to silence gcc 4.x complaint about shadowed variables Affected files ... .. //depot/projects/wifi/sys/net80211/ieee80211_amrr.c#2 edit Differences ... ==== //depot/projects/wifi/sys/net80211/ieee80211_amrr.c#2 (text+ko) ==== @@ -65,11 +65,11 @@ void ieee80211_amrr_init(struct ieee80211_amrr *amrr, - struct ieee80211com *ic, int min, int max) + struct ieee80211com *ic, int amin, int amax) { /* XXX bounds check? */ - amrr->amrr_min_success_threshold = min; - amrr->amrr_max_success_threshold = max; + amrr->amrr_min_success_threshold = amin; + amrr->amrr_max_success_threshold = amax; amrr->amrr_ic = ic; } From owner-p4-projects@FreeBSD.ORG Fri Apr 6 16:20:27 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D71EB16A529; Fri, 6 Apr 2007 16:20:26 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 9A10116A523 for ; Fri, 6 Apr 2007 16:20:26 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 72CF513C4C6 for ; Fri, 6 Apr 2007 16:20:26 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l36GKQpc060698 for ; Fri, 6 Apr 2007 16:20:26 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l36GKQQW060693 for perforce@freebsd.org; Fri, 6 Apr 2007 16:20:26 GMT (envelope-from sam@freebsd.org) Date: Fri, 6 Apr 2007 16:20:26 GMT Message-Id: <200704061620.l36GKQQW060693@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 117513 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 06 Apr 2007 16:20:27 -0000 http://perforce.freebsd.org/chv.cgi?CH=117513 Change 117513 by sam@sam_ebb on 2007/04/06 16:20:04 s/0/NULL/ for type compatibility Affected files ... .. //depot/projects/wifi/sys/net80211/ieee80211_crypto.c#21 edit Differences ... ==== //depot/projects/wifi/sys/net80211/ieee80211_crypto.c#21 (text+ko) ==== @@ -592,7 +592,7 @@ "[%s] unable to pullup %s header\n", ether_sprintf(wh->i_addr2), cip->ic_name); ic->ic_stats.is_rx_wepfail++; /* XXX */ - return 0; + return NULL; } return (cip->ic_decap(k, m, hdrlen) ? k : NULL); From owner-p4-projects@FreeBSD.ORG Fri Apr 6 16:21:28 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B15FD16A404; Fri, 6 Apr 2007 16:21:28 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 7657D16A402 for ; Fri, 6 Apr 2007 16:21:28 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 6700513C4BF for ; Fri, 6 Apr 2007 16:21:28 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l36GLSmr061333 for ; Fri, 6 Apr 2007 16:21:28 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l36GLRwO061329 for perforce@freebsd.org; Fri, 6 Apr 2007 16:21:27 GMT (envelope-from sam@freebsd.org) Date: Fri, 6 Apr 2007 16:21:27 GMT Message-Id: <200704061621.l36GLRwO061329@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 117514 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 06 Apr 2007 16:21:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=117514 Change 117514 by sam@sam_ebb on 2007/04/06 16:21:02 explicitly initialize array entries to silence gcc 4.x complaint Affected files ... .. //depot/projects/wifi/sys/net80211/ieee80211_proto.c#51 edit Differences ... ==== //depot/projects/wifi/sys/net80211/ieee80211_proto.c#51 (text+ko) ==== @@ -554,68 +554,68 @@ } paramType; static const struct phyParamType phyParamForAC_BE[IEEE80211_MODE_MAX] = { - { 3, 4, 6 }, /* IEEE80211_MODE_AUTO */ - { 3, 4, 6 }, /* IEEE80211_MODE_11A */ - { 3, 5, 7 }, /* IEEE80211_MODE_11B */ - { 3, 4, 6 }, /* IEEE80211_MODE_11G */ - { 3, 5, 7 }, /* IEEE80211_MODE_FH */ - { 2, 3, 5 }, /* IEEE80211_MODE_TURBO_A */ - { 2, 3, 5 }, /* IEEE80211_MODE_TURBO_G */ + { 3, 4, 6, 0, 0 }, /* IEEE80211_MODE_AUTO */ + { 3, 4, 6, 0, 0 }, /* IEEE80211_MODE_11A */ + { 3, 5, 7, 0, 0 }, /* IEEE80211_MODE_11B */ + { 3, 4, 6, 0, 0 }, /* IEEE80211_MODE_11G */ + { 3, 5, 7, 0, 0 }, /* IEEE80211_MODE_FH */ + { 2, 3, 5, 0, 0 }, /* IEEE80211_MODE_TURBO_A */ + { 2, 3, 5, 0, 0 }, /* IEEE80211_MODE_TURBO_G */ }; static const struct phyParamType phyParamForAC_BK[IEEE80211_MODE_MAX] = { - { 7, 4, 10 }, /* IEEE80211_MODE_AUTO */ - { 7, 4, 10 }, /* IEEE80211_MODE_11A */ - { 7, 5, 10 }, /* IEEE80211_MODE_11B */ - { 7, 4, 10 }, /* IEEE80211_MODE_11G */ - { 7, 5, 10 }, /* IEEE80211_MODE_FH */ - { 7, 3, 10 }, /* IEEE80211_MODE_TURBO_A */ - { 7, 3, 10 }, /* IEEE80211_MODE_TURBO_G */ + { 7, 4, 10, 0, 0 }, /* IEEE80211_MODE_AUTO */ + { 7, 4, 10, 0, 0 }, /* IEEE80211_MODE_11A */ + { 7, 5, 10, 0, 0 }, /* IEEE80211_MODE_11B */ + { 7, 4, 10, 0, 0 }, /* IEEE80211_MODE_11G */ + { 7, 5, 10, 0, 0 }, /* IEEE80211_MODE_FH */ + { 7, 3, 10, 0, 0 }, /* IEEE80211_MODE_TURBO_A */ + { 7, 3, 10, 0, 0 }, /* IEEE80211_MODE_TURBO_G */ }; static const struct phyParamType phyParamForAC_VI[IEEE80211_MODE_MAX] = { - { 1, 3, 4, 94 }, /* IEEE80211_MODE_AUTO */ - { 1, 3, 4, 94 }, /* IEEE80211_MODE_11A */ - { 1, 4, 5, 188 }, /* IEEE80211_MODE_11B */ - { 1, 3, 4, 94 }, /* IEEE80211_MODE_11G */ - { 1, 4, 5, 188 }, /* IEEE80211_MODE_FH */ - { 1, 2, 3, 94 }, /* IEEE80211_MODE_TURBO_A */ - { 1, 2, 3, 94 }, /* IEEE80211_MODE_TURBO_G */ + { 1, 3, 4, 94, 0 }, /* IEEE80211_MODE_AUTO */ + { 1, 3, 4, 94, 0 }, /* IEEE80211_MODE_11A */ + { 1, 4, 5, 188, 0 }, /* IEEE80211_MODE_11B */ + { 1, 3, 4, 94, 0 }, /* IEEE80211_MODE_11G */ + { 1, 4, 5, 188, 0 }, /* IEEE80211_MODE_FH */ + { 1, 2, 3, 94, 0 }, /* IEEE80211_MODE_TURBO_A */ + { 1, 2, 3, 94, 0 }, /* IEEE80211_MODE_TURBO_G */ }; static const struct phyParamType phyParamForAC_VO[IEEE80211_MODE_MAX] = { - { 1, 2, 3, 47 }, /* IEEE80211_MODE_AUTO */ - { 1, 2, 3, 47 }, /* IEEE80211_MODE_11A */ - { 1, 3, 4, 102 }, /* IEEE80211_MODE_11B */ - { 1, 2, 3, 47 }, /* IEEE80211_MODE_11G */ - { 1, 3, 4, 102 }, /* IEEE80211_MODE_FH */ - { 1, 2, 2, 47 }, /* IEEE80211_MODE_TURBO_A */ - { 1, 2, 2, 47 }, /* IEEE80211_MODE_TURBO_G */ + { 1, 2, 3, 47, 0 }, /* IEEE80211_MODE_AUTO */ + { 1, 2, 3, 47, 0 }, /* IEEE80211_MODE_11A */ + { 1, 3, 4, 102, 0 }, /* IEEE80211_MODE_11B */ + { 1, 2, 3, 47, 0 }, /* IEEE80211_MODE_11G */ + { 1, 3, 4, 102, 0 }, /* IEEE80211_MODE_FH */ + { 1, 2, 2, 47, 0 }, /* IEEE80211_MODE_TURBO_A */ + { 1, 2, 2, 47, 0 }, /* IEEE80211_MODE_TURBO_G */ }; static const struct phyParamType bssPhyParamForAC_BE[IEEE80211_MODE_MAX] = { - { 3, 4, 10 }, /* IEEE80211_MODE_AUTO */ - { 3, 4, 10 }, /* IEEE80211_MODE_11A */ - { 3, 5, 10 }, /* IEEE80211_MODE_11B */ - { 3, 4, 10 }, /* IEEE80211_MODE_11G */ - { 3, 5, 10 }, /* IEEE80211_MODE_FH */ - { 2, 3, 10 }, /* IEEE80211_MODE_TURBO_A */ - { 2, 3, 10 }, /* IEEE80211_MODE_TURBO_G */ + { 3, 4, 10, 0, 0 }, /* IEEE80211_MODE_AUTO */ + { 3, 4, 10, 0, 0 }, /* IEEE80211_MODE_11A */ + { 3, 5, 10, 0, 0 }, /* IEEE80211_MODE_11B */ + { 3, 4, 10, 0, 0 }, /* IEEE80211_MODE_11G */ + { 3, 5, 10, 0, 0 }, /* IEEE80211_MODE_FH */ + { 2, 3, 10, 0, 0 }, /* IEEE80211_MODE_TURBO_A */ + { 2, 3, 10, 0, 0 }, /* IEEE80211_MODE_TURBO_G */ }; static const struct phyParamType bssPhyParamForAC_VI[IEEE80211_MODE_MAX] = { - { 2, 3, 4, 94 }, /* IEEE80211_MODE_AUTO */ - { 2, 3, 4, 94 }, /* IEEE80211_MODE_11A */ - { 2, 4, 5, 188 }, /* IEEE80211_MODE_11B */ - { 2, 3, 4, 94 }, /* IEEE80211_MODE_11G */ - { 2, 4, 5, 188 }, /* IEEE80211_MODE_FH */ - { 2, 2, 3, 94 }, /* IEEE80211_MODE_TURBO_A */ - { 2, 2, 3, 94 }, /* IEEE80211_MODE_TURBO_G */ + { 2, 3, 4, 94, 0 }, /* IEEE80211_MODE_AUTO */ + { 2, 3, 4, 94, 0 }, /* IEEE80211_MODE_11A */ + { 2, 4, 5, 188, 0 }, /* IEEE80211_MODE_11B */ + { 2, 3, 4, 94, 0 }, /* IEEE80211_MODE_11G */ + { 2, 4, 5, 188, 0 }, /* IEEE80211_MODE_FH */ + { 2, 2, 3, 94, 0 }, /* IEEE80211_MODE_TURBO_A */ + { 2, 2, 3, 94, 0 }, /* IEEE80211_MODE_TURBO_G */ }; static const struct phyParamType bssPhyParamForAC_VO[IEEE80211_MODE_MAX] = { - { 2, 2, 3, 47 }, /* IEEE80211_MODE_AUTO */ - { 2, 2, 3, 47 }, /* IEEE80211_MODE_11A */ - { 2, 3, 4, 102 }, /* IEEE80211_MODE_11B */ - { 2, 2, 3, 47 }, /* IEEE80211_MODE_11G */ - { 2, 3, 4, 102 }, /* IEEE80211_MODE_FH */ - { 1, 2, 2, 47 }, /* IEEE80211_MODE_TURBO_A */ - { 1, 2, 2, 47 }, /* IEEE80211_MODE_TURBO_G */ + { 2, 2, 3, 47, 0 }, /* IEEE80211_MODE_AUTO */ + { 2, 2, 3, 47, 0 }, /* IEEE80211_MODE_11A */ + { 2, 3, 4, 102, 0 }, /* IEEE80211_MODE_11B */ + { 2, 2, 3, 47, 0 }, /* IEEE80211_MODE_11G */ + { 2, 3, 4, 102, 0 }, /* IEEE80211_MODE_FH */ + { 1, 2, 2, 47, 0 }, /* IEEE80211_MODE_TURBO_A */ + { 1, 2, 2, 47, 0 }, /* IEEE80211_MODE_TURBO_G */ }; void @@ -725,13 +725,13 @@ ieee80211_wme_updateparams_locked(struct ieee80211com *ic) { static const paramType phyParam[IEEE80211_MODE_MAX] = { - { 2, 4, 10, 64 }, /* IEEE80211_MODE_AUTO */ - { 2, 4, 10, 64 }, /* IEEE80211_MODE_11A */ - { 2, 5, 10, 64 }, /* IEEE80211_MODE_11B */ - { 2, 4, 10, 64 }, /* IEEE80211_MODE_11G */ - { 2, 5, 10, 64 }, /* IEEE80211_MODE_FH */ - { 1, 3, 10, 64 }, /* IEEE80211_MODE_TURBO_A */ - { 1, 3, 10, 64 }, /* IEEE80211_MODE_TURBO_G */ + { 2, 4, 10, 64, 0 }, /* IEEE80211_MODE_AUTO */ + { 2, 4, 10, 64, 0 }, /* IEEE80211_MODE_11A */ + { 2, 5, 10, 64, 0 }, /* IEEE80211_MODE_11B */ + { 2, 4, 10, 64, 0 }, /* IEEE80211_MODE_11G */ + { 2, 5, 10, 64, 0 }, /* IEEE80211_MODE_FH */ + { 1, 3, 10, 64, 0 }, /* IEEE80211_MODE_TURBO_A */ + { 1, 3, 10, 64, 0 }, /* IEEE80211_MODE_TURBO_G */ }; struct ieee80211_wme_state *wme = &ic->ic_wme; const struct wmeParams *wmep; From owner-p4-projects@FreeBSD.ORG Fri Apr 6 16:41:57 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F3CAD16A402; Fri, 6 Apr 2007 16:41:56 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id C975C16A405 for ; Fri, 6 Apr 2007 16:41:56 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 7FF0013C484 for ; Fri, 6 Apr 2007 16:41:56 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l36GfuQS065208 for ; Fri, 6 Apr 2007 16:41:56 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l36GfuHB065204 for perforce@freebsd.org; Fri, 6 Apr 2007 16:41:56 GMT (envelope-from sam@freebsd.org) Date: Fri, 6 Apr 2007 16:41:56 GMT Message-Id: <200704061641.l36GfuHB065204@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 117517 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 06 Apr 2007 16:41:57 -0000 http://perforce.freebsd.org/chv.cgi?CH=117517 Change 117517 by sam@sam_ebb on 2007/04/06 16:41:15 Media-related cleanups in preparation for 11n support: o factor out code to add media entries to a new addmedia routine o when announcing tx rates, cvt media word back to a rate to print o factor out rate lookup logic used in mapping rate -> media word Also avoid call to ieee80211_chan2mode unless result is needed. Affected files ... .. //depot/projects/wifi/sys/net80211/ieee80211.c#46 edit Differences ... ==== //depot/projects/wifi/sys/net80211/ieee80211.c#46 (text+ko) ==== @@ -423,6 +423,36 @@ return NULL; } +static void +addmedia(struct ieee80211com *ic, int mode, int mword) +{ +#define ADD(_ic, _s, _o) \ + ifmedia_add(&(_ic)->ic_media, \ + IFM_MAKEWORD(IFM_IEEE80211, (_s), (_o), 0), 0, NULL) + static const u_int mopts[IEEE80211_MODE_MAX] = { + IFM_AUTO, + IFM_IEEE80211_11A, + IFM_IEEE80211_11B, + IFM_IEEE80211_11G, + IFM_IEEE80211_FH, + IFM_IEEE80211_11A | IFM_IEEE80211_TURBO, + IFM_IEEE80211_11G | IFM_IEEE80211_TURBO, + }; + u_int mopt; + + mopt = mopts[mode]; + ADD(ic, mword, mopt); /* e.g. 11a auto */ + if (ic->ic_caps & IEEE80211_C_IBSS) + ADD(ic, mword, mopt | IFM_IEEE80211_ADHOC); + if (ic->ic_caps & IEEE80211_C_HOSTAP) + ADD(ic, mword, mopt | IFM_IEEE80211_HOSTAP); + if (ic->ic_caps & IEEE80211_C_AHDEMO) + ADD(ic, mword, mopt | IFM_IEEE80211_ADHOC | IFM_FLAG0); + if (ic->ic_caps & IEEE80211_C_MONITOR) + ADD(ic, mword, mopt | IFM_IEEE80211_MONITOR); +#undef ADD +} + /* * Setup the media data structures according to the channel and * rate tables. This must be called by the driver after @@ -432,12 +462,9 @@ ieee80211_media_init(struct ieee80211com *ic, ifm_change_cb_t media_change, ifm_stat_cb_t media_stat) { -#define ADD(_ic, _s, _o) \ - ifmedia_add(&(_ic)->ic_media, \ - IFM_MAKEWORD(IFM_IEEE80211, (_s), (_o), 0), 0, NULL) struct ifnet *ifp = ic->ic_ifp; - int i, j, mode, rate, maxrate, mword, mopt, r; - struct ieee80211_rateset *rs; + int i, j, mode, rate, maxrate, mword, r; + const struct ieee80211_rateset *rs; struct ieee80211_rateset allrates; /* NB: this works because the structure is initialized to zero */ @@ -463,29 +490,14 @@ */ ifmedia_init(&ic->ic_media, 0, media_change, media_stat); maxrate = 0; + /* + * Add media for legacy operating modes. + */ memset(&allrates, 0, sizeof(allrates)); for (mode = IEEE80211_MODE_AUTO; mode < IEEE80211_MODE_MAX; mode++) { - static const u_int mopts[] = { - IFM_AUTO, - IFM_IEEE80211_11A, - IFM_IEEE80211_11B, - IFM_IEEE80211_11G, - IFM_IEEE80211_FH, - IFM_IEEE80211_11A | IFM_IEEE80211_TURBO, - IFM_IEEE80211_11G | IFM_IEEE80211_TURBO, - }; if (isclr(ic->ic_modecaps, mode)) continue; - mopt = mopts[mode]; - ADD(ic, IFM_AUTO, mopt); /* e.g. 11a auto */ - if (ic->ic_caps & IEEE80211_C_IBSS) - ADD(ic, IFM_AUTO, mopt | IFM_IEEE80211_ADHOC); - if (ic->ic_caps & IEEE80211_C_HOSTAP) - ADD(ic, IFM_AUTO, mopt | IFM_IEEE80211_HOSTAP); - if (ic->ic_caps & IEEE80211_C_AHDEMO) - ADD(ic, IFM_AUTO, mopt | IFM_IEEE80211_ADHOC | IFM_FLAG0); - if (ic->ic_caps & IEEE80211_C_MONITOR) - ADD(ic, IFM_AUTO, mopt | IFM_IEEE80211_MONITOR); + addmedia(ic, mode, IFM_AUTO); if (mode == IEEE80211_MODE_AUTO) continue; rs = &ic->ic_sup_rates[mode]; @@ -494,17 +506,9 @@ mword = ieee80211_rate2media(ic, rate, mode); if (mword == 0) continue; - ADD(ic, mword, mopt); - if (ic->ic_caps & IEEE80211_C_IBSS) - ADD(ic, mword, mopt | IFM_IEEE80211_ADHOC); - if (ic->ic_caps & IEEE80211_C_HOSTAP) - ADD(ic, mword, mopt | IFM_IEEE80211_HOSTAP); - if (ic->ic_caps & IEEE80211_C_AHDEMO) - ADD(ic, mword, mopt | IFM_IEEE80211_ADHOC | IFM_FLAG0); - if (ic->ic_caps & IEEE80211_C_MONITOR) - ADD(ic, mword, mopt | IFM_IEEE80211_MONITOR); + addmedia(ic, mode, mword); /* - * Add rate to the collection of all rates. + * Add legacy rate to the collection of all rates. */ r = rate & IEEE80211_RATE_VAL; for (j = 0; j < allrates.rs_nrates; j++) @@ -525,16 +529,8 @@ IEEE80211_MODE_AUTO); if (mword == 0) continue; - mword = IFM_SUBTYPE(mword); /* remove media options */ - ADD(ic, mword, 0); - if (ic->ic_caps & IEEE80211_C_IBSS) - ADD(ic, mword, IFM_IEEE80211_ADHOC); - if (ic->ic_caps & IEEE80211_C_HOSTAP) - ADD(ic, mword, IFM_IEEE80211_HOSTAP); - if (ic->ic_caps & IEEE80211_C_AHDEMO) - ADD(ic, mword, IFM_IEEE80211_ADHOC | IFM_FLAG0); - if (ic->ic_caps & IEEE80211_C_MONITOR) - ADD(ic, mword, IFM_IEEE80211_MONITOR); + /* NB: remove media options from mword */ + addmedia(ic, IEEE80211_MODE_AUTO, IFM_SUBTYPE(mword)); } /* NB: strip explicit mode; we're actually in autoselect */ ifmedia_set(&ic->ic_media, @@ -542,19 +538,16 @@ if (maxrate) ifp->if_baudrate = IF_Mbps(maxrate); -#undef ADD } const struct ieee80211_rateset * ieee80211_get_suprates(struct ieee80211com *ic, const struct ieee80211_channel *c) { - enum ieee80211_phymode mode = ieee80211_chan2mode(c); - if (IEEE80211_IS_CHAN_HALF(c)) return &ieee80211_rateset_half; if (IEEE80211_IS_CHAN_QUARTER(c)) return &ieee80211_rateset_quarter; - return &ic->ic_sup_rates[mode]; + return &ic->ic_sup_rates[ieee80211_chan2mode(c)]; } void @@ -562,7 +555,7 @@ { struct ifnet *ifp = ic->ic_ifp; int i, mode, rate, mword; - struct ieee80211_rateset *rs; + const struct ieee80211_rateset *rs; for (mode = IEEE80211_MODE_11A; mode < IEEE80211_MODE_MAX; mode++) { if (isclr(ic->ic_modecaps, mode)) @@ -574,9 +567,9 @@ mword = ieee80211_rate2media(ic, rate, mode); if (mword == 0) continue; + rate = ieee80211_media2rate(mword); printf("%s%d%sMbps", (i != 0 ? " " : ""), - (rate & IEEE80211_RATE_VAL) / 2, - ((rate & 0x1) != 0 ? ".5" : "")); + rate / 2, ((rate & 0x1) != 0 ? ".5" : "")); } printf("\n"); } @@ -986,18 +979,31 @@ return IEEE80211_MODE_11B; } +struct ratemedia { + u_int match; /* rate + mode */ + u_int media; /* if_media rate */ +}; + +static int +findmedia(const struct ratemedia rates[], int n, u_int match) +{ + int i; + + for (i = 0; i < n; i++) + if (rates[i].match == match) + return rates[i].media; + return IFM_AUTO; +} + /* - * convert IEEE80211 rate value to ifmedia subtype. - * ieee80211 rate is in unit of 0.5Mbps. + * Convert IEEE80211 rate value to ifmedia subtype. + * Rate is a legacy rate in units of 0.5Mbps. */ int ieee80211_rate2media(struct ieee80211com *ic, int rate, enum ieee80211_phymode mode) { #define N(a) (sizeof(a) / sizeof(a[0])) - static const struct { - u_int m; /* rate + mode */ - u_int r; /* if_media rate */ - } rates[] = { + static const struct ratemedia rates[] = { { 2 | IFM_IEEE80211_FH, IFM_IEEE80211_FH1 }, { 4 | IFM_IEEE80211_FH, IFM_IEEE80211_FH2 }, { 2 | IFM_IEEE80211_11B, IFM_IEEE80211_DS1 }, @@ -1030,37 +1036,28 @@ { 54 | IFM_IEEE80211_11A, IFM_IEEE80211_OFDM27 }, /* NB: OFDM72 doesn't realy exist so we don't handle it */ }; - u_int mask, i; - mask = rate & IEEE80211_RATE_VAL; + rate &= IEEE80211_RATE_VAL; switch (mode) { case IEEE80211_MODE_11A: case IEEE80211_MODE_TURBO_A: case IEEE80211_MODE_STURBO_A: - mask |= IFM_IEEE80211_11A; - break; + return findmedia(rates, N(rates), rate | IFM_IEEE80211_11A); case IEEE80211_MODE_11B: - mask |= IFM_IEEE80211_11B; - break; + return findmedia(rates, N(rates), rate | IFM_IEEE80211_11B); case IEEE80211_MODE_FH: - mask |= IFM_IEEE80211_FH; - break; + return findmedia(rates, N(rates), rate | IFM_IEEE80211_FH); case IEEE80211_MODE_AUTO: /* NB: ic may be NULL for some drivers */ - if (ic && ic->ic_phytype == IEEE80211_T_FH) { - mask |= IFM_IEEE80211_FH; - break; - } + if (ic && ic->ic_phytype == IEEE80211_T_FH) + return findmedia(rates, N(rates), + rate | IFM_IEEE80211_FH); /* NB: hack, 11g matches both 11b+11a rates */ /* fall thru... */ case IEEE80211_MODE_11G: case IEEE80211_MODE_TURBO_G: - mask |= IFM_IEEE80211_11G; - break; + return findmedia(rates, N(rates), rate | IFM_IEEE80211_11G); } - for (i = 0; i < N(rates); i++) - if (rates[i].m == mask) - return rates[i].r; return IFM_AUTO; #undef N } From owner-p4-projects@FreeBSD.ORG Fri Apr 6 16:42:59 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C8F9016A40A; Fri, 6 Apr 2007 16:42:58 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id A206A16A405 for ; Fri, 6 Apr 2007 16:42:58 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 942D413C45A for ; Fri, 6 Apr 2007 16:42:58 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l36Ggww5065487 for ; Fri, 6 Apr 2007 16:42:58 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l36GgwQQ065478 for perforce@freebsd.org; Fri, 6 Apr 2007 16:42:58 GMT (envelope-from sam@freebsd.org) Date: Fri, 6 Apr 2007 16:42:58 GMT Message-Id: <200704061642.l36GgwQQ065478@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 117518 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 06 Apr 2007 16:42:59 -0000 http://perforce.freebsd.org/chv.cgi?CH=117518 Change 117518 by sam@sam_ebb on 2007/04/06 16:42:54 another minor diff reduction against 11n code base Affected files ... .. //depot/projects/wifi/sys/net80211/ieee80211.c#47 edit Differences ... ==== //depot/projects/wifi/sys/net80211/ieee80211.c#47 (text+ko) ==== @@ -563,8 +563,7 @@ if_printf(ifp, "%s rates: ", ieee80211_phymode_name[mode]); rs = &ic->ic_sup_rates[mode]; for (i = 0; i < rs->rs_nrates; i++) { - rate = rs->rs_rates[i]; - mword = ieee80211_rate2media(ic, rate, mode); + mword = ieee80211_rate2media(ic, rs->rs_rates[i], mode); if (mword == 0) continue; rate = ieee80211_media2rate(mword); From owner-p4-projects@FreeBSD.ORG Fri Apr 6 16:46:03 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 64D1F16A407; Fri, 6 Apr 2007 16:46:03 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id E3AEE16A406 for ; Fri, 6 Apr 2007 16:46:02 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id D5E5213C459 for ; Fri, 6 Apr 2007 16:46:02 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l36Gk2mX065825 for ; Fri, 6 Apr 2007 16:46:02 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l36Gk2XN065822 for perforce@freebsd.org; Fri, 6 Apr 2007 16:46:02 GMT (envelope-from sam@freebsd.org) Date: Fri, 6 Apr 2007 16:46:02 GMT Message-Id: <200704061646.l36Gk2XN065822@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 117519 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 06 Apr 2007 16:46:03 -0000 http://perforce.freebsd.org/chv.cgi?CH=117519 Change 117519 by sam@sam_ebb on 2007/04/06 16:45:13 don't lock down ic_des_mode when operating as ap; this is no longer required because we can now completely specify a channel to use (including flags which used to sometimes be inferred by the curent mode) Affected files ... .. //depot/projects/wifi/sys/net80211/ieee80211.c#48 edit Differences ... ==== //depot/projects/wifi/sys/net80211/ieee80211.c#48 (text+ko) ==== @@ -771,21 +771,6 @@ newopmode = IEEE80211_M_STA; /* - * Autoselect doesn't make sense when operating as an AP. - * If no phy mode has been selected, pick one and lock it - * down so rate tables can be used in forming beacon frames - * and the like. - */ - if (newopmode == IEEE80211_M_HOSTAP && - newphymode == IEEE80211_MODE_AUTO) { - for (j = IEEE80211_MODE_11A; j < IEEE80211_MODE_MAX; j++) - if (isset(ic->ic_modecaps, j)) { - newphymode = j; - break; - } - } - - /* * Handle phy mode change. */ if (ic->ic_des_mode != newphymode) { /* change phy mode */ From owner-p4-projects@FreeBSD.ORG Fri Apr 6 16:51:10 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 40DF716A404; Fri, 6 Apr 2007 16:51:10 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 0ACA716A402 for ; Fri, 6 Apr 2007 16:51:10 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id D8AA513C459 for ; Fri, 6 Apr 2007 16:51:09 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l36Gp9MW074692 for ; Fri, 6 Apr 2007 16:51:09 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l36Gp9Ss074683 for perforce@freebsd.org; Fri, 6 Apr 2007 16:51:09 GMT (envelope-from sam@freebsd.org) Date: Fri, 6 Apr 2007 16:51:09 GMT Message-Id: <200704061651.l36Gp9Ss074683@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 117520 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 06 Apr 2007 16:51:10 -0000 http://perforce.freebsd.org/chv.cgi?CH=117520 Change 117520 by sam@sam_ebb on 2007/04/06 16:50:10 oops, remove unused variable Affected files ... .. //depot/projects/wifi/sys/net80211/ieee80211.c#49 edit Differences ... ==== //depot/projects/wifi/sys/net80211/ieee80211.c#49 (text+ko) ==== @@ -696,7 +696,7 @@ struct ifmedia_entry *ime; enum ieee80211_opmode newopmode; enum ieee80211_phymode newphymode; - int j, newrate, error = 0; + int newrate, error = 0; ic = ieee80211_find_instance(ifp); if (!ic) { From owner-p4-projects@FreeBSD.ORG Fri Apr 6 16:51:10 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B57B016A51D; Fri, 6 Apr 2007 16:51:10 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 5F41116A4D0 for ; Fri, 6 Apr 2007 16:51:10 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 4F05013C484 for ; Fri, 6 Apr 2007 16:51:10 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l36GpA8x074708 for ; Fri, 6 Apr 2007 16:51:10 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l36Gp9cd074699 for perforce@freebsd.org; Fri, 6 Apr 2007 16:51:09 GMT (envelope-from sam@freebsd.org) Date: Fri, 6 Apr 2007 16:51:09 GMT Message-Id: <200704061651.l36Gp9cd074699@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 117521 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 06 Apr 2007 16:51:11 -0000 http://perforce.freebsd.org/chv.cgi?CH=117521 Change 117521 by sam@sam_ebb on 2007/04/06 16:50:27 diff reduction: remove trailing whitespace Affected files ... .. //depot/projects/wifi/sys/net80211/ieee80211_proto.c#52 edit Differences ... ==== //depot/projects/wifi/sys/net80211/ieee80211_proto.c#52 (text+ko) ==== @@ -41,8 +41,8 @@ #include #include -#include - +#include + #include #include @@ -246,7 +246,7 @@ void ieee80211_print_essid(const u_int8_t *essid, int len) { - const u_int8_t *p; + const u_int8_t *p; int i; if (len > IEEE80211_NWID_LEN) @@ -546,76 +546,76 @@ * WME protocol support. The following parameters come from the spec. */ typedef struct phyParamType { - u_int8_t aifsn; + u_int8_t aifsn; u_int8_t logcwmin; - u_int8_t logcwmax; + u_int8_t logcwmax; u_int16_t txopLimit; u_int8_t acm; } paramType; static const struct phyParamType phyParamForAC_BE[IEEE80211_MODE_MAX] = { { 3, 4, 6, 0, 0 }, /* IEEE80211_MODE_AUTO */ - { 3, 4, 6, 0, 0 }, /* IEEE80211_MODE_11A */ - { 3, 5, 7, 0, 0 }, /* IEEE80211_MODE_11B */ - { 3, 4, 6, 0, 0 }, /* IEEE80211_MODE_11G */ - { 3, 5, 7, 0, 0 }, /* IEEE80211_MODE_FH */ - { 2, 3, 5, 0, 0 }, /* IEEE80211_MODE_TURBO_A */ - { 2, 3, 5, 0, 0 }, /* IEEE80211_MODE_TURBO_G */ + { 3, 4, 6, 0, 0 }, /* IEEE80211_MODE_11A */ + { 3, 5, 7, 0, 0 }, /* IEEE80211_MODE_11B */ + { 3, 4, 6, 0, 0 }, /* IEEE80211_MODE_11G */ + { 3, 5, 7, 0, 0 }, /* IEEE80211_MODE_FH */ + { 2, 3, 5, 0, 0 }, /* IEEE80211_MODE_TURBO_A */ + { 2, 3, 5, 0, 0 }, /* IEEE80211_MODE_TURBO_G */ }; static const struct phyParamType phyParamForAC_BK[IEEE80211_MODE_MAX] = { { 7, 4, 10, 0, 0 }, /* IEEE80211_MODE_AUTO */ - { 7, 4, 10, 0, 0 }, /* IEEE80211_MODE_11A */ - { 7, 5, 10, 0, 0 }, /* IEEE80211_MODE_11B */ - { 7, 4, 10, 0, 0 }, /* IEEE80211_MODE_11G */ - { 7, 5, 10, 0, 0 }, /* IEEE80211_MODE_FH */ - { 7, 3, 10, 0, 0 }, /* IEEE80211_MODE_TURBO_A */ - { 7, 3, 10, 0, 0 }, /* IEEE80211_MODE_TURBO_G */ + { 7, 4, 10, 0, 0 }, /* IEEE80211_MODE_11A */ + { 7, 5, 10, 0, 0 }, /* IEEE80211_MODE_11B */ + { 7, 4, 10, 0, 0 }, /* IEEE80211_MODE_11G */ + { 7, 5, 10, 0, 0 }, /* IEEE80211_MODE_FH */ + { 7, 3, 10, 0, 0 }, /* IEEE80211_MODE_TURBO_A */ + { 7, 3, 10, 0, 0 }, /* IEEE80211_MODE_TURBO_G */ }; static const struct phyParamType phyParamForAC_VI[IEEE80211_MODE_MAX] = { { 1, 3, 4, 94, 0 }, /* IEEE80211_MODE_AUTO */ - { 1, 3, 4, 94, 0 }, /* IEEE80211_MODE_11A */ - { 1, 4, 5, 188, 0 }, /* IEEE80211_MODE_11B */ - { 1, 3, 4, 94, 0 }, /* IEEE80211_MODE_11G */ - { 1, 4, 5, 188, 0 }, /* IEEE80211_MODE_FH */ - { 1, 2, 3, 94, 0 }, /* IEEE80211_MODE_TURBO_A */ - { 1, 2, 3, 94, 0 }, /* IEEE80211_MODE_TURBO_G */ + { 1, 3, 4, 94, 0 }, /* IEEE80211_MODE_11A */ + { 1, 4, 5, 188, 0 }, /* IEEE80211_MODE_11B */ + { 1, 3, 4, 94, 0 }, /* IEEE80211_MODE_11G */ + { 1, 4, 5, 188, 0 }, /* IEEE80211_MODE_FH */ + { 1, 2, 3, 94, 0 }, /* IEEE80211_MODE_TURBO_A */ + { 1, 2, 3, 94, 0 }, /* IEEE80211_MODE_TURBO_G */ }; static const struct phyParamType phyParamForAC_VO[IEEE80211_MODE_MAX] = { { 1, 2, 3, 47, 0 }, /* IEEE80211_MODE_AUTO */ - { 1, 2, 3, 47, 0 }, /* IEEE80211_MODE_11A */ - { 1, 3, 4, 102, 0 }, /* IEEE80211_MODE_11B */ - { 1, 2, 3, 47, 0 }, /* IEEE80211_MODE_11G */ - { 1, 3, 4, 102, 0 }, /* IEEE80211_MODE_FH */ - { 1, 2, 2, 47, 0 }, /* IEEE80211_MODE_TURBO_A */ - { 1, 2, 2, 47, 0 }, /* IEEE80211_MODE_TURBO_G */ + { 1, 2, 3, 47, 0 }, /* IEEE80211_MODE_11A */ + { 1, 3, 4, 102, 0 }, /* IEEE80211_MODE_11B */ + { 1, 2, 3, 47, 0 }, /* IEEE80211_MODE_11G */ + { 1, 3, 4, 102, 0 }, /* IEEE80211_MODE_FH */ + { 1, 2, 2, 47, 0 }, /* IEEE80211_MODE_TURBO_A */ + { 1, 2, 2, 47, 0 }, /* IEEE80211_MODE_TURBO_G */ }; static const struct phyParamType bssPhyParamForAC_BE[IEEE80211_MODE_MAX] = { { 3, 4, 10, 0, 0 }, /* IEEE80211_MODE_AUTO */ - { 3, 4, 10, 0, 0 }, /* IEEE80211_MODE_11A */ - { 3, 5, 10, 0, 0 }, /* IEEE80211_MODE_11B */ - { 3, 4, 10, 0, 0 }, /* IEEE80211_MODE_11G */ - { 3, 5, 10, 0, 0 }, /* IEEE80211_MODE_FH */ - { 2, 3, 10, 0, 0 }, /* IEEE80211_MODE_TURBO_A */ - { 2, 3, 10, 0, 0 }, /* IEEE80211_MODE_TURBO_G */ + { 3, 4, 10, 0, 0 }, /* IEEE80211_MODE_11A */ + { 3, 5, 10, 0, 0 }, /* IEEE80211_MODE_11B */ + { 3, 4, 10, 0, 0 }, /* IEEE80211_MODE_11G */ + { 3, 5, 10, 0, 0 }, /* IEEE80211_MODE_FH */ + { 2, 3, 10, 0, 0 }, /* IEEE80211_MODE_TURBO_A */ + { 2, 3, 10, 0, 0 }, /* IEEE80211_MODE_TURBO_G */ }; static const struct phyParamType bssPhyParamForAC_VI[IEEE80211_MODE_MAX] = { { 2, 3, 4, 94, 0 }, /* IEEE80211_MODE_AUTO */ - { 2, 3, 4, 94, 0 }, /* IEEE80211_MODE_11A */ - { 2, 4, 5, 188, 0 }, /* IEEE80211_MODE_11B */ - { 2, 3, 4, 94, 0 }, /* IEEE80211_MODE_11G */ - { 2, 4, 5, 188, 0 }, /* IEEE80211_MODE_FH */ - { 2, 2, 3, 94, 0 }, /* IEEE80211_MODE_TURBO_A */ - { 2, 2, 3, 94, 0 }, /* IEEE80211_MODE_TURBO_G */ + { 2, 3, 4, 94, 0 }, /* IEEE80211_MODE_11A */ + { 2, 4, 5, 188, 0 }, /* IEEE80211_MODE_11B */ + { 2, 3, 4, 94, 0 }, /* IEEE80211_MODE_11G */ + { 2, 4, 5, 188, 0 }, /* IEEE80211_MODE_FH */ + { 2, 2, 3, 94, 0 }, /* IEEE80211_MODE_TURBO_A */ + { 2, 2, 3, 94, 0 }, /* IEEE80211_MODE_TURBO_G */ }; static const struct phyParamType bssPhyParamForAC_VO[IEEE80211_MODE_MAX] = { { 2, 2, 3, 47, 0 }, /* IEEE80211_MODE_AUTO */ - { 2, 2, 3, 47, 0 }, /* IEEE80211_MODE_11A */ - { 2, 3, 4, 102, 0 }, /* IEEE80211_MODE_11B */ - { 2, 2, 3, 47, 0 }, /* IEEE80211_MODE_11G */ - { 2, 3, 4, 102, 0 }, /* IEEE80211_MODE_FH */ - { 1, 2, 2, 47, 0 }, /* IEEE80211_MODE_TURBO_A */ - { 1, 2, 2, 47, 0 }, /* IEEE80211_MODE_TURBO_G */ + { 2, 2, 3, 47, 0 }, /* IEEE80211_MODE_11A */ + { 2, 3, 4, 102, 0 }, /* IEEE80211_MODE_11B */ + { 2, 2, 3, 47, 0 }, /* IEEE80211_MODE_11G */ + { 2, 3, 4, 102, 0 }, /* IEEE80211_MODE_FH */ + { 1, 2, 2, 47, 0 }, /* IEEE80211_MODE_TURBO_A */ + { 1, 2, 2, 47, 0 }, /* IEEE80211_MODE_TURBO_G */ }; void @@ -725,13 +725,13 @@ ieee80211_wme_updateparams_locked(struct ieee80211com *ic) { static const paramType phyParam[IEEE80211_MODE_MAX] = { - { 2, 4, 10, 64, 0 }, /* IEEE80211_MODE_AUTO */ - { 2, 4, 10, 64, 0 }, /* IEEE80211_MODE_11A */ - { 2, 5, 10, 64, 0 }, /* IEEE80211_MODE_11B */ - { 2, 4, 10, 64, 0 }, /* IEEE80211_MODE_11G */ - { 2, 5, 10, 64, 0 }, /* IEEE80211_MODE_FH */ - { 1, 3, 10, 64, 0 }, /* IEEE80211_MODE_TURBO_A */ - { 1, 3, 10, 64, 0 }, /* IEEE80211_MODE_TURBO_G */ + { 2, 4, 10, 64, 0 }, /* IEEE80211_MODE_AUTO */ + { 2, 4, 10, 64, 0 }, /* IEEE80211_MODE_11A */ + { 2, 5, 10, 64, 0 }, /* IEEE80211_MODE_11B */ + { 2, 4, 10, 64, 0 }, /* IEEE80211_MODE_11G */ + { 2, 5, 10, 64, 0 }, /* IEEE80211_MODE_FH */ + { 1, 3, 10, 64, 0 }, /* IEEE80211_MODE_TURBO_A */ + { 1, 3, 10, 64, 0 }, /* IEEE80211_MODE_TURBO_G */ }; struct ieee80211_wme_state *wme = &ic->ic_wme; const struct wmeParams *wmep; @@ -877,7 +877,7 @@ * we should be able to apply any new state/parameters * simply by re-associating. Otherwise we need to * re-scan to select an appropriate ap. - */ + */ if (ic->ic_state != IEEE80211_S_RUN || forcescan) ieee80211_new_state(ic, IEEE80211_S_SCAN, 0); else @@ -967,7 +967,7 @@ } ic->ic_bmiss_count = 0; if (ic->ic_roaming == IEEE80211_ROAMING_AUTO) { - /* + /* * If we receive a beacon miss interrupt when using * dynamic turbo, attempt to switch modes before * reassociating. From owner-p4-projects@FreeBSD.ORG Fri Apr 6 17:10:41 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 055BC16A405; Fri, 6 Apr 2007 17:10:41 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id BA33B16A401 for ; Fri, 6 Apr 2007 17:10:40 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id A9B8713C45A for ; Fri, 6 Apr 2007 17:10:40 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l36HAe0b078620 for ; Fri, 6 Apr 2007 17:10:40 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l36HAat7078613 for perforce@freebsd.org; Fri, 6 Apr 2007 17:10:36 GMT (envelope-from rdivacky@FreeBSD.org) Date: Fri, 6 Apr 2007 17:10:36 GMT Message-Id: <200704061710.l36HAat7078613@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 117525 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 06 Apr 2007 17:10:41 -0000 http://perforce.freebsd.org/chv.cgi?CH=117525 Change 117525 by rdivacky@rdivacky_witten on 2007/04/06 17:09:41 IFC (welcome new sx and ZFS!) Affected files ... .. //depot/projects/linuxolator/src/sys/arm/at91/uart_cpu_at91rm9200usart.c#2 integrate .. //depot/projects/linuxolator/src/sys/arm/at91/uart_dev_at91usart.c#4 integrate .. //depot/projects/linuxolator/src/sys/arm/sa11x0/uart_cpu_sa1110.c#2 integrate .. //depot/projects/linuxolator/src/sys/arm/sa11x0/uart_dev_sa1110.c#3 integrate .. //depot/projects/linuxolator/src/sys/arm/xscale/i80321/uart_cpu_i80321.c#2 integrate .. //depot/projects/linuxolator/src/sys/arm/xscale/ixp425/uart_cpu_ixp425.c#2 integrate .. //depot/projects/linuxolator/src/sys/boot/arm/at91/boot2/boot2.c#5 integrate .. //depot/projects/linuxolator/src/sys/compat/linux/linux_file.c#23 integrate .. //depot/projects/linuxolator/src/sys/compat/ndis/kern_ndis.c#3 integrate .. //depot/projects/linuxolator/src/sys/compat/ndis/ndis_var.h#2 integrate .. //depot/projects/linuxolator/src/sys/compat/ndis/subr_ndis.c#3 integrate .. //depot/projects/linuxolator/src/sys/compat/ndis/subr_pe.c#2 integrate .. //depot/projects/linuxolator/src/sys/compat/opensolaris/kern/opensolaris_kmem.c#1 branch .. //depot/projects/linuxolator/src/sys/compat/opensolaris/kern/opensolaris_kobj.c#1 branch .. //depot/projects/linuxolator/src/sys/compat/opensolaris/kern/opensolaris_kstat.c#1 branch .. //depot/projects/linuxolator/src/sys/compat/opensolaris/kern/opensolaris_policy.c#1 branch .. //depot/projects/linuxolator/src/sys/compat/opensolaris/kern/opensolaris_string.c#1 branch .. //depot/projects/linuxolator/src/sys/compat/opensolaris/kern/opensolaris_vfs.c#1 branch .. //depot/projects/linuxolator/src/sys/compat/opensolaris/kern/opensolaris_zone.c#1 branch .. //depot/projects/linuxolator/src/sys/compat/opensolaris/machine/endian.h#1 branch .. //depot/projects/linuxolator/src/sys/compat/opensolaris/rpc/xdr.h#1 branch .. //depot/projects/linuxolator/src/sys/compat/opensolaris/sys/acl.h#1 branch .. //depot/projects/linuxolator/src/sys/compat/opensolaris/sys/byteorder.h#1 branch .. //depot/projects/linuxolator/src/sys/compat/opensolaris/sys/callb.h#1 branch .. //depot/projects/linuxolator/src/sys/compat/opensolaris/sys/cmn_err.h#1 branch .. //depot/projects/linuxolator/src/sys/compat/opensolaris/sys/cred.h#1 branch .. //depot/projects/linuxolator/src/sys/compat/opensolaris/sys/debug.h#1 branch .. //depot/projects/linuxolator/src/sys/compat/opensolaris/sys/dirent.h#1 branch .. //depot/projects/linuxolator/src/sys/compat/opensolaris/sys/dkio.h#1 branch .. //depot/projects/linuxolator/src/sys/compat/opensolaris/sys/kcondvar.h#1 branch .. //depot/projects/linuxolator/src/sys/compat/opensolaris/sys/kmem.h#1 branch .. //depot/projects/linuxolator/src/sys/compat/opensolaris/sys/kobj.h#1 branch .. //depot/projects/linuxolator/src/sys/compat/opensolaris/sys/kstat.h#1 branch .. //depot/projects/linuxolator/src/sys/compat/opensolaris/sys/mntent.h#1 branch .. //depot/projects/linuxolator/src/sys/compat/opensolaris/sys/mnttab.h#1 branch .. //depot/projects/linuxolator/src/sys/compat/opensolaris/sys/mount.h#1 branch .. //depot/projects/linuxolator/src/sys/compat/opensolaris/sys/mutex.h#1 branch .. //depot/projects/linuxolator/src/sys/compat/opensolaris/sys/policy.h#1 branch .. //depot/projects/linuxolator/src/sys/compat/opensolaris/sys/proc.h#1 branch .. //depot/projects/linuxolator/src/sys/compat/opensolaris/sys/random.h#1 branch .. //depot/projects/linuxolator/src/sys/compat/opensolaris/sys/rwlock.h#1 branch .. //depot/projects/linuxolator/src/sys/compat/opensolaris/sys/sdt.h#1 branch .. //depot/projects/linuxolator/src/sys/compat/opensolaris/sys/string.h#1 branch .. //depot/projects/linuxolator/src/sys/compat/opensolaris/sys/sysmacros.h#1 branch .. //depot/projects/linuxolator/src/sys/compat/opensolaris/sys/systm.h#1 branch .. //depot/projects/linuxolator/src/sys/compat/opensolaris/sys/taskq.h#1 branch .. //depot/projects/linuxolator/src/sys/compat/opensolaris/sys/taskq_impl.h#1 branch .. //depot/projects/linuxolator/src/sys/compat/opensolaris/sys/time.h#1 branch .. //depot/projects/linuxolator/src/sys/compat/opensolaris/sys/types.h#1 branch .. //depot/projects/linuxolator/src/sys/compat/opensolaris/sys/uio.h#1 branch .. //depot/projects/linuxolator/src/sys/compat/opensolaris/sys/varargs.h#1 branch .. //depot/projects/linuxolator/src/sys/compat/opensolaris/sys/vfs.h#1 branch .. //depot/projects/linuxolator/src/sys/compat/opensolaris/sys/vnode.h#1 branch .. //depot/projects/linuxolator/src/sys/compat/opensolaris/sys/zone.h#1 branch .. //depot/projects/linuxolator/src/sys/compat/svr4/svr4_filio.c#2 integrate .. //depot/projects/linuxolator/src/sys/conf/files#25 integrate .. //depot/projects/linuxolator/src/sys/conf/files.amd64#11 integrate .. //depot/projects/linuxolator/src/sys/conf/files.i386#10 integrate .. //depot/projects/linuxolator/src/sys/conf/files.pc98#8 integrate .. //depot/projects/linuxolator/src/sys/conf/files.powerpc#5 integrate .. //depot/projects/linuxolator/src/sys/conf/options#22 integrate .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/common/acl/acl_common.c#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/common/acl/acl_common.h#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/common/avl/avl.c#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/common/nvpair/nvpair.c#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/common/nvpair/nvpair_alloc_fixed.c#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/common/zfs/zfs_namecheck.c#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/common/zfs/zfs_namecheck.h#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/common/zfs/zfs_prop.c#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/common/zfs/zfs_prop.h#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/Makefile.files#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/arch/amd64/atomic.S#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/arch/i386/atomic.S#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/fs/dnlc.c#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/fs/gfs.c#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/fs/zfs/arc.c#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/fs/zfs/bplist.c#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/fs/zfs/dbuf.c#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/fs/zfs/dmu.c#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/fs/zfs/dmu_object.c#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/fs/zfs/dmu_objset.c#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/fs/zfs/dmu_send.c#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/fs/zfs/dmu_traverse.c#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/fs/zfs/dmu_tx.c#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/fs/zfs/dmu_zfetch.c#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/fs/zfs/dnode.c#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/fs/zfs/dnode_sync.c#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/fs/zfs/dsl_dir.c#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/fs/zfs/dsl_pool.c#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/fs/zfs/dsl_prop.c#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/fs/zfs/dsl_synctask.c#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/fs/zfs/fletcher.c#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/fs/zfs/gzip.c#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/fs/zfs/lzjb.c#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/fs/zfs/metaslab.c#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/fs/zfs/refcount.c#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/fs/zfs/sha256.c#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/fs/zfs/spa.c#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/fs/zfs/spa_config.c#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/fs/zfs/spa_errlog.c#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/fs/zfs/spa_history.c#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/fs/zfs/spa_misc.c#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/fs/zfs/space_map.c#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/arc.h#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/bplist.h#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dbuf.h#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dmu.h#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_impl.h#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_objset.h#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_traverse.h#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_tx.h#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_zfetch.h#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dnode.h#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_dataset.h#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_dir.h#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_pool.h#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_prop.h#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_synctask.h#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/metaslab.h#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/metaslab_impl.h#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/refcount.h#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/spa.h#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/spa_impl.h#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/space_map.h#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/txg.h#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/txg_impl.h#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/uberblock.h#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/uberblock_impl.h#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/unique.h#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/vdev.h#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_disk.h#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_file.h#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_impl.h#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zap.h#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zap_impl.h#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zap_leaf.h#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_acl.h#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_context.h#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_ctldir.h#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_debug.h#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_dir.h#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_ioctl.h#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_rlock.h#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_vfsops.h#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_znode.h#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zil.h#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zil_impl.h#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zio.h#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zio_checksum.h#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zio_compress.h#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zio_impl.h#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zvol.h#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/fs/zfs/txg.c#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/fs/zfs/uberblock.c#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/fs/zfs/unique.c#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/fs/zfs/vdev.c#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_cache.c#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_disk.c#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_file.c#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_label.c#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_mirror.c#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_missing.c#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_queue.c#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_raidz.c#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_root.c#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/fs/zfs/zap.c#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/fs/zfs/zap_leaf.c#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/fs/zfs/zap_micro.c#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs.conf#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_acl.c#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_byteswap.c#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_dir.c#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_fm.c#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_log.c#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_replay.c#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_rlock.c#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/fs/zfs/zil.c#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/fs/zfs/zio.c#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/fs/zfs/zio_checksum.c#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/fs/zfs/zio_compress.c#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/fs/zfs/zio_inject.c#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/fs/zfs/zvol.c#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/os/callb.c#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/os/list.c#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/os/nvpair_alloc_system.c#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/os/taskq.c#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/rpc/xdr.c#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/rpc/xdr.h#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/rpc/xdr_array.c#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/rpc/xdr_mem.c#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/sys/asm_linkage.h#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/sys/atomic.h#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/sys/avl.h#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/sys/avl_impl.h#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/sys/bitmap.h#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/sys/byteorder.h#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/sys/callb.h#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/sys/ccompile.h#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/sys/compress.h#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/sys/cred.h#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/sys/debug.h#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/sys/dkio.h#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/sys/dklabel.h#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/sys/dnlc.h#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/sys/errorq.h#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/sys/feature_tests.h#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/sys/fm/fs/zfs.h#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/sys/fm/protocol.h#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/sys/fm/util.h#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/sys/fs/zfs.h#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/sys/gfs.h#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/sys/isa_defs.h#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/sys/list.h#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/sys/list_impl.h#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/sys/note.h#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/sys/nvpair.h#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/sys/nvpair_impl.h#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/sys/processor.h#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/sys/procset.h#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/sys/sdt.h#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/sys/synch.h#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/sys/sysevent.h#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/sys/sysmacros.h#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/sys/vfs.h#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/sys/vmem.h#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/sys/zmod.h#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/zmod/adler32.c#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/zmod/crc32.c#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/zmod/crc32.h#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/zmod/deflate.c#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/zmod/deflate.h#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/zmod/inffast.c#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/zmod/inffast.h#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/zmod/inffixed.h#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/zmod/inflate.c#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/zmod/inflate.h#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/zmod/inftrees.c#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/zmod/inftrees.h#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/zmod/trees.c#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/zmod/zconf.h#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/zmod/zlib.h#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/zmod/zmod.c#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/zmod/zmod_subr.c#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/zmod/zutil.c#1 branch .. //depot/projects/linuxolator/src/sys/contrib/opensolaris/uts/common/zmod/zutil.h#1 branch .. //depot/projects/linuxolator/src/sys/dev/ata/ata-all.h#5 integrate .. //depot/projects/linuxolator/src/sys/dev/ata/ata-chipset.c#12 integrate .. //depot/projects/linuxolator/src/sys/dev/ata/ata-dma.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/ata/ata-lowlevel.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/ata/ata_if.m#2 integrate .. //depot/projects/linuxolator/src/sys/dev/bge/if_bge.c#17 integrate .. //depot/projects/linuxolator/src/sys/dev/cxgb/cxgb_adapter.h#3 integrate .. //depot/projects/linuxolator/src/sys/dev/cxgb/cxgb_sge.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/if_ndis/if_ndis_pccard.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/msk/if_msk.c#7 integrate .. //depot/projects/linuxolator/src/sys/dev/mxge/if_mxge.c#11 integrate .. //depot/projects/linuxolator/src/sys/dev/streams/streams.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/uart/uart.h#2 integrate .. //depot/projects/linuxolator/src/sys/dev/uart/uart_bus.h#2 integrate .. //depot/projects/linuxolator/src/sys/dev/uart/uart_bus_pci.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/uart/uart_core.c#4 integrate .. //depot/projects/linuxolator/src/sys/dev/uart/uart_cpu.h#3 integrate .. //depot/projects/linuxolator/src/sys/dev/uart/uart_cpu_amd64.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/uart/uart_cpu_i386.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/uart/uart_cpu_ia64.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/uart/uart_cpu_pc98.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/uart/uart_cpu_powerpc.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/uart/uart_cpu_sparc64.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/uart/uart_dev_ns8250.c#4 integrate .. //depot/projects/linuxolator/src/sys/dev/uart/uart_dev_sab82532.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/uart/uart_dev_z8530.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/uart/uart_kbd_sun.c#6 integrate .. //depot/projects/linuxolator/src/sys/dev/uart/uart_subr.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/usb/if_ural.c#6 integrate .. //depot/projects/linuxolator/src/sys/fs/devfs/devfs_vnops.c#7 integrate .. //depot/projects/linuxolator/src/sys/fs/fdescfs/fdesc_vfsops.c#2 integrate .. //depot/projects/linuxolator/src/sys/fs/fdescfs/fdesc_vnops.c#3 integrate .. //depot/projects/linuxolator/src/sys/fs/fifofs/fifo_vnops.c#3 integrate .. //depot/projects/linuxolator/src/sys/fs/pseudofs/pseudofs.c#3 integrate .. //depot/projects/linuxolator/src/sys/fs/pseudofs/pseudofs.h#3 integrate .. //depot/projects/linuxolator/src/sys/fs/unionfs/union_subr.c#6 integrate .. //depot/projects/linuxolator/src/sys/geom/journal/g_journal.c#5 integrate .. //depot/projects/linuxolator/src/sys/kern/kern_descrip.c#10 integrate .. //depot/projects/linuxolator/src/sys/kern/kern_event.c#5 integrate .. //depot/projects/linuxolator/src/sys/kern/kern_fork.c#14 integrate .. //depot/projects/linuxolator/src/sys/kern/kern_jail.c#9 integrate .. //depot/projects/linuxolator/src/sys/kern/kern_mbuf.c#5 integrate .. //depot/projects/linuxolator/src/sys/kern/kern_mutex.c#8 integrate .. //depot/projects/linuxolator/src/sys/kern/kern_sx.c#8 integrate .. //depot/projects/linuxolator/src/sys/kern/subr_lock.c#6 integrate .. //depot/projects/linuxolator/src/sys/kern/subr_witness.c#11 integrate .. //depot/projects/linuxolator/src/sys/kern/sys_generic.c#6 integrate .. //depot/projects/linuxolator/src/sys/kern/uipc_mqueue.c#7 integrate .. //depot/projects/linuxolator/src/sys/kern/uipc_syscalls.c#8 integrate .. //depot/projects/linuxolator/src/sys/kern/uipc_usrreq.c#12 integrate .. //depot/projects/linuxolator/src/sys/kern/vfs_cache.c#3 integrate .. //depot/projects/linuxolator/src/sys/kern/vfs_lookup.c#10 integrate .. //depot/projects/linuxolator/src/sys/kern/vfs_mount.c#13 integrate .. //depot/projects/linuxolator/src/sys/kern/vfs_syscalls.c#14 integrate .. //depot/projects/linuxolator/src/sys/libkern/memset.c#1 branch .. //depot/projects/linuxolator/src/sys/modules/Makefile#12 integrate .. //depot/projects/linuxolator/src/sys/modules/zfs/Makefile#1 branch .. //depot/projects/linuxolator/src/sys/netatm/atm_if.c#2 integrate .. //depot/projects/linuxolator/src/sys/netinet/in_pcb.h#4 integrate .. //depot/projects/linuxolator/src/sys/netinet/ip_fw2.c#13 integrate .. //depot/projects/linuxolator/src/sys/netinet/ip_var.h#3 integrate .. //depot/projects/linuxolator/src/sys/netinet/libalias/alias_ftp.c#3 integrate .. //depot/projects/linuxolator/src/sys/netinet/libalias/alias_irc.c#3 integrate .. //depot/projects/linuxolator/src/sys/netinet/libalias/alias_proxy.c#4 integrate .. //depot/projects/linuxolator/src/sys/netinet/sctp_asconf.c#9 integrate .. //depot/projects/linuxolator/src/sys/netinet/sctp_bsd_addr.h#4 integrate .. //depot/projects/linuxolator/src/sys/netinet/sctp_constants.h#9 integrate .. //depot/projects/linuxolator/src/sys/netinet/sctp_indata.c#11 integrate .. //depot/projects/linuxolator/src/sys/netinet/sctp_input.c#11 integrate .. //depot/projects/linuxolator/src/sys/netinet/sctp_os_bsd.h#10 integrate .. //depot/projects/linuxolator/src/sys/netinet/sctp_output.c#11 integrate .. //depot/projects/linuxolator/src/sys/netinet/sctp_output.h#4 integrate .. //depot/projects/linuxolator/src/sys/netinet/sctp_pcb.c#11 integrate .. //depot/projects/linuxolator/src/sys/netinet/sctp_pcb.h#9 integrate .. //depot/projects/linuxolator/src/sys/netinet/sctp_sysctl.c#3 integrate .. //depot/projects/linuxolator/src/sys/netinet/sctp_sysctl.h#3 integrate .. //depot/projects/linuxolator/src/sys/netinet/sctp_timer.c#8 integrate .. //depot/projects/linuxolator/src/sys/netinet/sctp_uio.h#8 integrate .. //depot/projects/linuxolator/src/sys/netinet/sctp_usrreq.c#11 integrate .. //depot/projects/linuxolator/src/sys/netinet/sctputil.c#11 integrate .. //depot/projects/linuxolator/src/sys/netinet/tcp_input.c#14 integrate .. //depot/projects/linuxolator/src/sys/netinet/tcp_output.c#9 integrate .. //depot/projects/linuxolator/src/sys/netinet/tcp_sack.c#3 integrate .. //depot/projects/linuxolator/src/sys/netinet/tcp_subr.c#9 integrate .. //depot/projects/linuxolator/src/sys/netinet/tcp_syncache.c#7 integrate .. //depot/projects/linuxolator/src/sys/netinet/tcp_timer.c#4 integrate .. //depot/projects/linuxolator/src/sys/netinet6/sctp6_usrreq.c#11 integrate .. //depot/projects/linuxolator/src/sys/netsmb/smb_dev.c#3 integrate .. //depot/projects/linuxolator/src/sys/opencrypto/cryptodev.c#3 integrate .. //depot/projects/linuxolator/src/sys/security/audit/audit_bsm_klib.c#3 integrate .. //depot/projects/linuxolator/src/sys/sun4v/include/smp.h#5 integrate .. //depot/projects/linuxolator/src/sys/sys/elf_common.h#4 integrate .. //depot/projects/linuxolator/src/sys/sys/filedesc.h#2 integrate .. //depot/projects/linuxolator/src/sys/sys/filio.h#2 integrate .. //depot/projects/linuxolator/src/sys/sys/jail.h#3 integrate .. //depot/projects/linuxolator/src/sys/sys/kernel.h#3 integrate .. //depot/projects/linuxolator/src/sys/sys/link_elf.h#2 integrate .. //depot/projects/linuxolator/src/sys/sys/lock.h#8 integrate .. //depot/projects/linuxolator/src/sys/sys/lock_profile.h#5 integrate .. //depot/projects/linuxolator/src/sys/sys/mbuf.h#9 integrate .. //depot/projects/linuxolator/src/sys/sys/mount.h#10 integrate .. //depot/projects/linuxolator/src/sys/sys/mutex.h#9 integrate .. //depot/projects/linuxolator/src/sys/sys/param.h#14 integrate .. //depot/projects/linuxolator/src/sys/sys/priv.h#7 integrate .. //depot/projects/linuxolator/src/sys/sys/sx.h#5 integrate .. //depot/projects/linuxolator/src/sys/sys/systm.h#12 integrate .. //depot/projects/linuxolator/src/sys/sys/unistd.h#5 integrate .. //depot/projects/linuxolator/src/sys/ufs/ffs/ffs_snapshot.c#5 integrate .. //depot/projects/linuxolator/src/sys/ufs/ffs/ffs_softdep.c#9 integrate .. //depot/projects/linuxolator/src/sys/ufs/ffs/ffs_vfsops.c#10 integrate .. //depot/projects/linuxolator/src/sys/ufs/ffs/ffs_vnops.c#10 integrate .. //depot/projects/linuxolator/src/sys/vm/vm_fault.c#7 integrate .. //depot/projects/linuxolator/src/sys/vm/vm_kern.c#6 integrate Differences ... ==== //depot/projects/linuxolator/src/sys/arm/at91/uart_cpu_at91rm9200usart.c#2 (text) ==== @@ -27,7 +27,7 @@ #include "opt_uart.h" #include -__FBSDID("$FreeBSD: src/sys/arm/at91/uart_cpu_at91rm9200usart.c,v 1.2 2006/05/13 23:41:16 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/at91/uart_cpu_at91rm9200usart.c,v 1.3 2007/04/02 22:00:21 marcel Exp $"); #include #include @@ -43,7 +43,7 @@ bus_space_tag_t uart_bus_space_io; bus_space_tag_t uart_bus_space_mem; -extern struct uart_ops at91_usart_ops; +extern struct uart_class at91_usart_class; extern struct bus_space at91_bs_tag; int @@ -55,7 +55,10 @@ int uart_cpu_getdev(int devtype, struct uart_devinfo *di) { - di->ops = at91_usart_ops; + struct uart_class *class; + + class = &at91_usart_class; + di->ops = uart_getops(class); di->bas.chan = 0; di->bas.bst = &at91_bs_tag; /* @@ -77,7 +80,5 @@ uart_bus_space_io = &at91_bs_tag; uart_bus_space_mem = NULL; /* Check the environment for overrides */ - if (uart_getenv(devtype, di) == 0) - return (0); - return (0); + return (uart_getenv(devtype, di, class)); } ==== //depot/projects/linuxolator/src/sys/arm/at91/uart_dev_at91usart.c#4 (text) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/at91/uart_dev_at91usart.c,v 1.11 2007/01/18 22:01:19 marius Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/at91/uart_dev_at91usart.c,v 1.12 2007/04/02 22:00:21 marcel Exp $"); #include "opt_comconsole.h" @@ -196,7 +196,7 @@ return (0); } -struct uart_ops at91_usart_ops = { +static struct uart_ops at91_usart_ops = { .probe = at91_usart_probe, .init = at91_usart_init, .term = at91_usart_term, @@ -662,10 +662,12 @@ } return (EINVAL); } + struct uart_class at91_usart_class = { - "at91_usart class", + "at91_usart", at91_usart_methods, sizeof(struct at91_usart_softc), + .uc_ops = &at91_usart_ops, .uc_range = 8, .uc_rclk = DEFAULT_RCLK }; ==== //depot/projects/linuxolator/src/sys/arm/sa11x0/uart_cpu_sa1110.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/sa11x0/uart_cpu_sa1110.c,v 1.6 2006/06/21 10:56:59 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/sa11x0/uart_cpu_sa1110.c,v 1.7 2007/04/02 22:00:21 marcel Exp $"); #include #include @@ -42,7 +42,7 @@ bus_space_tag_t uart_bus_space_io; bus_space_tag_t uart_bus_space_mem; -extern struct uart_ops uart_sa1110_ops; +extern struct uart_class uart_sa1110_class; vm_offset_t sa1110_uart_vaddr; @@ -55,7 +55,8 @@ int uart_cpu_getdev(int devtype, struct uart_devinfo *di) { - di->ops = uart_sa1110_ops; + + di->ops = uart_getops(&uart_sa1110_class); di->bas.chan = 0; di->bas.bst = &sa11x0_bs_tag; di->bas.bsh = sa1110_uart_vaddr; ==== //depot/projects/linuxolator/src/sys/arm/sa11x0/uart_dev_sa1110.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/sa11x0/uart_dev_sa1110.c,v 1.7 2007/01/18 22:01:19 marius Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/sa11x0/uart_dev_sa1110.c,v 1.8 2007/04/02 22:00:21 marcel Exp $"); #include #include @@ -57,7 +57,7 @@ extern SLIST_HEAD(uart_devinfo_list, uart_devinfo) uart_sysdevs; -struct uart_ops uart_sa1110_ops = { +static struct uart_ops uart_sa1110_ops = { .probe = sa1110_probe, .init = sa1110_init, .term = sa1110_term, @@ -272,10 +272,12 @@ { return (EINVAL); } + struct uart_class uart_sa1110_class = { - "sa1110 class", + "sa1110", sa1110_methods, 1, + .uc_ops = &uart_sa1110_ops, .uc_range = 8, .uc_rclk = 3686400 }; ==== //depot/projects/linuxolator/src/sys/arm/xscale/i80321/uart_cpu_i80321.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/xscale/i80321/uart_cpu_i80321.c,v 1.4 2005/01/20 22:23:26 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/xscale/i80321/uart_cpu_i80321.c,v 1.5 2007/04/02 22:00:22 marcel Exp $"); #include #include @@ -51,7 +51,7 @@ int uart_cpu_getdev(int devtype, struct uart_devinfo *di) { - di->ops = uart_ns8250_ops; + di->ops = uart_getops(&uart_ns8250_class); di->bas.chan = 0; di->bas.bst = &obio_bs_tag; di->bas.regshft = 0; ==== //depot/projects/linuxolator/src/sys/arm/xscale/ixp425/uart_cpu_ixp425.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/xscale/ixp425/uart_cpu_ixp425.c,v 1.1 2006/11/19 23:55:23 sam Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/xscale/ixp425/uart_cpu_ixp425.c,v 1.2 2007/04/02 22:00:22 marcel Exp $"); #include #include @@ -51,7 +51,7 @@ int uart_cpu_getdev(int devtype, struct uart_devinfo *di) { - di->ops = uart_ns8250_ops; + di->ops = uart_getops(&uart_ns8250_class); di->bas.chan = 0; di->bas.bst = &ixp425_a4x_bs_tag; di->bas.regshft = 0; ==== //depot/projects/linuxolator/src/sys/boot/arm/at91/boot2/boot2.c#5 (text+ko) ==== @@ -14,7 +14,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/boot/arm/at91/boot2/boot2.c,v 1.4 2007/03/28 21:18:45 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/arm/at91/boot2/boot2.c,v 1.5 2007/04/02 20:26:04 imp Exp $"); #include #include @@ -148,8 +148,9 @@ board_init(); EMAC_Init(); - sdcard_init(); EMAC_SetMACAddress(mac); + while (sdcard_init() == 0) + printf("Looking for SD card\n"); dmadat = (void *)(0x20000000 + (16 << 20)); /* Process configuration file */ ==== //depot/projects/linuxolator/src/sys/compat/linux/linux_file.c#23 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/linux/linux_file.c,v 1.102 2007/03/29 02:11:45 julian Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linux/linux_file.c,v 1.103 2007/04/04 09:11:31 rwatson Exp $"); #include "opt_compat.h" #include "opt_mac.h" ==== //depot/projects/linuxolator/src/sys/compat/ndis/kern_ndis.c#3 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/ndis/kern_ndis.c,v 1.94 2007/02/23 16:25:07 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/ndis/kern_ndis.c,v 1.95 2007/04/06 11:18:57 pjd Exp $"); #include #include @@ -323,8 +323,7 @@ TAILQ_FOREACH(e, device_get_sysctl_ctx(sc->ndis_dev), link) { #endif oidp = e->entry; - if (ndis_strcasecmp(oidp->oid_name, - vals->nc_cfgkey) == 0) + if (strcasecmp(oidp->oid_name, vals->nc_cfgkey) == 0) break; oidp = NULL; } ==== //depot/projects/linuxolator/src/sys/compat/ndis/ndis_var.h#2 (text+ko) ==== @@ -29,7 +29,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF * THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/compat/ndis/ndis_var.h,v 1.46 2005/11/07 16:57:14 wpaul Exp $ + * $FreeBSD: src/sys/compat/ndis/ndis_var.h,v 1.47 2007/04/06 11:18:57 pjd Exp $ */ #ifndef _NDIS_VAR_H_ @@ -1746,8 +1746,6 @@ extern int ndis_create_sysctls(void *); extern int ndis_add_sysctl(void *, char *, char *, char *, int); extern int ndis_flush_sysctls(void *); -extern int ndis_strcasecmp(const char *, const char *); -extern int ndis_strncasecmp(const char *, const char *, size_t); extern uint32_t NdisAddDevice(driver_object *, device_object *); extern void NdisAllocatePacketPool(ndis_status *, ==== //depot/projects/linuxolator/src/sys/compat/ndis/subr_ndis.c#3 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/ndis/subr_ndis.c,v 1.106 2006/06/20 21:31:38 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/ndis/subr_ndis.c,v 1.107 2007/04/06 11:18:57 pjd Exp $"); /* * This file implements a translation layer between the BSD networking @@ -613,53 +613,6 @@ return(NDIS_STATUS_SUCCESS); } -int -ndis_strcasecmp(s1, s2) - const char *s1; - const char *s2; -{ - char a, b; - - /* - * In the kernel, toupper() is a macro. Have to be careful - * not to use pointer arithmetic when passing it arguments. - */ - - while(1) { - a = *s1; - b = *s2++; - if (toupper(a) != toupper(b)) - break; - if (*s1++ == '\0') - return(0); - } - - return (*(const unsigned char *)s1 - *(const unsigned char *)(s2 - 1)); -} - -int -ndis_strncasecmp(s1, s2, n) - const char *s1; - const char *s2; - size_t n; -{ - char a, b; - - if (n != 0) { - do { - a = *s1; - b = *s2++; - if (toupper(a) != toupper(b)) - return (*(const unsigned char *)s1 - - *(const unsigned char *)(s2 - 1)); - if (*s1++ == '\0') - break; - } while (--n != 0); - } - - return(0); -} - static void NdisReadConfiguration(status, parm, cfg, key, type) ndis_status *status; @@ -700,7 +653,7 @@ TAILQ_FOREACH(e, device_get_sysctl_ctx(sc->ndis_dev), link) { #endif oidp = e->entry; - if (ndis_strcasecmp(oidp->oid_name, keystr) == 0) { + if (strcasecmp(oidp->oid_name, keystr) == 0) { if (strcmp((char *)oidp->oid_arg1, "UNSET") == 0) { RtlFreeAnsiString(&as); *status = NDIS_STATUS_FAILURE; @@ -809,7 +762,7 @@ TAILQ_FOREACH(e, device_get_sysctl_ctx(sc->ndis_dev), link) { #endif oidp = e->entry; - if (ndis_strcasecmp(oidp->oid_name, keystr) == 0) { + if (strcasecmp(oidp->oid_name, keystr) == 0) { /* Found it, set the value. */ strcpy((char *)oidp->oid_arg1, val); RtlFreeAnsiString(&as); ==== //depot/projects/linuxolator/src/sys/compat/ndis/subr_pe.c#2 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/ndis/subr_pe.c,v 1.12 2005/10/26 18:46:27 wpaul Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/ndis/subr_pe.c,v 1.13 2007/04/06 11:18:57 pjd Exp $"); /* * This file contains routines for relocating and dynamically linking @@ -53,8 +53,6 @@ #include #ifdef _KERNEL #include -extern int ndis_strncasecmp(const char *, const char *, size_t); -#define strncasecmp(a, b, c) ndis_strncasecmp(a, b, c) #else #include #include ==== //depot/projects/linuxolator/src/sys/compat/svr4/svr4_filio.c#2 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/svr4/svr4_filio.c,v 1.34 2005/01/05 22:34:36 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/svr4/svr4_filio.c,v 1.35 2007/04/04 09:11:31 rwatson Exp $"); #include #include @@ -211,15 +211,15 @@ switch (cmd) { case SVR4_FIOCLEX: - FILEDESC_LOCK_FAST(fdp); + FILEDESC_XLOCK(fdp); fdp->fd_ofileflags[fd] |= UF_EXCLOSE; - FILEDESC_UNLOCK_FAST(fdp); + FILEDESC_XUNLOCK(fdp); return 0; case SVR4_FIONCLEX: - FILEDESC_LOCK_FAST(fdp); + FILEDESC_XLOCK(fdp); fdp->fd_ofileflags[fd] &= ~UF_EXCLOSE; - FILEDESC_UNLOCK_FAST(fdp); + FILEDESC_XUNLOCK(fdp); return 0; case SVR4_FIOGETOWN: ==== //depot/projects/linuxolator/src/sys/conf/files#25 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.1188 2007/03/26 08:59:03 rwatson Exp $ +# $FreeBSD: src/sys/conf/files,v 1.1190 2007/04/06 04:51:50 kan Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and ==== //depot/projects/linuxolator/src/sys/conf/files.amd64#11 (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.100 2006/12/18 05:45:23 mjacob Exp $ +# $FreeBSD: src/sys/conf/files.amd64,v 1.101 2007/04/06 04:51:50 kan Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -267,3 +267,5 @@ i386/cpufreq/powernow.c optional cpufreq i386/cpufreq/est.c optional cpufreq i386/cpufreq/p4tcc.c optional cpufreq +# +libkern/memset.c standard ==== //depot/projects/linuxolator/src/sys/conf/files.i386#10 (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.572 2006/12/18 05:45:23 mjacob Exp $ +# $FreeBSD: src/sys/conf/files.i386,v 1.574 2007/04/06 11:29:52 nyan Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -440,6 +440,7 @@ libkern/divdi3.c standard libkern/ffsl.c standard libkern/flsl.c standard +libkern/memset.c standard libkern/moddi3.c standard libkern/qdivrem.c standard libkern/ucmpdi2.c standard ==== //depot/projects/linuxolator/src/sys/conf/files.pc98#8 (text+ko) ==== @@ -3,7 +3,7 @@ # # modified for PC-9801/PC-9821 # -# $FreeBSD: src/sys/conf/files.pc98,v 1.351 2006/12/18 05:45:23 mjacob Exp $ +# $FreeBSD: src/sys/conf/files.pc98,v 1.352 2007/04/06 11:30:31 nyan Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -314,6 +314,7 @@ libkern/divdi3.c standard libkern/ffsl.c standard libkern/flsl.c standard +libkern/memset.c standard libkern/moddi3.c standard libkern/qdivrem.c standard libkern/ucmpdi2.c standard ==== //depot/projects/linuxolator/src/sys/conf/files.powerpc#5 (text+ko) ==== @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $FreeBSD: src/sys/conf/files.powerpc,v 1.62 2007/02/07 18:55:29 marcel Exp $ +# $FreeBSD: src/sys/conf/files.powerpc,v 1.64 2007/04/06 11:29:52 nyan 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 @@ libkern/fls.c standard libkern/flsl.c standard libkern/lshrdi3.c standard +libkern/memset.c standard libkern/moddi3.c standard libkern/qdivrem.c standard libkern/ucmpdi2.c standard ==== //depot/projects/linuxolator/src/sys/conf/options#22 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options,v 1.584 2007/03/31 23:23:41 jhb Exp $ +# $FreeBSD: src/sys/conf/options,v 1.585 2007/04/04 14:44:15 andre Exp $ # # On the handling of kernel options # @@ -390,7 +390,6 @@ SLIP_IFF_OPTS opt_slip.h TCPDEBUG TCP_SIGNATURE opt_inet.h -TCP_SACK_DEBUG opt_tcp_sack.h DEV_VLAN opt_vlan.h VLAN_ARRAY opt_vlan.h XBONEHACK ==== //depot/projects/linuxolator/src/sys/dev/ata/ata-all.h#5 (text+ko) ==== @@ -23,7 +23,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/ata/ata-all.h,v 1.121 2007/03/08 16:39:25 sos Exp $ + * $FreeBSD: src/sys/dev/ata/ata-all.h,v 1.122 2007/04/06 16:18:59 sos Exp $ */ /* ATA register defines */ @@ -445,6 +445,7 @@ #define ATA_DMA_READ 0x01 /* transaction is a read */ #define ATA_DMA_LOADED 0x02 /* DMA tables etc loaded */ #define ATA_DMA_ACTIVE 0x04 /* DMA transfer in progress */ +#define ATA_DMA_64BIT 0x10 /* supports 64bit addressing */ void (*alloc)(device_t dev); void (*free)(device_t dev); ==== //depot/projects/linuxolator/src/sys/dev/ata/ata-chipset.c#12 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/ata-chipset.c,v 1.192 2007/03/12 15:34:08 sos Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/ata-chipset.c,v 1.194 2007/04/06 16:21:34 sos Exp $"); #include "opt_ata.h" #include @@ -503,6 +503,7 @@ { struct ata_pci_controller *ctlr = device_get_softc(device_get_parent(dev)); struct ata_channel *ch = device_get_softc(dev); + u_int64_t work; int offset = ch->unit << 7; /* set the SATA resources */ @@ -521,13 +522,13 @@ ch->hw.command = NULL; /* not used here */ /* setup work areas */ - ATA_OUTL(ctlr->r_res2, ATA_AHCI_P_CLB + offset, - ch->dma->work_bus + ATA_AHCI_CL_OFFSET); - ATA_OUTL(ctlr->r_res2, ATA_AHCI_P_CLBU + offset, 0x00000000); + work = ch->dma->work_bus + ATA_AHCI_CL_OFFSET; + ATA_OUTL(ctlr->r_res2, ATA_AHCI_P_CLB + offset, work & 0xffffffff); + ATA_OUTL(ctlr->r_res2, ATA_AHCI_P_CLBU + offset, work >> 32); - ATA_OUTL(ctlr->r_res2, ATA_AHCI_P_FB + offset, - ch->dma->work_bus + ATA_AHCI_FB_OFFSET); - ATA_OUTL(ctlr->r_res2, ATA_AHCI_P_FBU + offset, 0x00000000); + work = ch->dma->work_bus + ATA_AHCI_FB_OFFSET; + ATA_OUTL(ctlr->r_res2, ATA_AHCI_P_FB + offset, work & 0xffffffff); + ATA_OUTL(ctlr->r_res2, ATA_AHCI_P_FBU + offset, work >> 32); /* enable wanted port interrupts */ ATA_OUTL(ctlr->r_res2, ATA_AHCI_P_IE + offset, @@ -766,6 +767,7 @@ static void ata_ahci_dmainit(device_t dev) { + struct ata_pci_controller *ctlr = device_get_softc(device_get_parent(dev)); struct ata_channel *ch = device_get_softc(dev); ata_dmainit(dev); @@ -773,6 +775,8 @@ /* note start and stop are not used here */ ch->dma->setprd = ata_ahci_dmasetprd; ch->dma->max_iosize = 8192 * DEV_BSIZE; + if (ATA_INL(ctlr->r_res2, ATA_AHCI_CAP) & ATA_AHCI_CAP_64BIT) + ch->dma->flags |= ATA_DMA_64BIT; } } @@ -2417,7 +2421,7 @@ { struct ata_pci_controller *ctlr = device_get_softc(device_get_parent(dev)); struct ata_channel *ch = device_get_softc(dev); - bus_addr_t work = ch->dma->work_bus; + u_int64_t work = ch->dma->work_bus; int i; /* clear work area */ @@ -2470,7 +2474,7 @@ ATA_OUTL(ctlr->r_res1, 0x02000 + ATA_MV_EDMA_BASE(ch), (1<<11) | (1<<13)); /* request queue base high */ - ATA_OUTL(ctlr->r_res1, 0x02010 + ATA_MV_EDMA_BASE(ch), (work >> 16) >> 16); + ATA_OUTL(ctlr->r_res1, 0x02010 + ATA_MV_EDMA_BASE(ch), work >> 32); /* request queue in ptr */ ATA_OUTL(ctlr->r_res1, 0x02014 + ATA_MV_EDMA_BASE(ch), work & 0xffffffff); @@ -2480,7 +2484,7 @@ /* response queue base high */ work += 1024; - ATA_OUTL(ctlr->r_res1, 0x0201c + ATA_MV_EDMA_BASE(ch), (work >> 16) >> 16); + ATA_OUTL(ctlr->r_res1, 0x0201c + ATA_MV_EDMA_BASE(ch), work >> 32); /* response queue in ptr */ ATA_OUTL(ctlr->r_res1, 0x02020 + ATA_MV_EDMA_BASE(ch), 0x0); @@ -2568,7 +2572,7 @@ /* fill in this request */ quadp[0] = (long)ch->dma->sg_bus & 0xffffffff; - quadp[1] = (ch->dma->sg_bus & 0xffffffff00000000ull) >> 32; + quadp[1] = (u_int64_t)ch->dma->sg_bus >> 32; wordp[4] = (request->flags & ATA_R_READ ? 0x01 : 0x00) | (tag<<1); i = 10; @@ -2721,12 +2725,16 @@ static void ata_marvell_edma_dmainit(device_t dev) { + struct ata_pci_controller *ctlr = device_get_softc(device_get_parent(dev)); struct ata_channel *ch = device_get_softc(dev); ata_dmainit(dev); if (ch->dma) { /* note start and stop are not used here */ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Apr 6 17:27:02 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F018816A406; Fri, 6 Apr 2007 17:27:01 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id C66E916A402 for ; Fri, 6 Apr 2007 17:27:01 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id B88C113C46A for ; Fri, 6 Apr 2007 17:27:01 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l36HR1dD081463 for ; Fri, 6 Apr 2007 17:27:01 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l36HR1KE081460 for perforce@freebsd.org; Fri, 6 Apr 2007 17:27:01 GMT (envelope-from sam@freebsd.org) Date: Fri, 6 Apr 2007 17:27:01 GMT Message-Id: <200704061727.l36HR1KE081460@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 117526 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 06 Apr 2007 17:27:02 -0000 http://perforce.freebsd.org/chv.cgi?CH=117526 Change 117526 by sam@sam_ebb on 2007/04/06 17:26:12 remove dup code from mis-merge Affected files ... .. //depot/projects/wifi/sys/net80211/ieee80211_node.c#90 edit Differences ... ==== //depot/projects/wifi/sys/net80211/ieee80211_node.c#90 (text+ko) ==== @@ -957,15 +957,6 @@ } /* XXX not right for 802.1x/WPA */ ieee80211_node_authorize(ni); - if (ic->ic_opmode == IEEE80211_M_AHDEMO) { - /* - * Blindly propagate capabilities based on the - * local configuration. In particular this permits - * us to use QoS to disable ACK's. - */ - if (ic->ic_flags & IEEE80211_F_WME) - ni->ni_flags |= IEEE80211_NODE_QOS; - } } return ni; } From owner-p4-projects@FreeBSD.ORG Fri Apr 6 23:56:52 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8A1FD16A406; Fri, 6 Apr 2007 23:56:52 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 35F4D16A404 for ; Fri, 6 Apr 2007 23:56:52 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 0F5F013C465 for ; Fri, 6 Apr 2007 23:56:52 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l36NupFC062889 for ; Fri, 6 Apr 2007 23:56:51 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l36Nupff062886 for perforce@freebsd.org; Fri, 6 Apr 2007 23:56:51 GMT (envelope-from imp@freebsd.org) Date: Fri, 6 Apr 2007 23:56:51 GMT Message-Id: <200704062356.l36Nupff062886@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 117557 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 06 Apr 2007 23:56:52 -0000 http://perforce.freebsd.org/chv.cgi?CH=117557 Change 117557 by imp@imp_lighthouse on 2007/04/06 23:56:32 Add umoscom and ugensa Affected files ... .. //depot/projects/usb/src/sys/modules/Makefile#3 edit Differences ... ==== //depot/projects/usb/src/sys/modules/Makefile#3 (text+ko) ==== @@ -264,12 +264,14 @@ ufoma \ uftdi \ ugen \ + ugensa \ uhid \ ukbd \ ulpt \ umass \ umct \ umodem \ + umoscom \ ums \ unionfs \ uplcom \ From owner-p4-projects@FreeBSD.ORG Sat Apr 7 04:02:14 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A5F2116A403; Sat, 7 Apr 2007 04:02:14 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 6591E16A401 for ; Sat, 7 Apr 2007 04:02:14 +0000 (UTC) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 5539D13C4B0 for ; Sat, 7 Apr 2007 04:02:14 +0000 (UTC) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l3742ErY014113 for ; Sat, 7 Apr 2007 04:02:14 GMT (envelope-from mjacob@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l37423MA014036 for perforce@freebsd.org; Sat, 7 Apr 2007 04:02:03 GMT (envelope-from mjacob@freebsd.org) Date: Sat, 7 Apr 2007 04:02:03 GMT Message-Id: <200704070402.l37423MA014036@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 117567 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 07 Apr 2007 04:02:15 -0000 http://perforce.freebsd.org/chv.cgi?CH=117567 Change 117567 by mjacob@mjexp-obrien on 2007/04/07 04:01:56 IFC Affected files ... .. //depot/projects/mjexp/MAINTAINERS#3 integrate .. //depot/projects/mjexp/Makefile.inc1#7 integrate .. //depot/projects/mjexp/bin/df/df.c#3 integrate .. //depot/projects/mjexp/cddl/Makefile#1 branch .. //depot/projects/mjexp/cddl/Makefile.inc#1 branch .. //depot/projects/mjexp/cddl/lib/Makefile#1 branch .. //depot/projects/mjexp/cddl/lib/Makefile.inc#1 branch .. //depot/projects/mjexp/cddl/lib/libavl/Makefile#1 branch .. //depot/projects/mjexp/cddl/lib/libnvpair/Makefile#1 branch .. //depot/projects/mjexp/cddl/lib/libumem/Makefile#1 branch .. //depot/projects/mjexp/cddl/lib/libuutil/Makefile#1 branch .. //depot/projects/mjexp/cddl/lib/libzfs/Makefile#1 branch .. //depot/projects/mjexp/cddl/lib/libzpool/Makefile#1 branch .. //depot/projects/mjexp/cddl/sbin/Makefile#1 branch .. //depot/projects/mjexp/cddl/sbin/Makefile.inc#1 branch .. //depot/projects/mjexp/cddl/sbin/zfs/Makefile#1 branch .. //depot/projects/mjexp/cddl/sbin/zpool/Makefile#1 branch .. //depot/projects/mjexp/cddl/usr.bin/Makefile#1 branch .. //depot/projects/mjexp/cddl/usr.bin/Makefile.inc#1 branch .. //depot/projects/mjexp/cddl/usr.bin/ztest/Makefile#1 branch .. //depot/projects/mjexp/cddl/usr.sbin/Makefile#1 branch .. //depot/projects/mjexp/cddl/usr.sbin/Makefile.inc#1 branch .. //depot/projects/mjexp/cddl/usr.sbin/zdb/Makefile#1 branch .. //depot/projects/mjexp/compat/opensolaris/include/devid.h#1 branch .. //depot/projects/mjexp/compat/opensolaris/include/fsshare.h#1 branch .. //depot/projects/mjexp/compat/opensolaris/include/libintl.h#1 branch .. //depot/projects/mjexp/compat/opensolaris/include/mnttab.h#1 branch .. //depot/projects/mjexp/compat/opensolaris/include/priv.h#1 branch .. //depot/projects/mjexp/compat/opensolaris/include/solaris.h#1 branch .. //depot/projects/mjexp/compat/opensolaris/include/zone.h#1 branch .. //depot/projects/mjexp/compat/opensolaris/lib/libumem/umem.c#1 branch .. //depot/projects/mjexp/compat/opensolaris/lib/libumem/umem.h#1 branch .. //depot/projects/mjexp/compat/opensolaris/misc/fsshare.c#1 branch .. //depot/projects/mjexp/compat/opensolaris/misc/mkdirp.c#1 branch .. //depot/projects/mjexp/compat/opensolaris/misc/mnttab.c#1 branch .. //depot/projects/mjexp/compat/opensolaris/misc/zmount.c#1 branch .. //depot/projects/mjexp/compat/opensolaris/misc/zone.c#1 branch .. //depot/projects/mjexp/contrib/amd/hlfsd/hlfsd.h#2 integrate .. //depot/projects/mjexp/contrib/binutils/gas/as.h#2 integrate .. //depot/projects/mjexp/contrib/binutils/gas/tc.h#2 integrate .. //depot/projects/mjexp/contrib/opensolaris/cmd/zdb/zdb.8#1 branch .. //depot/projects/mjexp/contrib/opensolaris/cmd/zdb/zdb.c#1 branch .. //depot/projects/mjexp/contrib/opensolaris/cmd/zdb/zdb_il.c#1 branch .. //depot/projects/mjexp/contrib/opensolaris/cmd/zfs/zfs.8#1 branch .. //depot/projects/mjexp/contrib/opensolaris/cmd/zfs/zfs_iter.c#1 branch .. //depot/projects/mjexp/contrib/opensolaris/cmd/zfs/zfs_iter.h#1 branch .. //depot/projects/mjexp/contrib/opensolaris/cmd/zfs/zfs_main.c#1 branch .. //depot/projects/mjexp/contrib/opensolaris/cmd/zfs/zfs_util.h#1 branch .. //depot/projects/mjexp/contrib/opensolaris/cmd/zpool/zpool.8#1 branch .. //depot/projects/mjexp/contrib/opensolaris/cmd/zpool/zpool_iter.c#1 branch .. //depot/projects/mjexp/contrib/opensolaris/cmd/zpool/zpool_main.c#1 branch .. //depot/projects/mjexp/contrib/opensolaris/cmd/zpool/zpool_util.c#1 branch .. //depot/projects/mjexp/contrib/opensolaris/cmd/zpool/zpool_util.h#1 branch .. //depot/projects/mjexp/contrib/opensolaris/cmd/zpool/zpool_vdev.c#1 branch .. //depot/projects/mjexp/contrib/opensolaris/cmd/ztest/ztest.c#1 branch .. //depot/projects/mjexp/contrib/opensolaris/head/assert.h#1 branch .. //depot/projects/mjexp/contrib/opensolaris/head/atomic.h#1 branch .. //depot/projects/mjexp/contrib/opensolaris/head/libintl.h#1 branch .. //depot/projects/mjexp/contrib/opensolaris/head/stdio_ext.h#1 branch .. //depot/projects/mjexp/contrib/opensolaris/head/synch.h#1 branch .. //depot/projects/mjexp/contrib/opensolaris/head/thread.h#1 branch .. //depot/projects/mjexp/contrib/opensolaris/lib/libnvpair/libnvpair.c#1 branch .. //depot/projects/mjexp/contrib/opensolaris/lib/libnvpair/libnvpair.h#1 branch .. //depot/projects/mjexp/contrib/opensolaris/lib/libnvpair/nvpair_alloc_system.c#1 branch .. //depot/projects/mjexp/contrib/opensolaris/lib/libuutil/common/libuutil.h#1 branch .. //depot/projects/mjexp/contrib/opensolaris/lib/libuutil/common/libuutil_common.h#1 branch .. //depot/projects/mjexp/contrib/opensolaris/lib/libuutil/common/libuutil_impl.h#1 branch .. //depot/projects/mjexp/contrib/opensolaris/lib/libuutil/common/uu_alloc.c#1 branch .. //depot/projects/mjexp/contrib/opensolaris/lib/libuutil/common/uu_avl.c#1 branch .. //depot/projects/mjexp/contrib/opensolaris/lib/libuutil/common/uu_dprintf.c#1 branch .. //depot/projects/mjexp/contrib/opensolaris/lib/libuutil/common/uu_ident.c#1 branch .. //depot/projects/mjexp/contrib/opensolaris/lib/libuutil/common/uu_list.c#1 branch .. //depot/projects/mjexp/contrib/opensolaris/lib/libuutil/common/uu_misc.c#1 branch .. //depot/projects/mjexp/contrib/opensolaris/lib/libuutil/common/uu_open.c#1 branch .. //depot/projects/mjexp/contrib/opensolaris/lib/libuutil/common/uu_pname.c#1 branch .. //depot/projects/mjexp/contrib/opensolaris/lib/libuutil/common/uu_strtoint.c#1 branch .. //depot/projects/mjexp/contrib/opensolaris/lib/libzfs/common/libzfs.h#1 branch .. //depot/projects/mjexp/contrib/opensolaris/lib/libzfs/common/libzfs_changelist.c#1 branch .. //depot/projects/mjexp/contrib/opensolaris/lib/libzfs/common/libzfs_config.c#1 branch .. //depot/projects/mjexp/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c#1 branch .. //depot/projects/mjexp/contrib/opensolaris/lib/libzfs/common/libzfs_graph.c#1 branch .. //depot/projects/mjexp/contrib/opensolaris/lib/libzfs/common/libzfs_impl.h#1 branch .. //depot/projects/mjexp/contrib/opensolaris/lib/libzfs/common/libzfs_import.c#1 branch .. //depot/projects/mjexp/contrib/opensolaris/lib/libzfs/common/libzfs_mount.c#1 branch .. //depot/projects/mjexp/contrib/opensolaris/lib/libzfs/common/libzfs_pool.c#1 branch .. //depot/projects/mjexp/contrib/opensolaris/lib/libzfs/common/libzfs_status.c#1 branch .. //depot/projects/mjexp/contrib/opensolaris/lib/libzfs/common/libzfs_util.c#1 branch .. //depot/projects/mjexp/contrib/opensolaris/lib/libzpool/common/kernel.c#1 branch .. //depot/projects/mjexp/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h#1 branch .. //depot/projects/mjexp/contrib/opensolaris/lib/libzpool/common/taskq.c#1 branch .. //depot/projects/mjexp/contrib/opensolaris/lib/libzpool/common/util.c#1 branch .. //depot/projects/mjexp/contrib/tcpdump/print-stp.c#2 integrate .. //depot/projects/mjexp/contrib/tcsh/sh.lex.c#3 integrate .. //depot/projects/mjexp/etc/defaults/periodic.conf#2 integrate .. //depot/projects/mjexp/etc/defaults/rc.conf#10 integrate .. //depot/projects/mjexp/etc/mtree/BSD.root.dist#2 integrate .. //depot/projects/mjexp/etc/periodic/daily/404.status-zfs#1 branch .. //depot/projects/mjexp/etc/periodic/daily/Makefile#2 integrate .. //depot/projects/mjexp/etc/rc.d/Makefile#4 integrate .. //depot/projects/mjexp/etc/rc.d/mountd#2 integrate .. //depot/projects/mjexp/etc/rc.d/nfslocking#3 integrate .. //depot/projects/mjexp/etc/rc.d/zfs#1 branch .. //depot/projects/mjexp/etc/rc.firewall#5 integrate .. //depot/projects/mjexp/include/stdio.h#2 integrate .. //depot/projects/mjexp/lib/libarchive/Makefile#6 integrate .. //depot/projects/mjexp/lib/libarchive/archive_entry.c#7 integrate .. //depot/projects/mjexp/lib/libarchive/archive_read.3#7 integrate .. //depot/projects/mjexp/lib/libarchive/archive_read.c#10 integrate .. //depot/projects/mjexp/lib/libarchive/archive_read_data_into_buffer.c#4 delete .. //depot/projects/mjexp/lib/libarchive/archive_read_support_compression_bzip2.c#7 integrate .. //depot/projects/mjexp/lib/libarchive/archive_read_support_compression_compress.c#5 integrate .. //depot/projects/mjexp/lib/libarchive/archive_read_support_compression_gzip.c#5 integrate .. //depot/projects/mjexp/lib/libarchive/archive_read_support_compression_none.c#8 integrate .. //depot/projects/mjexp/lib/libarchive/archive_read_support_format_tar.c#7 integrate .. //depot/projects/mjexp/lib/libarchive/libarchive-formats.5#4 integrate .. //depot/projects/mjexp/lib/libatm/cache_key.c#2 integrate .. //depot/projects/mjexp/lib/libc/amd64/stdlib/Makefile.inc#1 branch .. //depot/projects/mjexp/lib/libc/amd64/stdlib/div.S#1 branch .. //depot/projects/mjexp/lib/libc/amd64/stdlib/ldiv.S#1 branch .. //depot/projects/mjexp/lib/libc/amd64/stdlib/lldiv.S#1 branch .. //depot/projects/mjexp/lib/libc/gen/Symbol.map#3 integrate .. //depot/projects/mjexp/lib/libc/gen/dlfcn.c#2 integrate .. //depot/projects/mjexp/lib/libc/gen/getvfsbyname.3#3 integrate .. //depot/projects/mjexp/lib/libc/resolv/Symbol.map#2 integrate .. //depot/projects/mjexp/lib/libc/resolv/res_debug.c#3 integrate .. //depot/projects/mjexp/lib/libc/sys/lseek.2#3 integrate .. //depot/projects/mjexp/lib/libc/sys/pathconf.2#3 integrate .. //depot/projects/mjexp/lib/libc/uuid/uuid_compare.c#2 integrate .. //depot/projects/mjexp/lib/libcrypt/crypt.3#2 integrate .. //depot/projects/mjexp/lib/libgssapi/gss_accept_sec_context.c#2 integrate .. //depot/projects/mjexp/lib/libgssapi/gss_add_cred.c#2 integrate .. //depot/projects/mjexp/lib/libgssapi/gss_add_oid_set_member.c#2 integrate .. //depot/projects/mjexp/lib/libgssapi/gss_canonicalize_name.c#2 integrate .. //depot/projects/mjexp/lib/libgssapi/gss_display_name.c#2 integrate .. //depot/projects/mjexp/lib/libgssapi/gss_duplicate_name.c#2 integrate .. //depot/projects/mjexp/lib/libgssapi/gss_export_sec_context.c#2 integrate .. //depot/projects/mjexp/lib/libgssapi/gss_import_name.c#2 integrate .. //depot/projects/mjexp/lib/libgssapi/gss_init_sec_context.c#2 integrate .. //depot/projects/mjexp/lib/libgssapi/gss_inquire_cred.c#2 integrate .. //depot/projects/mjexp/lib/libgssapi/gss_names.c#2 integrate .. //depot/projects/mjexp/lib/libgssapi/gss_utils.c#2 integrate .. //depot/projects/mjexp/lib/libradius/radlib.c#2 integrate .. //depot/projects/mjexp/lib/libstand/environment.c#2 integrate .. //depot/projects/mjexp/lib/libthr/thread/thr_info.c#3 integrate .. //depot/projects/mjexp/libexec/rtld-elf/Makefile#2 integrate .. //depot/projects/mjexp/libexec/rtld-elf/Symbol.map#1 branch .. //depot/projects/mjexp/libexec/rtld-elf/Versions.def#1 branch .. //depot/projects/mjexp/libexec/rtld-elf/i386/Symbol.map#1 branch .. //depot/projects/mjexp/libexec/rtld-elf/map_object.c#2 integrate .. //depot/projects/mjexp/libexec/rtld-elf/rtld.c#3 integrate .. //depot/projects/mjexp/libexec/rtld-elf/rtld.h#2 integrate .. //depot/projects/mjexp/libexec/rtld-elf/rtld_lock.c#2 integrate .. //depot/projects/mjexp/sbin/dump/traverse.c#3 integrate .. //depot/projects/mjexp/sbin/gbde/test.sh#2 integrate .. //depot/projects/mjexp/sbin/ggate/ggatec/Makefile#2 integrate .. //depot/projects/mjexp/sbin/ggate/shared/ggate.c#4 integrate .. //depot/projects/mjexp/share/man/man4/nfe.4#2 integrate .. //depot/projects/mjexp/share/man/man4/polling.4#3 integrate .. //depot/projects/mjexp/share/man/man4/tcp.4#4 integrate .. //depot/projects/mjexp/share/man/man5/rc.conf.5#10 integrate .. //depot/projects/mjexp/share/man/man5/src.conf.5#3 integrate .. //depot/projects/mjexp/share/man/man7/hier.7#5 integrate .. //depot/projects/mjexp/share/man/man9/VFS_SET.9#2 integrate .. //depot/projects/mjexp/share/misc/committers-ports.dot#2 integrate .. //depot/projects/mjexp/share/misc/committers-src.dot#2 integrate .. //depot/projects/mjexp/share/mk/Makefile#2 integrate .. //depot/projects/mjexp/share/mk/bsd.lib.mk#3 integrate .. //depot/projects/mjexp/share/mk/bsd.libnames.mk#4 integrate .. //depot/projects/mjexp/share/mk/bsd.own.mk#4 integrate .. //depot/projects/mjexp/share/mk/bsd.symver.mk#1 branch .. //depot/projects/mjexp/sys/boot/pc98/boot2/boot.c#4 integrate .. //depot/projects/mjexp/sys/compat/linprocfs/linprocfs.c#9 integrate .. //depot/projects/mjexp/sys/compat/linux/linux_file.c#5 integrate .. //depot/projects/mjexp/sys/compat/ndis/kern_ndis.c#3 integrate .. //depot/projects/mjexp/sys/compat/ndis/ndis_var.h#2 integrate .. //depot/projects/mjexp/sys/compat/ndis/subr_ndis.c#2 integrate .. //depot/projects/mjexp/sys/compat/ndis/subr_pe.c#2 integrate .. //depot/projects/mjexp/sys/compat/opensolaris/kern/opensolaris_kmem.c#1 branch .. //depot/projects/mjexp/sys/compat/opensolaris/kern/opensolaris_kobj.c#1 branch .. //depot/projects/mjexp/sys/compat/opensolaris/kern/opensolaris_kstat.c#1 branch .. //depot/projects/mjexp/sys/compat/opensolaris/kern/opensolaris_policy.c#1 branch .. //depot/projects/mjexp/sys/compat/opensolaris/kern/opensolaris_string.c#1 branch .. //depot/projects/mjexp/sys/compat/opensolaris/kern/opensolaris_vfs.c#1 branch .. //depot/projects/mjexp/sys/compat/opensolaris/kern/opensolaris_zone.c#1 branch .. //depot/projects/mjexp/sys/compat/opensolaris/machine/endian.h#1 branch .. //depot/projects/mjexp/sys/compat/opensolaris/rpc/xdr.h#1 branch .. //depot/projects/mjexp/sys/compat/opensolaris/sys/acl.h#1 branch .. //depot/projects/mjexp/sys/compat/opensolaris/sys/byteorder.h#1 branch .. //depot/projects/mjexp/sys/compat/opensolaris/sys/callb.h#1 branch .. //depot/projects/mjexp/sys/compat/opensolaris/sys/cmn_err.h#1 branch .. //depot/projects/mjexp/sys/compat/opensolaris/sys/cred.h#1 branch .. //depot/projects/mjexp/sys/compat/opensolaris/sys/debug.h#1 branch .. //depot/projects/mjexp/sys/compat/opensolaris/sys/dirent.h#1 branch .. //depot/projects/mjexp/sys/compat/opensolaris/sys/dkio.h#1 branch .. //depot/projects/mjexp/sys/compat/opensolaris/sys/kcondvar.h#1 branch .. //depot/projects/mjexp/sys/compat/opensolaris/sys/kmem.h#1 branch .. //depot/projects/mjexp/sys/compat/opensolaris/sys/kobj.h#1 branch .. //depot/projects/mjexp/sys/compat/opensolaris/sys/kstat.h#1 branch .. //depot/projects/mjexp/sys/compat/opensolaris/sys/mntent.h#1 branch .. //depot/projects/mjexp/sys/compat/opensolaris/sys/mnttab.h#1 branch .. //depot/projects/mjexp/sys/compat/opensolaris/sys/mount.h#1 branch .. //depot/projects/mjexp/sys/compat/opensolaris/sys/mutex.h#1 branch .. //depot/projects/mjexp/sys/compat/opensolaris/sys/policy.h#1 branch .. //depot/projects/mjexp/sys/compat/opensolaris/sys/proc.h#1 branch .. //depot/projects/mjexp/sys/compat/opensolaris/sys/random.h#1 branch .. //depot/projects/mjexp/sys/compat/opensolaris/sys/rwlock.h#1 branch .. //depot/projects/mjexp/sys/compat/opensolaris/sys/sdt.h#1 branch .. //depot/projects/mjexp/sys/compat/opensolaris/sys/string.h#1 branch .. //depot/projects/mjexp/sys/compat/opensolaris/sys/sysmacros.h#1 branch .. //depot/projects/mjexp/sys/compat/opensolaris/sys/systm.h#1 branch .. //depot/projects/mjexp/sys/compat/opensolaris/sys/taskq.h#1 branch .. //depot/projects/mjexp/sys/compat/opensolaris/sys/taskq_impl.h#1 branch .. //depot/projects/mjexp/sys/compat/opensolaris/sys/time.h#1 branch .. //depot/projects/mjexp/sys/compat/opensolaris/sys/types.h#1 branch .. //depot/projects/mjexp/sys/compat/opensolaris/sys/uio.h#1 branch .. //depot/projects/mjexp/sys/compat/opensolaris/sys/varargs.h#1 branch .. //depot/projects/mjexp/sys/compat/opensolaris/sys/vfs.h#1 branch .. //depot/projects/mjexp/sys/compat/opensolaris/sys/vnode.h#1 branch .. //depot/projects/mjexp/sys/compat/opensolaris/sys/zone.h#1 branch .. //depot/projects/mjexp/sys/compat/svr4/svr4_filio.c#2 integrate .. //depot/projects/mjexp/sys/conf/files#17 integrate .. //depot/projects/mjexp/sys/conf/files.amd64#7 integrate .. //depot/projects/mjexp/sys/conf/files.i386#7 integrate .. //depot/projects/mjexp/sys/conf/files.pc98#7 integrate .. //depot/projects/mjexp/sys/conf/files.powerpc#5 integrate .. //depot/projects/mjexp/sys/conf/options#15 integrate .. //depot/projects/mjexp/sys/contrib/opensolaris/common/acl/acl_common.c#1 branch .. //depot/projects/mjexp/sys/contrib/opensolaris/common/acl/acl_common.h#1 branch .. //depot/projects/mjexp/sys/contrib/opensolaris/common/avl/avl.c#1 branch .. //depot/projects/mjexp/sys/contrib/opensolaris/common/nvpair/nvpair.c#1 branch .. //depot/projects/mjexp/sys/contrib/opensolaris/common/nvpair/nvpair_alloc_fixed.c#1 branch .. //depot/projects/mjexp/sys/contrib/opensolaris/common/zfs/zfs_namecheck.c#1 branch .. //depot/projects/mjexp/sys/contrib/opensolaris/common/zfs/zfs_namecheck.h#1 branch .. //depot/projects/mjexp/sys/contrib/opensolaris/common/zfs/zfs_prop.c#1 branch .. //depot/projects/mjexp/sys/contrib/opensolaris/common/zfs/zfs_prop.h#1 branch .. //depot/projects/mjexp/sys/contrib/opensolaris/uts/common/Makefile.files#1 branch .. //depot/projects/mjexp/sys/contrib/opensolaris/uts/common/arch/amd64/atomic.S#1 branch .. //depot/projects/mjexp/sys/contrib/opensolaris/uts/common/arch/i386/atomic.S#1 branch .. //depot/projects/mjexp/sys/contrib/opensolaris/uts/common/fs/dnlc.c#1 branch .. //depot/projects/mjexp/sys/contrib/opensolaris/uts/common/fs/gfs.c#1 branch .. //depot/projects/mjexp/sys/contrib/opensolaris/uts/common/fs/zfs/arc.c#1 branch .. //depot/projects/mjexp/sys/contrib/opensolaris/uts/common/fs/zfs/bplist.c#1 branch .. //depot/projects/mjexp/sys/contrib/opensolaris/uts/common/fs/zfs/dbuf.c#1 branch .. //depot/projects/mjexp/sys/contrib/opensolaris/uts/common/fs/zfs/dmu.c#1 branch .. //depot/projects/mjexp/sys/contrib/opensolaris/uts/common/fs/zfs/dmu_object.c#1 branch .. //depot/projects/mjexp/sys/contrib/opensolaris/uts/common/fs/zfs/dmu_objset.c#1 branch .. //depot/projects/mjexp/sys/contrib/opensolaris/uts/common/fs/zfs/dmu_send.c#1 branch .. //depot/projects/mjexp/sys/contrib/opensolaris/uts/common/fs/zfs/dmu_traverse.c#1 branch .. //depot/projects/mjexp/sys/contrib/opensolaris/uts/common/fs/zfs/dmu_tx.c#1 branch .. //depot/projects/mjexp/sys/contrib/opensolaris/uts/common/fs/zfs/dmu_zfetch.c#1 branch .. //depot/projects/mjexp/sys/contrib/opensolaris/uts/common/fs/zfs/dnode.c#1 branch .. //depot/projects/mjexp/sys/contrib/opensolaris/uts/common/fs/zfs/dnode_sync.c#1 branch .. //depot/projects/mjexp/sys/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c#1 branch .. //depot/projects/mjexp/sys/contrib/opensolaris/uts/common/fs/zfs/dsl_dir.c#1 branch .. //depot/projects/mjexp/sys/contrib/opensolaris/uts/common/fs/zfs/dsl_pool.c#1 branch .. //depot/projects/mjexp/sys/contrib/opensolaris/uts/common/fs/zfs/dsl_prop.c#1 branch .. //depot/projects/mjexp/sys/contrib/opensolaris/uts/common/fs/zfs/dsl_synctask.c#1 branch .. //depot/projects/mjexp/sys/contrib/opensolaris/uts/common/fs/zfs/fletcher.c#1 branch .. //depot/projects/mjexp/sys/contrib/opensolaris/uts/common/fs/zfs/gzip.c#1 branch .. //depot/projects/mjexp/sys/contrib/opensolaris/uts/common/fs/zfs/lzjb.c#1 branch .. //depot/projects/mjexp/sys/contrib/opensolaris/uts/common/fs/zfs/metaslab.c#1 branch .. //depot/projects/mjexp/sys/contrib/opensolaris/uts/common/fs/zfs/refcount.c#1 branch .. //depot/projects/mjexp/sys/contrib/opensolaris/uts/common/fs/zfs/sha256.c#1 branch .. //depot/projects/mjexp/sys/contrib/opensolaris/uts/common/fs/zfs/spa.c#1 branch .. //depot/projects/mjexp/sys/contrib/opensolaris/uts/common/fs/zfs/spa_config.c#1 branch .. //depot/projects/mjexp/sys/contrib/opensolaris/uts/common/fs/zfs/spa_errlog.c#1 branch .. //depot/projects/mjexp/sys/contrib/opensolaris/uts/common/fs/zfs/spa_history.c#1 branch .. //depot/projects/mjexp/sys/contrib/opensolaris/uts/common/fs/zfs/spa_misc.c#1 branch .. //depot/projects/mjexp/sys/contrib/opensolaris/uts/common/fs/zfs/space_map.c#1 branch .. //depot/projects/mjexp/sys/contrib/opensolaris/uts/common/fs/zfs/sys/arc.h#1 branch .. //depot/projects/mjexp/sys/contrib/opensolaris/uts/common/fs/zfs/sys/bplist.h#1 branch .. //depot/projects/mjexp/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dbuf.h#1 branch .. //depot/projects/mjexp/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dmu.h#1 branch .. //depot/projects/mjexp/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_impl.h#1 branch .. //depot/projects/mjexp/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_objset.h#1 branch .. //depot/projects/mjexp/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_traverse.h#1 branch .. //depot/projects/mjexp/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_tx.h#1 branch .. //depot/projects/mjexp/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_zfetch.h#1 branch .. //depot/projects/mjexp/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dnode.h#1 branch .. //depot/projects/mjexp/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_dataset.h#1 branch .. //depot/projects/mjexp/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_dir.h#1 branch .. //depot/projects/mjexp/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_pool.h#1 branch .. //depot/projects/mjexp/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_prop.h#1 branch .. //depot/projects/mjexp/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_synctask.h#1 branch .. //depot/projects/mjexp/sys/contrib/opensolaris/uts/common/fs/zfs/sys/metaslab.h#1 branch .. //depot/projects/mjexp/sys/contrib/opensolaris/uts/common/fs/zfs/sys/metaslab_impl.h#1 branch .. //depot/projects/mjexp/sys/contrib/opensolaris/uts/common/fs/zfs/sys/refcount.h#1 branch .. //depot/projects/mjexp/sys/contrib/opensolaris/uts/common/fs/zfs/sys/spa.h#1 branch .. //depot/projects/mjexp/sys/contrib/opensolaris/uts/common/fs/zfs/sys/spa_impl.h#1 branch .. //depot/projects/mjexp/sys/contrib/opensolaris/uts/common/fs/zfs/sys/space_map.h#1 branch .. //depot/projects/mjexp/sys/contrib/opensolaris/uts/common/fs/zfs/sys/txg.h#1 branch .. //depot/projects/mjexp/sys/contrib/opensolaris/uts/common/fs/zfs/sys/txg_impl.h#1 branch .. //depot/projects/mjexp/sys/contrib/opensolaris/uts/common/fs/zfs/sys/uberblock.h#1 branch .. //depot/projects/mjexp/sys/contrib/opensolaris/uts/common/fs/zfs/sys/uberblock_impl.h#1 branch .. //depot/projects/mjexp/sys/contrib/opensolaris/uts/common/fs/zfs/sys/unique.h#1 branch .. //depot/projects/mjexp/sys/contrib/opensolaris/uts/common/fs/zfs/sys/vdev.h#1 branch .. //depot/projects/mjexp/sys/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_disk.h#1 branch .. //depot/projects/mjexp/sys/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_file.h#1 branch .. //depot/projects/mjexp/sys/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_impl.h#1 branch .. //depot/projects/mjexp/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zap.h#1 branch .. //depot/projects/mjexp/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zap_impl.h#1 branch .. //depot/projects/mjexp/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zap_leaf.h#1 branch .. //depot/projects/mjexp/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_acl.h#1 branch .. //depot/projects/mjexp/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_context.h#1 branch .. //depot/projects/mjexp/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_ctldir.h#1 branch .. //depot/projects/mjexp/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_debug.h#1 branch .. //depot/projects/mjexp/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_dir.h#1 branch .. //depot/projects/mjexp/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_ioctl.h#1 branch .. //depot/projects/mjexp/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_rlock.h#1 branch .. //depot/projects/mjexp/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_vfsops.h#1 branch .. //depot/projects/mjexp/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_znode.h#1 branch .. //depot/projects/mjexp/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zil.h#1 branch .. //depot/projects/mjexp/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zil_impl.h#1 branch .. //depot/projects/mjexp/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zio.h#1 branch .. //depot/projects/mjexp/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zio_checksum.h#1 branch .. //depot/projects/mjexp/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zio_compress.h#1 branch .. //depot/projects/mjexp/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zio_impl.h#1 branch .. //depot/projects/mjexp/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zvol.h#1 branch .. //depot/projects/mjexp/sys/contrib/opensolaris/uts/common/fs/zfs/txg.c#1 branch .. //depot/projects/mjexp/sys/contrib/opensolaris/uts/common/fs/zfs/uberblock.c#1 branch .. //depot/projects/mjexp/sys/contrib/opensolaris/uts/common/fs/zfs/unique.c#1 branch .. //depot/projects/mjexp/sys/contrib/opensolaris/uts/common/fs/zfs/vdev.c#1 branch .. //depot/projects/mjexp/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_cache.c#1 branch .. //depot/projects/mjexp/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_disk.c#1 branch .. //depot/projects/mjexp/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_file.c#1 branch .. //depot/projects/mjexp/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c#1 branch .. //depot/projects/mjexp/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_label.c#1 branch .. //depot/projects/mjexp/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_mirror.c#1 branch .. //depot/projects/mjexp/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_missing.c#1 branch .. //depot/projects/mjexp/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_queue.c#1 branch .. //depot/projects/mjexp/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_raidz.c#1 branch .. //depot/projects/mjexp/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_root.c#1 branch .. //depot/projects/mjexp/sys/contrib/opensolaris/uts/common/fs/zfs/zap.c#1 branch .. //depot/projects/mjexp/sys/contrib/opensolaris/uts/common/fs/zfs/zap_leaf.c#1 branch .. //depot/projects/mjexp/sys/contrib/opensolaris/uts/common/fs/zfs/zap_micro.c#1 branch .. //depot/projects/mjexp/sys/contrib/opensolaris/uts/common/fs/zfs/zfs.conf#1 branch .. //depot/projects/mjexp/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_acl.c#1 branch .. //depot/projects/mjexp/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_byteswap.c#1 branch .. //depot/projects/mjexp/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c#1 branch .. //depot/projects/mjexp/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_dir.c#1 branch .. //depot/projects/mjexp/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_fm.c#1 branch .. //depot/projects/mjexp/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c#1 branch .. //depot/projects/mjexp/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_log.c#1 branch .. //depot/projects/mjexp/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_replay.c#1 branch .. //depot/projects/mjexp/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_rlock.c#1 branch .. //depot/projects/mjexp/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c#1 branch .. //depot/projects/mjexp/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#1 branch .. //depot/projects/mjexp/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#1 branch .. //depot/projects/mjexp/sys/contrib/opensolaris/uts/common/fs/zfs/zil.c#1 branch .. //depot/projects/mjexp/sys/contrib/opensolaris/uts/common/fs/zfs/zio.c#1 branch .. //depot/projects/mjexp/sys/contrib/opensolaris/uts/common/fs/zfs/zio_checksum.c#1 branch .. //depot/projects/mjexp/sys/contrib/opensolaris/uts/common/fs/zfs/zio_compress.c#1 branch .. //depot/projects/mjexp/sys/contrib/opensolaris/uts/common/fs/zfs/zio_inject.c#1 branch .. //depot/projects/mjexp/sys/contrib/opensolaris/uts/common/fs/zfs/zvol.c#1 branch .. //depot/projects/mjexp/sys/contrib/opensolaris/uts/common/os/callb.c#1 branch .. //depot/projects/mjexp/sys/contrib/opensolaris/uts/common/os/list.c#1 branch .. //depot/projects/mjexp/sys/contrib/opensolaris/uts/common/os/nvpair_alloc_system.c#1 branch .. //depot/projects/mjexp/sys/contrib/opensolaris/uts/common/os/taskq.c#1 branch .. //depot/projects/mjexp/sys/contrib/opensolaris/uts/common/rpc/xdr.c#1 branch .. //depot/projects/mjexp/sys/contrib/opensolaris/uts/common/rpc/xdr.h#1 branch .. //depot/projects/mjexp/sys/contrib/opensolaris/uts/common/rpc/xdr_array.c#1 branch .. //depot/projects/mjexp/sys/contrib/opensolaris/uts/common/rpc/xdr_mem.c#1 branch .. //depot/projects/mjexp/sys/contrib/opensolaris/uts/common/sys/asm_linkage.h#1 branch .. //depot/projects/mjexp/sys/contrib/opensolaris/uts/common/sys/atomic.h#1 branch .. //depot/projects/mjexp/sys/contrib/opensolaris/uts/common/sys/avl.h#1 branch .. //depot/projects/mjexp/sys/contrib/opensolaris/uts/common/sys/avl_impl.h#1 branch .. //depot/projects/mjexp/sys/contrib/opensolaris/uts/common/sys/bitmap.h#1 branch .. //depot/projects/mjexp/sys/contrib/opensolaris/uts/common/sys/byteorder.h#1 branch .. //depot/projects/mjexp/sys/contrib/opensolaris/uts/common/sys/callb.h#1 branch .. //depot/projects/mjexp/sys/contrib/opensolaris/uts/common/sys/ccompile.h#1 branch .. //depot/projects/mjexp/sys/contrib/opensolaris/uts/common/sys/compress.h#1 branch .. //depot/projects/mjexp/sys/contrib/opensolaris/uts/common/sys/cred.h#1 branch .. //depot/projects/mjexp/sys/contrib/opensolaris/uts/common/sys/debug.h#1 branch .. //depot/projects/mjexp/sys/contrib/opensolaris/uts/common/sys/dkio.h#1 branch .. //depot/projects/mjexp/sys/contrib/opensolaris/uts/common/sys/dklabel.h#1 branch .. //depot/projects/mjexp/sys/contrib/opensolaris/uts/common/sys/dnlc.h#1 branch .. //depot/projects/mjexp/sys/contrib/opensolaris/uts/common/sys/errorq.h#1 branch .. //depot/projects/mjexp/sys/contrib/opensolaris/uts/common/sys/feature_tests.h#1 branch .. //depot/projects/mjexp/sys/contrib/opensolaris/uts/common/sys/fm/fs/zfs.h#1 branch .. //depot/projects/mjexp/sys/contrib/opensolaris/uts/common/sys/fm/protocol.h#1 branch .. //depot/projects/mjexp/sys/contrib/opensolaris/uts/common/sys/fm/util.h#1 branch .. //depot/projects/mjexp/sys/contrib/opensolaris/uts/common/sys/fs/zfs.h#1 branch .. //depot/projects/mjexp/sys/contrib/opensolaris/uts/common/sys/gfs.h#1 branch .. //depot/projects/mjexp/sys/contrib/opensolaris/uts/common/sys/isa_defs.h#1 branch .. //depot/projects/mjexp/sys/contrib/opensolaris/uts/common/sys/list.h#1 branch .. //depot/projects/mjexp/sys/contrib/opensolaris/uts/common/sys/list_impl.h#1 branch .. //depot/projects/mjexp/sys/contrib/opensolaris/uts/common/sys/note.h#1 branch .. //depot/projects/mjexp/sys/contrib/opensolaris/uts/common/sys/nvpair.h#1 branch .. //depot/projects/mjexp/sys/contrib/opensolaris/uts/common/sys/nvpair_impl.h#1 branch .. //depot/projects/mjexp/sys/contrib/opensolaris/uts/common/sys/processor.h#1 branch .. //depot/projects/mjexp/sys/contrib/opensolaris/uts/common/sys/procset.h#1 branch .. //depot/projects/mjexp/sys/contrib/opensolaris/uts/common/sys/sdt.h#1 branch .. //depot/projects/mjexp/sys/contrib/opensolaris/uts/common/sys/synch.h#1 branch .. //depot/projects/mjexp/sys/contrib/opensolaris/uts/common/sys/sysevent.h#1 branch .. //depot/projects/mjexp/sys/contrib/opensolaris/uts/common/sys/sysmacros.h#1 branch .. //depot/projects/mjexp/sys/contrib/opensolaris/uts/common/sys/vfs.h#1 branch .. //depot/projects/mjexp/sys/contrib/opensolaris/uts/common/sys/vmem.h#1 branch .. //depot/projects/mjexp/sys/contrib/opensolaris/uts/common/sys/zmod.h#1 branch .. //depot/projects/mjexp/sys/contrib/opensolaris/uts/common/zmod/adler32.c#1 branch .. //depot/projects/mjexp/sys/contrib/opensolaris/uts/common/zmod/crc32.c#1 branch .. //depot/projects/mjexp/sys/contrib/opensolaris/uts/common/zmod/crc32.h#1 branch .. //depot/projects/mjexp/sys/contrib/opensolaris/uts/common/zmod/deflate.c#1 branch .. //depot/projects/mjexp/sys/contrib/opensolaris/uts/common/zmod/deflate.h#1 branch .. //depot/projects/mjexp/sys/contrib/opensolaris/uts/common/zmod/inffast.c#1 branch .. //depot/projects/mjexp/sys/contrib/opensolaris/uts/common/zmod/inffast.h#1 branch .. //depot/projects/mjexp/sys/contrib/opensolaris/uts/common/zmod/inffixed.h#1 branch .. //depot/projects/mjexp/sys/contrib/opensolaris/uts/common/zmod/inflate.c#1 branch .. //depot/projects/mjexp/sys/contrib/opensolaris/uts/common/zmod/inflate.h#1 branch .. //depot/projects/mjexp/sys/contrib/opensolaris/uts/common/zmod/inftrees.c#1 branch .. //depot/projects/mjexp/sys/contrib/opensolaris/uts/common/zmod/inftrees.h#1 branch .. //depot/projects/mjexp/sys/contrib/opensolaris/uts/common/zmod/trees.c#1 branch .. //depot/projects/mjexp/sys/contrib/opensolaris/uts/common/zmod/zconf.h#1 branch .. //depot/projects/mjexp/sys/contrib/opensolaris/uts/common/zmod/zlib.h#1 branch .. //depot/projects/mjexp/sys/contrib/opensolaris/uts/common/zmod/zmod.c#1 branch .. //depot/projects/mjexp/sys/contrib/opensolaris/uts/common/zmod/zmod_subr.c#1 branch .. //depot/projects/mjexp/sys/contrib/opensolaris/uts/common/zmod/zutil.c#1 branch .. //depot/projects/mjexp/sys/contrib/opensolaris/uts/common/zmod/zutil.h#1 branch .. //depot/projects/mjexp/sys/dev/ata/ata-all.h#5 integrate .. //depot/projects/mjexp/sys/dev/ata/ata-chipset.c#11 integrate .. //depot/projects/mjexp/sys/dev/ata/ata-dma.c#3 integrate .. //depot/projects/mjexp/sys/dev/ata/ata-lowlevel.c#3 integrate .. //depot/projects/mjexp/sys/dev/ata/ata_if.m#2 integrate .. //depot/projects/mjexp/sys/dev/cxgb/cxgb_adapter.h#2 integrate .. //depot/projects/mjexp/sys/dev/cxgb/cxgb_sge.c#2 integrate .. //depot/projects/mjexp/sys/dev/if_ndis/if_ndis_pccard.c#2 integrate .. //depot/projects/mjexp/sys/dev/msk/if_msk.c#6 integrate .. //depot/projects/mjexp/sys/dev/streams/streams.c#2 integrate .. //depot/projects/mjexp/sys/dev/uart/uart_bus_pci.c#2 integrate .. //depot/projects/mjexp/sys/fs/devfs/devfs_vnops.c#6 integrate .. //depot/projects/mjexp/sys/fs/fdescfs/fdesc_vfsops.c#2 integrate .. //depot/projects/mjexp/sys/fs/fdescfs/fdesc_vnops.c#3 integrate .. //depot/projects/mjexp/sys/fs/fifofs/fifo_vnops.c#3 integrate .. //depot/projects/mjexp/sys/fs/pseudofs/pseudofs.c#3 integrate .. //depot/projects/mjexp/sys/fs/pseudofs/pseudofs.h#3 integrate .. //depot/projects/mjexp/sys/fs/unionfs/union_subr.c#5 integrate .. //depot/projects/mjexp/sys/geom/journal/g_journal.c#4 integrate .. //depot/projects/mjexp/sys/geom/uzip/g_uzip.c#2 integrate .. //depot/projects/mjexp/sys/i386/i386/identcpu.c#5 integrate .. //depot/projects/mjexp/sys/i386/i386/initcpu.c#2 integrate .. //depot/projects/mjexp/sys/i386/i386/minidump_machdep.c#2 integrate .. //depot/projects/mjexp/sys/i386/i386/pmap.c#8 integrate .. //depot/projects/mjexp/sys/i386/i386/trap.c#6 integrate .. //depot/projects/mjexp/sys/i386/include/pmap.h#4 integrate .. //depot/projects/mjexp/sys/i386/include/specialreg.h#4 integrate .. //depot/projects/mjexp/sys/i386/include/vmparam.h#2 integrate .. //depot/projects/mjexp/sys/kern/kern_descrip.c#9 integrate .. //depot/projects/mjexp/sys/kern/kern_event.c#4 integrate .. //depot/projects/mjexp/sys/kern/kern_fork.c#9 integrate .. //depot/projects/mjexp/sys/kern/kern_jail.c#8 integrate .. //depot/projects/mjexp/sys/kern/kern_mbuf.c#4 integrate .. //depot/projects/mjexp/sys/kern/kern_mutex.c#7 integrate .. //depot/projects/mjexp/sys/kern/kern_sx.c#7 integrate .. //depot/projects/mjexp/sys/kern/subr_lock.c#5 integrate .. //depot/projects/mjexp/sys/kern/subr_witness.c#9 integrate .. //depot/projects/mjexp/sys/kern/sys_generic.c#6 integrate .. //depot/projects/mjexp/sys/kern/uipc_mqueue.c#5 integrate .. //depot/projects/mjexp/sys/kern/uipc_syscalls.c#8 integrate .. //depot/projects/mjexp/sys/kern/uipc_usrreq.c#10 integrate .. //depot/projects/mjexp/sys/kern/vfs_cache.c#3 integrate .. //depot/projects/mjexp/sys/kern/vfs_lookup.c#6 integrate .. //depot/projects/mjexp/sys/kern/vfs_mount.c#10 integrate .. //depot/projects/mjexp/sys/kern/vfs_syscalls.c#11 integrate .. //depot/projects/mjexp/sys/libkern/memset.c#1 branch .. //depot/projects/mjexp/sys/modules/Makefile#8 integrate .. //depot/projects/mjexp/sys/modules/zfs/Makefile#1 branch .. //depot/projects/mjexp/sys/netinet/in_pcb.h#4 integrate .. //depot/projects/mjexp/sys/netinet/ip_fw2.c#9 integrate .. //depot/projects/mjexp/sys/netinet/ip_var.h#2 integrate .. //depot/projects/mjexp/sys/netinet/libalias/alias_ftp.c#2 integrate .. //depot/projects/mjexp/sys/netinet/libalias/alias_irc.c#2 integrate .. //depot/projects/mjexp/sys/netinet/libalias/alias_proxy.c#3 integrate .. //depot/projects/mjexp/sys/netinet/tcp_input.c#9 integrate .. //depot/projects/mjexp/sys/netinet/tcp_output.c#6 integrate .. //depot/projects/mjexp/sys/netinet/tcp_sack.c#3 integrate .. //depot/projects/mjexp/sys/netinet/tcp_subr.c#7 integrate .. //depot/projects/mjexp/sys/netinet/tcp_syncache.c#6 integrate .. //depot/projects/mjexp/sys/netinet/tcp_timer.c#4 integrate .. //depot/projects/mjexp/sys/netsmb/smb_dev.c#3 integrate .. //depot/projects/mjexp/sys/opencrypto/cryptodev.c#3 integrate .. //depot/projects/mjexp/sys/security/audit/audit_bsm_klib.c#3 integrate .. //depot/projects/mjexp/sys/sun4v/include/smp.h#5 integrate .. //depot/projects/mjexp/sys/sys/filedesc.h#2 integrate .. //depot/projects/mjexp/sys/sys/filio.h#2 integrate .. //depot/projects/mjexp/sys/sys/jail.h#3 integrate .. //depot/projects/mjexp/sys/sys/kernel.h#3 integrate .. //depot/projects/mjexp/sys/sys/link_elf.h#2 integrate .. //depot/projects/mjexp/sys/sys/lock.h#7 integrate .. //depot/projects/mjexp/sys/sys/lock_profile.h#4 integrate .. //depot/projects/mjexp/sys/sys/mbuf.h#6 integrate .. //depot/projects/mjexp/sys/sys/mount.h#9 integrate .. //depot/projects/mjexp/sys/sys/mutex.h#8 integrate .. //depot/projects/mjexp/sys/sys/param.h#13 integrate .. //depot/projects/mjexp/sys/sys/priv.h#4 integrate .. //depot/projects/mjexp/sys/sys/sx.h#5 integrate .. //depot/projects/mjexp/sys/sys/unistd.h#2 integrate .. //depot/projects/mjexp/sys/ufs/ffs/ffs_snapshot.c#4 integrate .. //depot/projects/mjexp/sys/ufs/ffs/ffs_softdep.c#6 integrate .. //depot/projects/mjexp/sys/ufs/ffs/ffs_vfsops.c#7 integrate .. //depot/projects/mjexp/sys/ufs/ffs/ffs_vnops.c#8 integrate .. //depot/projects/mjexp/sys/vm/vm_fault.c#6 integrate .. //depot/projects/mjexp/sys/vm/vm_kern.c#6 integrate .. //depot/projects/mjexp/tools/build/mk/OptionalObsoleteFiles.inc#5 integrate .. //depot/projects/mjexp/tools/build/options/WITHOUT_ZFS#1 branch .. //depot/projects/mjexp/usr.bin/calendar/calendars/calendar.freebsd#9 integrate .. //depot/projects/mjexp/usr.bin/lastcomm/lastcomm.1#2 integrate .. //depot/projects/mjexp/usr.bin/lastcomm/lastcomm.c#2 integrate .. //depot/projects/mjexp/usr.bin/lsvfs/lsvfs.c#2 integrate .. //depot/projects/mjexp/usr.bin/passwd/passwd.1#2 integrate .. //depot/projects/mjexp/usr.bin/sed/POSIX#2 integrate .. //depot/projects/mjexp/usr.bin/tar/test/test-basic.sh#3 integrate .. //depot/projects/mjexp/usr.sbin/jail/jail.8#3 integrate .. //depot/projects/mjexp/usr.sbin/rpc.lockd/lockd.c#2 integrate .. //depot/projects/mjexp/usr.sbin/rpc.lockd/rpc.lockd.8#2 integrate .. //depot/projects/mjexp/usr.sbin/rpc.statd/rpc.statd.8#2 integrate .. //depot/projects/mjexp/usr.sbin/rpc.statd/statd.c#2 integrate .. //depot/projects/mjexp/usr.sbin/sysinstall/config.c#4 integrate Differences ... ==== //depot/projects/mjexp/MAINTAINERS#3 (text+ko) ==== @@ -1,4 +1,4 @@ -$FreeBSD: src/MAINTAINERS,v 1.142 2006/11/11 22:24:10 kris Exp $ +$FreeBSD: src/MAINTAINERS,v 1.143 2007/04/06 10:57:15 pjd Exp $ Please note that the content of this file is strictly advisory. No locks listed here are valid. The only strict review requirements @@ -108,6 +108,7 @@ geom_stripe pjd Pre-commit review preferred. geom_zero pjd Pre-commit review preferred. sbin/geom pjd Pre-commit review preferred. +zfs pjd Pre-commit review preferred. nfs alfred Will be happy to review code, but not mandatory. rpc.lockd alfred Will be happy to review code, but not mandatory. truss alfred Will be happy to review code, but not mandatory. ==== //depot/projects/mjexp/Makefile.inc1#7 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.570 2007/03/09 12:11:56 rafan Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.571 2007/04/06 02:13:29 pjd Exp $ # # Make command line options: # -DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir @@ -40,6 +40,9 @@ .if ${MK_GAMES} != "no" SUBDIR+=games .endif +.if ${MK_CDDL} != "no" +SUBDIR+=cddl +.endif SUBDIR+=gnu include .if ${MK_KERBEROS} != "no" SUBDIR+=kerberos5 @@ -430,6 +433,9 @@ .for _t in obj includes cd ${.CURDIR}/include; ${LIB32WMAKE} ${_t} cd ${.CURDIR}/lib; ${LIB32WMAKE} ${_t} +.if ${MK_CDDL} != "no" + cd ${.CURDIR}/cddl/lib; ${LIB32WMAKE} ${_t} +.endif cd ${.CURDIR}/gnu/lib; ${LIB32WMAKE} ${_t} .if ${MK_CRYPT} != "no" cd ${.CURDIR}/secure/lib; ${LIB32WMAKE} ${_t} @@ -1014,12 +1020,16 @@ lib/libradius lib/libsbuf lib/libtacplus lib/libutil \ ${_lib_libypclnt} lib/libz lib/msun \ ${_secure_lib_libcrypto} ${_secure_lib_libssh} \ - ${_secure_lib_libssl} + ${_secure_lib_libssl} lib/libthr -_generic_libs= gnu/lib ${_kerberos5_lib} lib ${_secure_lib} usr.bin/lex/lib +_generic_libs= ${_cddl_lib} gnu/lib ${_kerberos5_lib} lib ${_secure_lib} usr.bin/lex/lib lib/libopie__L lib/libtacplus__L: lib/libmd__L +.if ${MK_CDDL} != "no" +_cddl_lib= cddl/lib +.endif + .if ${MK_CRYPT} != "no" .if ${MK_OPENSSL} != "no" _secure_lib_libcrypto= secure/lib/libcrypto ==== //depot/projects/mjexp/bin/df/df.c#3 (text+ko) ==== @@ -44,7 +44,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/bin/df/df.c,v 1.67 2007/03/08 06:10:17 will Exp $"); +__FBSDID("$FreeBSD: src/bin/df/df.c,v 1.68 2007/04/06 15:36:43 kan Exp $"); #include #include @@ -384,7 +384,7 @@ static void prtstat(struct statfs *sfsp, struct maxwidths *mwp) { - static u_long blocksize; + static long blocksize; static int headerlen, timesthrough = 0; static const char *header; int64_t used, availblks, inodes; @@ -461,7 +461,7 @@ static void update_maxwidths(struct maxwidths *mwp, const struct statfs *sfsp) { - static u_long blocksize = 0; + static long blocksize = 0; int dummy; if (blocksize == 0) ==== //depot/projects/mjexp/contrib/amd/hlfsd/hlfsd.h#2 (text+ko) ==== @@ -39,7 +39,7 @@ * %W% (Berkeley) %G% * * $Id: hlfsd.h,v 1.4.2.7 2004/01/06 03:15:23 ezk Exp $ - * $FreeBSD: src/contrib/amd/hlfsd/hlfsd.h,v 1.4 2004/07/06 13:16:46 mbr Exp $ + * $FreeBSD: src/contrib/amd/hlfsd/hlfsd.h,v 1.5 2007/04/06 15:51:35 kan Exp $ * * HLFSD was written at Columbia University Computer Science Department, by * Erez Zadok and Alexander Dupuy @@ -143,7 +143,6 @@ extern char *mailbox(int, char *); extern char *passwdfile; extern char *slinkname; -extern char mboxfile[]; extern gid_t hlfs_gid; extern int cache_interval; extern int noverify; ==== //depot/projects/mjexp/contrib/binutils/gas/as.h#2 (text+ko) ==== @@ -1,6 +1,6 @@ /* as.h - global header file Copyright 1987, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, - 1999, 2000, 2001, 2002, 2003 + 1999, 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. This file is part of GAS, the GNU Assembler. @@ -397,6 +397,22 @@ /* Enough bits for address, but still an integer type. Could be a problem, cross-assembling for 64-bit machines. */ typedef addressT relax_addressT; + +struct relax_type +{ + /* Forward reach. Signed number. > 0. */ + offsetT rlx_forward; + /* Backward reach. Signed number. < 0. */ + offsetT rlx_backward; + + /* Bytes length of this address. */ + unsigned char rlx_length; + + /* Next longer relax-state. 0 means there is no 'next' relax-state. */ + relax_substateT rlx_more; +}; + +typedef struct relax_type relax_typeS; /* main program "as.c" (command arguments etc) */ ==== //depot/projects/mjexp/contrib/binutils/gas/tc.h#2 (text+ko) ==== @@ -24,25 +24,6 @@ extern const pseudo_typeS md_pseudo_table[]; -/* JF moved this here from as.h under the theory that nobody except MACHINE.c - and write.c care about it anyway. */ - -struct relax_type -{ - /* Forward reach. Signed number. > 0. */ - long rlx_forward; - /* Backward reach. Signed number. < 0. */ - long rlx_backward; - - /* Bytes length of this address. */ - unsigned char rlx_length; - - /* Next longer relax-state. 0 means there is no 'next' relax-state. */ - relax_substateT rlx_more; -}; - -typedef struct relax_type relax_typeS; - extern const int md_reloc_size; /* Size of a relocation record */ char *md_atof (int what_statement_type, char *literalP, int *sizeP); ==== //depot/projects/mjexp/contrib/tcpdump/print-stp.c#2 (text+ko) ==== @@ -11,7 +11,7 @@ #ifndef lint static const char rcsid[] _U_ = - "@(#) $Header: /tcpdump/master/tcpdump/print-stp.c,v 1.13.2.1 2005/04/26 07:27:17 guy Exp $"; +"@(#) $Header: /tcpdump/master/tcpdump/print-stp.c,v 1.13.2.7 2007/03/18 17:12:36 hannes Exp $"; #endif #ifdef HAVE_CONFIG_H @@ -28,75 +28,338 @@ #include "addrtoname.h" #include "extract.h" -static void +#define RSTP_EXTRACT_PORT_ROLE(x) (((x)&0x0C)>>2) +/* STP timers are expressed in multiples of 1/256th second */ +#define STP_TIME_BASE 256 +#define STP_BPDU_MSTP_MIN_LEN 102 + +struct stp_bpdu_ { + u_int8_t protocol_id[2]; + u_int8_t protocol_version; + u_int8_t bpdu_type; + u_int8_t flags; + u_int8_t root_id[8]; + u_int8_t root_path_cost[4]; + u_int8_t bridge_id[8]; + u_int8_t port_id[2]; + u_int8_t message_age[2]; + u_int8_t max_age[2]; + u_int8_t hello_time[2]; + u_int8_t forward_delay[2]; + u_int8_t v1_length; +}; + +#define STP_PROTO_REGULAR 0x00 +#define STP_PROTO_RAPID 0x02 +#define STP_PROTO_MSTP 0x03 + +struct tok stp_proto_values[] = { + { STP_PROTO_REGULAR, "802.1d" }, + { STP_PROTO_RAPID, "802.1w" }, + { STP_PROTO_MSTP, "802.1s" }, + { 0, NULL} +}; + +#define STP_BPDU_TYPE_CONFIG 0x00 +#define STP_BPDU_TYPE_RSTP 0x02 +#define STP_BPDU_TYPE_TOPO_CHANGE 0x80 + +struct tok stp_bpdu_flag_values[] = { + { 0x01, "Topology change" }, + { 0x02, "Proposal" }, + { 0x10, "Learn" }, + { 0x20, "Forward" }, + { 0x40, "Agreement" }, + { 0x80, "Topology change ACK" }, + { 0, NULL} +}; + +struct tok stp_bpdu_type_values[] = { + { STP_BPDU_TYPE_CONFIG, "Config" }, + { STP_BPDU_TYPE_RSTP, "Rapid STP" }, + { STP_BPDU_TYPE_TOPO_CHANGE, "Topology Change" }, + { 0, NULL} +}; + +struct tok rstp_obj_port_role_values[] = { + { 0x00, "Unknown" }, + { 0x01, "Alternate" }, + { 0x02, "Root" }, + { 0x03, "Designated" }, + { 0, NULL} +}; + +static char * stp_print_bridge_id(const u_char *p) { - printf("%.2x%.2x.%.2x:%.2x:%.2x:%.2x:%.2x:%.2x", - p[0], p[1], p[2], p[3], p[4], p[5], p[6], p[7]); + static char bridge_id_str[sizeof("pppp.aa:bb:cc:dd:ee:ff")]; + + snprintf(bridge_id_str, sizeof(bridge_id_str), + "%.2x%.2x.%.2x:%.2x:%.2x:%.2x:%.2x:%.2x", + p[0], p[1], p[2], p[3], p[4], p[5], p[6], p[7]); + + return bridge_id_str; } static void -stp_print_config_bpdu(const u_char *p) +stp_print_config_bpdu(const struct stp_bpdu_ *stp_bpdu, u_int length) { - printf("config "); - if (p[4] & 1) - printf("TOP_CHANGE "); - if (p[4] & 0x80) - printf("TOP_CHANGE_ACK "); + printf(", Flags [%s]", + bittok2str(stp_bpdu_flag_values, "none", stp_bpdu->flags)); + + printf(", bridge-id %s.%04x, length %u", + stp_print_bridge_id((const u_char *)&stp_bpdu->bridge_id), + EXTRACT_16BITS(&stp_bpdu->port_id), length); - stp_print_bridge_id(p+17); - printf(".%.2x%.2x ", p[25], p[26]); + /* in non-verbose mode just print the bridge-id */ + if (!vflag) { + return; + } - printf("root "); - stp_print_bridge_id(p+5); + printf("\n\tmessage-age %.2fs, max-age %.2fs" + ", hello-time %.2fs, forwarding-delay %.2fs", + (float)EXTRACT_16BITS(&stp_bpdu->message_age) / STP_TIME_BASE, + (float)EXTRACT_16BITS(&stp_bpdu->max_age) / STP_TIME_BASE, + (float)EXTRACT_16BITS(&stp_bpdu->hello_time) / STP_TIME_BASE, + (float)EXTRACT_16BITS(&stp_bpdu->forward_delay) / STP_TIME_BASE); - printf(" pathcost %i ", (p[13] << 24) | (p[14] << 16) | (p[15] << 8) | p[16]); + printf("\n\troot-id %s, root-pathcost %u", + stp_print_bridge_id((const u_char *)&stp_bpdu->root_id), + EXTRACT_32BITS(&stp_bpdu->root_path_cost)); - printf("age %i ", p[27]); - printf("max %i ", p[29]); - printf("hello %i ", p[31]); - printf("fdelay %i ", p[33]); + /* Port role is only valid for 802.1w */ + if (stp_bpdu->protocol_version == STP_PROTO_RAPID) { + printf(", port-role %s", + tok2str(rstp_obj_port_role_values, "Unknown", + RSTP_EXTRACT_PORT_ROLE(stp_bpdu->flags))); + } } +/* + * MSTP packet format + * Ref. IEEE 802.1Q 2003 Ed. Section 14 + * + * MSTP BPDU + * + * 2 - bytes Protocol Id + * 1 - byte Protocol Ver. + * 1 - byte BPDU tye + * 1 - byte Flags + * 8 - bytes CIST Root Identifier + * 4 - bytes CIST External Path Cost + * 8 - bytes CIST Regional Root Identifier + * 2 - bytes CIST Port Identifier + * 2 - bytes Message Age + * 2 - bytes Max age + * 2 - bytes Hello Time + * 2 - bytes Forward delay + * 1 - byte Version 1 length. Must be 0 + * 2 - bytes Version 3 length + * 1 - byte Config Identifier + * 32 - bytes Config Name + * 2 - bytes Revision level + * 16 - bytes Config Digest [MD5] + * 4 - bytes CIST Internal Root Path Cost + * 8 - bytes CIST Bridge Identifier + * 1 - byte CIST Remaining Hops + * 16 - bytes MSTI information [Max 64 MSTI, each 16 bytes] + * + * MSTI Payload + * + * 1 - byte MSTI flag + * 8 - bytes MSTI Regional Root Identifier + * 4 - bytes MSTI Regional Path Cost + * 1 - byte MSTI Bridge Priority + * 1 - byte MSTI Port Priority + * 1 - byte MSTI Remaining Hops + */ + +#define MST_BPDU_MSTI_LENGTH 16 +#define MST_BPDU_CONFIG_INFO_LENGTH 64 + +/* Offsets of fields from the begginning for the packet */ +#define MST_BPDU_VER3_LEN_OFFSET 36 +#define MST_BPDU_CONFIG_NAME_OFFSET 39 +#define MST_BPDU_CONFIG_DIGEST_OFFSET 73 +#define MST_BPDU_CIST_INT_PATH_COST_OFFSET 89 +#define MST_BPDU_CIST_BRIDGE_ID_OFFSET 93 +#define MST_BPDU_CIST_REMAIN_HOPS_OFFSET 101 +#define MST_BPDU_MSTI_OFFSET 102 +/* Offsets within an MSTI */ +#define MST_BPDU_MSTI_ROOT_PRIO_OFFSET 1 +#define MST_BPDU_MSTI_ROOT_PATH_COST_OFFSET 9 +#define MST_BPDU_MSTI_BRIDGE_PRIO_OFFSET 13 +#define MST_BPDU_MSTI_PORT_PRIO_OFFSET 14 +#define MST_BPDU_MSTI_REMAIN_HOPS_OFFSET 15 + static void -stp_print_tcn_bpdu(void) +stp_print_mstp_bpdu(const struct stp_bpdu_ *stp_bpdu, u_int length) { - printf("tcn"); + const u_char *ptr; + u_int16_t v3len; + u_int16_t len; + u_int16_t msti; + u_int16_t offset; + + ptr = (const u_char *)stp_bpdu; + printf(", CIST Flags [%s]", + bittok2str(stp_bpdu_flag_values, "none", stp_bpdu->flags)); + + /* + * in non-verbose mode just print the flags. We dont read that much + * of the packet (DEFAULT_SNAPLEN) to print out cist bridge-id + */ + if (!vflag) { + return; + } + + printf(", CIST bridge-id %s.%04x, length %u", + stp_print_bridge_id(ptr + MST_BPDU_CIST_BRIDGE_ID_OFFSET), + EXTRACT_16BITS(&stp_bpdu->port_id), length); + + + printf("\n\tmessage-age %.2fs, max-age %.2fs" + ", hello-time %.2fs, forwarding-delay %.2fs", + (float)EXTRACT_16BITS(&stp_bpdu->message_age) / STP_TIME_BASE, + (float)EXTRACT_16BITS(&stp_bpdu->max_age) / STP_TIME_BASE, + (float)EXTRACT_16BITS(&stp_bpdu->hello_time) / STP_TIME_BASE, + (float)EXTRACT_16BITS(&stp_bpdu->forward_delay) / STP_TIME_BASE); + + printf("\n\tCIST root-id %s, ext-pathcost %u int-pathcost %u", + stp_print_bridge_id((const u_char *)&stp_bpdu->root_id), + EXTRACT_32BITS(&stp_bpdu->root_path_cost), + EXTRACT_32BITS(ptr + MST_BPDU_CIST_INT_PATH_COST_OFFSET)); + + printf(", port-role %s", + tok2str(rstp_obj_port_role_values, "Unknown", + RSTP_EXTRACT_PORT_ROLE(stp_bpdu->flags))); + + printf("\n\tCIST regional-root-id %s", + stp_print_bridge_id((const u_char *)&stp_bpdu->bridge_id)); + + printf("\n\tMSTP Configuration Name %s, revision %u, digest %08x%08x%08x%08x", + ptr + MST_BPDU_CONFIG_NAME_OFFSET, + EXTRACT_16BITS(ptr + MST_BPDU_CONFIG_NAME_OFFSET + 32), + EXTRACT_32BITS(ptr + MST_BPDU_CONFIG_DIGEST_OFFSET), + EXTRACT_32BITS(ptr + MST_BPDU_CONFIG_DIGEST_OFFSET + 4), + EXTRACT_32BITS(ptr + MST_BPDU_CONFIG_DIGEST_OFFSET + 8), + EXTRACT_32BITS(ptr + MST_BPDU_CONFIG_DIGEST_OFFSET + 12)); + + printf("\n\tCIST remaining-hops %d", ptr[MST_BPDU_CIST_REMAIN_HOPS_OFFSET]); + + /* Dump all MSTI's */ + v3len = EXTRACT_16BITS(ptr + MST_BPDU_VER3_LEN_OFFSET); + if (v3len > MST_BPDU_CONFIG_INFO_LENGTH) { + len = v3len - MST_BPDU_CONFIG_INFO_LENGTH; + offset = MST_BPDU_MSTI_OFFSET; + while (len >= MST_BPDU_MSTI_LENGTH) { + msti = EXTRACT_16BITS(ptr + offset + + MST_BPDU_MSTI_ROOT_PRIO_OFFSET); + msti = msti & 0x0FFF; + + printf("\n\tMSTI %d, Flags [%s], port-role %s", + msti, bittok2str(stp_bpdu_flag_values, "none", ptr[offset]), + tok2str(rstp_obj_port_role_values, "Unknown", + RSTP_EXTRACT_PORT_ROLE(ptr[offset]))); + printf("\n\t\tMSTI regional-root-id %s, pathcost %u", + stp_print_bridge_id(ptr + offset + + MST_BPDU_MSTI_ROOT_PRIO_OFFSET), + EXTRACT_32BITS(ptr + offset + + MST_BPDU_MSTI_ROOT_PATH_COST_OFFSET)); + printf("\n\t\tMSTI bridge-prio %d, port-prio %d, hops %d", + ptr[offset + MST_BPDU_MSTI_BRIDGE_PRIO_OFFSET] >> 4, + ptr[offset + MST_BPDU_MSTI_PORT_PRIO_OFFSET] >> 4, + ptr[offset + MST_BPDU_MSTI_REMAIN_HOPS_OFFSET]); + + len -= MST_BPDU_MSTI_LENGTH; + offset += MST_BPDU_MSTI_LENGTH; + } + } } /* - * Print 802.1d packets. + * Print 802.1d / 802.1w / 802.1q (mstp) packets. */ void stp_print(const u_char *p, u_int length) { - if (length < 4) - goto trunc; + const struct stp_bpdu_ *stp_bpdu; + u_int16_t mstp_len; + >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat Apr 7 04:03:16 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4FC4D16A406; Sat, 7 Apr 2007 04:03:16 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 2DA3116A403 for ; Sat, 7 Apr 2007 04:03:16 +0000 (UTC) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 1F5D613C458 for ; Sat, 7 Apr 2007 04:03:16 +0000 (UTC) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l3743F6Y015596 for ; Sat, 7 Apr 2007 04:03:16 GMT (envelope-from mjacob@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l3743FPT015593 for perforce@freebsd.org; Sat, 7 Apr 2007 04:03:15 GMT (envelope-from mjacob@freebsd.org) Date: Sat, 7 Apr 2007 04:03:15 GMT Message-Id: <200704070403.l3743FPT015593@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 117568 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 07 Apr 2007 04:03:16 -0000 http://perforce.freebsd.org/chv.cgi?CH=117568 Change 117568 by mjacob@mjexp on 2007/04/07 04:03:15 Hide bus reset messages within bootverbose MFP4 after: 1 days Affected files ... .. //depot/projects/mjexp/sys/dev/mpt/mpt_cam.c#14 edit Differences ... ==== //depot/projects/mjexp/sys/dev/mpt/mpt_cam.c#14 (text+ko) ==== @@ -2963,8 +2963,13 @@ break; } case XPT_RESET_DEV: - xpt_print(ccb->ccb_h.path, "reset %s\n", - ccb->ccb_h.func_code == XPT_RESET_BUS? "bus" : "device"); + if (ccb->ccb_h.func_code == XPT_RESET_BUS) { + if (bootverbose) { + xpt_print(ccb->ccb_h.path, "reset bus\n"); + } + } else { + xpt_print(ccb->ccb_h.path, "reset device\n"); + } CAMLOCK_2_MPTLOCK(mpt); (void) mpt_bus_reset(mpt, tgt, lun, FALSE); MPTLOCK_2_CAMLOCK(mpt); From owner-p4-projects@FreeBSD.ORG Sat Apr 7 09:53:40 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D5A1716A403; Sat, 7 Apr 2007 09:53:39 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id AF3A416A482 for ; Sat, 7 Apr 2007 09:53:39 +0000 (UTC) (envelope-from bushman@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 9F70D13C4B7 for ; Sat, 7 Apr 2007 09:53:39 +0000 (UTC) (envelope-from bushman@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l379rdI6093365 for ; Sat, 7 Apr 2007 09:53:39 GMT (envelope-from bushman@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l379rdaM093359 for perforce@freebsd.org; Sat, 7 Apr 2007 09:53:39 GMT (envelope-from bushman@freebsd.org) Date: Sat, 7 Apr 2007 09:53:39 GMT Message-Id: <200704070953.l379rdaM093359@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 117575 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 07 Apr 2007 09:53:40 -0000 http://perforce.freebsd.org/chv.cgi?CH=117575 Change 117575 by bushman@bushman_sh on 2007/04/07 09:53:04 + usage() cleanups in nsswitch regression tests + README file for regression tests added Affected files ... .. //depot/projects/soc2006/nss_ldap_cached/src/tools/regression/lib/libc/nss/README#1 add .. //depot/projects/soc2006/nss_ldap_cached/src/tools/regression/lib/libc/nss/test-getaddr.c#2 edit .. //depot/projects/soc2006/nss_ldap_cached/src/tools/regression/lib/libc/nss/test-getaddr.t#2 edit .. //depot/projects/soc2006/nss_ldap_cached/src/tools/regression/lib/libc/nss/test-getgr.c#5 edit .. //depot/projects/soc2006/nss_ldap_cached/src/tools/regression/lib/libc/nss/test-gethostby.c#4 edit .. //depot/projects/soc2006/nss_ldap_cached/src/tools/regression/lib/libc/nss/test-getproto.c#2 edit .. //depot/projects/soc2006/nss_ldap_cached/src/tools/regression/lib/libc/nss/test-getpw.c#5 edit .. //depot/projects/soc2006/nss_ldap_cached/src/tools/regression/lib/libc/nss/test-getrpc.c#2 edit .. //depot/projects/soc2006/nss_ldap_cached/src/tools/regression/lib/libc/nss/test-getserv.c#7 edit .. //depot/projects/soc2006/nss_ldap_cached/src/tools/regression/lib/libc/nss/test-getusershell.c#2 edit .. //depot/projects/soc2006/nss_ldap_cached/src/tools/regression/lib/libc/nss/test-getusershell.t#2 edit Differences ... ==== //depot/projects/soc2006/nss_ldap_cached/src/tools/regression/lib/libc/nss/test-getaddr.c#2 (text+ko) ==== @@ -50,7 +50,7 @@ static int debug = 0; static struct addrinfo hints; -static enum test_methods method = TEST_BUILD_SNAPSHOT; +static enum test_methods method = TEST_GETADDRINFO; DECLARE_TEST_DATA(addrinfo) DECLARE_TEST_FILE_SNAPSHOT(addrinfo) @@ -423,7 +423,7 @@ usage(void) { (void)fprintf(stderr, - "Usage: %s [-n] [-d] [-46] [-s ] -f \n", + "Usage: %s [-d] [-46] [-s -f \n", getprogname()); exit(1); } @@ -451,14 +451,12 @@ case '6': hints.ai_family = PF_INET6; break; - case 'n': - method = TEST_GETADDRINFO; - break; case 'd': debug = 1; break; case 's': snapshot_file = strdup(optarg); + method = TEST_BUILD_SNAPSHOT; break; case 'f': hostlist_file = strdup(optarg); @@ -481,9 +479,6 @@ usage(); } - if ((snapshot_file == NULL) && (method == TEST_BUILD_SNAPSHOT)) - usage(); - if (debug) printf("building host lists from %s\n", hostlist_file); ==== //depot/projects/soc2006/nss_ldap_cached/src/tools/regression/lib/libc/nss/test-getaddr.t#2 (text+ko) ==== @@ -20,13 +20,14 @@ echo 1..6 #Tests with hints.ai_family is set to PF_UNSPEC -do_test 1 'getaddrinfo() (PF_UNSPEC)' '-n -f mach' -do_test 2 'getaddrinfo() snapshot (PF_UNSPEC)' '-n -f mach -s snapshot_ai' +do_test 1 'getaddrinfo() (PF_UNSPEC)' '-f mach' +do_test 2 'getaddrinfo() snapshot (PF_UNSPEC)' '-f mach -s snapshot_ai' #Tests with hints.ai_family is set to PF_INET -do_test 3 'getaddrinfo() (PF_INET)' '-n -f mach' -do_test 4 'getaddrinfo() snapshot (PF_INET)' '-4 -n -f mach -s snapshot_ai4' +do_test 3 'getaddrinfo() (PF_INET)' '-f mach' +do_test 4 'getaddrinfo() snapshot (PF_INET)' '-4 -f mach -s snapshot_ai4' #Tests with hints.ai_family is set to PF_INET6 -do_test 5 'getaddrinfo() (PF_INET6)' '-n -f mach' -do_test 6 'getaddrinfo() snapshot (PF_INET6)' '-6 -n -f mach -s snapshot_ai6' +do_test 5 'getaddrinfo() (PF_INET6)' '-f mach' +do_test 6 'getaddrinfo() snapshot (PF_INET6)' '-6 -f mach -s snapshot_ai6' + ==== //depot/projects/soc2006/nss_ldap_cached/src/tools/regression/lib/libc/nss/test-getgr.c#5 (text+ko) ==== @@ -414,7 +414,7 @@ usage(void) { (void)fprintf(stderr, - "Usage: %s [-dnge2] [-s ]\n", + "Usage: %s -nge2 [-d] [-s ]\n", getprogname()); exit(1); } ==== //depot/projects/soc2006/nss_ldap_cached/src/tools/regression/lib/libc/nss/test-gethostby.c#4 (text+ko) ==== @@ -869,7 +869,7 @@ usage(void) { (void)fprintf(stderr, - "Usage: %s [-na2i] [-d] [-46] [-s ] -f \n", + "Usage: %s -na2i [-o] [-d] [-m46] [-s ] -f \n", getprogname()); exit(1); } ==== //depot/projects/soc2006/nss_ldap_cached/src/tools/regression/lib/libc/nss/test-getproto.c#2 (text+ko) ==== @@ -415,7 +415,7 @@ usage(void) { (void)fprintf(stderr, - "Usage: %s [-dnve2] [-s ]\n", + "Usage: %s -nve2 [-d] [-s ]\n", getprogname()); exit(1); } ==== //depot/projects/soc2006/nss_ldap_cached/src/tools/regression/lib/libc/nss/test-getpw.c#5 (text+ko) ==== @@ -368,7 +368,7 @@ usage(void) { (void)fprintf(stderr, - "Usage: %s [-dnue2] [-s ]\n", + "Usage: %s -nue2 [-d] [-s ]\n", getprogname()); exit(1); } ==== //depot/projects/soc2006/nss_ldap_cached/src/tools/regression/lib/libc/nss/test-getrpc.c#2 (text+ko) ==== @@ -415,7 +415,7 @@ usage(void) { (void)fprintf(stderr, - "Usage: %s [-dnve2] [-s ]\n", + "Usage: %s -nve2 [-d] [-s ]\n", getprogname()); exit(1); } ==== //depot/projects/soc2006/nss_ldap_cached/src/tools/regression/lib/libc/nss/test-getserv.c#7 (text+ko) ==== @@ -431,7 +431,7 @@ usage(void) { (void)fprintf(stderr, - "Usage: %s [-dnpe2] [-s ]\n", + "Usage: %s -npe2 [-d] [-s ]\n", getprogname()); exit(1); } ==== //depot/projects/soc2006/nss_ldap_cached/src/tools/regression/lib/libc/nss/test-getusershell.c#2 (text+ko) ==== @@ -139,7 +139,7 @@ usage(void) { (void)fprintf(stderr, - "Usage: %s [-s ]\n", + "Usage: %s [-d] -s \n", getprogname()); exit(1); } @@ -153,6 +153,9 @@ int rv; int c; + if (argc < 2) + usage(); + rv = 0; snapshot_file = NULL; while ((c = getopt(argc, argv, "ds:")) != -1) { ==== //depot/projects/soc2006/nss_ldap_cached/src/tools/regression/lib/libc/nss/test-getusershell.t#2 (text+ko) ==== @@ -18,6 +18,5 @@ make $executable 2>&1 > /dev/null -echo 1..2 -do_test 1 'getusershell()' '' -do_test 2 'getusershell() snapshot' '-s snapshot_usershell' +echo 1..1 +do_test 1 'getusershell() snapshot' '-s snapshot_usershell' From owner-p4-projects@FreeBSD.ORG Sat Apr 7 09:55:43 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EE04016A403; Sat, 7 Apr 2007 09:55:42 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id C2B8216A401 for ; Sat, 7 Apr 2007 09:55:42 +0000 (UTC) (envelope-from bushman@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id B38A713C45E for ; Sat, 7 Apr 2007 09:55:42 +0000 (UTC) (envelope-from bushman@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l379tgFu093707 for ; Sat, 7 Apr 2007 09:55:42 GMT (envelope-from bushman@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l379tgjd093704 for perforce@freebsd.org; Sat, 7 Apr 2007 09:55:42 GMT (envelope-from bushman@freebsd.org) Date: Sat, 7 Apr 2007 09:55:42 GMT Message-Id: <200704070955.l379tgjd093704@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 117576 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 07 Apr 2007 09:55:43 -0000 http://perforce.freebsd.org/chv.cgi?CH=117576 Change 117576 by bushman@bushman_sh on 2007/04/07 09:54:51 - minor code cleanup Affected files ... .. //depot/projects/soc2006/nss_ldap_cached/src/tools/regression/lib/libc/nss/test-getaddr.c#3 edit Differences ... ==== //depot/projects/soc2006/nss_ldap_cached/src/tools/regression/lib/libc/nss/test-getaddr.c#3 (text+ko) ==== @@ -536,26 +536,3 @@ } -/*int -main(int argc, char **argv) -{ - debug = 1; - - char buffer[1024]; - struct addrinfo *ai; - struct addrinfo ai2; - int res; - - res = getaddrinfo("yandex.ru", NULL, NULL, &ai); - printf("== %d\n", res); - dump_addrinfo(ai); - - sdump_addrinfo(ai, buffer, sizeof(buffer)); - res = addrinfo_read_snapshot_func(&ai2, buffer); - printf("==2 %d\n", res); - dump_addrinfo(&ai2); - printf("==3 %d\n", compare_addrinfo(ai, &ai2, NULL)); - printf("==4 %d\n", addrinfo_test_correctness(ai, NULL)); - - return (0); -}*/ From owner-p4-projects@FreeBSD.ORG Sat Apr 7 15:45:07 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9149716A405; Sat, 7 Apr 2007 15:45:07 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 5761616A403 for ; Sat, 7 Apr 2007 15:45:07 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 4655D13C480 for ; Sat, 7 Apr 2007 15:45:07 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l37Fj7BY064078 for ; Sat, 7 Apr 2007 15:45:07 GMT (envelope-from gabor@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l37Fj6W1064075 for perforce@freebsd.org; Sat, 7 Apr 2007 15:45:06 GMT (envelope-from gabor@freebsd.org) Date: Sat, 7 Apr 2007 15:45:06 GMT Message-Id: <200704071545.l37Fj6W1064075@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 117596 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 07 Apr 2007 15:45:08 -0000 http://perforce.freebsd.org/chv.cgi?CH=117596 Change 117596 by gabor@gabor_server on 2007/04/07 15:44:57 IFC Affected files ... .. //depot/projects/soc2006/gabor_destdir/CHANGES#5 integrate .. //depot/projects/soc2006/gabor_destdir/GIDs#4 integrate .. //depot/projects/soc2006/gabor_destdir/LEGAL#4 integrate .. //depot/projects/soc2006/gabor_destdir/MOVED#5 integrate .. //depot/projects/soc2006/gabor_destdir/Mk/bsd.autotools.mk#4 integrate .. //depot/projects/soc2006/gabor_destdir/Mk/bsd.emacs.mk#4 integrate .. //depot/projects/soc2006/gabor_destdir/Mk/bsd.port.mk#9 integrate .. //depot/projects/soc2006/gabor_destdir/Mk/bsd.ruby.mk#4 integrate .. //depot/projects/soc2006/gabor_destdir/Mk/bsd.sites.mk#5 integrate .. //depot/projects/soc2006/gabor_destdir/Mk/bsd.tcl.mk#3 integrate .. //depot/projects/soc2006/gabor_destdir/Tools/scripts/rmport#3 integrate .. //depot/projects/soc2006/gabor_destdir/Tools/scripts/security-check.awk#2 edit .. //depot/projects/soc2006/gabor_destdir/UIDs#4 integrate .. //depot/projects/soc2006/gabor_destdir/UPDATING#5 integrate Differences ... ==== //depot/projects/soc2006/gabor_destdir/CHANGES#5 (text+ko) ==== @@ -10,6 +10,22 @@ All ports committers are allowed to commit to this file. +20070403: +AUTHOR: portmgr@FreeBSD.org +The following changes were made to the ports infrastructure: + + * The default dependency of USE_GHOSTSCRIPT has been changed from + ghostscript-gnu to ghostscript-gpl. The WITH_GHOSTSCRIPT_GPL variable is + now no-op. New WITH_GHOSTSCRIPT_GNU variable was added. + + * bsd.tcl.mk was overhauled. Most importantly, the semantics of USE_TCL* and + USE_TK* variables was changed. USE_TCL and USE_TK now implies both build + and run dependencies, USE_TCL_RUN and USE_TK_BUILD variables were + introduced. Existing ports in the tree were modified. + + * Unused category tcl81 was removed, and new categories tcl and tk were + added. + 20070324: AUTHOR: portmgr@FreeBSD.org The following changes were made to the ports infrastructure: @@ -1304,4 +1320,4 @@ Contact Erwin Lansing if you have any questions about your use of this document. -$FreeBSD: ports/CHANGES,v 1.67 2007/03/24 14:02:05 pav Exp $ +$FreeBSD: ports/CHANGES,v 1.68 2007/04/02 23:14:45 pav Exp $ ==== //depot/projects/soc2006/gabor_destdir/GIDs#4 (text+ko) ==== @@ -1,4 +1,4 @@ -$FreeBSD: ports/GIDs,v 1.32 2007/03/24 05:10:35 marcus Exp $ +$FreeBSD: ports/GIDs,v 1.34 2007/03/31 12:53:57 laszlof Exp $ # Please keep this file sorted by GID! smmsp:*:25: bind:*:53: @@ -14,6 +14,7 @@ pgsql:*:70: ircd:*:72: simscan:*:74: +hybserv:*:76: audit:*:77: virtuoso:*:79: www:*:80: @@ -103,4 +104,5 @@ bnetd:*:700: bopm:*:717: openxpki:*:777: +netdisco:*:840: bacula:*:910: ==== //depot/projects/soc2006/gabor_destdir/LEGAL#4 (text+ko) ==== @@ -1,5 +1,5 @@ # Creator: Jordan Hubbard -# $FreeBSD: ports/LEGAL,v 1.530 2007/03/20 11:09:57 miwi Exp $ +# $FreeBSD: ports/LEGAL,v 1.531 2007/03/31 03:41:14 alepulver Exp $ ********************************************************************** *** NOTE TO COMMITTERS *** @@ -49,7 +49,10 @@ author aestats-* games/aestats Commercial use is prohibited AGSatellite0520* net-p2p/linux-agsatellite Unsure of licensing issues -infinity.* games/alephone-data Bungie/Microsoft do not +alephone/M1A1.zip games/alephone-data Bungie/Microsoft do not + allow charging for Marathon + data files +alephone/Marathon*.zip games/alephone-data Bungie/Microsoft do not allow charging for Marathon data files ads-java-novm-* databases/adstudio Free for personal or educational @@ -392,12 +395,6 @@ l_fc_p*_*.*.*.tar lang/ifc7 No redistribution allowed l_fc_p*_*.*.*.tar.gz lang/ifc No redistribution allowed macopix-*.tar.gz games/macopix Contains commercial character data -MarathonEvil-*.tar.gz games/marathon-evil Bungie/Microsoft do not - allow charging for Marathon data - files -marathon2.zip games/marathon2-data Bungie/Microsoft do not - allow charging for Marathon data - files. mathfonts-4.1/* x11-fonts/mathfonts No redistribution allowed MB339-PAN.zip games/flightgear-mb339-pan Redistribution prohibited mbrola-freebsd/* audio/mbrola No commercial, military use ==== //depot/projects/soc2006/gabor_destdir/MOVED#5 (text+ko) ==== @@ -1,7 +1,7 @@ # # MOVED - a list of (recently) moved or removed ports # -# $FreeBSD: ports/MOVED,v 1.1333 2007/03/25 20:41:50 ahze Exp $ +# $FreeBSD: ports/MOVED,v 1.1339 2007/04/06 21:48:08 gerald Exp $ # # Each entry consists of a single line containing the following four # fields in the order named, separated with the pipe (`|') character: @@ -2887,3 +2887,14 @@ www/drupal-textile|www/drupal4-textile|2007-03-25|rename for drupal5 security/drupal-ldap_integration|security/drupal4-ldap_integration|2007-03-25|rename for drupal5 devel/xdg-user-dirs-gtk||2007-03-25|Not all dependencies are in ports yet +net/pcs|net/py-pcs|2007-03-26|Renamed to fit python module naming convention +japanese/gal||2007-03-28|Has expired: Broken on all supported versions of FreeBSD +japanese/gnome||2007-03-28|Has expired: Broken on all supported versions of FreeBSD +japanese/gnomelibs||2007-03-28|Has expired: Broken on all supported versions of FreeBSD +x11-toolkits/ruby-fox|x11-toolkits/ruby-fox10|2007-03-29|rename for supporting multiple fox version +x11-toolkits/ruby-fox-devel|x11-toolkits/ruby-fox12|2007-03-29|rename for supporting multiple fox version +lang/tcl81-thread||2007-03-29|Remove an ancient, unused tcl version +editors/emacs20-dl||2007-04-02|Has expired: unfetchable, obsolete +editors/flim113-emacs20||2007-04-02|Has expired: unfetchable, obsolete +editors/semi113-emacs20||2007-04-02|Has expired: unfetchable, obsolete +lang/gfortran|lang/gcc42|2007-04-06|Superseded by and equivalent to gcc42 ==== //depot/projects/soc2006/gabor_destdir/Mk/bsd.autotools.mk#4 (text+ko) ==== @@ -1,7 +1,7 @@ #-*- mode: makefile; tab-width: 4; -*- # ex:ts=4 # -# $FreeBSD: ports/Mk/bsd.autotools.mk,v 1.26 2007/03/24 14:02:06 pav Exp $ +# $FreeBSD: ports/Mk/bsd.autotools.mk,v 1.28 2007/03/27 01:23:56 linimon Exp $ # # Please view me with 4 column tabs! # ==== //depot/projects/soc2006/gabor_destdir/Mk/bsd.emacs.mk#4 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: ports/Mk/bsd.emacs.mk,v 1.61 2007/02/06 20:58:06 anray Exp $ +# $FreeBSD: ports/Mk/bsd.emacs.mk,v 1.62 2007/04/04 07:24:06 clsung Exp $ # # bsd.emacs.mk - 19990829 Shigeyuki Fukushima. # @@ -115,7 +115,7 @@ # Emacs-22.x .elif (${EMACS_PORT_NAME} == "emacs22") EMACS_NAME= emacs -EMACS_VER= 22.0.93 +EMACS_VER= 22.0.97 EMACS_MAJOR_VER= 22 EMACS_LIBDIR?= share/${EMACS_NAME} EMACS_LIBDIR_WITH_VER?= share/${EMACS_NAME}/${EMACS_VER} ==== //depot/projects/soc2006/gabor_destdir/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.557 2007/03/24 14:02:06 pav Exp $ +# $FreeBSD: ports/Mk/bsd.port.mk,v 1.565 2007/04/07 12:51:47 pav Exp $ # $NetBSD: $ # # bsd.port.mk - 940820 Jordan K. Hubbard. @@ -355,12 +355,13 @@ # Some installations may wish to override the default # to specify a version without X11 and/or localized # versions for their nationality. -# WITH_GHOSTSCRIPT_GPL -# - If set, this port uses the GPL version of the ghostscript -# software instead of the GNU version, which is used otherwise. +# Default: print/ghostscript-gpl # WITH_GHOSTSCRIPT_AFPL # - If set, this port uses the AFPL version of the ghostscript -# software instead of the GNU version, which is used otherwise. +# software instead of the GPL version, which is used otherwise. +# WITH_GHOSTSCRIPT_GNU +# - If set, this port uses the GNU version of the ghostscript +# software instead of the GPL version, which is used otherwise. ## # USE_BISON - If set, this port uses bison for building. ## @@ -1273,7 +1274,13 @@ OPTIONSFILE?= ${PORT_DBDIR}/${UNIQUENAME}/options _OPTIONSFILE!= ${ECHO_CMD} "${OPTIONSFILE}" .if defined(OPTIONS) -. if defined(PACKAGE_BUILDING) || (defined(BATCH) && !exists(${_OPTIONSFILE})) +# include OPTIONSFILE first if exists +. if exists(${_OPTIONSFILE}) && !make(rmconfig) +. include "${_OPTIONSFILE}" +. endif +. if exists(${_OPTIONSFILE}.local) +. include "${_OPTIONSFILE}.local" +. endif WITHOUT:= WITH:= . if defined(OPTIONS) @@ -1289,23 +1296,21 @@ OPT:=${RO} . endfor . endif +# define only if NO WITH/WITHOUT_${W} is defined . for W in ${WITH} +. if !defined(WITH_${W}) && !defined(WITHOUT_${W}) WITH_${W}:= true +. endif . endfor . for W in ${WITHOUT} +. if !defined(WITH_${W}) && !defined(WITHOUT_${W}) WITHOUT_${W}:= true +. endif . endfor . undef WITH . undef WITHOUT . undef RO . undef REALOPTIONS -. endif -. if exists(${_OPTIONSFILE}) && !make(rmconfig) -. include "${_OPTIONSFILE}" -. endif -. if exists(${_OPTIONSFILE}.local) -. include "${_OPTIONSFILE}.local" -. endif .endif .endif @@ -1481,7 +1486,7 @@ .include "${PORTSDIR}/Mk/bsd.ocaml.mk" .endif -.if defined(USE_TCL) || defined(USE_TCL_BUILD) || defined(USE_TK) || defined(USE_TK_BUILD) +.if defined(USE_TCL) || defined(USE_TCL_BUILD) || defined(USE_TCL_RUN) || defined(USE_TCL_WRAPPER) || defined(USE_TK) || defined(USE_TK_BUILD) || defined(USE_TK_RUN) || defined(USE_TK_WRAPPER) .include "${PORTSDIR}/Mk/bsd.tcl.mk" .endif @@ -2007,20 +2012,20 @@ # Set the default for the installation of Postscript(TM)- # compatible functionality. .if !defined(WITHOUT_X11) -.if defined(WITH_GHOSTSCRIPT_AFPL) +.if defined(WITH_GHOSTSCRIPT_GNU) +GHOSTSCRIPT_PORT?= print/ghostscript-gnu +.elif defined(WITH_GHOSTSCRIPT_AFPL) GHOSTSCRIPT_PORT?= print/ghostscript-afpl -.elif defined(WITH_GHOSTSCRIPT_GPL) +.else GHOSTSCRIPT_PORT?= print/ghostscript-gpl -.else -GHOSTSCRIPT_PORT?= print/ghostscript-gnu .endif .else -.if defined(WITH_GHOSTSCRIPT_AFPL) +.if defined(WITH_GHOSTSCRIPT_GNU) +GHOSTSCRIPT_PORT?= print/ghostscript-gnu-nox11 +.elif defined(WITH_GHOSTSCRIPT_AFPL) GHOSTSCRIPT_PORT?= print/ghostscript-afpl-nox11 -.elif defined(WITH_GHOSTSCRIPT_GPL) +.else GHOSTSCRIPT_PORT?= print/ghostscript-gpl-nox11 -.else -GHOSTSCRIPT_PORT?= print/ghostscript-gnu-nox11 .endif .endif @@ -2727,8 +2732,8 @@ palm parallel pear perl5 plan9 polish portuguese ports-mgmt \ print python ruby rubygems russian \ scheme science security shells spanish sysutils \ - tcl80 tcl81 tcl82 tcl83 tcl84 textproc \ - tk80 tk82 tk83 tk84 tkstep80 \ + tcl tcl80 tcl82 tcl83 tcl84 textproc \ + tk tk80 tk82 tk83 tk84 tkstep80 \ ukrainian vietnamese windowmaker www \ x11 x11-clocks x11-fm x11-fonts x11-servers x11-themes x11-toolkits \ x11-wm xfce zope @@ -3124,8 +3129,7 @@ # ################################################################ .if (!defined(OPTIONS) || defined(CONFIG_DONE) || \ - defined(PACKAGE_BUILDING) || defined(BATCH) || \ - exists(${_OPTIONSFILE}) || exists(${_OPTIONSFILE}.local)) + defined(PACKAGE_BUILDING) || defined(BATCH)) _OPTIONS_OK=yes .endif @@ -3259,16 +3263,25 @@ fi .endif +# set alg to any of SIZE, MD5, SHA256 (or any other checksum algorithm): +DISTINFO_DATA?= if [ \( -n "${DISABLE_SIZE}" -a -n "${NO_CHECKSUM}" \) -o ! -f "${MD5_FILE}" ]; then exit; fi; \ + DIR=${DIST_SUBDIR}; ${AWK} -v alg=$$alg -v file=$${DIR:+$$DIR/}$${file} \ + '$$1 == alg && $$2 == "(" file ")" {print $$4}' ${MD5_FILE} + # Fetch .if !target(do-fetch) do-fetch: @${MKDIR} ${_DISTDIR} - @(cd ${_DISTDIR}; \ + @cd ${_DISTDIR};\ ${_MASTER_SITES_ENV} ; \ for _file in ${DISTFILES}; do \ - file=`${ECHO_CMD} $$_file | ${SED} -E -e 's/:[^:]+$$//'` ; \ - select=`${ECHO_CMD} $${_file#$${file}} | ${SED} -e 's/^://' -e 's/,/ /g'` ; \ + file=$${_file%%:*}; \ + if [ $$_file = $$file ]; then \ + select=''; \ + else \ + select=`${ECHO_CMD} $${_file##*:} | ${SED} -e 's/,/ /g'` ; \ + fi; \ force_fetch=false; \ filebasename=`${BASENAME} $$file`; \ for afile in ${FORCE_FETCH}; do \ @@ -3278,8 +3291,6 @@ fi; \ done; \ if [ ! -f $$file -a ! -f $$filebasename -o "$$force_fetch" = "true" ]; then \ - DIR=${DIST_SUBDIR}; \ - pattern="$${DIR:+$$DIR/}`${ECHO_CMD} $$file | ${SED} -e 's/\./\\\\./g'`"; \ if [ -L $$file -o -L $$filebasename ]; then \ ${ECHO_MSG} "=> ${_DISTDIR}/$$file is a broken symlink."; \ ${ECHO_MSG} "=> Perhaps a filesystem (most likely a CD) isn't mounted?"; \ @@ -3287,7 +3298,8 @@ exit 1; \ fi ; \ if [ -f ${MD5_FILE} -a "x${NO_CHECKSUM}" = "x" ]; then \ - if ! ${GREP} -q "^MD5 ($$pattern)" ${MD5_FILE}; then \ + _md5sum=`alg=MD5; ${DISTINFO_DATA}`; \ + if [ -z "$$_md5sum" ]; then \ ${ECHO_MSG} "=> $${DIR:+$$DIR/}$$file is not in ${MD5_FILE}."; \ ${ECHO_MSG} "=> Either ${MD5_FILE} is out of date, or"; \ ${ECHO_MSG} "=> $${DIR:+$$DIR/}$$file is spelled incorrectly."; \ @@ -3314,8 +3326,7 @@ fi ; \ for site in `eval $$SORTED_MASTER_SITES_CMD_TMP ${_RANDOMIZE_SITES}`; do \ ${ECHO_MSG} "=> Attempting to fetch from $${site}."; \ - DIR=${DIST_SUBDIR}; \ - CKSIZE=`${GREP} "^SIZE ($${DIR:+$$DIR/}$$file)" ${MD5_FILE} | ${AWK} '{print $$4}'`; \ + CKSIZE=`alg=SIZE; ${DISTINFO_DATA}`; \ case $${file} in \ */*) ${MKDIR} $${file%/*}; \ args="-o $${file} $${site}$${file}";; \ @@ -3329,10 +3340,10 @@ ${ECHO_MSG} "=> port manually into ${_DISTDIR} and try again."; \ exit 1; \ fi \ - done) + done .if defined(PATCHFILES) - @(cd ${_DISTDIR}; \ - ${_PATCH_SITES_ENV} ; \ + @cd ${_DISTDIR};\ + ${_PATCH_SITES_ENV} ; \ for _file in ${PATCHFILES}; do \ file=`${ECHO_CMD} $$_file | ${SED} -E -e 's/:[^:]+$$//'` ; \ select=`${ECHO_CMD} $${_file#$${file}} | ${SED} -e 's/^://' -e 's/,/ /g'` ; \ @@ -3367,9 +3378,7 @@ fi ; \ for site in `eval $$SORTED_PATCH_SITES_CMD_TMP`; do \ ${ECHO_MSG} "=> Attempting to fetch from $${site}."; \ - DIR=${DIST_SUBDIR}; \ - pattern="$${DIR:+$$DIR/}`${ECHO_CMD} $$file | ${SED} -e 's/\./\\\\./g'`"; \ - CKSIZE=`${GREP} "^SIZE ($$pattern)" ${MD5_FILE} | ${AWK} '{print $$4}'`; \ + CKSIZE=`alg=SIZE; ${DISTINFO_DATA}`; \ case $${file} in \ */*) ${MKDIR} $${file%/*}; \ args="-o $${file} $${site}$${file}";; \ @@ -3383,7 +3392,7 @@ ${ECHO_MSG} "=> port manually into ${_DISTDIR} and try again."; \ exit 1; \ fi \ - done) + done .endif .endif @@ -4035,7 +4044,7 @@ .if !target(${target}) && defined(_OPTIONS_OK) ${target}: ${${target:U}_COOKIE} .elif !target(${target}) -${target}: config +${target}: config-conditional @cd ${.CURDIR} && ${MAKE} CONFIG_DONE=1 ${__softMAKEFLAGS} ${${target:U}_COOKIE} .elif target(${target}) && defined(IGNORE) .endif @@ -4327,8 +4336,8 @@ continue; \ fi; \ fi; \ - DIR=${DIST_SUBDIR}; \ - CKSIZE=`${GREP} "^SIZE ($${DIR:+$$DIR/}$$file)" ${MD5_FILE} | ${AWK} '{print $$4}'`; \ + DIR=${DIST_SUBDIR};\ + CKSIZE=`alg=SIZE; ${DISTINFO_DATA}`; \ case $${file} in \ */*) args="-o $${file} $${site}$${file}";; \ *) args=$${site}$${file};; \ @@ -4359,8 +4368,7 @@ SORTED_PATCH_SITES_CMD_TMP="${SORTED_PATCH_SITES_DEFAULT_CMD}" ; \ fi ; \ for site in `eval $$SORTED_PATCH_SITES_CMD_TMP ${_RANDOMIZE_SITES}`; do \ - DIR=${DIST_SUBDIR}; \ - CKSIZE=`${GREP} "^SIZE ($${DIR:+$$DIR/}$$file)" ${MD5_FILE} | ${AWK} '{print $$4}'`; \ + CKSIZE=`alg=SIZE; ${DISTINFO_DATA}`; \ case $${file} in \ */*) args="-o $${file} $${site}$${file}";; \ *) args=$${site}$${file};; \ @@ -4437,23 +4445,19 @@ .if !target(checksum) checksum: fetch check-checksum-algorithms - @ \ - \ - ${checksum_init} \ - \ + @${checksum_init} \ if [ -f ${MD5_FILE} ]; then \ - ( cd ${DISTDIR}; OK=""; \ + cd ${DISTDIR}; OK="";\ for file in ${_CKSUMFILES}; do \ - pattern="`${ECHO_CMD} $$file | ${SED} -e 's/\./\\\\./g'`"; \ - \ ignored="true"; \ + _file=$${file#${DIST_SUBDIR}/*}; \ for alg in ${CHECKSUM_ALGORITHMS:U}; do \ ignore="false"; \ eval alg_executable=\$$$$alg; \ \ if [ $$alg_executable != "NO" ]; then \ MKSUM=`$$alg_executable < $$file`; \ - CKSUM=`${GREP} "^$$alg ($$pattern)" ${MD5_FILE} | ${AWK} '{print $$4}'`; \ + CKSUM=`file=$$_file; ${DISTINFO_DATA}`; \ else \ ignore="true"; \ fi; \ @@ -4498,8 +4502,7 @@ done; \ \ for file in ${_IGNOREFILES}; do \ - pattern="`${ECHO_CMD} $$file | ${SED} -e 's/\./\\\\./g'`"; \ - \ + _file=$${file#${DIST_SUBDIR}/*}; \ ignored="true"; \ alreadymatched="false"; \ for alg in ${CHECKSUM_ALGORITHMS:U}; do \ @@ -4507,7 +4510,7 @@ eval alg_executable=\$$$$alg; \ \ if [ $$alg_executable != "NO" ]; then \ - CKSUM=`${GREP} "^$$alg ($$pattern)" ${MD5_FILE} | ${AWK} '{print $$4}'`; \ + CKSUM=`file=$$_file; ${DISTINFO_DATA}`; \ else \ ignore="true"; \ fi; \ @@ -4555,7 +4558,6 @@ if [ "$$OK" != "true" ]; then \ exit 1; \ fi \ - ); \ elif [ -n "${_CKSUMFILES:M*}" ]; then \ ${ECHO_MSG} "=> No checksum file (${MD5_FILE})."; \ fi @@ -4840,61 +4842,59 @@ done .endif +# Used by fetch-required and fetch-required list, this script looks +# at each of the dependencies. If 3 items are specified in the tuple, +# such as foo:${PORTSDIR}/graphics/foo:extract, the first item (foo) +# is examined. Only if it begins with a / and does not exist on the +# file-system will ``make targ'' proceed. +# For more usual (dual-item) dependency tuples, the ``make targ'' +# proceeds, if the exact package, which the directory WOULD'VE installed, +# is not yet installed. +# This is the exact behaviour of the old code, and it may need +# revisiting. For example, the entire first case seems dubious, and in +# the second case we, probably, should be satisfied with _any_ (earlier) +# package, with the same origin as that of the dir. +# +# -mi +FETCH_LIST?= for i in $$deps; do \ + prog=$${i%%:*}; dir=$${i\#*:}; \ + case $$dir in \ + *:*) if [ $$prog != $${prog\#/} -o ! -e $$prog ]; then \ + dir=$${dir%%:*}; \ + else \ + continue; \ + fi;; \ + *) if [ -d ${PKG_DBDIR}/$$(cd $$dir; ${MAKE} -V PKGNAME) ]; then \ + continue; \ + fi;; \ + esac; \ + echo cd $$dir; ${MAKE} $$targ; \ + done + .if !target(fetch-required) fetch-required: fetch +.if defined(NO_DEPENDS) + @${ECHO_MSG} "===> NO_DEPENDS is set, not fetching any distfiles for ${PKG_NAME}" +.else @${ECHO_MSG} "===> Fetching all required distfiles for ${PKGNAME} and dependencies" .for deptype in EXTRACT PATCH FETCH BUILD RUN .if defined(${deptype}_DEPENDS) -.if !defined(NO_DEPENDS) - @for i in ${${deptype}_DEPENDS}; do \ - prog=`${ECHO_CMD} $$i | ${CUT} -f 1 -d ':'`; \ - dir=`${ECHO_CMD} $$i | ${CUT} -f 2-999 -d ':'`; \ - if ${EXPR} "$$dir" : '.*:' > /dev/null; then \ - dir=`${ECHO_CMD} $$dir | ${CUT} -f 1 -d ':'`; \ - if ${EXPR} "$$prog" : \\/ >/dev/null; then \ - if [ ! -e "$$prog" ]; then \ - (cd $$dir; ${MAKE} fetch); \ - fi; \ - fi; \ - else \ - (cd $$dir; \ - tmp=`${MAKE} -V PKGNAME`; \ - if [ ! -d ${PKG_DBDIR}/$${tmp} ]; then \ - ${MAKE} fetch; \ - fi ); \ - fi; \ - done + @targ=fetch; deps="${${deptype}_DEPENDS}"; ${FETCH_LIST} .endif +.endfor .endif -.endfor + .endif .if !target(fetch-required-list) fetch-required-list: fetch-list +.if !defined(NO_DEPENDS) .for deptype in EXTRACT PATCH FETCH BUILD RUN .if defined(${deptype}_DEPENDS) -.if !defined(NO_DEPENDS) - @for i in ${${deptype}_DEPENDS}; do \ - prog=`${ECHO_CMD} $$i | ${CUT} -f 1 -d ':'`; \ - dir=`${ECHO_CMD} $$i | ${CUT} -f 2-999 -d ':'`; \ - if ${EXPR} "$$dir" : '.*:' > /dev/null; then \ - dir=`${ECHO_CMD} $$dir | ${CUT} -f 1 -d ':'`; \ - if ${EXPR} "$$prog" : \\/ >/dev/null; then \ - if [ ! -e "$$prog" ]; then \ - (cd $$dir; ${MAKE} fetch-list); \ - fi; \ - fi; \ - else \ - (cd $$dir; \ - tmp=`${MAKE} -V PKGNAME`; \ - if [ ! -d ${PKG_DBDIR}/$${tmp} ]; then \ - ${MAKE} fetch-list; \ - fi ); \ - fi; \ - done + @targ=fetch-list; deps="${${deptype}_DEPENDS}"; ${FETCH_LIST} .endif +.endfor .endif -.endfor .endif .if !target(checksum-recursive) @@ -4913,7 +4913,7 @@ .endif BUILD-DEPENDS-LIST= \ - for dir in $$(${ECHO_CMD} "${EXTRACT_DEPENDS} ${PATCH_DEPENDS} ${FETCH_DEPENDS} ${BUILD_DEPENDS} ${LIB_DEPENDS}" | ${TR} '\040' '\012' | ${SED} -e 's/^[^:]*://' -e 's/:.*//' | ${SORT} -u); do \ + for dir in $$(${ECHO_CMD} "${EXTRACT_DEPENDS} ${PATCH_DEPENDS} ${FETCH_DEPENDS} ${BUILD_DEPENDS} ${LIB_DEPENDS}" | ${SED} -E -e 's,([^: ]*):([^: ]*)(:[^ ]*)?,\2,g' -e 'y/ /\n/'| ${SORT} -u); do \ if [ -d $$dir ]; then \ ${ECHO_CMD} $$dir; \ else \ @@ -4927,7 +4927,7 @@ .endif RUN-DEPENDS-LIST= \ - for dir in $$(${ECHO_CMD} "${LIB_DEPENDS} ${RUN_DEPENDS}" | ${SED} -e 'y/ /\n/' | ${CUT} -f 2 -d ':' | ${SORT} -u); do \ + for dir in $$(${ECHO_CMD} "${_LIB_RUN_DEPENDS:C,.*:([^:]*).*,\1,}" | ${SED} -e 'y/ /\n/' | ${SORT} -u); do \ if [ -d $$dir ]; then \ ${ECHO_CMD} $$dir; \ else \ @@ -4943,6 +4943,7 @@ @${PACKAGE-DEPENDS-LIST} .endif +_LIB_RUN_DEPENDS= ${LIB_DEPENDS} ${RUN_DEPENDS} PACKAGE-DEPENDS-LIST?= \ if [ "${CHILD_DEPENDS}" ]; then \ installed=$$(${PKG_INFO} -qO ${PKGORIGIN} 2>/dev/null || \ @@ -4958,21 +4959,22 @@ done; \ fi; \ checked="${PARENT_CHECKED}"; \ - for dir in $$(${ECHO_CMD} "${LIB_DEPENDS} ${RUN_DEPENDS}" | ${SED} -e 'y/ /\n/' | ${CUT} -f 2 -d ':'); do \ + for dir in ${_LIB_RUN_DEPENDS:C,[^:]*:([^:]*):?.*,\1,}; do \ dir=$$(${REALPATH} $$dir); \ if [ -d $$dir ]; then \ - if (${ECHO_CMD} $$checked | ${GREP} -qwv "$$dir"); then \ - childout=$$(cd $$dir; ${MAKE} CHILD_DEPENDS=yes PARENT_CHECKED="$$checked" package-depends-list); \ - set -- $$childout; \ - childdir=""; \ - while [ $$\# != 0 ]; do \ - childdir="$$childdir $$2"; \ - ${ECHO_CMD} "$$1 $$2 $$3"; \ - shift 3; \ - done; \ - checked="$$dir $$childdir $$checked"; \ - fi; \ - else \ + case $$checked in \ + $$dir|$$dir\ *|*\ $$dir|*\ $$dir\ *) continue;; \ + esac; \ + childout=$$(cd $$dir; ${MAKE} CHILD_DEPENDS=yes PARENT_CHECKED="$$checked" package-depends-list); \ + set -- $$childout; \ + childdir=""; \ + while [ $$\# != 0 ]; do \ + childdir="$$childdir $$2"; \ + ${ECHO_CMD} "$$1 $$2 $$3"; \ + shift 3; \ + done; \ + checked="$$dir $$childdir $$checked"; \ + else \\ ${ECHO_MSG} "${PKGNAME}: \"$$dir\" non-existent -- dependency list incomplete" >&2; \ fi; \ done @@ -4992,7 +4994,7 @@ # Show missing dependiencies missing: @for dir in $$(${ALL-DEPENDS-LIST}); do \ - THISORIGIN=$$(${ECHO_CMD} $$dir | ${SED} 's,${PORTSDIR}/,,'); \ + THISORIGIN=$${dir##${PORTSDIR}/}; \ installed=$$(${PKG_INFO} -qO $${THISORIGIN}); \ if [ -z "$$installed" ]; then \ ${ECHO_CMD} $$THISORIGIN; \ @@ -5195,7 +5197,7 @@ @${ECHO_CMD} '@cwd ${PREFIX}' >> ${TMPPLIST} .endif @for i in $$(${ECHO_CMD} ${__MANPAGES} ${_TMLINKS:M${_PREFIX}*:S|^${_PREFIX}/||} ' ' | ${SED} -E -e 's|man([1-9ln])/([^/ ]+) |cat\1/\2 |g'); do \ - ${ECHO_CMD} "@unexec rm -f %D/$${i%.gz} %D/$${i%.gz}.gz" >> ${TMPPLIST}; \ + ${ECHO_CMD} "@unexec rm -f %D/$$i %D/$${i%.gz} %D/$${i%.bz2} %D/$$i.gz %D/$$i.bz2" >> ${TMPPLIST}; \ done .endfor @if [ -f ${PLIST} ]; then \ @@ -5208,7 +5210,7 @@ .endfor .for dir in ${PLIST_DIRS} - @${ECHO_CMD} ${dir} | ${SED} ${PLIST_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} | ${SED} -e 's,^,@dirrm ,' >> ${TMPPLIST} + @${ECHO_CMD} ${dir} | ${SED} ${PLIST_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} -e 's,^,@dirrm ,' >> ${TMPPLIST} .endfor # To be removed once INSTALLS_SHLIB has been eradicated. .if defined(INSTALLS_SHLIB) && !defined(INSTALL_AS_USER) @@ -5386,7 +5388,7 @@ if [ -f ${PKGMESSAGE} ]; then \ ${CP} ${PKGMESSAGE} ${PKG_DBDIR}/${PKGNAME}/+DISPLAY; \ fi; \ - for dep in `${PKG_INFO} -qf ${PKGNAME} | ${GREP} -w ^@pkgdep | ${AWK} '{print $$2}' | ${SORT} -u`; do \ + for dep in `${PKG_INFO} -qf ${PKGNAME} | ${AWK} '/^@pkgdep / {print $$2}' | ${SORT} -u`; do \ if [ -d ${PKG_DBDIR}/$$dep -a -z `${ECHO_CMD} $$dep | ${GREP} -E ${PKG_IGNORE_DEPENDS}` ]; then \ if ! ${GREP} ^${PKGNAME}$$ ${PKG_DBDIR}/$$dep/+REQUIRED_BY \ >/dev/null 2>&1; then \ @@ -5529,10 +5531,36 @@ .if !target(config-conditional) config-conditional: -.if defined(OPTIONS) && !exists(${_OPTIONSFILE}) +.if defined(OPTIONS) +.if exists(${_OPTIONSFILE}) +# scan saved options and invalidate them, if the set of options does not match + @. ${_OPTIONSFILE}; \ + set ${OPTIONS} XXX; \ + while [ $$# -gt 3 ]; do \ + withvar=WITH_$$1; \ + withoutvar=WITHOUT_$$1; \ + withval=$$(eval ${ECHO_CMD} $$\{$${withvar}\}); \ + withoutval=$$(eval ${ECHO_CMD} $$\{$${withoutvar}\}); \ + if [ ! -z "$${withval}" ]; then \ + val=on; \ + elif [ ! -z "$${withoutval}" ]; then \ + val=off; \ + else \ + val=missing; \ + fi; \ + if [ "$${val}" = "missing" ]; then \ + OPTIONS_INVALID=yes; \ + fi; \ + shift 3; \ + done; \ + if [ "$${OPTIONS_INVALID}" = "yes" ]; then \ + cd ${.CURDIR} && ${MAKE} config; \ + fi; +.else cd ${.CURDIR} && ${MAKE} config; .endif .endif +.endif .if !target(showconfig) showconfig: ==== //depot/projects/soc2006/gabor_destdir/Mk/bsd.ruby.mk#4 (text+ko) ==== @@ -3,7 +3,7 @@ # # Created by: Akinori MUSHA # -# $FreeBSD: ports/Mk/bsd.ruby.mk,v 1.158 2007/02/13 10:33:46 stas Exp $ +# $FreeBSD: ports/Mk/bsd.ruby.mk,v 1.160 2007/04/04 12:52:04 stas Exp $ # .if !defined(Ruby_Include) @@ -74,6 +74,8 @@ # suffix in the form of `xyz'. # RUBY_PORTVERSION - PORTVERSION for the standard ruby ports (ruby, # ruby-gdbm, etc.). +# RUBY_PORTREVISION - PORTREVISION for the standard ruby ports. +# RUBY_PORTEPOCH - PORTEPOCH for the standard ruby ports. # RUBY_DISTNAME - DISTNAME for the standard ruby ports, i.e. the # basename of the ruby distribution tarball. # RUBY_DISTVERSION - The version number part of RUBY_DISTNAME. @@ -159,12 +161,18 @@ RUBY?= ${LOCALBASE}/bin/${RUBY_NAME} .if defined(RUBY_VER) && ${RUBY_VER} == 1.8 -RUBY_RELVERSION= 1.8.5 -RUBY_PATCHLEVEL= 12 +RUBY_RELVERSION= 1.8.6 +RUBY_PORTREVISION= 0 +RUBY_PORTEPOCH= 1 +RUBY_PATCHLEVEL= 0 + +.if ${RUBY_PATCHLEVEL} == 0 +RUBY_VERSION?= ${RUBY_RELVERSION} +RUBY_DISTVERSION?= ${RUBY_RELVERSION} +.else RUBY_VERSION?= ${RUBY_RELVERSION}.${RUBY_PATCHLEVEL} RUBY_DISTVERSION?= ${RUBY_RELVERSION}-p${RUBY_PATCHLEVEL} -RUBY_PORTREVISION= 1 -#RUBY_PATCHFILES?= ruby-${RUBY_DISTVERSION}-yyyy.mm.dd.diff.bz2 +.endif # Security patch RUBY_PATCHFILES?= ${RUBY_VERSION}-patch1.gz ==== //depot/projects/soc2006/gabor_destdir/Mk/bsd.sites.mk#5 (text+ko) ==== @@ -20,7 +20,7 @@ # # Note: all entries should terminate with a slash. # -# $FreeBSD: ports/Mk/bsd.sites.mk,v 1.415 2007/03/24 18:50:20 lofi Exp $ +# $FreeBSD: ports/Mk/bsd.sites.mk,v 1.416 2007/04/03 21:58:35 stas Exp $ # # Where to put distfiles that don't have any other master site @@ -968,11 +968,11 @@ .if !defined(IGNORE_MASTER_SITE_RUBY) MASTER_SITE_RUBY+= \ - ftp://ftp.iij.ad.jp/pub/lang/ruby/%SUBDIR%/ \ + ftp://ftp.SpringDaemons.com/pub/ruby/ruby/%SUBDIR%/ \ + ftp://ftp.ruby-lang.org/pub/ruby/%SUBDIR%/ \ http://www.ibiblio.org/pub/languages/ruby/%SUBDIR%/ \ ftp://xyz.lcs.mit.edu/pub/ruby/%SUBDIR%/ \ ${MASTER_SITE_RINGSERVER:S,%SUBDIR%,lang/ruby/&,} \ - ftp://ftp.ruby-lang.org/pub/ruby/%SUBDIR%/ \ ftp://ftp.fu-berlin.de/unix/languages/ruby/%SUBDIR%/ \ ftp://ftp.easynet.be/ruby/ruby/%SUBDIR%/ \ ftp://ftp.ntua.gr/pub/lang/ruby/%SUBDIR%/ \ ==== //depot/projects/soc2006/gabor_destdir/Mk/bsd.tcl.mk#3 (text+ko) ==== @@ -1,7 +1,7 @@ # -*- mode: Makefile; tab-width: 4; -*- # ex: ts=4 # -# $FreeBSD: ports/Mk/bsd.tcl.mk,v 1.7 2007/02/05 14:03:40 pav Exp $ +# $FreeBSD: ports/Mk/bsd.tcl.mk,v 1.8 2007/04/02 22:55:29 pav Exp $ # .if !defined(_POSTMKINCLUDED) && !defined(Tcl_Pre_Include) @@ -9,157 +9,431 @@ Tcl_Pre_Include= bsd.tcl.mk Tcl_Include_MAINTAINER= ports@FreeBSD.org -# USE_TCL - Depend on tcl to run. In case of incompatible APIs of -# different TCL versions the version can be specified directly. -# If version is not specified (USE_TCL=yes) then the latest -# version is used (8.4 currently). -# Available values are: 85, 85-thread, 84, 84-thread, 83, 82, -# 81 and 80. -# USE_TCL_BUILD - Build time dependency on tcl. Same semantics as USE_TCL. +# USE_TCL - Add library dependency on Tcl. If no version is given by the maintainer +# via the port or by the user via defined variable try to find the highest +# stable installed version. +# Available values: yes 85+ 84+ 83+ 82+ 80+ 85 84 83 82 80 +# NOTE: - default value 84 is used in case of USE_TCL=yes +# +# USE_TCL_BUILD - Add buildtime dependency on Tcl (tclsh). +# Available values: see USE_TCL +# NOTE: - has no effect if USE_TCL is defined +# +# USE_TCL_RUN - Add runtime dependency on Tcl (tclsh). +# Available values: see USE_TCL +# NOTE: - has no effect if USE_TCL is defined +# - value is implied by USE_TCL_BUILD (if defined) +# +# USE_TCL_WRAPPER - Depend on the tclsh wrapper to run. Ports that do not explicitly require +# a specific tclsh version may use this. +# The tclsh wrapper script installs into ${LOCALBASE}/bin/tclsh +# NOTE: - USE_TCL_WRAPPER and USE_TCL can be used together +# - ports using the wrapper should support default Tcl (8.4) +## +# INVALID_TCL_VER - This variable contains a list of Tcl versions not supported by the port. +# This setting is effective only when USE_TCL is set to a range (e.g. 83+) +# WITH_TCL_VER - User defined global variable to set Tcl version +# This variable is effective only if USE_TCL is set to a range (e.g. 83+) +# and WITH_TCL_VER points inside that range. +# NOTE: INVALID_TCL_VER takes precedence +# _WITH_TCL_VER - User defined port specific variable to set Tcl version +## +# USE_TCL_THREADS - If defined, Tcl a threaded version of tcl is required. +# NOTE: support for threaded builds starts with version 84 +# USE_TCL_NO_THREADS - If defined, port may not use a threaded Tcl, even if requested via +# USE_TCL_THREADS or WITH_TCL_THREADS +# WITH_TCL_THREADS - User defined variable to use Tcl with threads +# _WITH_TCL_THREADS - User defined port specific variable to require Tcl with threads +## +# TCL_VER - Detected by bsd.tcl.mk. Contains the version number of Tcl to be used. +# +## +# USE_TK - Add library dependency on Tk. If no version is given by the maintainer +# via the port or by the user via defined variable try to find the highest +# stable installed version. +# Avaliable values: yes 85+ 84+ 83+ 82+ 80+ 85 84 83 82 80 +# NOTE: - overrides USE_TCL +# - default value 84 is used in case of USE_TK=yes +# +# USE_TK_BUILD - Add buildtime dependency on Tk (wish). +# Available values: see USE_TK +# NOTE: - has no effect if USE_TK is defined +# +# USE_TK_RUN - Add runtime dependency on Tk (wish). +# Available values: see USE_TK +# NOTE: - has no effect if USE_TK is defined +# - value is implied by USE_TK_BUILD (if defined) # -# USE_TK - Depend on tk to run. In case of incompatible APIs of different -# TK versions the version can be specified directly. If version -# is not specified (USE_TK=yes) then the latest version is -# used (8.4 currently). -# Available values are: 85, 84, 83, 82, 81 and 80. -# USE_TK_BUILD - Build time dependency on tk. Same semantics as USE_TK. +# USE_TK_WRAPPER - Depend on the wish wrapper to run. Ports that do not explicitly require +# a specific wish version may use this. +# The wish wrapper script installs into ${LOCALBASE}/bin/wish +# NOTE: - USE_TK_WRAPPER and USE_TK can be used together. +# - ports using the wrapper should support default Tk (8.4) +## +# INVALID_TK_VER - This variable contains a list of Tk versions not supported by the port +# This setting is effective only when USE_TK is set to a range (e.g. 83+) +# WITH_TK_VER - User defined global variable to set Tk version. +# This variable is effective only if USE_TK is set to a range (e.g. 83+) +# and WITH_TK_VER points inside that range. +# NOTE: overrides WITH_TCL_VER. +# _WITH_TK_VER - User defined port specific variable to set Tk version +# NOTE: overrides _WITH_TCL_VER. ## -# TCL_LIBDIR - Path where tcl libraries can be found +# USE_TK_THREADS - Tk has to obey tcl in threads. A threaded Tk requires +# a threaded Tcl and a non-threaded Tcl requires a non-threaded Tk. +# This variable defines USE_TCL_THREADS +# USE_TK_NO_THREADS - If defined, port may not use a threaded Tk, even if requested via +# USE_TK_THREADS or WITH_TK_THREADS. Defines USE_TCL_NO_THREADS +# WITH_TK_THREADS - User defined variable to use Tk with threads +# _WITH_TK_THREADS - User defined port specific variable to require Tk with threads +### +# TCL_LIBDIR - Path where tcl libraries can be found # -# TCL_INCLUDEDIR -# - Path where tcl C headers can be found +# TCL_INCLUDEDIR - Path where tcl C headers can be found ## # TK_LIBDIR - Path where tk libraries can be found # -# TK_INCLUDEDIR - Path where tk C headers can be found +# TK_INCLUDEDIR - Path where tk C headers can be found ## -# TCLSH - Path to tclsh executable respecting tcl version +# TCLSH - Path to tclsh executable respecting Tcl version +# or to the tclsh wrapper if USE_TCL_WRAPPER is set +# +# WISH - Path to wish executable respecting Tk version +# or to the wish wrapper if USE_TK_WRAPPER is set # -# WISH - Path to wish executable respecting tk version ## -# PATCH_TCL_SCRIPTS -# - List of tcl scripts that need to be patched to replace -# tclsh calls with tclsh${TK_VER} calls. Also note that -# post-patch target is used. +# PATCH_TCL_SCRIPTS - List of tcl scripts that need to be patched to replace +# tclsh calls with tclsh${TK_VER} calls. Also note that +# post-patch target is used. # -# PATCH_TK_SCRIPTS -# - List of tcl scripts that need to be patched to replace -# wish calls with wish${TK_VER} calls. Also note that -# post-patch target is used. +# PATCH_TK_SCRIPTS - List of tcl scripts that need to be patched to replace +# wish calls with wish${TK_VER} calls. Also note that +# post-patch target is used. -.if defined(USE_TCL) || defined(USE_TCL_BUILD) +# Set RUN_DEPENDS for wrappers +. if defined(USE_TCL_WRAPPER) +RUN_DEPENDS+= tclsh:${PORTSDIR}/lang/tcl-wrapper +. endif +. if defined(USE_TK_WRAPPER) +RUN_DEPENDS+= wish:${PORTSDIR}/x11-toolkits/tk-wrapper +. endif -_TCL_VERSIONS= 85 85-thread 84 84-thread 83 82 81 80 +# Process USE_TCL_BUILD and USE_TCL_RUN +.if !defined(USE_TCL) +. if defined(USE_TCL_RUN) +USE_TCL:= ${USE_TCL_RUN} +_TCL_RUN_DEPENDS= yes +. endif +. if defined(USE_TCL_BUILD) +USE_TCL:= ${USE_TCL_BUILD} +_TCL_BUILD_DEPENDS= yes +. endif +.endif -.if defined(USE_TCL) -_RUN= yes +# Process USE_TK_BUILD and USE_TK_RUN +.if !defined(USE_TK) +. if defined(USE_TK_RUN) +USE_TK:= ${USE_TK_RUN} +_TK_RUN_DEPENDS= yes +. endif +. if defined(USE_TK_BUILD) +USE_TK:= ${USE_TK_BUILD} +_TK_BUILD_DEPENDS= yes +. endif .endif -.if defined(USE_TCL_BUILD) -USE_TCL= ${USE_TCL_BUILD} -_BUILD= yes +# Set WITH_TCL_THREADS or WITH_TK_THREADS if port-specific define +. if defined(${UNIQUENAME:U:S,-,_,}_WITH_TCL_THREADS) +WITH_TCL_THREADS= yes +. endif +. if defined(${UNIQUENAME:U:S,-,_,}_WITH_TK_THREADS) +WITH_TK_THREADS= yes .endif -.if ${USE_TCL} == "yes" -USE_TCL= 84 -.endif +# If a threaded Tcl or Tk is requested we require a threaded Tcl +. if !defined(USE_TK_NO_THREADS) && !defined(USE_TCL_NO_THREADS) +. if defined(USE_TCL_THREADS) || defined(USE_TK_THREADS) +USE_TCL_THREADS= yes +. endif +. if defined(WITH_TK_THREADS) +WITH_TCL_THREADS= ${WITH_TK_THREADS} +. endif +. endif + +# Override the global WITH_TCL_VER or WITH_TK_VER with the +# port specific _WITH_TCL_VER or _WITH_TK_VER +. if defined(${UNIQUENAME:U:S,-,_,}_WITH_TCL_VER) +WITH_TCL_VER:= ${${UNIQUENAME:U:S,-,_,}_WITH_TCL_VER} +. endif +. if defined(${UNIQUENAME:U:S,-,_,}_WITH_TK_VER) +WITH_TK_VER:= ${${UNIQUENAME:U:S,-,_,}_WITH_TK_VER} +. endif + +# If USE_TK, WITH_TK_VER, INVALID_TK_VER is defined, >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat Apr 7 17:27:20 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A247516A403; Sat, 7 Apr 2007 17:27:20 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 5F69116A40A for ; Sat, 7 Apr 2007 17:27:20 +0000 (UTC) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 4D09213C4BC for ; Sat, 7 Apr 2007 17:27:20 +0000 (UTC) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l37HRK9E090218 for ; Sat, 7 Apr 2007 17:27:20 GMT (envelope-from mjacob@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l37HREJx090214 for perforce@freebsd.org; Sat, 7 Apr 2007 17:27:14 GMT (envelope-from mjacob@freebsd.org) Date: Sat, 7 Apr 2007 17:27:14 GMT Message-Id: <200704071727.l37HREJx090214@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 117599 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 07 Apr 2007 17:27:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=117599 Change 117599 by mjacob@mjexp_6 on 2007/04/07 17:27:04 Integrate from vendor branch. Affected files ... .. //depot/projects/mjexp_6/sys/amd64/amd64/io_apic.c#2 integrate .. //depot/projects/mjexp_6/sys/amd64/amd64/local_apic.c#2 integrate .. //depot/projects/mjexp_6/sys/amd64/amd64/mptable_pci.c#3 integrate .. //depot/projects/mjexp_6/sys/amd64/amd64/msi.c#1 branch .. //depot/projects/mjexp_6/sys/amd64/amd64/nexus.c#2 integrate .. //depot/projects/mjexp_6/sys/amd64/conf/GENERIC#2 integrate .. //depot/projects/mjexp_6/sys/amd64/include/apicvar.h#2 integrate .. //depot/projects/mjexp_6/sys/amd64/include/intr_machdep.h#2 integrate .. //depot/projects/mjexp_6/sys/amd64/pci/pci_bus.c#3 integrate .. //depot/projects/mjexp_6/sys/arm/arm/identcpu.c#2 integrate .. //depot/projects/mjexp_6/sys/arm/xscale/i80321/i80321_wdog.c#3 integrate .. //depot/projects/mjexp_6/sys/arm/xscale/ixp425/ixp425_wdog.c#2 integrate .. //depot/projects/mjexp_6/sys/boot/forth/loader.conf#3 integrate .. //depot/projects/mjexp_6/sys/boot/pc98/cdboot/cdboot.s#2 integrate .. //depot/projects/mjexp_6/sys/cam/cam_xpt.c#4 integrate .. //depot/projects/mjexp_6/sys/cam/cam_xpt.h#3 integrate .. //depot/projects/mjexp_6/sys/conf/NOTES#5 integrate .. //depot/projects/mjexp_6/sys/conf/files#6 integrate .. //depot/projects/mjexp_6/sys/conf/files.amd64#2 integrate .. //depot/projects/mjexp_6/sys/conf/files.arm#4 integrate .. //depot/projects/mjexp_6/sys/conf/files.i386#2 integrate .. //depot/projects/mjexp_6/sys/conf/files.pc98#2 integrate .. //depot/projects/mjexp_6/sys/dev/acpica/Osd/OsdDebug.c#2 integrate .. //depot/projects/mjexp_6/sys/dev/acpica/acpi_battery.c#2 integrate .. //depot/projects/mjexp_6/sys/dev/acpica/acpi_dock.c#1 branch .. //depot/projects/mjexp_6/sys/dev/acpica/acpi_hpet.c#1 branch .. //depot/projects/mjexp_6/sys/dev/acpica/acpi_pcib_acpi.c#3 integrate .. //depot/projects/mjexp_6/sys/dev/acpica/acpi_pcib_pci.c#3 integrate .. //depot/projects/mjexp_6/sys/dev/acpica/acpi_thermal.c#2 integrate .. //depot/projects/mjexp_6/sys/dev/arcmsr/arcmsr.c#2 integrate .. //depot/projects/mjexp_6/sys/dev/arcmsr/arcmsr.h#2 integrate .. //depot/projects/mjexp_6/sys/dev/ata/ata-queue.c#3 integrate .. //depot/projects/mjexp_6/sys/dev/ata/atapi-cam.c#3 integrate .. //depot/projects/mjexp_6/sys/dev/ath/if_ath.c#4 integrate .. //depot/projects/mjexp_6/sys/dev/ath/if_athvar.h#3 integrate .. //depot/projects/mjexp_6/sys/dev/bce/if_bce.c#5 integrate .. //depot/projects/mjexp_6/sys/dev/bge/if_bge.c#4 integrate .. //depot/projects/mjexp_6/sys/dev/bge/if_bgereg.h#3 integrate .. //depot/projects/mjexp_6/sys/dev/cxgb/common/cxgb_ael1002.c#1 branch .. //depot/projects/mjexp_6/sys/dev/cxgb/common/cxgb_common.h#1 branch .. //depot/projects/mjexp_6/sys/dev/cxgb/common/cxgb_firmware_exports.h#1 branch .. //depot/projects/mjexp_6/sys/dev/cxgb/common/cxgb_mc5.c#1 branch .. //depot/projects/mjexp_6/sys/dev/cxgb/common/cxgb_mv88e1xxx.c#1 branch .. //depot/projects/mjexp_6/sys/dev/cxgb/common/cxgb_regs.h#1 branch .. //depot/projects/mjexp_6/sys/dev/cxgb/common/cxgb_sge_defs.h#1 branch .. //depot/projects/mjexp_6/sys/dev/cxgb/common/cxgb_t3_cpl.h#1 branch .. //depot/projects/mjexp_6/sys/dev/cxgb/common/cxgb_t3_hw.c#1 branch .. //depot/projects/mjexp_6/sys/dev/cxgb/common/cxgb_tcb.h#1 branch .. //depot/projects/mjexp_6/sys/dev/cxgb/common/cxgb_version.h#1 branch .. //depot/projects/mjexp_6/sys/dev/cxgb/common/cxgb_vsc8211.c#1 branch .. //depot/projects/mjexp_6/sys/dev/cxgb/common/cxgb_xgmac.c#1 branch .. //depot/projects/mjexp_6/sys/dev/cxgb/cxgb_adapter.h#1 branch .. //depot/projects/mjexp_6/sys/dev/cxgb/cxgb_config.h#1 branch .. //depot/projects/mjexp_6/sys/dev/cxgb/cxgb_ioctl.h#1 branch .. //depot/projects/mjexp_6/sys/dev/cxgb/cxgb_lro.c#1 branch .. //depot/projects/mjexp_6/sys/dev/cxgb/cxgb_main.c#1 branch .. //depot/projects/mjexp_6/sys/dev/cxgb/cxgb_osdep.h#1 branch .. //depot/projects/mjexp_6/sys/dev/cxgb/cxgb_sge.c#1 branch .. //depot/projects/mjexp_6/sys/dev/cxgb/t3fw-3.2.bin.gz.uu#1 branch .. //depot/projects/mjexp_6/sys/dev/firewire/firewire.c#2 integrate .. //depot/projects/mjexp_6/sys/dev/firewire/fwohci.c#2 integrate .. //depot/projects/mjexp_6/sys/dev/firewire/fwohci_pci.c#2 integrate .. //depot/projects/mjexp_6/sys/dev/firewire/sbp.c#2 integrate .. //depot/projects/mjexp_6/sys/dev/ichwd/ichwd.c#3 integrate .. //depot/projects/mjexp_6/sys/dev/ipw/if_ipw.c#3 integrate .. //depot/projects/mjexp_6/sys/dev/isp/isp.c#5 integrate .. //depot/projects/mjexp_6/sys/dev/isp/isp_freebsd.c#5 integrate .. //depot/projects/mjexp_6/sys/dev/isp/isp_freebsd.h#6 integrate .. //depot/projects/mjexp_6/sys/dev/isp/isp_ioctl.h#3 integrate .. //depot/projects/mjexp_6/sys/dev/isp/isp_library.c#3 integrate .. //depot/projects/mjexp_6/sys/dev/isp/isp_library.h#3 integrate .. //depot/projects/mjexp_6/sys/dev/isp/isp_pci.c#4 integrate .. //depot/projects/mjexp_6/sys/dev/isp/isp_sbus.c#3 integrate .. //depot/projects/mjexp_6/sys/dev/isp/isp_target.c#5 integrate .. //depot/projects/mjexp_6/sys/dev/isp/isp_target.h#4 integrate .. //depot/projects/mjexp_6/sys/dev/isp/isp_tpublic.h#4 integrate .. //depot/projects/mjexp_6/sys/dev/isp/ispmbox.h#3 integrate .. //depot/projects/mjexp_6/sys/dev/isp/ispreg.h#3 integrate .. //depot/projects/mjexp_6/sys/dev/isp/ispvar.h#4 integrate .. //depot/projects/mjexp_6/sys/dev/ispfw/asm_2300.h#2 integrate .. //depot/projects/mjexp_6/sys/dev/ispfw/ispfw.c#3 integrate .. //depot/projects/mjexp_6/sys/dev/iwi/if_iwi.c#5 integrate .. //depot/projects/mjexp_6/sys/dev/mii/brgphy.c#4 integrate .. //depot/projects/mjexp_6/sys/dev/mii/brgphyreg.h#2 integrate .. //depot/projects/mjexp_6/sys/dev/mii/e1000phy.c#2 integrate .. //depot/projects/mjexp_6/sys/dev/mii/e1000phyreg.h#2 integrate .. //depot/projects/mjexp_6/sys/dev/mii/miidevs#3 integrate .. //depot/projects/mjexp_6/sys/dev/mk48txx/mk48txx.c#3 integrate .. //depot/projects/mjexp_6/sys/dev/mpt/mpt.c#4 integrate .. //depot/projects/mjexp_6/sys/dev/mpt/mpt.h#4 integrate .. //depot/projects/mjexp_6/sys/dev/mpt/mpt_cam.c#4 integrate .. //depot/projects/mjexp_6/sys/dev/mpt/mpt_cam.h#3 integrate .. //depot/projects/mjexp_6/sys/dev/mpt/mpt_debug.c#3 integrate .. //depot/projects/mjexp_6/sys/dev/mpt/mpt_pci.c#3 integrate .. //depot/projects/mjexp_6/sys/dev/mpt/mpt_raid.c#3 integrate .. //depot/projects/mjexp_6/sys/dev/msk/if_msk.c#1 branch .. //depot/projects/mjexp_6/sys/dev/msk/if_mskreg.h#1 branch .. //depot/projects/mjexp_6/sys/dev/my/if_my.c#3 integrate .. //depot/projects/mjexp_6/sys/dev/pci/pci.c#4 integrate .. //depot/projects/mjexp_6/sys/dev/pci/pci_if.m#3 integrate .. //depot/projects/mjexp_6/sys/dev/pci/pci_pci.c#3 integrate .. //depot/projects/mjexp_6/sys/dev/pci/pci_private.h#4 integrate .. //depot/projects/mjexp_6/sys/dev/pci/pcib_if.m#2 integrate .. //depot/projects/mjexp_6/sys/dev/pci/pcib_private.h#4 integrate .. //depot/projects/mjexp_6/sys/dev/pci/pcireg.h#3 integrate .. //depot/projects/mjexp_6/sys/dev/pci/pcivar.h#4 integrate .. //depot/projects/mjexp_6/sys/dev/ppbus/lpt.c#2 integrate .. //depot/projects/mjexp_6/sys/dev/ppbus/ppbconf.c#2 integrate .. //depot/projects/mjexp_6/sys/dev/ppc/ppc.c#2 integrate .. //depot/projects/mjexp_6/sys/dev/ppc/ppcvar.h#2 integrate .. //depot/projects/mjexp_6/sys/dev/ral/rt2560.c#3 integrate .. //depot/projects/mjexp_6/sys/dev/ral/rt2661.c#3 integrate .. //depot/projects/mjexp_6/sys/dev/sk/if_sk.c#2 integrate .. //depot/projects/mjexp_6/sys/dev/sk/if_skreg.h#2 integrate .. //depot/projects/mjexp_6/sys/dev/sound/pci/atiixp.c#2 integrate .. //depot/projects/mjexp_6/sys/dev/sound/pci/maestro3.c#2 integrate .. //depot/projects/mjexp_6/sys/dev/usb/if_ural.c#3 integrate .. //depot/projects/mjexp_6/sys/gnu/fs/ext2fs/ext2_vfsops.c#3 integrate .. //depot/projects/mjexp_6/sys/i386/conf/GENERIC#2 integrate .. //depot/projects/mjexp_6/sys/i386/conf/NOTES#2 integrate .. //depot/projects/mjexp_6/sys/i386/i386/elan-mmcr.c#3 integrate .. //depot/projects/mjexp_6/sys/i386/i386/geode.c#2 integrate .. //depot/projects/mjexp_6/sys/i386/i386/io_apic.c#2 integrate .. //depot/projects/mjexp_6/sys/i386/i386/local_apic.c#2 integrate .. //depot/projects/mjexp_6/sys/i386/i386/mp_machdep.c#3 integrate .. //depot/projects/mjexp_6/sys/i386/i386/mptable_pci.c#3 integrate .. //depot/projects/mjexp_6/sys/i386/i386/msi.c#1 branch .. //depot/projects/mjexp_6/sys/i386/i386/nexus.c#2 integrate .. //depot/projects/mjexp_6/sys/i386/i386/pmap.c#2 integrate .. //depot/projects/mjexp_6/sys/i386/i386/vm_machdep.c#2 integrate .. //depot/projects/mjexp_6/sys/i386/include/apicvar.h#2 integrate .. //depot/projects/mjexp_6/sys/i386/include/intr_machdep.h#2 integrate .. //depot/projects/mjexp_6/sys/i386/pci/pci_bus.c#3 integrate .. //depot/projects/mjexp_6/sys/ia64/ia64/pmap.c#2 integrate .. //depot/projects/mjexp_6/sys/isofs/cd9660/cd9660_node.h#2 integrate .. //depot/projects/mjexp_6/sys/kern/kern_lock.c#2 integrate .. //depot/projects/mjexp_6/sys/kern/kern_prot.c#2 integrate .. //depot/projects/mjexp_6/sys/kern/uipc_socket.c#3 integrate .. //depot/projects/mjexp_6/sys/kern/uipc_socket2.c#2 integrate .. //depot/projects/mjexp_6/sys/kern/vfs_export.c#2 integrate .. //depot/projects/mjexp_6/sys/kern/vfs_syscalls.c#3 integrate .. //depot/projects/mjexp_6/sys/modules/Makefile#4 integrate .. //depot/projects/mjexp_6/sys/modules/acpi/Makefile#2 integrate .. //depot/projects/mjexp_6/sys/modules/acpi/acpi/Makefile#2 integrate .. //depot/projects/mjexp_6/sys/modules/acpi/acpi_dock/Makefile#1 branch .. //depot/projects/mjexp_6/sys/modules/cxgb/Makefile#1 branch .. //depot/projects/mjexp_6/sys/modules/msk/Makefile#1 branch .. //depot/projects/mjexp_6/sys/modules/my/Makefile#2 integrate .. //depot/projects/mjexp_6/sys/net/if.c#2 integrate .. //depot/projects/mjexp_6/sys/net/if_bridge.c#5 integrate .. //depot/projects/mjexp_6/sys/net/if_tap.c#4 integrate .. //depot/projects/mjexp_6/sys/net80211/_ieee80211.h#3 integrate .. //depot/projects/mjexp_6/sys/net80211/ieee80211.c#3 integrate .. //depot/projects/mjexp_6/sys/net80211/ieee80211_crypto.c#2 integrate .. //depot/projects/mjexp_6/sys/net80211/ieee80211_crypto.h#2 integrate .. //depot/projects/mjexp_6/sys/net80211/ieee80211_freebsd.c#2 integrate .. //depot/projects/mjexp_6/sys/net80211/ieee80211_freebsd.h#3 integrate .. //depot/projects/mjexp_6/sys/net80211/ieee80211_input.c#3 integrate .. //depot/projects/mjexp_6/sys/net80211/ieee80211_ioctl.c#2 integrate .. //depot/projects/mjexp_6/sys/net80211/ieee80211_node.c#3 integrate .. //depot/projects/mjexp_6/sys/net80211/ieee80211_node.h#2 integrate .. //depot/projects/mjexp_6/sys/net80211/ieee80211_output.c#3 integrate .. //depot/projects/mjexp_6/sys/net80211/ieee80211_proto.c#3 integrate .. //depot/projects/mjexp_6/sys/net80211/ieee80211_proto.h#2 integrate .. //depot/projects/mjexp_6/sys/net80211/ieee80211_radiotap.h#2 integrate .. //depot/projects/mjexp_6/sys/net80211/ieee80211_var.h#3 integrate .. //depot/projects/mjexp_6/sys/netgraph/bluetooth/l2cap/ng_l2cap_cmds.c#2 integrate .. //depot/projects/mjexp_6/sys/netgraph/ng_eiface.c#2 integrate .. //depot/projects/mjexp_6/sys/netinet/if_ether.c#3 integrate .. //depot/projects/mjexp_6/sys/netinet/in.c#2 integrate .. //depot/projects/mjexp_6/sys/netinet/ip_dummynet.c#2 integrate .. //depot/projects/mjexp_6/sys/netinet/ip_fastfwd.c#3 integrate .. //depot/projects/mjexp_6/sys/netinet/ip_fw.h#2 integrate .. //depot/projects/mjexp_6/sys/netinet/ip_fw2.c#2 integrate .. //depot/projects/mjexp_6/sys/netinet/ip_fw_pfil.c#2 integrate .. //depot/projects/mjexp_6/sys/netinet/ip_input.c#2 integrate .. //depot/projects/mjexp_6/sys/netinet/ip_output.c#2 integrate .. //depot/projects/mjexp_6/sys/netinet/raw_ip.c#3 integrate .. //depot/projects/mjexp_6/sys/netinet/tcp_input.c#2 integrate .. //depot/projects/mjexp_6/sys/netinet/tcp_output.c#2 integrate .. //depot/projects/mjexp_6/sys/netinet/udp_usrreq.c#3 integrate .. //depot/projects/mjexp_6/sys/nfsclient/nfs_vfsops.c#3 integrate .. //depot/projects/mjexp_6/sys/nfsserver/nfs_srvsubs.c#3 integrate .. //depot/projects/mjexp_6/sys/pci/if_ste.c#2 integrate .. //depot/projects/mjexp_6/sys/pci/if_stereg.h#2 integrate .. //depot/projects/mjexp_6/sys/sparc64/include/pmap.h#2 integrate .. //depot/projects/mjexp_6/sys/sparc64/sparc64/pmap.c#2 integrate .. //depot/projects/mjexp_6/sys/sys/param.h#6 integrate .. //depot/projects/mjexp_6/sys/sys/socketvar.h#2 integrate .. //depot/projects/mjexp_6/sys/sys/ucred.h#2 integrate .. //depot/projects/mjexp_6/sys/ufs/ffs/ffs_alloc.c#3 integrate .. //depot/projects/mjexp_6/sys/ufs/ffs/ffs_softdep.c#2 integrate .. //depot/projects/mjexp_6/sys/ufs/ffs/ffs_vnops.c#2 integrate .. //depot/projects/mjexp_6/sys/ufs/ufs/ufs_vnops.c#3 integrate .. //depot/projects/mjexp_6/sys/vm/pmap.h#2 integrate .. //depot/projects/mjexp_6/sys/vm/vm_object.c#2 integrate Differences ... ==== //depot/projects/mjexp_6/sys/amd64/amd64/io_apic.c#2 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/io_apic.c,v 1.15.2.7 2006/12/01 17:13:56 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/io_apic.c,v 1.15.2.8 2007/03/12 19:50:29 jhb Exp $"); #include "opt_isa.h" @@ -36,11 +36,15 @@ #include #include #include +#include #include -#include +#include #include #include +#include +#include + #include #include @@ -723,3 +727,46 @@ if (pin->io_irq < NUM_IO_INTS) intr_register_source(&pin->io_intsrc); } + +/* A simple new-bus driver to consume PCI I/O APIC devices. */ +static int +ioapic_pci_probe(device_t dev) +{ + + if (pci_get_class(dev) == PCIC_BASEPERIPH && + pci_get_subclass(dev) == PCIS_BASEPERIPH_PIC) { + switch (pci_get_progif(dev)) { + case PCIP_BASEPERIPH_PIC_IO_APIC: + device_set_desc(dev, "IO APIC"); + break; + case PCIP_BASEPERIPH_PIC_IOX_APIC: + device_set_desc(dev, "IO(x) APIC"); + break; + default: + return (ENXIO); + } + device_quiet(dev); + return (-10000); + } + return (ENXIO); +} + +static int +ioapic_pci_attach(device_t dev) +{ + + return (0); +} + +static device_method_t ioapic_pci_methods[] = { + /* Device interface */ + DEVMETHOD(device_probe, ioapic_pci_probe), + DEVMETHOD(device_attach, ioapic_pci_attach), + + { 0, 0 } +}; + +DEFINE_CLASS_0(ioapic, ioapic_pci_driver, ioapic_pci_methods, 0); + +static devclass_t ioapic_devclass; +DRIVER_MODULE(ioapic, pci, ioapic_pci_driver, ioapic_devclass, 0, 0); ==== //depot/projects/mjexp_6/sys/amd64/amd64/local_apic.c#2 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/local_apic.c,v 1.17.2.11 2006/11/29 01:19:23 sobomax Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/local_apic.c,v 1.17.2.12 2007/03/31 15:23:19 jhb Exp $"); #include "opt_hwpmc_hooks.h" @@ -741,6 +741,65 @@ panic("Couldn't find an APIC vector for IRQ %u", irq); } +/* + * Request 'count' free contiguous IDT vectors to be used by 'count' + * IRQs. 'count' must be a power of two and the vectors will be + * aligned on a boundary of 'align'. If the request cannot be + * satisfied, 0 is returned. + */ +u_int +apic_alloc_vectors(u_int *irqs, u_int count, u_int align) +{ + u_int first, run, vector; + + KASSERT(powerof2(count), ("bad count")); + KASSERT(powerof2(align), ("bad align")); + KASSERT(align >= count, ("align < count")); +#ifdef INVARIANTS + for (run = 0; run < count; run++) + KASSERT(irqs[run] < NUM_IO_INTS, ("Invalid IRQ %u at index %u", + irqs[run], run)); +#endif + + /* + * Search for 'count' free vectors. As with apic_alloc_vector(), + * this just uses a simple first fit algorithm. + */ + run = 0; + first = 0; + mtx_lock_spin(&icu_lock); + for (vector = 0; vector < APIC_NUM_IOINTS; vector++) { + + /* Vector is in use, end run. */ + if (ioint_irqs[vector] != 0) { + run = 0; + first = 0; + continue; + } + + /* Start a new run if run == 0 and vector is aligned. */ + if (run == 0) { + if ((vector & (align - 1)) != 0) + continue; + first = vector; + } + run++; + + /* Keep looping if the run isn't long enough yet. */ + if (run < count) + continue; + + /* Found a run, assign IRQs and return the first vector. */ + for (vector = 0; vector < count; vector++) + ioint_irqs[first + vector] = irqs[vector]; + mtx_unlock_spin(&icu_lock); + return (first + APIC_IO_INTS); + } + mtx_unlock_spin(&icu_lock); + printf("APIC: Couldn't find APIC vectors for %u IRQs\n", count); + return (0); +} + void apic_enable_vector(u_int vector) { @@ -1001,6 +1060,9 @@ intr_register_pic(&lapic_pic); if (bootverbose) lapic_dump("BSP"); + + /* Enable the MSI "pic". */ + msi_init(); } SYSINIT(apic_setup_io, SI_SUB_INTR, SI_ORDER_SECOND, apic_setup_io, NULL) ==== //depot/projects/mjexp_6/sys/amd64/amd64/mptable_pci.c#3 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/mptable_pci.c,v 1.2.8.2 2006/12/28 22:09:46 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/mptable_pci.c,v 1.2.8.3 2007/03/31 15:23:19 jhb Exp $"); #include #include @@ -72,6 +72,27 @@ return (bus_generic_attach(dev)); } +/* Pass MSI alloc requests up to the nexus. */ +static int +mptable_hostb_alloc_msi(device_t pcib, device_t dev, int count, int maxcount, + int *irqs) +{ + device_t bus; + + bus = device_get_parent(pcib); + return (PCIB_ALLOC_MSI(device_get_parent(bus), dev, count, maxcount, + irqs)); +} + +static int +mptable_hostb_alloc_msix(device_t pcib, device_t dev, int index, int *irq) +{ + device_t bus; + + bus = device_get_parent(pcib); + return (PCIB_ALLOC_MSIX(device_get_parent(bus), dev, index, irq)); +} + static device_method_t mptable_hostb_methods[] = { /* Device interface */ DEVMETHOD(device_probe, mptable_hostb_probe), @@ -96,6 +117,11 @@ DEVMETHOD(pcib_read_config, legacy_pcib_read_config), DEVMETHOD(pcib_write_config, legacy_pcib_write_config), DEVMETHOD(pcib_route_interrupt, mptable_pci_route_interrupt), + DEVMETHOD(pcib_alloc_msi, mptable_hostb_alloc_msi), + DEVMETHOD(pcib_release_msi, pcib_release_msi), + DEVMETHOD(pcib_alloc_msix, mptable_hostb_alloc_msix), + DEVMETHOD(pcib_remap_msix, pcib_remap_msix), + DEVMETHOD(pcib_release_msix, pcib_release_msix), { 0, 0 } }; @@ -148,6 +174,11 @@ DEVMETHOD(pcib_read_config, pcib_read_config), DEVMETHOD(pcib_write_config, pcib_write_config), DEVMETHOD(pcib_route_interrupt, mptable_pci_route_interrupt), + DEVMETHOD(pcib_alloc_msi, pcib_alloc_msi), + DEVMETHOD(pcib_release_msi, pcib_release_msi), + DEVMETHOD(pcib_alloc_msix, pcib_alloc_msix), + DEVMETHOD(pcib_remap_msix, pcib_remap_msix), + DEVMETHOD(pcib_release_msix, pcib_release_msix), {0, 0} }; @@ -157,4 +188,3 @@ DEFINE_CLASS_0(pcib, mptable_pcib_driver, mptable_pcib_pci_methods, sizeof(struct pcib_softc)); DRIVER_MODULE(mptable_pcib, pci, mptable_pcib_driver, pcib_devclass, 0, 0); - ==== //depot/projects/mjexp_6/sys/amd64/amd64/nexus.c#2 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/nexus.c,v 1.66.2.1 2006/09/22 19:04:51 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/nexus.c,v 1.66.2.2 2007/03/31 15:23:19 jhb Exp $"); /* * This code implements a `root nexus' for Intel Architecture @@ -62,6 +62,8 @@ #include +#include "pcib_if.h" + #ifdef DEV_ISA #include #include @@ -101,6 +103,11 @@ static int nexus_set_resource(device_t, device_t, int, int, u_long, u_long); static int nexus_get_resource(device_t, device_t, int, int, u_long *, u_long *); static void nexus_delete_resource(device_t, device_t, int, int); +static int nexus_alloc_msi(device_t pcib, device_t dev, int count, int maxcount, int *irqs); +static int nexus_release_msi(device_t pcib, device_t dev, int count, int *irqs); +static int nexus_alloc_msix(device_t pcib, device_t dev, int index, int *irq); +static int nexus_remap_msix(device_t pcib, device_t dev, int index, int irq); +static int nexus_release_msix(device_t pcib, device_t dev, int irq); static device_method_t nexus_methods[] = { /* Device interface */ @@ -126,6 +133,13 @@ DEVMETHOD(bus_get_resource, nexus_get_resource), DEVMETHOD(bus_delete_resource, nexus_delete_resource), + /* pcib interface */ + DEVMETHOD(pcib_alloc_msi, nexus_alloc_msi), + DEVMETHOD(pcib_release_msi, nexus_release_msi), + DEVMETHOD(pcib_alloc_msix, nexus_alloc_msix), + DEVMETHOD(pcib_remap_msix, nexus_remap_msix), + DEVMETHOD(pcib_release_msix, nexus_release_msix), + { 0, 0 } }; @@ -505,6 +519,54 @@ resource_list_delete(rl, type, rid); } +static int +nexus_alloc_msix(device_t pcib, device_t dev, int index, int *irq) +{ + int error, new; + + error = msix_alloc(dev, index, irq, &new); + if (new) + rman_manage_region(&irq_rman, *irq, *irq); + return (error); +} + +static int +nexus_remap_msix(device_t pcib, device_t dev, int index, int irq) +{ + + return (msix_remap(index, irq)); +} + +static int +nexus_release_msix(device_t pcib, device_t dev, int irq) +{ + + return (msix_release(irq)); +} + +static int +nexus_alloc_msi(device_t pcib, device_t dev, int count, int maxcount, int *irqs) +{ + int error, i, newirq, newcount; + + /* First alloc the messages. */ + error = msi_alloc(dev, count, maxcount, irqs, &newirq, &newcount); + + /* Always add any new IRQs to the rman, even on failure. */ + for (i = 0; i < newcount; i++) + rman_manage_region(&irq_rman, irqs[newirq + i], + irqs[newirq + i]); + + return (error); +} + +static int +nexus_release_msi(device_t pcib, device_t dev, int count, int *irqs) +{ + + return (msi_release(irqs, count)); +} + #ifdef DEV_ISA /* * Placeholder which claims PnP 'devices' which describe system ==== //depot/projects/mjexp_6/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.439.2.17 2006/12/14 04:06:59 obrien Exp $ +# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.439.2.18 2007/03/27 02:33:00 yongari Exp $ machine amd64 cpu HAMMER @@ -188,6 +188,7 @@ device dc # DEC/Intel 21143 and various workalikes device fxp # Intel EtherExpress PRO/100B (82557, 82558) device lge # Level 1 LXT1001 gigabit Ethernet +device msk # Marvell/SysKonnect Yukon II Gigabit Ethernet device nge # NatSemi DP83820 gigabit Ethernet device nve # nVidia nForce MCP on-board Ethernet Networking device pcn # AMD Am79C97x PCI 10/100 (precedence over 'le') ==== //depot/projects/mjexp_6/sys/amd64/include/apicvar.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/apicvar.h,v 1.13.2.3 2006/10/30 18:03:03 jhb Exp $ + * $FreeBSD: src/sys/amd64/include/apicvar.h,v 1.13.2.4 2007/03/31 15:23:20 jhb Exp $ */ #ifndef _MACHINE_APICVAR_H_ @@ -174,6 +174,7 @@ IDTVEC(apic_isr7), IDTVEC(spuriousint), IDTVEC(timerint); u_int apic_alloc_vector(u_int irq); +u_int apic_alloc_vectors(u_int *irqs, u_int count, u_int align); 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); ==== //depot/projects/mjexp_6/sys/amd64/include/intr_machdep.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/amd64/include/intr_machdep.h,v 1.5.2.5 2006/10/30 18:03:03 jhb Exp $ + * $FreeBSD: src/sys/amd64/include/intr_machdep.h,v 1.5.2.6 2007/03/31 15:23:20 jhb Exp $ */ #ifndef __MACHINE_INTR_MACHDEP_H__ @@ -43,11 +43,18 @@ * 191 and still be safe since only interrupt sources in actual use will * allocate IDT vectors. * - * For now we stick with 255 as ISA IRQs and PCI intline IRQs only allow - * for IRQs in the range 0 - 254. When MSI support is added this number - * will likely increase. + * The first 255 IRQs (0 - 254) are reserved for ISA IRQs and PCI intline IRQs. + * IRQ values beyond 256 are used by MSI. We leave 255 unused to avoid + * confusion since 255 is used in PCI to indicate an invalid IRQ. + */ +#define NUM_MSI_INTS 128 +#define FIRST_MSI_INT 256 +#define NUM_IO_INTS (FIRST_MSI_INT + NUM_MSI_INTS) + +/* + * Default base address for MSI messages on x86 platforms. */ -#define NUM_IO_INTS 255 +#define MSI_INTEL_ADDR_BASE 0xfee00000 /* * - 1 ??? dummy counter. @@ -140,6 +147,13 @@ void intr_resume(void); void intr_suspend(void); void intrcnt_add(const char *name, u_long **countp); +int msi_alloc(device_t dev, int count, int maxcount, int *irqs, int *newirq, + int *newcount); +void msi_init(void); +int msi_release(int *irqs, int count); +int msix_alloc(device_t dev, int index, int *irq, int *new); +int msix_remap(int index, int irq); +int msix_release(int irq); #endif /* !LOCORE */ #endif /* _KERNEL */ ==== //depot/projects/mjexp_6/sys/amd64/pci/pci_bus.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/pci/pci_bus.c,v 1.113.2.2 2006/12/28 22:09:46 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/pci/pci_bus.c,v 1.113.2.3 2007/03/31 15:23:20 jhb Exp $"); #include "opt_cpu.h" @@ -81,6 +81,28 @@ return (PCI_INVALID_IRQ); } +/* Pass MSI alloc requests up to the nexus. */ + +static int +legacy_pcib_alloc_msi(device_t pcib, device_t dev, int count, int maxcount, + int *irqs) +{ + device_t bus; + + bus = device_get_parent(pcib); + return (PCIB_ALLOC_MSI(device_get_parent(bus), dev, count, maxcount, + irqs)); +} + +static int +legacy_pcib_alloc_msix(device_t pcib, device_t dev, int index, int *irq) +{ + device_t bus; + + bus = device_get_parent(pcib); + return (PCIB_ALLOC_MSIX(device_get_parent(bus), dev, index, irq)); +} + static const char * legacy_pcib_is_host_bridge(int bus, int slot, int func, uint32_t id, uint8_t class, uint8_t subclass, @@ -322,6 +344,11 @@ DEVMETHOD(pcib_read_config, legacy_pcib_read_config), DEVMETHOD(pcib_write_config, legacy_pcib_write_config), DEVMETHOD(pcib_route_interrupt, legacy_pcib_route_interrupt), + DEVMETHOD(pcib_alloc_msi, legacy_pcib_alloc_msi), + DEVMETHOD(pcib_release_msi, pcib_release_msi), + DEVMETHOD(pcib_alloc_msix, legacy_pcib_alloc_msix), + DEVMETHOD(pcib_remap_msix, pcib_remap_msix), + DEVMETHOD(pcib_release_msix, pcib_release_msix), { 0, 0 } }; ==== //depot/projects/mjexp_6/sys/arm/arm/identcpu.c#2 (text+ko) ==== @@ -42,7 +42,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/arm/identcpu.c,v 1.4 2005/01/05 21:58:47 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/identcpu.c,v 1.4.2.1 2007/03/10 00:16:52 sam Exp $"); #include #include #include @@ -134,7 +134,7 @@ }; static const char * const ixp425_steppings[16] = { - "step 0", "rev 1", "rev 2", "rev 3", + "step 0 (A0)", "rev 1 (ARMv5TE)", "rev 2", "rev 3", "rev 4", "rev 5", "rev 6", "rev 7", "rev 8", "rev 9", "rev 10", "rev 11", "rev 12", "rev 13", "rev 14", "rev 15", ==== //depot/projects/mjexp_6/sys/arm/xscale/i80321/i80321_wdog.c#3 (text+ko) ==== @@ -41,7 +41,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/xscale/i80321/i80321_wdog.c,v 1.2.2.1 2007/02/20 22:56:27 n_hibma Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/xscale/i80321/i80321_wdog.c,v 1.2.2.2 2007/03/30 19:17:36 n_hibma Exp $"); #include #include @@ -118,11 +118,9 @@ sc->armed = 1; *error = 0; } else { - /* XXX Can't disable this watchdog? */ + /* Can't disable this watchdog! */ if (sc->armed) *error = EOPNOTSUPP; - else if (cmd > 0) - *error = EINVAL; } } ==== //depot/projects/mjexp_6/sys/arm/xscale/ixp425/ixp425_wdog.c#2 (text+ko) ==== @@ -22,7 +22,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #include -__FBSDID("$FreeBSD: src/sys/arm/xscale/ixp425/ixp425_wdog.c,v 1.1.2.1 2007/02/26 23:13:09 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/xscale/ixp425/ixp425_wdog.c,v 1.1.2.2 2007/03/30 19:17:37 n_hibma Exp $"); /* * IXP425 Watchdog Timer Support. @@ -70,7 +70,7 @@ u_int u = cmd & WD_INTERVAL; WR4(sc, IXP425_OST_WDOG_KEY, OST_WDOG_KEY_MAJICK); - if (cmd && 4 <= u && u <= 35) { + if (4 <= u && u <= 35) { WR4(sc, IXP425_OST_WDOG_ENAB, 0); /* approximate 66.66MHz cycles */ WR4(sc, IXP425_OST_WDOG, 2<<(u - 4)); ==== //depot/projects/mjexp_6/sys/boot/forth/loader.conf#3 (text+ko) ==== @@ -6,7 +6,7 @@ # # All arguments must be in double quotes. # -# $FreeBSD: src/sys/boot/forth/loader.conf,v 1.95.2.11 2007/01/17 02:45:35 maxim Exp $ +# $FreeBSD: src/sys/boot/forth/loader.conf,v 1.95.2.12 2007/03/27 02:29:45 yongari Exp $ ############################################################## ### Basic configuration options ############################ @@ -238,6 +238,7 @@ if_lge_load="NO" # Level 1 LXT1001 NetCellerator PCI Gigabit # Ethernet if_lnc_load="NO" # AMD Lance/PCnet Ethernet +if_msk_load="NO" # Marvell/SysKonnect Yukon II Gigabit Ethernet if_my_load="NO" # Myson PCI Fast Ethernet if_nge_load="NO" # National Semiconductor PCI Gigabit Ethernet if_nve_load="NO" # NVIDIA nForce MCP Networking Adapter ==== //depot/projects/mjexp_6/sys/boot/pc98/cdboot/cdboot.s#2 (text+ko) ==== @@ -28,7 +28,7 @@ # SUCH DAMAGE. # -# $FreeBSD: src/sys/boot/pc98/cdboot/cdboot.s,v 1.1.2.1 2006/06/16 13:40:50 nyan Exp $ +# $FreeBSD: src/sys/boot/pc98/cdboot/cdboot.s,v 1.1.2.2 2007/03/21 03:41:25 nyan Exp $ # # Basically, we first create a set of boot arguments to pass to the loaded @@ -705,7 +705,7 @@ twiddle: push %ax # Save push %bx # Save mov twiddle_index,%al # Load index - mov twiddle_chars,%bx # Address table + mov $twiddle_chars,%bx # Address table inc %al # Next and $3,%al # char mov %al,twiddle_index # Save index for next call ==== //depot/projects/mjexp_6/sys/cam/cam_xpt.c#4 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/cam_xpt.c,v 1.155.2.10 2006/12/24 03:23:43 mjacob Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/cam_xpt.c,v 1.155.2.11 2007/03/08 05:30:26 mjacob Exp $"); #include #include ==== //depot/projects/mjexp_6/sys/cam/cam_xpt.h#3 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/cam/cam_xpt.h,v 1.5.2.1 2006/12/16 07:05:54 mjacob Exp $ + * $FreeBSD: src/sys/cam/cam_xpt.h,v 1.5.2.2 2007/03/08 05:30:26 mjacob Exp $ */ #ifndef _CAM_CAM_XPT_H ==== //depot/projects/mjexp_6/sys/conf/NOTES#5 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/NOTES,v 1.1325.2.26 2007/01/28 17:14:56 glebius Exp $ +# $FreeBSD: src/sys/conf/NOTES,v 1.1325.2.28 2007/03/27 02:20:20 yongari Exp $ # # NOTES -- Lines that can be cut/pasted into kernel and hints configs. # @@ -1739,6 +1739,10 @@ # lge: Support for PCI gigabit ethernet adapters based on the Level 1 # LXT1001 NetCellerator chipset. This includes the D-Link DGE-500SX, # SMC TigerCard 1000 (SMC9462SX), and some Addtron cards. +# msk: Support for gigabit ethernet adapters based on the Marvell/SysKonnect +# Yukon II Gigabit controllers, including 88E8021, 88E8022, 88E8061, +# 88E8062, 88E8035, 88E8036, 88E8038, 88E8050, 88E8052, 88E8053, +# 88E8055, 88E8056 and D-Link 560T/550SX. # my: Myson Fast Ethernet (MTD80X, MTD89X) # nge: Support for PCI gigabit ethernet adapters based on the National # Semiconductor DP83820 and DP83821 chipset. This includes the @@ -1862,6 +1866,7 @@ # PCI Gigabit & FDDI NICs. device bge +device cxgb # Chelsio T3 10 Gigabit Ethernet device lge device nge device sk ==== //depot/projects/mjexp_6/sys/conf/files#6 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.1031.2.51 2007/02/26 23:17:51 cognet Exp $ +# $FreeBSD: src/sys/conf/files,v 1.1031.2.54 2007/03/27 02:20:20 yongari Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -364,6 +364,7 @@ dev/acpica/acpi_cmbat.c optional acpi dev/acpica/acpi_cpu.c optional acpi dev/acpica/acpi_ec.c optional acpi +dev/acpica/acpi_hpet.c optional acpi dev/acpica/acpi_isab.c optional acpi isa dev/acpica/acpi_lid.c optional acpi dev/acpica/acpi_package.c optional acpi @@ -381,6 +382,7 @@ dev/acpica/acpi_throttle.c optional acpi dev/acpica/acpi_timer.c optional acpi dev/acpica/acpi_video.c optional acpi_video acpi +dev/acpica/acpi_dock.c optional acpi_dock acpi dev/adlink/adlink.c optional adlink dev/advansys/adv_eisa.c optional adv eisa dev/advansys/adv_pci.c optional adv pci @@ -477,6 +479,15 @@ dev/cs/if_cs.c optional cs dev/cs/if_cs_isa.c optional cs isa dev/cs/if_cs_pccard.c optional cs pccard +dev/cxgb/cxgb_main.c optional cxgb pci +dev/cxgb/cxgb_lro.c optional cxgb pci +dev/cxgb/cxgb_sge.c optional cxgb pci +dev/cxgb/common/cxgb_mc5.c optional cxgb pci +dev/cxgb/common/cxgb_vsc8211.c optional cxgb pci +dev/cxgb/common/cxgb_ael1002.c optional cxgb pci +dev/cxgb/common/cxgb_mv88e1xxx.c optional cxgb pci +dev/cxgb/common/cxgb_xgmac.c optional cxgb pci +dev/cxgb/common/cxgb_t3_hw.c optional cxgb pci dev/cy/cy.c optional cy dev/cy/cy_isa.c optional cy isa dev/cy/cy_pci.c optional cy pci @@ -747,6 +758,7 @@ dev/mpt/mpt_debug.c optional mpt dev/mpt/mpt_pci.c optional mpt pci dev/mpt/mpt_raid.c optional mpt +dev/msk/if_msk.c optional msk dev/my/if_my.c optional my dev/ncv/ncr53c500.c optional ncv dev/ncv/ncr53c500_pccard.c optional ncv pccard ==== //depot/projects/mjexp_6/sys/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.71.2.10 2006/09/29 21:21:52 jhb Exp $ +# $FreeBSD: src/sys/conf/files.amd64,v 1.71.2.11 2007/03/31 20:21:14 jhb Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -113,6 +113,7 @@ amd64/amd64/mpboot.S optional smp amd64/amd64/mptable.c optional mptable amd64/amd64/mptable_pci.c optional mptable pci +amd64/amd64/msi.c optional pci amd64/amd64/nexus.c standard amd64/amd64/pmap.c standard amd64/amd64/prof_machdep.c optional profiling-routine ==== //depot/projects/mjexp_6/sys/conf/files.arm#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files.arm,v 1.8.2.3 2007/02/27 00:02:40 cognet Exp $ +# $FreeBSD: src/sys/conf/files.arm,v 1.8.2.4 2007/03/10 00:19:24 sam Exp $ crypto/blowfish/bf_enc.c optional crypto | ipsec ipsec_esp crypto/des/des_enc.c optional crypto | ipsec ipsec_esp | \ netsmb @@ -54,6 +54,13 @@ geom/geom_bsd_enc.c standard geom/geom_mbr.c standard geom/geom_mbr_enc.c standard +hal.o optional ath_hal \ + compile-with "ATH_HAL_CPU=`echo ${CONF_CFLAGS}|sed 's/.*-mcpu=\([a-zA-Z0-9]*\).*/\1/'`; ATH_ENDIAN=`if (echo ${CC}|grep mbig-endian>/dev/null); then echo be; else echo le; fi;`; uudecode < $S/contrib/dev/ath/public/$$ATH_HAL_CPU-$$ATH_ENDIAN-elf.hal.o.uu" \ + no-implicit-rule +opt_ah.h optional ath_hal \ + compile-with "ATH_HAL_CPU=`echo ${CONF_CFLAGS}|sed 's/.*-mcpu=\([a-zA-Z0-9]*\).*/\1/'`; ATH_ENDIAN=`if (echo ${CC}|grep mbig-endian>/dev/null); then echo be; else echo le; fi;`; rm -f opt_ah.h; cp $S/contrib/dev/ath/public/$$ATH_HAL_CPU-$$ATH_ENDIAN-elf.opt_ah.h opt_ah.h" \ + no-obj no-implicit-rule before-depend \ + clean "opt_ah.h" libkern/arm/divsi3.S standard libkern/arm/ffs.S standard libkern/arm/muldi3.c standard ==== //depot/projects/mjexp_6/sys/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.538.2.12 2006/09/29 21:21:52 jhb Exp $ +# $FreeBSD: src/sys/conf/files.i386,v 1.538.2.13 2007/03/31 20:21:14 jhb Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -307,6 +307,7 @@ i386/i386/mpboot.s optional smp i386/i386/mptable.c optional apic i386/i386/mptable_pci.c optional apic pci +i386/i386/msi.c optional apic pci i386/i386/nexus.c standard i386/i386/perfmon.c optional perfmon i386/i386/perfmon.c optional perfmon profiling-routine ==== //depot/projects/mjexp_6/sys/conf/files.pc98#2 (text+ko) ==== @@ -3,7 +3,7 @@ # # modified for PC-9801/PC-9821 # -# $FreeBSD: src/sys/conf/files.pc98,v 1.327.2.6 2006/07/26 11:57:24 nyan Exp $ +# $FreeBSD: src/sys/conf/files.pc98,v 1.327.2.7 2007/04/04 15:51:09 nyan Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -187,6 +187,7 @@ i386/i386/mpboot.s optional smp i386/i386/mptable.c optional apic i386/i386/mptable_pci.c optional apic pci +i386/i386/msi.c optional apic pci i386/i386/nexus.c standard i386/i386/perfmon.c optional perfmon i386/i386/perfmon.c optional perfmon profiling-routine ==== //depot/projects/mjexp_6/sys/dev/acpica/Osd/OsdDebug.c#2 (text+ko) ==== @@ -30,7 +30,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/acpica/Osd/OsdDebug.c,v 1.9.2.2 2005/11/07 09:53:23 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/acpica/Osd/OsdDebug.c,v 1.9.2.3 2007/03/14 19:50:07 njl Exp $"); #include "opt_ddb.h" #include @@ -78,9 +78,11 @@ switch (Function) { case ACPI_SIGNAL_FATAL: fatal = (ACPI_SIGNAL_FATAL_INFO *)Info; - printf("ACPI fatal signal, type 0x%x code 0x%x argument 0x%x", + printf("ACPI fatal signal, type 0x%x code 0x%x argument 0x%x", fatal->Type, fatal->Code, fatal->Argument); +#ifdef ACPI_DEBUG kdb_enter("AcpiOsSignal"); +#endif break; case ACPI_SIGNAL_BREAKPOINT: ==== //depot/projects/mjexp_6/sys/dev/acpica/acpi_battery.c#2 (text+ko) ==== >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat Apr 7 21:21:18 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2433316A404; Sat, 7 Apr 2007 21:21:18 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id CC6F316A401 for ; Sat, 7 Apr 2007 21:21:17 +0000 (UTC) (envelope-from csjp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id BDC9F13C45A for ; Sat, 7 Apr 2007 21:21:17 +0000 (UTC) (envelope-from csjp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l37LLHfn040800 for ; Sat, 7 Apr 2007 21:21:17 GMT (envelope-from csjp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l37LLHTq040797 for perforce@freebsd.org; Sat, 7 Apr 2007 21:21:17 GMT (envelope-from csjp@freebsd.org) Date: Sat, 7 Apr 2007 21:21:17 GMT Message-Id: <200704072121.l37LLHTq040797@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 117607 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 07 Apr 2007 21:21:18 -0000 http://perforce.freebsd.org/chv.cgi?CH=117607 Change 117607 by csjp@csjp_push on 2007/04/07 21:21:11 - Change unconditonal Giant aquisition to depend on the status mpsafe.net - Add NET_LOCK_GIANT around a call into the ifnet layer's ioctl Affected files ... .. //depot/projects/zcopybpf/src/sys/net/bpf.c#20 edit Differences ... ==== //depot/projects/zcopybpf/src/sys/net/bpf.c#20 (text+ko) ==== @@ -1032,8 +1032,10 @@ if (d->bd_bif == NULL) error = EINVAL; else { + NET_LOCK_GIANT(); ifp = d->bd_bif->bif_ifp; error = (*ifp->if_ioctl)(ifp, cmd, addr); + NET_UNLOCK_GIANT(); } break; } @@ -1081,9 +1083,9 @@ break; } if (d->bd_promisc == 0) { - mtx_lock(&Giant); + NET_LOCK_GIANT(); error = ifpromisc(d->bd_bif->bif_ifp, 1); - mtx_unlock(&Giant); + NET_UNLOCK_GIANT(); if (error == 0) d->bd_promisc = 1; }