From owner-p4-projects@FreeBSD.ORG Sun Feb 25 00:31: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 7312516A403; Sun, 25 Feb 2007 00:31: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 357D116A401 for ; Sun, 25 Feb 2007 00:31:14 +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 26FF313C478 for ; Sun, 25 Feb 2007 00:31:14 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l1P0VE57072926 for ; Sun, 25 Feb 2007 00:31:14 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l1P0VDjs072917 for perforce@freebsd.org; Sun, 25 Feb 2007 00:31:13 GMT (envelope-from sam@freebsd.org) Date: Sun, 25 Feb 2007 00:31:13 GMT Message-Id: <200702250031.l1P0VDjs072917@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 115002 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 25 Feb 2007 00:31:14 -0000 http://perforce.freebsd.org/chv.cgi?CH=115002 Change 115002 by sam@sam_ebb on 2007/02/25 00:30:36 IFC sysctl fixes Affected files ... .. //depot/projects/wifi/sys/dev/ath/if_ath.c#135 integrate .. //depot/projects/wifi/sys/dev/ath/if_athvar.h#54 integrate Differences ... ==== //depot/projects/wifi/sys/dev/ath/if_ath.c#135 (text+ko) ==== @@ -35,7 +35,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ath/if_ath.c,v 1.160 2007/01/21 19:32:50 marius Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ath/if_ath.c,v 1.162 2007/02/24 23:23:29 sam Exp $"); /* * Driver for the Atheros Wireless LAN controller. @@ -6001,6 +6001,29 @@ } static int +ath_sysctl_txantenna(SYSCTL_HANDLER_ARGS) +{ + struct ath_softc *sc = arg1; + u_int txantenna = ath_hal_getantennaswitch(sc->sc_ah); + int error; + + error = sysctl_handle_int(oidp, &txantenna, 0, req); + if (!error && req->newptr) { + /* XXX assumes 2 antenna ports */ + if (txantenna < HAL_ANT_VARIABLE || txantenna > HAL_ANT_FIXED_B) + return EINVAL; + ath_hal_setantennaswitch(sc->sc_ah, txantenna); + /* + * NB: with the switch locked this isn't meaningful, + * but set it anyway so things like radiotap get + * consistent info in their data. + */ + sc->sc_txantenna = txantenna; + } + return error; +} + +static int ath_sysctl_rxantenna(SYSCTL_HANDLER_ARGS) { struct ath_softc *sc = arg1; @@ -6056,7 +6079,8 @@ error = sysctl_handle_int(oidp, &scale, 0, req); if (error || !req->newptr) return error; - return !ath_hal_settpscale(sc->sc_ah, scale) ? EINVAL : ath_reset(ifp); + return !ath_hal_settpscale(sc->sc_ah, scale) ? EINVAL : + (ifp->if_drv_flags & IFF_DRV_RUNNING) ? ath_reset(ifp) : 0; } static int @@ -6076,13 +6100,15 @@ ath_sysctl_rfkill(SYSCTL_HANDLER_ARGS) { struct ath_softc *sc = arg1; + struct ifnet *ifp = sc->sc_ifp; u_int rfkill = ath_hal_getrfkill(sc->sc_ah); int error; error = sysctl_handle_int(oidp, &rfkill, 0, req); if (error || !req->newptr) return error; - return !ath_hal_setrfkill(sc->sc_ah, rfkill) ? EINVAL : 0; + return !ath_hal_setrfkill(sc->sc_ah, rfkill) ? EINVAL : + (ifp->if_drv_flags & IFF_DRV_RUNNING) ? ath_reset(ifp) : 0; } static int @@ -6209,9 +6235,9 @@ SYSCTL_ADD_INT(ctx, SYSCTL_CHILDREN(tree), OID_AUTO, "ledidle", CTLFLAG_RW, &sc->sc_ledidle, 0, "idle time for inactivity LED (ticks)"); - SYSCTL_ADD_INT(ctx, SYSCTL_CHILDREN(tree), OID_AUTO, - "txantenna", CTLFLAG_RW, &sc->sc_txantenna, 0, - "tx antenna (0=auto)"); + SYSCTL_ADD_PROC(ctx, SYSCTL_CHILDREN(tree), OID_AUTO, + "txantenna", CTLTYPE_INT | CTLFLAG_RW, sc, 0, + ath_sysctl_txantenna, "I", "antenna switch"); SYSCTL_ADD_PROC(ctx, SYSCTL_CHILDREN(tree), OID_AUTO, "rxantenna", CTLTYPE_INT | CTLFLAG_RW, sc, 0, ath_sysctl_rxantenna, "I", "default/rx antenna"); ==== //depot/projects/wifi/sys/dev/ath/if_athvar.h#54 (text+ko) ==== @@ -33,7 +33,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF * THE POSSIBILITY OF SUCH DAMAGES. * - * $FreeBSD: src/sys/dev/ath/if_athvar.h,v 1.58 2007/01/15 04:26:19 sam Exp $ + * $FreeBSD: src/sys/dev/ath/if_athvar.h,v 1.59 2007/02/24 23:12:58 sam Exp $ */ /* @@ -507,6 +507,10 @@ (ath_hal_getcapability(_ah, HAL_CAP_DIVERSITY, 1, NULL) == HAL_OK) #define ath_hal_setdiversity(_ah, _v) \ ath_hal_setcapability(_ah, HAL_CAP_DIVERSITY, 1, _v, NULL) +#define ath_hal_getantennaswitch(_ah) \ + ((*(_ah)->ah_getAntennaSwitch)((_ah))) +#define ath_hal_setantennaswitch(_ah, _v) \ + ((*(_ah)->ah_setAntennaSwitch)((_ah), (_v))) #define ath_hal_getdiag(_ah, _pv) \ (ath_hal_getcapability(_ah, HAL_CAP_DIAG, 0, _pv) == HAL_OK) #define ath_hal_setdiag(_ah, _v) \ From owner-p4-projects@FreeBSD.ORG Sun Feb 25 01:36: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 75CAE16A409; Sun, 25 Feb 2007 01:36: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 2F82616A407 for ; Sun, 25 Feb 2007 01:36:37 +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 2135513C478 for ; Sun, 25 Feb 2007 01:36:37 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l1P1ab78095591 for ; Sun, 25 Feb 2007 01:36:37 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l1P1aatW095588 for perforce@freebsd.org; Sun, 25 Feb 2007 01:36:36 GMT (envelope-from jhb@freebsd.org) Date: Sun, 25 Feb 2007 01:36:36 GMT Message-Id: <200702250136.l1P1aatW095588@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 115004 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 25 Feb 2007 01:36:37 -0000 http://perforce.freebsd.org/chv.cgi?CH=115004 Change 115004 by jhb@jhb_zion on 2007/02/25 01:36:24 Drop the idlespin hack for now. Affected files ... .. //depot/projects/smpng/sys/kern/kern_mutex.c#139 edit Differences ... ==== //depot/projects/smpng/sys/kern/kern_mutex.c#139 (text+ko) ==== @@ -410,14 +410,11 @@ int line) { struct thread *td; - int contested = 0, i = 0, idlespin = 0; + int contested = 0, i = 0; if (LOCK_LOG_TEST(&m->mtx_object, opts)) CTR1(KTR_LOCK, "_mtx_lock_spin: %p spinning", m); - /* It's ok for the idle loop to spin forever on sched_lock. */ - if (m == &sched_lock && curthread == PCPU_GET(idlethread)) - idlespin = 1; while (!_obtain_lock(m, tid)) { lock_profile_obtain_lock_failed(&m->mtx_object, &contested); @@ -428,8 +425,7 @@ cpu_spinwait(); continue; } - if (i < 60000000 || kdb_active || panicstr != NULL || - idlespin) + if (i < 60000000 || kdb_active || panicstr != NULL) DELAY(1); else { td = mtx_owner(m); From owner-p4-projects@FreeBSD.ORG Sun Feb 25 10:24: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 B8A7816A403; Sun, 25 Feb 2007 10:24: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 7268416A401 for ; Sun, 25 Feb 2007 10:24:48 +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 2DD4313C4A5 for ; Sun, 25 Feb 2007 10:24:48 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l1PAOm2w020283 for ; Sun, 25 Feb 2007 10:24:48 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l1PAOlUp020280 for perforce@freebsd.org; Sun, 25 Feb 2007 10:24:47 GMT (envelope-from rdivacky@FreeBSD.org) Date: Sun, 25 Feb 2007 10:24:47 GMT Message-Id: <200702251024.l1PAOlUp020280@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 115016 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 25 Feb 2007 10:24:49 -0000 http://perforce.freebsd.org/chv.cgi?CH=115016 Change 115016 by rdivacky@rdivacky_witten on 2007/02/25 10:24:38 Return EINVAL for invalid flags combination or non-page aligned addr in mremap(). This fixes mremap02 LTP test. Affected files ... .. //depot/projects/linuxolator/src/sys/compat/linux/linux_misc.c#61 edit .. //depot/projects/linuxolator/src/sys/compat/linux/linux_misc.h#5 edit Differences ... ==== //depot/projects/linuxolator/src/sys/compat/linux/linux_misc.c#61 (text+ko) ==== @@ -591,6 +591,18 @@ (unsigned long)args->new_len, (unsigned long)args->flags); #endif + + if (args->flags & ~(LINUX_MREMAP_FIXED | LINUX_MREMAP_MAYMOVE)) { + td->td_retval[0] = 0; + return (EINVAL); + } + + /* Linux defines PAGE_MASK to be FreeBSD ~PAGE_MASK */ + if (args->addr & PAGE_MASK) { + td->td_retval[0] = 0; + return (EINVAL); + } + args->new_len = round_page(args->new_len); args->old_len = round_page(args->old_len); ==== //depot/projects/linuxolator/src/sys/compat/linux/linux_misc.h#5 (text+ko) ==== @@ -42,4 +42,7 @@ #define LINUX_MAX_COMM_LEN 16 /* Maximum length of the process name. */ +#define LINUX_MREMAP_MAYMOVE 1 +#define LINUX_MREMAP_FIXED 2 + #endif /* _LINUX_MISC_H_ */ From owner-p4-projects@FreeBSD.ORG Sun Feb 25 13:30: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 9649816A406; Sun, 25 Feb 2007 13: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 69E4716A401 for ; Sun, 25 Feb 2007 13:30:42 +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 584EE13C4B4 for ; Sun, 25 Feb 2007 13:30:42 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l1PDUge5060304 for ; Sun, 25 Feb 2007 13:30:42 GMT (envelope-from gabor@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l1PDUffv060300 for perforce@freebsd.org; Sun, 25 Feb 2007 13:30:41 GMT (envelope-from gabor@freebsd.org) Date: Sun, 25 Feb 2007 13:30:41 GMT Message-Id: <200702251330.l1PDUffv060300@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 115022 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 25 Feb 2007 13:30:43 -0000 http://perforce.freebsd.org/chv.cgi?CH=115022 Change 115022 by gabor@gabor_server on 2007/02/25 13:30:18 Roll back current DESTDIR implementation, step 2. Affected files ... .. //depot/projects/soc2006/gabor_destdir/Mk/bsd.emacs.mk#3 edit .. //depot/projects/soc2006/gabor_destdir/Mk/bsd.gnome.mk#4 edit .. //depot/projects/soc2006/gabor_destdir/Mk/bsd.openssl.mk#2 edit .. //depot/projects/soc2006/gabor_destdir/Mk/bsd.port.mk#4 edit .. //depot/projects/soc2006/gabor_destdir/Mk/bsd.port.subdir.mk#4 edit .. //depot/projects/soc2006/gabor_destdir/Mk/bsd.python.mk#3 edit Differences ... ==== //depot/projects/soc2006/gabor_destdir/Mk/bsd.emacs.mk#3 (text+ko) ==== @@ -236,8 +236,8 @@ # find where emacsen is installed # look for it in PREEFIX first and fall back to LOCALBASE then -.if exists(${TARGETDIR}/bin/${EMACS_NAME}-${EMACS_VER}) -EMACS_BASE?= ${TARGETDIR} +.if exists(/bin/${EMACS_NAME}-${EMACS_VER}) +EMACS_BASE?= ${PREFIX} .else EMACS_BASE?= ${LOCALBASE} .endif ==== //depot/projects/soc2006/gabor_destdir/Mk/bsd.gnome.mk#4 (text+ko) ==== @@ -107,13 +107,13 @@ GNOME_HTML_DIR?= ${PREFIX}/share/doc GCONF_CONFIG_OPTIONS?= merged GCONF_CONFIG_DIRECTORY?=etc/gconf/gconf.xml.defaults -GCONF_CONFIG_SOURCE?=xml:${GCONF_CONFIG_OPTIONS}:${TARGETDIR}/${GCONF_CONFIG_DIRECTORY} +GCONF_CONFIG_SOURCE?=xml:${GCONF_CONFIG_OPTIONS}:${PREFIX}/${GCONF_CONFIG_DIRECTORY} GNOME_LOCALSTATEDIR?= ${PREFIX}/share/gnome gnomeprefix_CONFIGURE_ENV=GTKDOC="false" gnomeprefix_CONFIGURE_ARGS=--localstatedir=${GNOME_LOCALSTATEDIR} \ - --datadir=${TARGETDIR}/share/gnome \ + --datadir=${PREFIX}/share/gnome \ --with-html-dir=${GNOME_HTML_DIR} \ - --with-help-dir=${TARGETDIR}/share/gnome/help \ + --with-help-dir=${PREFIX}/share/gnome/help \ --disable-gtk-doc \ --with-gconf-source=${GCONF_CONFIG_SOURCE} \ --mandir=${PREFIX}/man @@ -764,10 +764,10 @@ gnome-pre-su-install: .if defined(_USE_GNOME) && ${_USE_GNOME:Mgnomeprefix}!="" && !defined(NO_MTREE) - @${MTREE_CMD} ${MTREE_ARGS:S/${MTREE_FILE}/${GNOME_MTREE_FILE}/} ${TARGETDIR}/ >/dev/null + @${MTREE_CMD} ${MTREE_ARGS:S/${MTREE_FILE}/${GNOME_MTREE_FILE}/} ${PREFIX}/ >/dev/null .endif .if defined(GCONF_SCHEMAS) - @${MKDIR} ${TARGETDIR}/etc/gconf/gconf.xml.defaults/ + @${MKDIR} ${PREFIX}/etc/gconf/gconf.xml.defaults/ .else @${DO_NADA} .endif ==== //depot/projects/soc2006/gabor_destdir/Mk/bsd.openssl.mk#2 (text+ko) ==== @@ -59,10 +59,10 @@ .endif .if defined(WITH_OPENSSL_BASE) -OPENSSLBASE= ${DESTDIR}/usr -OPENSSLDIR= ${DESTDIR}/etc/ssl +OPENSSLBASE= /usr +OPENSSLDIR= /etc/ssl -.if !exists(${DESTDIR}/usr/lib/libcrypto.so) +.if !exists(/usr/lib/libcrypto.so) check-depends:: @${ECHO_CMD} "Dependency error: this port requires the OpenSSL library, which is part of" @${ECHO_CMD} "the FreeBSD crypto distribution but not installed on your" @@ -98,7 +98,7 @@ .endif MAKE_ARGS+= OPENSSL_CFLAGS="${OPENSSL_CFLAGS}" .endif -OPENSSLRPATH= ${DESTDIR}/usr/lib:${LOCALBASE}/lib +OPENSSLRPATH= /usr/lib:${LOCALBASE}/lib .else @@ -121,11 +121,11 @@ .if !defined(OPENSSL_PORT) && \ exists(${LOCALBASE}/lib/libcrypto.so) # find installed port and use it for dependency -PKG_DBDIR?= ${DESTDIR}/var/db/pkg +PKG_DBDIR?= /var/db/pkg OPENSSL_INSTALLED!= grep -l -r "^lib/libssl.so." "${PKG_DBDIR}" | \ while read contents; do \ sslprefix=`grep "^@cwd " "$${contents}" | ${HEAD} -n 1`; \ - if test "$${sslprefix}" = "@cwd ${LOCALBASE_REL}" ; then \ + if test "$${sslprefix}" = "@cwd ${LOCALBASE}" ; then \ echo "$${contents}"; break; fi; done OPENSSL_PORT!= grep "^@comment ORIGIN:" "${OPENSSL_INSTALLED}" | ${CUT} -d : -f 2 OPENSSL_SHLIBFILE!= grep "^lib/libssl.so." "${OPENSSL_INSTALLED}" ==== //depot/projects/soc2006/gabor_destdir/Mk/bsd.port.mk#4 (text+ko) ==== @@ -1395,16 +1395,16 @@ USE_XLIB= yes .endif .if defined(USE_X_PREFIX) -PREFIX?= ${X11BASE_REL} +PREFIX?= ${X11BASE} .elif defined(USE_LINUX_PREFIX) -PREFIX?= ${LINUXBASE_REL} +PREFIX?= ${LINUXBASE} NO_MTREE= yes .else -PREFIX?= ${LOCALBASE_REL} +PREFIX?= ${LOCALBASE} .endif .if defined(USE_LINUX_PREFIX) -LDCONFIG_CMD?= ${LINUXBASE_REL}/sbin/ldconfig -r ${LINUXBASE_REL} +LDCONFIG_CMD?= ${LINUXBASE}/sbin/ldconfig -r ${LINUXBASE} LDCONFIG_PLIST_EXEC_CMD?= ${LDCONFIG_CMD} LDCONFIG_PLIST_UNEXEC_CMD?= ${LDCONFIG_CMD} .else @@ -1613,8 +1613,8 @@ BUILD_WRKSRC?= ${WRKSRC} INSTALL_WRKSRC?=${WRKSRC} -PLIST_SUB+= OSREL=${OSREL} PREFIX=%D LOCALBASE=${LOCALBASE_REL} X11BASE=${X11BASE_REL} -SUB_LIST+= PREFIX=${PREFIX} LOCALBASE=${LOCALBASE_REL} X11BASE=${X11BASE_REL} \ +PLIST_SUB+= OSREL=${OSREL} PREFIX=%D LOCALBASE=${LOCALBASE} X11BASE=${X11BASE} +SUB_LIST+= PREFIX=${PREFIX} LOCALBASE=${LOCALBASE} X11BASE=${X11BASE} \ DATADIR=${DATADIR} DOCSDIR=${DOCSDIR} EXAMPLESDIR=${EXAMPLESDIR} PLIST_REINPLACE+= dirrmtry stopdaemon @@ -2099,8 +2099,8 @@ .endif .if exists(/sbin/sha256) SHA256?= /sbin/sha256 -.elif exists(${LOCALBASE_REL}/sbin/sha256) -SHA256?= ${LOCALBASE_REL}/sbin/sha256 +.elif exists(${LOCALBASE}/sbin/sha256) +SHA256?= ${LOCALBASE}/sbin/sha256 .else SHA256?= NO .endif @@ -2112,7 +2112,7 @@ MAKE_FLAGS?= -f MAKEFILE?= Makefile MAKE_ENV+= PREFIX=${PREFIX} \ - LOCALBASE=${LOCALBASE_REL} X11BASE=${X11BASE_REL} \ + LOCALBASE=${LOCALBASE} X11BASE=${X11BASE} \ MOTIFLIB="${MOTIFLIB}" LIBDIR="${LIBDIR}" CFLAGS="${CFLAGS}" \ CXXFLAGS="${CXXFLAGS}" MANPREFIX="${MANPREFIX}" @@ -2208,7 +2208,7 @@ # Figure out where the local mtree file is .if !defined(MTREE_FILE) && !defined(NO_MTREE) -.if ${PREFIX} == ${X11BASE_REL} || defined(USE_X_PREFIX) +.if ${PREFIX} == ${X11BASE} || defined(USE_X_PREFIX) # User may have specified non-standard PREFIX for installing a port that # uses X MTREE_FILE= /etc/mtree/BSD.x11-4.dist @@ -2281,16 +2281,16 @@ EXTRACT_DEPENDS+= ${LOCALBASE}/sbin/pkg_info:${PORTSDIR}/ports-mgmt/pkg_install .endif .if !defined(DESTDIR) -PKG_CMD?= ${LOCALBASE_REL}/sbin/pkg_create -PKG_ADD?= ${LOCALBASE_REL}/sbin/pkg_add -PKG_DELETE?= ${LOCALBASE_REL}/sbin/pkg_delete -PKG_INFO?= ${LOCALBASE_REL}/sbin/pkg_info -PKG_VERSION?= ${LOCALBASE_REL}/sbin/pkg_version +PKG_CMD?= ${LOCALBASE}/sbin/pkg_create +PKG_ADD?= ${LOCALBASE}/sbin/pkg_add +PKG_DELETE?= ${LOCALBASE}/sbin/pkg_delete +PKG_INFO?= ${LOCALBASE}/sbin/pkg_info +PKG_VERSION?= ${LOCALBASE}/sbin/pkg_version .else -PKG_CMD?= ${LOCALBASE_REL}/sbin/pkg_create -PKG_ADD?= ${CHROOT} ${DESTDIR} ${LOCALBASE_REL}/sbin/pkg_add -PKG_DELETE?= ${CHROOT} ${DESTDIR} ${LOCALBASE_REL}/sbin/pkg_delete -PKG_INFO?= ${CHROOT} ${DESTDIR} ${LOCALBASE_REL}/sbin/pkg_info +PKG_CMD?= ${LOCALBASE}/sbin/pkg_create +PKG_ADD?= ${CHROOT} ${DESTDIR} ${LOCALBASE}/sbin/pkg_add +PKG_DELETE?= ${CHROOT} ${DESTDIR} ${LOCALBASE}/sbin/pkg_delete +PKG_INFO?= ${CHROOT} ${DESTDIR} ${LOCALBASE}/sbin/pkg_info .endif .else .if !defined(DESTDIR) @@ -5463,7 +5463,7 @@ .endfor .if (${PREFIX} != "/usr") @${ECHO_CMD} "@unexec if [ -f %D/${INFO_PATH}/dir ]; then if sed -e '1,/Menu:/d' %D/${INFO_PATH}/dir | grep -q '^[*] '; then true; else rm %D/${INFO_PATH}/dir; fi; fi" >> ${TMPPLIST} -.if (${PREFIX} != ${LOCALBASE_REL} && ${PREFIX} != ${X11BASE_REL} && ${PREFIX} != ${LINUXBASE_REL}) +.if (${PREFIX} != ${LOCALBASE} && ${PREFIX} != ${X11BASE} && ${PREFIX} != ${LINUXBASE}) @${ECHO_CMD} "@unexec rmdir %D/info 2> /dev/null || true" >> ${TMPPLIST} .endif .endif @@ -5474,7 +5474,7 @@ # deinstall-time .if !target(add-plist-post) add-plist-post: -.if (${PREFIX} != ${LOCALBASE_REL} && ${PREFIX} != ${X11BASE_REL} && ${PREFIX} != ${LINUXBASE_REL} && ${PREFIX} != "/usr") +.if (${PREFIX} != ${LOCALBASE} && ${PREFIX} != ${X11BASE} && ${PREFIX} != ${LINUXBASE} && ${PREFIX} != "/usr") @${ECHO_CMD} "@unexec rmdir %D 2> /dev/null || true" >> ${TMPPLIST} .else @${DO_NADA} ==== //depot/projects/soc2006/gabor_destdir/Mk/bsd.port.subdir.mk#4 (text+ko) ==== @@ -64,7 +64,7 @@ ID?= /usr/bin/id UID!= ${ID} -u -LOCALBASE?= ${LOCALBASE_REL} +LOCALBASE?= ${LOCALBASE} .if exists(${LOCALBASE}/sbin/pkg_info) PKG_INFO?= ${LOCALBASE}/sbin/pkg_info .else ==== //depot/projects/soc2006/gabor_destdir/Mk/bsd.python.mk#3 (text+ko) ==== @@ -414,7 +414,7 @@ @${ECHO} "Legal values are: 2.7 (default), 2.8, 2.9, 2.10, 3.2" @${FALSE} .endif -ZOPEBASEDIR?= ${TARGETDIR}/${SZOPEBASEDIR} +ZOPEBASEDIR?= ${PREFIX}/${SZOPEBASEDIR} ZOPEPRODUCTDIR?= Products .endif From owner-p4-projects@FreeBSD.ORG Sun Feb 25 15:39: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 9D06416A409; Sun, 25 Feb 2007 15:39:02 +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 4F91116A403 for ; Sun, 25 Feb 2007 15:39:02 +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 3B01913C4B4 for ; Sun, 25 Feb 2007 15:39:02 +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.6/8.13.6) with ESMTP id l1PFd21u095184 for ; Sun, 25 Feb 2007 15:39:02 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l1PFaxax093026 for perforce@freebsd.org; Sun, 25 Feb 2007 15:36:59 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 25 Feb 2007 15:36:59 GMT Message-Id: <200702251536.l1PFaxax093026@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 115028 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 25 Feb 2007 15:39:03 -0000 http://perforce.freebsd.org/chv.cgi?CH=115028 Change 115028 by rwatson@rwatson_cinnamon on 2007/02/25 15:35:21 Integrate TrustedBSD ACL branch: almost all local changes are in conflict so will need manual merging in follow-up submits. Affected files ... .. //depot/projects/trustedbsd/acl/bin/cp/cp.1#3 integrate .. //depot/projects/trustedbsd/acl/bin/cp/cp.c#3 integrate .. //depot/projects/trustedbsd/acl/bin/cp/extern.h#3 integrate .. //depot/projects/trustedbsd/acl/bin/cp/utils.c#3 integrate .. //depot/projects/trustedbsd/acl/bin/getfacl/getfacl.1#4 integrate .. //depot/projects/trustedbsd/acl/bin/getfacl/getfacl.c#7 integrate .. //depot/projects/trustedbsd/acl/bin/mv/mv.1#2 integrate .. //depot/projects/trustedbsd/acl/bin/mv/mv.c#4 integrate .. //depot/projects/trustedbsd/acl/bin/setfacl/Makefile#2 integrate .. //depot/projects/trustedbsd/acl/bin/setfacl/file.c#2 integrate .. //depot/projects/trustedbsd/acl/bin/setfacl/mask.c#2 integrate .. //depot/projects/trustedbsd/acl/bin/setfacl/merge.c#2 integrate .. //depot/projects/trustedbsd/acl/bin/setfacl/remove.c#2 integrate .. //depot/projects/trustedbsd/acl/bin/setfacl/setfacl.1#4 integrate .. //depot/projects/trustedbsd/acl/bin/setfacl/setfacl.c#6 integrate .. //depot/projects/trustedbsd/acl/bin/setfacl/setfacl.h#4 integrate .. //depot/projects/trustedbsd/acl/bin/setfacl/util.c#2 integrate .. //depot/projects/trustedbsd/acl/contrib/bzip2/CHANGES#2 integrate .. //depot/projects/trustedbsd/acl/contrib/bzip2/FREEBSD-Xlist#1 branch .. //depot/projects/trustedbsd/acl/contrib/bzip2/FREEBSD-upgrade#2 integrate .. //depot/projects/trustedbsd/acl/contrib/bzip2/LICENSE#2 integrate .. //depot/projects/trustedbsd/acl/contrib/bzip2/Makefile#2 integrate .. //depot/projects/trustedbsd/acl/contrib/bzip2/Makefile-libbz2_so#2 integrate .. //depot/projects/trustedbsd/acl/contrib/bzip2/README#2 integrate .. //depot/projects/trustedbsd/acl/contrib/bzip2/README.COMPILATION.PROBLEMS#2 integrate .. //depot/projects/trustedbsd/acl/contrib/bzip2/blocksort.c#2 integrate .. //depot/projects/trustedbsd/acl/contrib/bzip2/bzip2.1#2 integrate .. //depot/projects/trustedbsd/acl/contrib/bzip2/bzip2.c#2 integrate .. //depot/projects/trustedbsd/acl/contrib/bzip2/bzip2recover.c#2 integrate .. //depot/projects/trustedbsd/acl/contrib/bzip2/bzlib.c#2 integrate .. //depot/projects/trustedbsd/acl/contrib/bzip2/bzlib.h#2 integrate .. //depot/projects/trustedbsd/acl/contrib/bzip2/bzlib_private.h#2 integrate .. //depot/projects/trustedbsd/acl/contrib/bzip2/compress.c#2 integrate .. //depot/projects/trustedbsd/acl/contrib/bzip2/crctable.c#2 integrate .. //depot/projects/trustedbsd/acl/contrib/bzip2/decompress.c#2 integrate .. //depot/projects/trustedbsd/acl/contrib/bzip2/huffman.c#2 integrate .. //depot/projects/trustedbsd/acl/contrib/bzip2/randtable.c#2 integrate .. //depot/projects/trustedbsd/acl/contrib/bzip2/sample1.bz2.uu#2 integrate .. //depot/projects/trustedbsd/acl/contrib/bzip2/sample1.ref.gz.uu#2 integrate .. //depot/projects/trustedbsd/acl/contrib/bzip2/sample2.bz2.uu#2 integrate .. //depot/projects/trustedbsd/acl/contrib/bzip2/sample2.ref.gz.uu#2 integrate .. //depot/projects/trustedbsd/acl/contrib/bzip2/sample3.bz2.uu#2 integrate .. //depot/projects/trustedbsd/acl/contrib/bzip2/sample3.ref.gz.uu#2 integrate .. //depot/projects/trustedbsd/acl/gnu/usr.bin/gzip/COPYING#2 delete .. //depot/projects/trustedbsd/acl/gnu/usr.bin/gzip/ChangeLog#2 delete .. //depot/projects/trustedbsd/acl/gnu/usr.bin/gzip/Makefile#3 delete .. //depot/projects/trustedbsd/acl/gnu/usr.bin/gzip/NEWS#2 delete .. //depot/projects/trustedbsd/acl/gnu/usr.bin/gzip/README#2 delete .. //depot/projects/trustedbsd/acl/gnu/usr.bin/gzip/THANKS#2 delete .. //depot/projects/trustedbsd/acl/gnu/usr.bin/gzip/TODO#2 delete .. //depot/projects/trustedbsd/acl/gnu/usr.bin/gzip/algorithm.doc#2 delete .. //depot/projects/trustedbsd/acl/gnu/usr.bin/gzip/bits.c#2 delete .. //depot/projects/trustedbsd/acl/gnu/usr.bin/gzip/crypt.c#2 delete .. //depot/projects/trustedbsd/acl/gnu/usr.bin/gzip/crypt.h#2 delete .. //depot/projects/trustedbsd/acl/gnu/usr.bin/gzip/deflate.c#2 delete .. //depot/projects/trustedbsd/acl/gnu/usr.bin/gzip/getopt.c#2 delete .. //depot/projects/trustedbsd/acl/gnu/usr.bin/gzip/getopt.h#2 delete .. //depot/projects/trustedbsd/acl/gnu/usr.bin/gzip/gzexe#2 delete .. //depot/projects/trustedbsd/acl/gnu/usr.bin/gzip/gzexe.1#2 delete .. //depot/projects/trustedbsd/acl/gnu/usr.bin/gzip/gzip.1#2 delete .. //depot/projects/trustedbsd/acl/gnu/usr.bin/gzip/gzip.c#3 delete .. //depot/projects/trustedbsd/acl/gnu/usr.bin/gzip/gzip.h#2 delete .. //depot/projects/trustedbsd/acl/gnu/usr.bin/gzip/inflate.c#2 delete .. //depot/projects/trustedbsd/acl/gnu/usr.bin/gzip/lzw.c#2 delete .. //depot/projects/trustedbsd/acl/gnu/usr.bin/gzip/lzw.h#2 delete .. //depot/projects/trustedbsd/acl/gnu/usr.bin/gzip/match.S#2 delete .. //depot/projects/trustedbsd/acl/gnu/usr.bin/gzip/revision.h#2 delete .. //depot/projects/trustedbsd/acl/gnu/usr.bin/gzip/tailor.h#2 delete .. //depot/projects/trustedbsd/acl/gnu/usr.bin/gzip/trees.c#2 delete .. //depot/projects/trustedbsd/acl/gnu/usr.bin/gzip/unlzh.c#2 delete .. //depot/projects/trustedbsd/acl/gnu/usr.bin/gzip/unlzw.c#2 delete .. //depot/projects/trustedbsd/acl/gnu/usr.bin/gzip/unpack.c#2 delete .. //depot/projects/trustedbsd/acl/gnu/usr.bin/gzip/unzip.c#2 delete .. //depot/projects/trustedbsd/acl/gnu/usr.bin/gzip/util.c#2 delete .. //depot/projects/trustedbsd/acl/gnu/usr.bin/gzip/zdiff#2 delete .. //depot/projects/trustedbsd/acl/gnu/usr.bin/gzip/zdiff.1#2 delete .. //depot/projects/trustedbsd/acl/gnu/usr.bin/gzip/zforce#2 delete .. //depot/projects/trustedbsd/acl/gnu/usr.bin/gzip/zforce.1#2 delete .. //depot/projects/trustedbsd/acl/gnu/usr.bin/gzip/zgrep#2 delete .. //depot/projects/trustedbsd/acl/gnu/usr.bin/gzip/zgrep.1#2 delete .. //depot/projects/trustedbsd/acl/gnu/usr.bin/gzip/zgrep.getopt#2 delete .. //depot/projects/trustedbsd/acl/gnu/usr.bin/gzip/zgrep.libz#2 delete .. //depot/projects/trustedbsd/acl/gnu/usr.bin/gzip/zip.c#2 delete .. //depot/projects/trustedbsd/acl/gnu/usr.bin/gzip/zmore#2 delete .. //depot/projects/trustedbsd/acl/gnu/usr.bin/gzip/zmore.1#2 delete .. //depot/projects/trustedbsd/acl/gnu/usr.bin/gzip/znew#2 delete .. //depot/projects/trustedbsd/acl/gnu/usr.bin/gzip/znew.1#2 delete .. //depot/projects/trustedbsd/acl/lib/libc/Makefile#4 integrate .. //depot/projects/trustedbsd/acl/lib/libc/Versions.def#1 branch .. //depot/projects/trustedbsd/acl/lib/libc/alpha/Makefile.inc#2 delete .. //depot/projects/trustedbsd/acl/lib/libc/alpha/SYS.h#2 delete .. //depot/projects/trustedbsd/acl/lib/libc/alpha/_fpmath.h#3 delete .. //depot/projects/trustedbsd/acl/lib/libc/alpha/arith.h#3 delete .. //depot/projects/trustedbsd/acl/lib/libc/alpha/gen/Makefile.inc#2 delete .. //depot/projects/trustedbsd/acl/lib/libc/alpha/gen/_ctx_start.S#3 delete .. //depot/projects/trustedbsd/acl/lib/libc/alpha/gen/_setjmp.S#3 delete .. //depot/projects/trustedbsd/acl/lib/libc/alpha/gen/divrem.m4#2 delete .. //depot/projects/trustedbsd/acl/lib/libc/alpha/gen/fabs.S#3 delete .. //depot/projects/trustedbsd/acl/lib/libc/alpha/gen/flt_rounds.c#2 delete .. //depot/projects/trustedbsd/acl/lib/libc/alpha/gen/fpgetmask.c#2 delete .. //depot/projects/trustedbsd/acl/lib/libc/alpha/gen/fpgetround.c#2 delete .. //depot/projects/trustedbsd/acl/lib/libc/alpha/gen/fpgetsticky.c#2 delete .. //depot/projects/trustedbsd/acl/lib/libc/alpha/gen/fpsetmask.c#2 delete .. //depot/projects/trustedbsd/acl/lib/libc/alpha/gen/fpsetround.c#2 delete .. //depot/projects/trustedbsd/acl/lib/libc/alpha/gen/fpsetsticky.c#2 delete .. //depot/projects/trustedbsd/acl/lib/libc/alpha/gen/frexp.c#2 delete .. //depot/projects/trustedbsd/acl/lib/libc/alpha/gen/infinity.c#3 delete .. //depot/projects/trustedbsd/acl/lib/libc/alpha/gen/isinf.c#3 delete .. //depot/projects/trustedbsd/acl/lib/libc/alpha/gen/ldexp.c#2 delete .. //depot/projects/trustedbsd/acl/lib/libc/alpha/gen/makecontext.c#3 delete .. //depot/projects/trustedbsd/acl/lib/libc/alpha/gen/modf.c#2 delete .. //depot/projects/trustedbsd/acl/lib/libc/alpha/gen/rfork_thread.S#3 delete .. //depot/projects/trustedbsd/acl/lib/libc/alpha/gen/setjmp.S#3 delete .. //depot/projects/trustedbsd/acl/lib/libc/alpha/gen/sigsetjmp.S#3 delete .. //depot/projects/trustedbsd/acl/lib/libc/alpha/net/Makefile.inc#2 delete .. //depot/projects/trustedbsd/acl/lib/libc/alpha/net/byte_swap_2.S#3 delete .. //depot/projects/trustedbsd/acl/lib/libc/alpha/net/byte_swap_4.S#3 delete .. //depot/projects/trustedbsd/acl/lib/libc/alpha/net/htonl.S#3 delete .. //depot/projects/trustedbsd/acl/lib/libc/alpha/net/htons.S#3 delete .. //depot/projects/trustedbsd/acl/lib/libc/alpha/net/ntohl.S#3 delete .. //depot/projects/trustedbsd/acl/lib/libc/alpha/net/ntohs.S#3 delete .. //depot/projects/trustedbsd/acl/lib/libc/alpha/stdlib/Makefile.inc#2 delete .. //depot/projects/trustedbsd/acl/lib/libc/alpha/stdlib/gdtoa.mk#2 delete .. //depot/projects/trustedbsd/acl/lib/libc/alpha/string/Makefile.inc#2 delete .. //depot/projects/trustedbsd/acl/lib/libc/alpha/string/bcopy.S#3 delete .. //depot/projects/trustedbsd/acl/lib/libc/alpha/string/bzero.S#3 delete .. //depot/projects/trustedbsd/acl/lib/libc/alpha/string/ffs.S#3 delete .. //depot/projects/trustedbsd/acl/lib/libc/alpha/string/memcpy.S#3 delete .. //depot/projects/trustedbsd/acl/lib/libc/alpha/string/memmove.S#3 delete .. //depot/projects/trustedbsd/acl/lib/libc/alpha/sys/Makefile.inc#2 delete .. //depot/projects/trustedbsd/acl/lib/libc/alpha/sys/Ovfork.S#3 delete .. //depot/projects/trustedbsd/acl/lib/libc/alpha/sys/brk.S#3 delete .. //depot/projects/trustedbsd/acl/lib/libc/alpha/sys/cerror.S#3 delete .. //depot/projects/trustedbsd/acl/lib/libc/alpha/sys/exect.S#3 delete .. //depot/projects/trustedbsd/acl/lib/libc/alpha/sys/fork.S#3 delete .. //depot/projects/trustedbsd/acl/lib/libc/alpha/sys/pipe.S#3 delete .. //depot/projects/trustedbsd/acl/lib/libc/alpha/sys/ptrace.S#3 delete .. //depot/projects/trustedbsd/acl/lib/libc/alpha/sys/sbrk.S#3 delete .. //depot/projects/trustedbsd/acl/lib/libc/alpha/sys/setlogin.S#3 delete .. //depot/projects/trustedbsd/acl/lib/libc/alpha/sys/sigreturn.S#3 delete .. //depot/projects/trustedbsd/acl/lib/libc/amd64/Makefile.inc#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/amd64/SYS.h#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/amd64/Symbol.map#1 branch .. //depot/projects/trustedbsd/acl/lib/libc/amd64/_fpmath.h#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/amd64/gd_qnan.h#1 branch .. //depot/projects/trustedbsd/acl/lib/libc/amd64/gen/Makefile.inc#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/amd64/gen/_set_tp.c#1 branch .. //depot/projects/trustedbsd/acl/lib/libc/amd64/gen/_setjmp.S#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/amd64/gen/fabs.S#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/amd64/gen/flt_rounds.c#1 branch .. //depot/projects/trustedbsd/acl/lib/libc/amd64/gen/fpsetsticky.c#2 delete .. //depot/projects/trustedbsd/acl/lib/libc/amd64/gen/frexp.c#2 delete .. //depot/projects/trustedbsd/acl/lib/libc/amd64/gen/isinf.c#2 delete .. //depot/projects/trustedbsd/acl/lib/libc/amd64/gen/ldexp.c#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/amd64/gen/makecontext.c#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/amd64/gen/modf.S#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/amd64/gen/rfork_thread.S#1 branch .. //depot/projects/trustedbsd/acl/lib/libc/amd64/gen/setjmp.S#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/amd64/gen/signalcontext.c#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/amd64/gen/sigsetjmp.S#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/amd64/net/Makefile.inc#2 delete .. //depot/projects/trustedbsd/acl/lib/libc/amd64/net/htonl.S#2 delete .. //depot/projects/trustedbsd/acl/lib/libc/amd64/net/htons.S#2 delete .. //depot/projects/trustedbsd/acl/lib/libc/amd64/net/ntohl.S#2 delete .. //depot/projects/trustedbsd/acl/lib/libc/amd64/net/ntohs.S#2 delete .. //depot/projects/trustedbsd/acl/lib/libc/amd64/stdlib/gdtoa.mk#2 delete .. //depot/projects/trustedbsd/acl/lib/libc/amd64/string/Makefile.inc#1 branch .. //depot/projects/trustedbsd/acl/lib/libc/amd64/string/bcmp.S#1 branch .. //depot/projects/trustedbsd/acl/lib/libc/amd64/string/bcopy.S#1 branch .. //depot/projects/trustedbsd/acl/lib/libc/amd64/string/bzero.S#1 branch .. //depot/projects/trustedbsd/acl/lib/libc/amd64/string/memcmp.S#1 branch .. //depot/projects/trustedbsd/acl/lib/libc/amd64/string/memcpy.S#1 branch .. //depot/projects/trustedbsd/acl/lib/libc/amd64/string/memmove.S#1 branch .. //depot/projects/trustedbsd/acl/lib/libc/amd64/string/memset.S#1 branch .. //depot/projects/trustedbsd/acl/lib/libc/amd64/string/strcat.S#1 branch .. //depot/projects/trustedbsd/acl/lib/libc/amd64/string/strcmp.S#1 branch .. //depot/projects/trustedbsd/acl/lib/libc/amd64/string/strcpy.S#1 branch .. //depot/projects/trustedbsd/acl/lib/libc/amd64/sys/Makefile.inc#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/amd64/sys/amd64_get_fsbase.c#1 branch .. //depot/projects/trustedbsd/acl/lib/libc/amd64/sys/amd64_get_gsbase.c#1 branch .. //depot/projects/trustedbsd/acl/lib/libc/amd64/sys/amd64_set_fsbase.c#1 branch .. //depot/projects/trustedbsd/acl/lib/libc/amd64/sys/amd64_set_gsbase.c#1 branch .. //depot/projects/trustedbsd/acl/lib/libc/amd64/sys/brk.S#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/amd64/sys/cerror.S#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/amd64/sys/exect.S#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/amd64/sys/getcontext.S#1 branch .. //depot/projects/trustedbsd/acl/lib/libc/amd64/sys/pipe.S#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/amd64/sys/ptrace.S#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/amd64/sys/reboot.S#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/amd64/sys/sbrk.S#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/amd64/sys/setlogin.S#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/amd64/sys/sigreturn.S#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/amd64/sys/vfork.S#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/arm/Makefile.inc#1 branch .. //depot/projects/trustedbsd/acl/lib/libc/arm/SYS.h#1 branch .. //depot/projects/trustedbsd/acl/lib/libc/arm/Symbol.map#1 branch .. //depot/projects/trustedbsd/acl/lib/libc/arm/_fpmath.h#1 branch .. //depot/projects/trustedbsd/acl/lib/libc/arm/arith.h#1 branch .. //depot/projects/trustedbsd/acl/lib/libc/arm/gd_qnan.h#1 branch .. //depot/projects/trustedbsd/acl/lib/libc/arm/gen/Makefile.inc#1 branch .. //depot/projects/trustedbsd/acl/lib/libc/arm/gen/_ctx_start.S#1 branch .. //depot/projects/trustedbsd/acl/lib/libc/arm/gen/_set_tp.c#1 branch .. //depot/projects/trustedbsd/acl/lib/libc/arm/gen/_setjmp.S#1 branch .. //depot/projects/trustedbsd/acl/lib/libc/arm/gen/alloca.S#1 branch .. //depot/projects/trustedbsd/acl/lib/libc/arm/gen/divsi3.S#1 branch .. //depot/projects/trustedbsd/acl/lib/libc/arm/gen/fabs.c#1 branch .. //depot/projects/trustedbsd/acl/lib/libc/arm/gen/infinity.c#1 branch .. //depot/projects/trustedbsd/acl/lib/libc/arm/gen/makecontext.c#1 branch .. //depot/projects/trustedbsd/acl/lib/libc/arm/gen/modf.c#1 branch .. //depot/projects/trustedbsd/acl/lib/libc/arm/gen/setjmp.S#1 branch .. //depot/projects/trustedbsd/acl/lib/libc/arm/gen/signalcontext.c#1 branch .. //depot/projects/trustedbsd/acl/lib/libc/arm/gen/sigsetjmp.S#1 branch .. //depot/projects/trustedbsd/acl/lib/libc/arm/softfloat/arm-gcc.h#1 branch .. //depot/projects/trustedbsd/acl/lib/libc/arm/softfloat/milieu.h#1 branch .. //depot/projects/trustedbsd/acl/lib/libc/arm/softfloat/softfloat.h#1 branch .. //depot/projects/trustedbsd/acl/lib/libc/arm/stdlib/Makefile.inc#1 branch .. //depot/projects/trustedbsd/acl/lib/libc/arm/string/Makefile.inc#1 branch .. //depot/projects/trustedbsd/acl/lib/libc/arm/string/bcopy.S#1 branch .. //depot/projects/trustedbsd/acl/lib/libc/arm/string/bzero.S#1 branch .. //depot/projects/trustedbsd/acl/lib/libc/arm/string/ffs.S#1 branch .. //depot/projects/trustedbsd/acl/lib/libc/arm/string/memcmp.S#1 branch .. //depot/projects/trustedbsd/acl/lib/libc/arm/string/memcpy.S#1 branch .. //depot/projects/trustedbsd/acl/lib/libc/arm/string/memcpy_arm.S#1 branch .. //depot/projects/trustedbsd/acl/lib/libc/arm/string/memcpy_xscale.S#1 branch .. //depot/projects/trustedbsd/acl/lib/libc/arm/string/memmove.S#1 branch .. //depot/projects/trustedbsd/acl/lib/libc/arm/string/memset.S#1 branch .. //depot/projects/trustedbsd/acl/lib/libc/arm/string/strcmp.S#1 branch .. //depot/projects/trustedbsd/acl/lib/libc/arm/string/strlen.S#1 branch .. //depot/projects/trustedbsd/acl/lib/libc/arm/string/strncmp.S#1 branch .. //depot/projects/trustedbsd/acl/lib/libc/arm/sys/Makefile.inc#1 branch .. //depot/projects/trustedbsd/acl/lib/libc/arm/sys/Ovfork.S#1 branch .. //depot/projects/trustedbsd/acl/lib/libc/arm/sys/brk.S#1 branch .. //depot/projects/trustedbsd/acl/lib/libc/arm/sys/cerror.S#1 branch .. //depot/projects/trustedbsd/acl/lib/libc/arm/sys/fork.S#1 branch .. //depot/projects/trustedbsd/acl/lib/libc/arm/sys/pipe.S#1 branch .. //depot/projects/trustedbsd/acl/lib/libc/arm/sys/ptrace.S#1 branch .. //depot/projects/trustedbsd/acl/lib/libc/arm/sys/sbrk.S#1 branch .. //depot/projects/trustedbsd/acl/lib/libc/arm/sys/shmat.S#1 branch .. //depot/projects/trustedbsd/acl/lib/libc/arm/sys/sigreturn.S#1 branch .. //depot/projects/trustedbsd/acl/lib/libc/arm/sys/syscall.S#1 branch .. //depot/projects/trustedbsd/acl/lib/libc/compat-43/Makefile.inc#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/compat-43/Symbol.map#1 branch .. //depot/projects/trustedbsd/acl/lib/libc/compat-43/creat.2#3 integrate .. //depot/projects/trustedbsd/acl/lib/libc/compat-43/creat.c#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/compat-43/gethostid.3#3 integrate .. //depot/projects/trustedbsd/acl/lib/libc/compat-43/gethostid.c#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/compat-43/getwd.c#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/compat-43/killpg.2#3 integrate .. //depot/projects/trustedbsd/acl/lib/libc/compat-43/killpg.c#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/compat-43/sethostid.c#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/compat-43/setpgrp.c#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/compat-43/setrgid.c#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/compat-43/setruid.3#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/compat-43/setruid.c#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/compat-43/sigcompat.c#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/compat-43/sigpause.2#4 integrate .. //depot/projects/trustedbsd/acl/lib/libc/compat-43/sigsetmask.2#3 integrate .. //depot/projects/trustedbsd/acl/lib/libc/compat-43/sigvec.2#4 integrate .. //depot/projects/trustedbsd/acl/lib/libc/db/Makefile.inc#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/db/Symbol.map#1 branch .. //depot/projects/trustedbsd/acl/lib/libc/db/btree/bt_close.c#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/db/btree/bt_conv.c#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/db/btree/bt_debug.c#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/db/btree/bt_delete.c#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/db/btree/bt_get.c#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/db/btree/bt_open.c#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/db/btree/bt_overflow.c#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/db/btree/bt_page.c#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/db/btree/bt_put.c#4 integrate .. //depot/projects/trustedbsd/acl/lib/libc/db/btree/bt_search.c#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/db/btree/bt_seq.c#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/db/btree/bt_split.c#3 integrate .. //depot/projects/trustedbsd/acl/lib/libc/db/btree/bt_utils.c#3 integrate .. //depot/projects/trustedbsd/acl/lib/libc/db/btree/btree.h#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/db/btree/extern.h#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/db/db/db.c#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/db/hash/extern.h#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/db/hash/hash.c#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/db/hash/hash.h#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/db/hash/hash_bigkey.c#3 integrate .. //depot/projects/trustedbsd/acl/lib/libc/db/hash/hash_buf.c#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/db/hash/hash_func.c#3 integrate .. //depot/projects/trustedbsd/acl/lib/libc/db/hash/hash_log2.c#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/db/hash/hash_page.c#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/db/hash/ndbm.c#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/db/hash/page.h#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/db/man/btree.3#3 integrate .. //depot/projects/trustedbsd/acl/lib/libc/db/man/dbm.3#3 integrate .. //depot/projects/trustedbsd/acl/lib/libc/db/man/dbopen.3#3 integrate .. //depot/projects/trustedbsd/acl/lib/libc/db/man/hash.3#3 integrate .. //depot/projects/trustedbsd/acl/lib/libc/db/man/mpool.3#4 integrate .. //depot/projects/trustedbsd/acl/lib/libc/db/man/recno.3#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/db/mpool/mpool.c#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/db/recno/extern.h#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/db/recno/rec_close.c#3 integrate .. //depot/projects/trustedbsd/acl/lib/libc/db/recno/rec_delete.c#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/db/recno/rec_get.c#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/db/recno/rec_open.c#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/db/recno/rec_put.c#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/db/recno/rec_search.c#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/db/recno/rec_seq.c#3 integrate .. //depot/projects/trustedbsd/acl/lib/libc/db/recno/rec_utils.c#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/db/recno/recno.h#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/db/test/btree.tests/main.c#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/db/test/dbtest.c#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/db/test/hash.tests/driver2.c#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/db/test/hash.tests/tcreat3.c#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/db/test/hash.tests/tdel.c#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/db/test/hash.tests/thash4.c#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/db/test/hash.tests/tread2.c#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/db/test/hash.tests/tseq.c#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/db/test/hash.tests/tverify.c#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/gdtoa/Makefile.inc#3 integrate .. //depot/projects/trustedbsd/acl/lib/libc/gdtoa/Symbol.map#1 branch .. //depot/projects/trustedbsd/acl/lib/libc/gdtoa/_hdtoa.c#1 branch .. //depot/projects/trustedbsd/acl/lib/libc/gdtoa/_ldtoa.c#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/gen/Makefile.inc#5 integrate .. //depot/projects/trustedbsd/acl/lib/libc/gen/Symbol.map#1 branch .. //depot/projects/trustedbsd/acl/lib/libc/gen/__xuname.c#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/gen/_pthread_stubs.c#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/gen/_spinlock_stub.c#3 integrate .. //depot/projects/trustedbsd/acl/lib/libc/gen/alarm.3#3 integrate .. //depot/projects/trustedbsd/acl/lib/libc/gen/alarm.c#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/gen/arc4random.c#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/gen/assert.c#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/gen/basename.3#3 integrate .. //depot/projects/trustedbsd/acl/lib/libc/gen/check_utility_compat.3#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/gen/clock.3#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/gen/clock.c#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/gen/closedir.c#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/gen/confstr.3#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/gen/confstr.c#3 integrate .. //depot/projects/trustedbsd/acl/lib/libc/gen/crypt.c#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/gen/ctermid.3#3 integrate .. //depot/projects/trustedbsd/acl/lib/libc/gen/ctermid.c#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/gen/daemon.3#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/gen/daemon.c#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/gen/devname.3#4 integrate .. //depot/projects/trustedbsd/acl/lib/libc/gen/devname.c#3 integrate .. //depot/projects/trustedbsd/acl/lib/libc/gen/directory.3#3 integrate .. //depot/projects/trustedbsd/acl/lib/libc/gen/dirname.3#3 integrate .. //depot/projects/trustedbsd/acl/lib/libc/gen/disklabel.c#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/gen/dladdr.3#3 integrate .. //depot/projects/trustedbsd/acl/lib/libc/gen/dlfcn.c#4 integrate .. //depot/projects/trustedbsd/acl/lib/libc/gen/dlinfo.3#3 integrate .. //depot/projects/trustedbsd/acl/lib/libc/gen/dllockinit.3#3 integrate .. //depot/projects/trustedbsd/acl/lib/libc/gen/dlopen.3#4 integrate .. //depot/projects/trustedbsd/acl/lib/libc/gen/err.3#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/gen/err.c#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/gen/errlst.c#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/gen/exec.3#4 integrate .. //depot/projects/trustedbsd/acl/lib/libc/gen/exec.c#4 integrate .. //depot/projects/trustedbsd/acl/lib/libc/gen/fmtcheck.3#3 integrate .. //depot/projects/trustedbsd/acl/lib/libc/gen/fmtcheck.c#3 integrate .. //depot/projects/trustedbsd/acl/lib/libc/gen/fnmatch.3#3 integrate .. //depot/projects/trustedbsd/acl/lib/libc/gen/fnmatch.c#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/gen/fpclassify.3#3 integrate .. //depot/projects/trustedbsd/acl/lib/libc/gen/fpclassify.c#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/gen/frexp.3#3 integrate .. //depot/projects/trustedbsd/acl/lib/libc/gen/frexp.c#1 branch .. //depot/projects/trustedbsd/acl/lib/libc/gen/fstab.c#3 integrate .. //depot/projects/trustedbsd/acl/lib/libc/gen/ftok.3#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/gen/ftok.c#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/gen/fts.3#4 integrate .. //depot/projects/trustedbsd/acl/lib/libc/gen/fts.c#3 integrate .. //depot/projects/trustedbsd/acl/lib/libc/gen/ftw.3#1 branch .. //depot/projects/trustedbsd/acl/lib/libc/gen/ftw.c#1 branch .. //depot/projects/trustedbsd/acl/lib/libc/gen/getbootfile.3#3 integrate .. //depot/projects/trustedbsd/acl/lib/libc/gen/getbootfile.c#3 integrate .. //depot/projects/trustedbsd/acl/lib/libc/gen/getbsize.3#3 integrate .. //depot/projects/trustedbsd/acl/lib/libc/gen/getbsize.c#3 integrate .. //depot/projects/trustedbsd/acl/lib/libc/gen/getcap.3#4 integrate .. //depot/projects/trustedbsd/acl/lib/libc/gen/getcap.c#4 integrate .. //depot/projects/trustedbsd/acl/lib/libc/gen/getcontext.3#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/gen/getcwd.3#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/gen/getcwd.c#3 integrate .. //depot/projects/trustedbsd/acl/lib/libc/gen/getdiskbyname.3#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/gen/getdomainname.3#4 integrate .. //depot/projects/trustedbsd/acl/lib/libc/gen/getdomainname.c#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/gen/getfsent.3#3 integrate .. //depot/projects/trustedbsd/acl/lib/libc/gen/getgrent.3#4 integrate .. //depot/projects/trustedbsd/acl/lib/libc/gen/getgrent.c#4 integrate .. //depot/projects/trustedbsd/acl/lib/libc/gen/getgrouplist.3#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/gen/getgrouplist.c#3 integrate .. //depot/projects/trustedbsd/acl/lib/libc/gen/gethostname.3#3 integrate .. //depot/projects/trustedbsd/acl/lib/libc/gen/gethostname.c#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/gen/getloadavg.3#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/gen/getloadavg.c#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/gen/getlogin.c#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/gen/getmntinfo.3#3 integrate .. //depot/projects/trustedbsd/acl/lib/libc/gen/getmntinfo.c#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/gen/getnetgrent.3#3 integrate .. //depot/projects/trustedbsd/acl/lib/libc/gen/getnetgrent.c#3 integrate .. //depot/projects/trustedbsd/acl/lib/libc/gen/getobjformat.3#3 delete .. //depot/projects/trustedbsd/acl/lib/libc/gen/getobjformat.c#2 delete .. //depot/projects/trustedbsd/acl/lib/libc/gen/getosreldate.3#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/gen/getosreldate.c#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/gen/getpagesize.3#3 integrate .. //depot/projects/trustedbsd/acl/lib/libc/gen/getpagesize.c#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/gen/getpass.3#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/gen/getpwent.3#4 integrate .. //depot/projects/trustedbsd/acl/lib/libc/gen/getpwent.c#4 integrate .. //depot/projects/trustedbsd/acl/lib/libc/gen/getttyent.3#3 integrate .. //depot/projects/trustedbsd/acl/lib/libc/gen/getttyent.c#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/gen/getusershell.3#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/gen/getusershell.c#4 integrate .. //depot/projects/trustedbsd/acl/lib/libc/gen/getvfsbyname.3#3 integrate .. //depot/projects/trustedbsd/acl/lib/libc/gen/getvfsbyname.c#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/gen/getvfsent.3#3 delete .. //depot/projects/trustedbsd/acl/lib/libc/gen/getvfsent.c#3 delete .. //depot/projects/trustedbsd/acl/lib/libc/gen/glob.3#4 integrate .. //depot/projects/trustedbsd/acl/lib/libc/gen/glob.c#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/gen/initgroups.3#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/gen/initgroups.c#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/gen/isatty.c#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/gen/isgreater.3#3 integrate .. //depot/projects/trustedbsd/acl/lib/libc/gen/isinf.c#1 branch .. //depot/projects/trustedbsd/acl/lib/libc/gen/isnan.c#1 branch .. //depot/projects/trustedbsd/acl/lib/libc/gen/ldexp.3#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/gen/ldexp.c#1 branch .. //depot/projects/trustedbsd/acl/lib/libc/gen/lockf.3#3 integrate .. //depot/projects/trustedbsd/acl/lib/libc/gen/modf.3#3 integrate .. //depot/projects/trustedbsd/acl/lib/libc/gen/msgctl.3#3 integrate .. //depot/projects/trustedbsd/acl/lib/libc/gen/msgrcv.3#3 integrate .. //depot/projects/trustedbsd/acl/lib/libc/gen/msgsnd.3#4 integrate .. //depot/projects/trustedbsd/acl/lib/libc/gen/nftw.c#1 branch .. //depot/projects/trustedbsd/acl/lib/libc/gen/nice.3#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/gen/nice.c#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/gen/nlist.3#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/gen/nlist.c#3 integrate .. //depot/projects/trustedbsd/acl/lib/libc/gen/ntp_gettime.c#2 delete .. //depot/projects/trustedbsd/acl/lib/libc/gen/opendir.c#4 integrate .. //depot/projects/trustedbsd/acl/lib/libc/gen/pause.3#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/gen/pause.c#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/gen/pmadvise.c#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/gen/popen.3#4 integrate .. //depot/projects/trustedbsd/acl/lib/libc/gen/popen.c#3 integrate .. //depot/projects/trustedbsd/acl/lib/libc/gen/psignal.3#3 integrate .. //depot/projects/trustedbsd/acl/lib/libc/gen/psignal.c#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/gen/pw_scan.c#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/gen/pw_scan.h#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/gen/pwcache.3#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/gen/pwcache.c#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/gen/raise.3#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/gen/raise.c#3 integrate .. //depot/projects/trustedbsd/acl/lib/libc/gen/rand48.3#3 integrate .. //depot/projects/trustedbsd/acl/lib/libc/gen/readdir.c#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/gen/readpassphrase.3#3 integrate .. //depot/projects/trustedbsd/acl/lib/libc/gen/rewinddir.c#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/gen/scandir.3#3 integrate .. //depot/projects/trustedbsd/acl/lib/libc/gen/scandir.c#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/gen/seekdir.c#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/gen/sem.c#1 branch .. //depot/projects/trustedbsd/acl/lib/libc/gen/sem_destroy.3#1 branch .. //depot/projects/trustedbsd/acl/lib/libc/gen/sem_getvalue.3#1 branch .. //depot/projects/trustedbsd/acl/lib/libc/gen/sem_init.3#1 branch .. //depot/projects/trustedbsd/acl/lib/libc/gen/sem_open.3#1 branch .. //depot/projects/trustedbsd/acl/lib/libc/gen/sem_post.3#1 branch .. //depot/projects/trustedbsd/acl/lib/libc/gen/sem_wait.3#1 branch .. //depot/projects/trustedbsd/acl/lib/libc/gen/setdomainname.c#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/gen/sethostname.c#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/gen/setjmp.3#3 integrate .. //depot/projects/trustedbsd/acl/lib/libc/gen/setjmperr.c#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/gen/setmode.3#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/gen/setmode.c#3 integrate .. //depot/projects/trustedbsd/acl/lib/libc/gen/setproctitle.3#3 integrate .. //depot/projects/trustedbsd/acl/lib/libc/gen/shm_open.3#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/gen/siginterrupt.3#3 integrate .. //depot/projects/trustedbsd/acl/lib/libc/gen/siginterrupt.c#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/gen/siglist.c#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/gen/signal.3#3 integrate .. //depot/projects/trustedbsd/acl/lib/libc/gen/signal.c#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/gen/signbit.3#2 delete .. //depot/projects/trustedbsd/acl/lib/libc/gen/signbit.c#2 delete .. //depot/projects/trustedbsd/acl/lib/libc/gen/sigsetops.3#4 integrate .. //depot/projects/trustedbsd/acl/lib/libc/gen/sigsetops.c#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/gen/sleep.3#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/gen/sleep.c#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/gen/stringlist.3#4 integrate .. //depot/projects/trustedbsd/acl/lib/libc/gen/stringlist.c#3 integrate .. //depot/projects/trustedbsd/acl/lib/libc/gen/strtofflags.3#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/gen/strtofflags.c#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/gen/sysconf.3#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/gen/sysconf.c#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/gen/sysctl.3#3 integrate .. //depot/projects/trustedbsd/acl/lib/libc/gen/sysctl.c#3 integrate .. //depot/projects/trustedbsd/acl/lib/libc/gen/syslog.3#3 integrate .. //depot/projects/trustedbsd/acl/lib/libc/gen/syslog.c#3 integrate .. //depot/projects/trustedbsd/acl/lib/libc/gen/tcgetpgrp.3#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/gen/tcsendbreak.3#3 integrate .. //depot/projects/trustedbsd/acl/lib/libc/gen/tcsetattr.3#3 integrate .. //depot/projects/trustedbsd/acl/lib/libc/gen/tcsetpgrp.3#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/gen/telldir.c#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/gen/termios.c#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/gen/time.3#3 integrate .. //depot/projects/trustedbsd/acl/lib/libc/gen/time.c#3 integrate .. //depot/projects/trustedbsd/acl/lib/libc/gen/times.3#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/gen/times.c#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/gen/timezone.3#3 integrate .. //depot/projects/trustedbsd/acl/lib/libc/gen/timezone.c#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/gen/tls.c#1 branch .. //depot/projects/trustedbsd/acl/lib/libc/gen/ttyname.3#3 integrate .. //depot/projects/trustedbsd/acl/lib/libc/gen/ttyname.c#3 integrate .. //depot/projects/trustedbsd/acl/lib/libc/gen/ttyslot.c#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/gen/tzset.3#3 integrate .. //depot/projects/trustedbsd/acl/lib/libc/gen/ualarm.3#3 integrate .. //depot/projects/trustedbsd/acl/lib/libc/gen/ualarm.c#3 integrate .. //depot/projects/trustedbsd/acl/lib/libc/gen/ucontext.3#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/gen/uname.3#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/gen/uname.c#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/gen/unvis.3#3 integrate .. //depot/projects/trustedbsd/acl/lib/libc/gen/unvis.c#3 integrate .. //depot/projects/trustedbsd/acl/lib/libc/gen/usleep.3#3 integrate .. //depot/projects/trustedbsd/acl/lib/libc/gen/usleep.c#3 integrate .. //depot/projects/trustedbsd/acl/lib/libc/gen/utime.3#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/gen/utime.c#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/gen/valloc.3#3 integrate .. //depot/projects/trustedbsd/acl/lib/libc/gen/valloc.c#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/gen/vis.3#3 integrate .. //depot/projects/trustedbsd/acl/lib/libc/gen/vis.c#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/gen/wait.c#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/gen/wait3.c#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/gen/waitpid.c#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/gen/wordexp.3#4 integrate .. //depot/projects/trustedbsd/acl/lib/libc/gen/wordexp.c#3 integrate .. //depot/projects/trustedbsd/acl/lib/libc/gmon/Makefile.inc#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/gmon/Symbol.map#1 branch .. //depot/projects/trustedbsd/acl/lib/libc/gmon/gmon.c#3 integrate .. //depot/projects/trustedbsd/acl/lib/libc/gmon/mcount.c#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/gmon/moncontrol.3#3 integrate .. //depot/projects/trustedbsd/acl/lib/libc/i386/Makefile.inc#1 branch .. //depot/projects/trustedbsd/acl/lib/libc/i386/SYS.h#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/i386/Symbol.map#1 branch .. //depot/projects/trustedbsd/acl/lib/libc/i386/_fpmath.h#3 integrate .. //depot/projects/trustedbsd/acl/lib/libc/i386/gd_qnan.h#1 branch .. //depot/projects/trustedbsd/acl/lib/libc/i386/gen/Makefile.inc#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/i386/gen/_ctx_start.S#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/i386/gen/_set_tp.c#1 branch .. //depot/projects/trustedbsd/acl/lib/libc/i386/gen/_setjmp.S#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/i386/gen/alloca.S#3 delete .. //depot/projects/trustedbsd/acl/lib/libc/i386/gen/fabs.S#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/i386/gen/flt_rounds.c#1 branch .. //depot/projects/trustedbsd/acl/lib/libc/i386/gen/frexp.c#2 delete .. //depot/projects/trustedbsd/acl/lib/libc/i386/gen/isinf.c#3 delete .. //depot/projects/trustedbsd/acl/lib/libc/i386/gen/ldexp.c#3 integrate .. //depot/projects/trustedbsd/acl/lib/libc/i386/gen/makecontext.c#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/i386/gen/modf.S#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/i386/gen/setjmp.S#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/i386/gen/signalcontext.c#4 integrate .. //depot/projects/trustedbsd/acl/lib/libc/i386/gen/sigsetjmp.S#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/i386/net/Makefile.inc#2 delete .. //depot/projects/trustedbsd/acl/lib/libc/i386/net/htonl.S#2 delete .. //depot/projects/trustedbsd/acl/lib/libc/i386/net/htons.S#2 delete .. //depot/projects/trustedbsd/acl/lib/libc/i386/net/ntohl.S#2 delete .. //depot/projects/trustedbsd/acl/lib/libc/i386/net/ntohs.S#2 delete .. //depot/projects/trustedbsd/acl/lib/libc/i386/stdlib/abs.S#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/i386/stdlib/div.S#3 integrate .. //depot/projects/trustedbsd/acl/lib/libc/i386/stdlib/gdtoa.mk#2 delete .. //depot/projects/trustedbsd/acl/lib/libc/i386/stdlib/labs.S#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/i386/string/bcmp.S#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/i386/string/bcopy.S#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/i386/sys/Makefile.inc#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/i386/sys/Ovfork.S#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/i386/sys/brk.S#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/i386/sys/cerror.S#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/i386/sys/exect.S#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/i386/sys/getcontext.S#1 branch .. //depot/projects/trustedbsd/acl/lib/libc/i386/sys/i386_get_fsbase.c#1 branch .. //depot/projects/trustedbsd/acl/lib/libc/i386/sys/i386_get_gsbase.c#1 branch .. //depot/projects/trustedbsd/acl/lib/libc/i386/sys/i386_get_ioperm.2#3 integrate .. //depot/projects/trustedbsd/acl/lib/libc/i386/sys/i386_get_ioperm.c#3 integrate .. //depot/projects/trustedbsd/acl/lib/libc/i386/sys/i386_get_ldt.2#4 integrate .. //depot/projects/trustedbsd/acl/lib/libc/i386/sys/i386_get_ldt.c#3 integrate .. //depot/projects/trustedbsd/acl/lib/libc/i386/sys/i386_set_fsbase.c#1 branch .. //depot/projects/trustedbsd/acl/lib/libc/i386/sys/i386_set_gsbase.c#1 branch .. //depot/projects/trustedbsd/acl/lib/libc/i386/sys/i386_set_ioperm.c#3 integrate .. //depot/projects/trustedbsd/acl/lib/libc/i386/sys/i386_set_ldt.c#3 integrate .. //depot/projects/trustedbsd/acl/lib/libc/i386/sys/i386_set_watch.3#3 integrate .. //depot/projects/trustedbsd/acl/lib/libc/i386/sys/i386_vm86.c#3 integrate .. //depot/projects/trustedbsd/acl/lib/libc/i386/sys/pipe.S#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/i386/sys/ptrace.S#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/i386/sys/reboot.S#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/i386/sys/sbrk.S#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/i386/sys/setlogin.S#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/i386/sys/sigreturn.S#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/i386/sys/syscall.S#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/ia64/Makefile.inc#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/ia64/Symbol.map#1 branch .. //depot/projects/trustedbsd/acl/lib/libc/ia64/_fpmath.h#3 integrate .. //depot/projects/trustedbsd/acl/lib/libc/ia64/gd_qnan.h#1 branch .. //depot/projects/trustedbsd/acl/lib/libc/ia64/gen/Makefile.inc#4 integrate .. //depot/projects/trustedbsd/acl/lib/libc/ia64/gen/_mcount.S#1 branch .. //depot/projects/trustedbsd/acl/lib/libc/ia64/gen/_set_tp.c#1 branch .. //depot/projects/trustedbsd/acl/lib/libc/ia64/gen/flt_rounds.c#1 branch .. //depot/projects/trustedbsd/acl/lib/libc/ia64/gen/fpgetmask.c#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/ia64/gen/fpsetmask.c#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/ia64/gen/frexp.c#2 delete .. //depot/projects/trustedbsd/acl/lib/libc/ia64/gen/isinf.c#3 delete .. //depot/projects/trustedbsd/acl/lib/libc/ia64/gen/ldexp.c#2 delete .. //depot/projects/trustedbsd/acl/lib/libc/ia64/gen/makecontext.c#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/ia64/gen/signalcontext.c#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/ia64/gen/unwind.c#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/ia64/net/Makefile.inc#2 delete .. //depot/projects/trustedbsd/acl/lib/libc/ia64/net/byte_swap_2.S#3 delete .. //depot/projects/trustedbsd/acl/lib/libc/ia64/net/byte_swap_4.S#3 delete .. //depot/projects/trustedbsd/acl/lib/libc/ia64/net/htonl.S#3 delete .. //depot/projects/trustedbsd/acl/lib/libc/ia64/net/htons.S#3 delete .. //depot/projects/trustedbsd/acl/lib/libc/ia64/net/ntohl.S#3 delete .. //depot/projects/trustedbsd/acl/lib/libc/ia64/net/ntohs.S#3 delete .. //depot/projects/trustedbsd/acl/lib/libc/ia64/stdlib/gdtoa.mk#2 delete .. //depot/projects/trustedbsd/acl/lib/libc/ia64/string/bcopy.S#3 integrate .. //depot/projects/trustedbsd/acl/lib/libc/ia64/string/bzero.S#3 integrate .. //depot/projects/trustedbsd/acl/lib/libc/ia64/string/memcpy.S#3 integrate .. //depot/projects/trustedbsd/acl/lib/libc/ia64/string/memmove.S#3 integrate .. //depot/projects/trustedbsd/acl/lib/libc/ia64/sys/Makefile.inc#3 integrate .. //depot/projects/trustedbsd/acl/lib/libc/include/fpmath.h#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/include/isc/eventlib.h#1 branch .. //depot/projects/trustedbsd/acl/lib/libc/include/isc/list.h#1 branch .. //depot/projects/trustedbsd/acl/lib/libc/include/libc_private.h#3 integrate .. //depot/projects/trustedbsd/acl/lib/libc/include/namespace.h#4 integrate .. //depot/projects/trustedbsd/acl/lib/libc/include/nscache.h#1 branch .. //depot/projects/trustedbsd/acl/lib/libc/include/nscachedcli.h#1 branch .. //depot/projects/trustedbsd/acl/lib/libc/include/nss_tls.h#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/include/port_after.h#1 branch .. //depot/projects/trustedbsd/acl/lib/libc/include/port_before.h#1 branch .. //depot/projects/trustedbsd/acl/lib/libc/include/reentrant.h#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/include/resolv_mt.h#1 branch .. //depot/projects/trustedbsd/acl/lib/libc/include/spinlock.h#3 integrate .. //depot/projects/trustedbsd/acl/lib/libc/include/un-namespace.h#4 integrate .. //depot/projects/trustedbsd/acl/lib/libc/inet/Makefile.inc#1 branch .. //depot/projects/trustedbsd/acl/lib/libc/inet/Symbol.map#1 branch .. //depot/projects/trustedbsd/acl/lib/libc/inet/inet_addr.c#1 branch .. //depot/projects/trustedbsd/acl/lib/libc/inet/inet_cidr_ntop.c#1 branch .. //depot/projects/trustedbsd/acl/lib/libc/inet/inet_cidr_pton.c#1 branch .. //depot/projects/trustedbsd/acl/lib/libc/inet/inet_lnaof.c#1 branch .. //depot/projects/trustedbsd/acl/lib/libc/inet/inet_makeaddr.c#1 branch .. //depot/projects/trustedbsd/acl/lib/libc/inet/inet_net_ntop.c#1 branch .. //depot/projects/trustedbsd/acl/lib/libc/inet/inet_net_pton.c#1 branch .. //depot/projects/trustedbsd/acl/lib/libc/inet/inet_neta.c#1 branch .. //depot/projects/trustedbsd/acl/lib/libc/inet/inet_netof.c#1 branch .. //depot/projects/trustedbsd/acl/lib/libc/inet/inet_network.c#1 branch .. //depot/projects/trustedbsd/acl/lib/libc/inet/inet_ntoa.c#1 branch .. //depot/projects/trustedbsd/acl/lib/libc/inet/inet_ntop.c#1 branch .. //depot/projects/trustedbsd/acl/lib/libc/inet/inet_pton.c#1 branch .. //depot/projects/trustedbsd/acl/lib/libc/inet/nsap_addr.c#1 branch .. //depot/projects/trustedbsd/acl/lib/libc/isc/Makefile.inc#1 branch .. //depot/projects/trustedbsd/acl/lib/libc/isc/ev_streams.c#1 branch .. //depot/projects/trustedbsd/acl/lib/libc/isc/ev_timers.c#1 branch .. //depot/projects/trustedbsd/acl/lib/libc/isc/eventlib_p.h#1 branch .. //depot/projects/trustedbsd/acl/lib/libc/locale/Makefile.inc#4 integrate .. //depot/projects/trustedbsd/acl/lib/libc/locale/Symbol.map#1 branch .. //depot/projects/trustedbsd/acl/lib/libc/locale/big5.5#1 branch .. //depot/projects/trustedbsd/acl/lib/libc/locale/big5.c#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/locale/btowc.c#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/locale/collate.c#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/locale/collate.h#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/locale/collcmp.c#3 integrate .. //depot/projects/trustedbsd/acl/lib/libc/locale/ctype.3#3 integrate .. //depot/projects/trustedbsd/acl/lib/libc/locale/digittoint.3#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/locale/euc.4#2 delete .. //depot/projects/trustedbsd/acl/lib/libc/locale/euc.5#1 branch .. //depot/projects/trustedbsd/acl/lib/libc/locale/euc.c#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/locale/frune.c#3 delete .. //depot/projects/trustedbsd/acl/lib/libc/locale/gb18030.5#1 branch .. //depot/projects/trustedbsd/acl/lib/libc/locale/gb18030.c#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/locale/gb2312.5#1 branch .. //depot/projects/trustedbsd/acl/lib/libc/locale/gb2312.c#1 branch .. //depot/projects/trustedbsd/acl/lib/libc/locale/gbk.5#1 branch .. //depot/projects/trustedbsd/acl/lib/libc/locale/gbk.c#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/locale/isalnum.3#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/locale/isalpha.3#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/locale/isascii.3#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/locale/isblank.3#3 integrate .. //depot/projects/trustedbsd/acl/lib/libc/locale/iscntrl.3#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/locale/isctype.c#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/locale/isdigit.3#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/locale/isgraph.3#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/locale/isideogram.3#1 branch .. //depot/projects/trustedbsd/acl/lib/libc/locale/islower.3#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/locale/isphonogram.3#1 branch .. //depot/projects/trustedbsd/acl/lib/libc/locale/isprint.3#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/locale/ispunct.3#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/locale/isrune.3#1 branch .. //depot/projects/trustedbsd/acl/lib/libc/locale/isspace.3#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/locale/isspecial.3#1 branch .. //depot/projects/trustedbsd/acl/lib/libc/locale/isupper.3#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/locale/iswalnum.3#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/locale/iswctype.c#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/locale/isxdigit.3#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/locale/ldpart.c#3 integrate .. //depot/projects/trustedbsd/acl/lib/libc/locale/localeconv.3#1 branch .. //depot/projects/trustedbsd/acl/lib/libc/locale/mblen.3#1 branch .. //depot/projects/trustedbsd/acl/lib/libc/locale/mblen.c#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/locale/mblocal.h#1 branch .. //depot/projects/trustedbsd/acl/lib/libc/locale/mbrlen.3#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/locale/mbrlen.c#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/locale/mbrtowc.3#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/locale/mbrtowc.c#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/locale/mbrune.3#4 delete .. //depot/projects/trustedbsd/acl/lib/libc/locale/mbrune.c#3 delete .. //depot/projects/trustedbsd/acl/lib/libc/locale/mbsinit.3#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/locale/mbsinit.c#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/locale/mbsnrtowcs.c#1 branch .. //depot/projects/trustedbsd/acl/lib/libc/locale/mbsrtowcs.3#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/locale/mbsrtowcs.c#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/locale/mbstowcs.3#1 branch .. //depot/projects/trustedbsd/acl/lib/libc/locale/mbstowcs.c#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/locale/mbtowc.3#1 branch .. //depot/projects/trustedbsd/acl/lib/libc/locale/mbtowc.c#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/locale/mskanji.5#1 branch .. //depot/projects/trustedbsd/acl/lib/libc/locale/mskanji.c#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/locale/multibyte.3#3 integrate .. //depot/projects/trustedbsd/acl/lib/libc/locale/nextwctype.3#1 branch .. //depot/projects/trustedbsd/acl/lib/libc/locale/nextwctype.c#1 branch .. //depot/projects/trustedbsd/acl/lib/libc/locale/nl_langinfo.3#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/locale/none.c#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/locale/rpmatch.3#1 branch .. //depot/projects/trustedbsd/acl/lib/libc/locale/rpmatch.c#1 branch .. //depot/projects/trustedbsd/acl/lib/libc/locale/rune.3#3 delete .. //depot/projects/trustedbsd/acl/lib/libc/locale/rune.c#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/locale/runefile.h#1 branch .. //depot/projects/trustedbsd/acl/lib/libc/locale/runetype.c#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/locale/setinvalidrune.c#3 delete .. //depot/projects/trustedbsd/acl/lib/libc/locale/setlocale.3#4 integrate .. //depot/projects/trustedbsd/acl/lib/libc/locale/setlocale.c#3 integrate .. //depot/projects/trustedbsd/acl/lib/libc/locale/setrunelocale.c#3 integrate .. //depot/projects/trustedbsd/acl/lib/libc/locale/table.c#3 integrate .. //depot/projects/trustedbsd/acl/lib/libc/locale/toascii.3#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/locale/tolower.3#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/locale/tolower.c#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/locale/toupper.3#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/locale/toupper.c#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/locale/towlower.3#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/locale/towupper.3#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/locale/utf2.4#2 delete .. //depot/projects/trustedbsd/acl/lib/libc/locale/utf2.c#3 delete .. //depot/projects/trustedbsd/acl/lib/libc/locale/utf8.5#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/locale/utf8.c#3 integrate .. //depot/projects/trustedbsd/acl/lib/libc/locale/wcrtomb.3#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/locale/wcrtomb.c#3 integrate .. //depot/projects/trustedbsd/acl/lib/libc/locale/wcsftime.c#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/locale/wcsnrtombs.c#1 branch .. //depot/projects/trustedbsd/acl/lib/libc/locale/wcsrtombs.3#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/locale/wcsrtombs.c#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/locale/wcstod.c#3 integrate .. //depot/projects/trustedbsd/acl/lib/libc/locale/wcstof.c#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/locale/wcstoimax.c#3 integrate .. //depot/projects/trustedbsd/acl/lib/libc/locale/wcstol.c#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/locale/wcstold.c#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/locale/wcstoll.c#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/locale/wcstombs.3#1 branch .. //depot/projects/trustedbsd/acl/lib/libc/locale/wcstombs.c#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/locale/wcstoul.c#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/locale/wcstoull.c#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/locale/wcstoumax.c#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/locale/wctob.c#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/locale/wctomb.3#1 branch .. //depot/projects/trustedbsd/acl/lib/libc/locale/wctomb.c#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/locale/wctrans.c#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/locale/wctype.3#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/locale/wctype.c#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/locale/wcwidth.3#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/locale/wcwidth.c#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/nameser/Makefile.inc#1 branch .. //depot/projects/trustedbsd/acl/lib/libc/nameser/Symbol.map#1 branch .. //depot/projects/trustedbsd/acl/lib/libc/nameser/ns_name.c#1 branch .. //depot/projects/trustedbsd/acl/lib/libc/nameser/ns_netint.c#1 branch .. //depot/projects/trustedbsd/acl/lib/libc/nameser/ns_parse.c#1 branch .. //depot/projects/trustedbsd/acl/lib/libc/nameser/ns_print.c#1 branch .. //depot/projects/trustedbsd/acl/lib/libc/nameser/ns_samedomain.c#1 branch .. //depot/projects/trustedbsd/acl/lib/libc/nameser/ns_ttl.c#1 branch .. //depot/projects/trustedbsd/acl/lib/libc/net/Makefile.inc#4 integrate .. //depot/projects/trustedbsd/acl/lib/libc/net/Symbol.map#1 branch .. //depot/projects/trustedbsd/acl/lib/libc/net/addr2ascii.3#3 integrate .. //depot/projects/trustedbsd/acl/lib/libc/net/byteorder.3#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/net/ethers.3#3 integrate .. //depot/projects/trustedbsd/acl/lib/libc/net/eui64.3#1 branch .. //depot/projects/trustedbsd/acl/lib/libc/net/eui64.c#1 branch .. //depot/projects/trustedbsd/acl/lib/libc/net/gai_strerror.3#1 branch .. //depot/projects/trustedbsd/acl/lib/libc/net/gai_strerror.c#1 branch .. //depot/projects/trustedbsd/acl/lib/libc/net/getaddrinfo.3#3 integrate .. //depot/projects/trustedbsd/acl/lib/libc/net/getaddrinfo.c#4 integrate .. //depot/projects/trustedbsd/acl/lib/libc/net/gethostbydns.c#3 integrate .. //depot/projects/trustedbsd/acl/lib/libc/net/gethostbyht.c#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/net/gethostbyname.3#5 integrate .. //depot/projects/trustedbsd/acl/lib/libc/net/gethostbynis.c#3 integrate .. //depot/projects/trustedbsd/acl/lib/libc/net/gethostnamadr.c#3 integrate .. //depot/projects/trustedbsd/acl/lib/libc/net/getifaddrs.3#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/net/getifmaddrs.3#1 branch .. //depot/projects/trustedbsd/acl/lib/libc/net/getifmaddrs.c#1 branch .. //depot/projects/trustedbsd/acl/lib/libc/net/getipnodebyname.3#3 integrate .. //depot/projects/trustedbsd/acl/lib/libc/net/getnameinfo.3#3 integrate .. //depot/projects/trustedbsd/acl/lib/libc/net/getnameinfo.c#3 integrate .. //depot/projects/trustedbsd/acl/lib/libc/net/getnetbydns.c#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/net/getnetbyht.c#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/net/getnetbynis.c#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/net/getnetent.3#3 integrate .. //depot/projects/trustedbsd/acl/lib/libc/net/getnetnamadr.c#3 integrate .. //depot/projects/trustedbsd/acl/lib/libc/net/getproto.c#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/net/getprotoent.3#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/net/getprotoent.c#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/net/getprotoname.c#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/net/getservbyname.c#2 delete .. //depot/projects/trustedbsd/acl/lib/libc/net/getservbyport.c#2 delete .. //depot/projects/trustedbsd/acl/lib/libc/net/getservent.3#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/net/getservent.c#3 integrate .. //depot/projects/trustedbsd/acl/lib/libc/net/herror.c#2 delete .. //depot/projects/trustedbsd/acl/lib/libc/net/hesiod.3#3 integrate .. //depot/projects/trustedbsd/acl/lib/libc/net/if_indextoname.3#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/net/inet.3#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/net/inet6_opt_init.3#1 branch .. //depot/projects/trustedbsd/acl/lib/libc/net/inet6_option_space.3#3 integrate .. //depot/projects/trustedbsd/acl/lib/libc/net/inet6_rth_space.3#1 branch .. //depot/projects/trustedbsd/acl/lib/libc/net/inet6_rthdr_space.3#3 integrate .. //depot/projects/trustedbsd/acl/lib/libc/net/inet_addr.c#2 delete .. //depot/projects/trustedbsd/acl/lib/libc/net/inet_lnaof.c#2 delete .. //depot/projects/trustedbsd/acl/lib/libc/net/inet_makeaddr.c#2 delete .. //depot/projects/trustedbsd/acl/lib/libc/net/inet_net.3#3 integrate .. //depot/projects/trustedbsd/acl/lib/libc/net/inet_net_ntop.c#2 delete .. //depot/projects/trustedbsd/acl/lib/libc/net/inet_net_pton.c#2 delete .. //depot/projects/trustedbsd/acl/lib/libc/net/inet_neta.c#3 delete .. //depot/projects/trustedbsd/acl/lib/libc/net/inet_netof.c#2 delete .. //depot/projects/trustedbsd/acl/lib/libc/net/inet_network.c#2 delete .. //depot/projects/trustedbsd/acl/lib/libc/net/inet_ntoa.c#2 delete .. //depot/projects/trustedbsd/acl/lib/libc/net/inet_ntop.c#2 delete .. //depot/projects/trustedbsd/acl/lib/libc/net/inet_pton.c#2 delete .. //depot/projects/trustedbsd/acl/lib/libc/net/ip6opt.c#3 integrate .. //depot/projects/trustedbsd/acl/lib/libc/net/linkaddr.3#3 integrate .. //depot/projects/trustedbsd/acl/lib/libc/net/linkaddr.c#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/net/map_v4v6.c#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/net/name6.c#4 integrate .. //depot/projects/trustedbsd/acl/lib/libc/net/netdb_private.h#1 branch .. //depot/projects/trustedbsd/acl/lib/libc/net/ns_name.c#3 delete .. //depot/projects/trustedbsd/acl/lib/libc/net/ns_netint.c#2 delete .. //depot/projects/trustedbsd/acl/lib/libc/net/ns_parse.c#2 delete .. //depot/projects/trustedbsd/acl/lib/libc/net/ns_print.c#2 delete .. //depot/projects/trustedbsd/acl/lib/libc/net/ns_ttl.c#3 delete .. //depot/projects/trustedbsd/acl/lib/libc/net/nsap_addr.c#2 delete .. //depot/projects/trustedbsd/acl/lib/libc/net/nscache.c#1 branch .. //depot/projects/trustedbsd/acl/lib/libc/net/nscachedcli.c#1 branch .. //depot/projects/trustedbsd/acl/lib/libc/net/nsdispatch.3#5 integrate .. //depot/projects/trustedbsd/acl/lib/libc/net/nsdispatch.c#4 integrate .. //depot/projects/trustedbsd/acl/lib/libc/net/nsparser.y#3 integrate .. //depot/projects/trustedbsd/acl/lib/libc/net/nss_compat.c#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/net/ntoh.c#1 branch .. //depot/projects/trustedbsd/acl/lib/libc/net/rcmd.3#3 integrate .. //depot/projects/trustedbsd/acl/lib/libc/net/rcmd.c#3 integrate .. //depot/projects/trustedbsd/acl/lib/libc/net/rcmdsh.3#3 integrate .. //depot/projects/trustedbsd/acl/lib/libc/net/recv.c#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/net/res_comp.c#2 delete .. //depot/projects/trustedbsd/acl/lib/libc/net/res_config.h#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/net/res_data.c#2 delete .. //depot/projects/trustedbsd/acl/lib/libc/net/res_debug.c#3 delete .. //depot/projects/trustedbsd/acl/lib/libc/net/res_init.c#2 delete .. //depot/projects/trustedbsd/acl/lib/libc/net/res_mkquery.c#2 delete .. //depot/projects/trustedbsd/acl/lib/libc/net/res_mkupdate.c#3 delete .. //depot/projects/trustedbsd/acl/lib/libc/net/res_query.c#3 delete .. //depot/projects/trustedbsd/acl/lib/libc/net/res_send.c#2 delete .. //depot/projects/trustedbsd/acl/lib/libc/net/res_update.c#2 delete .. //depot/projects/trustedbsd/acl/lib/libc/net/resolver.3#3 integrate .. //depot/projects/trustedbsd/acl/lib/libc/net/rthdr.c#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/net/sctp_sys_calls.c#1 branch .. //depot/projects/trustedbsd/acl/lib/libc/net/send.c#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/nls/C.msg#1 branch .. //depot/projects/trustedbsd/acl/lib/libc/nls/Makefile.inc#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/nls/Symbol.map#1 branch .. //depot/projects/trustedbsd/acl/lib/libc/nls/catclose.3#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/nls/catgets.3#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/nls/catopen.3#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/nls/ko_KR.UTF-8.msg#1 branch .. //depot/projects/trustedbsd/acl/lib/libc/nls/ko_KR.eucKR.msg#1 branch .. //depot/projects/trustedbsd/acl/lib/libc/nls/msgcat.c#3 integrate .. //depot/projects/trustedbsd/acl/lib/libc/nls/msgcat.h#2 delete .. //depot/projects/trustedbsd/acl/lib/libc/nls/pl_PL.ISO8859-2.msg#1 branch .. //depot/projects/trustedbsd/acl/lib/libc/nls/ru_RU.KOI8-R.msg#1 branch .. //depot/projects/trustedbsd/acl/lib/libc/posix1e/Makefile.inc#4 integrate .. //depot/projects/trustedbsd/acl/lib/libc/posix1e/Symbol.map#1 branch .. //depot/projects/trustedbsd/acl/lib/libc/posix1e/acl_delete.3#7 integrate .. //depot/projects/trustedbsd/acl/lib/libc/posix1e/acl_delete_entry.3#3 integrate .. //depot/projects/trustedbsd/acl/lib/libc/posix1e/acl_delete_entry.c#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/posix1e/acl_delete_perm.3#3 integrate .. //depot/projects/trustedbsd/acl/lib/libc/posix1e/acl_dup.3#4 integrate .. //depot/projects/trustedbsd/acl/lib/libc/posix1e/acl_free.3#4 integrate .. //depot/projects/trustedbsd/acl/lib/libc/posix1e/acl_from_text.3#5 integrate .. //depot/projects/trustedbsd/acl/lib/libc/posix1e/acl_get.3#7 integrate .. //depot/projects/trustedbsd/acl/lib/libc/posix1e/acl_get_entry.3#3 integrate .. //depot/projects/trustedbsd/acl/lib/libc/posix1e/acl_get_qualifier.3#3 integrate .. //depot/projects/trustedbsd/acl/lib/libc/posix1e/acl_init.3#4 integrate .. //depot/projects/trustedbsd/acl/lib/libc/posix1e/acl_set.3#6 integrate .. //depot/projects/trustedbsd/acl/lib/libc/posix1e/acl_set_qualifier.3#3 integrate .. //depot/projects/trustedbsd/acl/lib/libc/posix1e/acl_set_tag_type.3#3 integrate .. //depot/projects/trustedbsd/acl/lib/libc/posix1e/acl_support.c#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/posix1e/acl_to_text.3#5 integrate .. //depot/projects/trustedbsd/acl/lib/libc/posix1e/acl_valid.3#5 integrate .. //depot/projects/trustedbsd/acl/lib/libc/posix1e/extattr.c#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/posix1e/mac.3#4 integrate .. //depot/projects/trustedbsd/acl/lib/libc/posix1e/mac.c#3 integrate .. //depot/projects/trustedbsd/acl/lib/libc/posix1e/mac.conf.5#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/posix1e/mac_free.3#3 integrate .. //depot/projects/trustedbsd/acl/lib/libc/posix1e/mac_get.3#3 integrate .. //depot/projects/trustedbsd/acl/lib/libc/posix1e/mac_get.c#3 integrate .. //depot/projects/trustedbsd/acl/lib/libc/posix1e/mac_is_present.3#1 branch .. //depot/projects/trustedbsd/acl/lib/libc/posix1e/mac_is_present_np.3#3 delete .. //depot/projects/trustedbsd/acl/lib/libc/posix1e/mac_prepare.3#3 integrate .. //depot/projects/trustedbsd/acl/lib/libc/posix1e/mac_set.3#4 integrate .. //depot/projects/trustedbsd/acl/lib/libc/posix1e/mac_text.3#3 integrate .. //depot/projects/trustedbsd/acl/lib/libc/posix1e/posix1e.3#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/powerpc/Makefile.inc#1 branch .. //depot/projects/trustedbsd/acl/lib/libc/powerpc/Symbol.map#1 branch .. //depot/projects/trustedbsd/acl/lib/libc/powerpc/_fpmath.h#3 integrate .. //depot/projects/trustedbsd/acl/lib/libc/powerpc/gd_qnan.h#1 branch .. //depot/projects/trustedbsd/acl/lib/libc/powerpc/gen/Makefile.inc#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/powerpc/gen/_ctx_start.S#1 branch .. //depot/projects/trustedbsd/acl/lib/libc/powerpc/gen/_set_tp.c#1 branch .. //depot/projects/trustedbsd/acl/lib/libc/powerpc/gen/fabs.S#1 branch .. //depot/projects/trustedbsd/acl/lib/libc/powerpc/gen/flt_rounds.c#1 branch .. //depot/projects/trustedbsd/acl/lib/libc/powerpc/gen/fpgetmask.c#1 branch .. //depot/projects/trustedbsd/acl/lib/libc/powerpc/gen/fpgetround.c#1 branch .. //depot/projects/trustedbsd/acl/lib/libc/powerpc/gen/fpgetsticky.c#1 branch .. //depot/projects/trustedbsd/acl/lib/libc/powerpc/gen/fpsetmask.c#1 branch .. //depot/projects/trustedbsd/acl/lib/libc/powerpc/gen/fpsetround.c#1 branch .. //depot/projects/trustedbsd/acl/lib/libc/powerpc/gen/frexp.c#2 delete .. //depot/projects/trustedbsd/acl/lib/libc/powerpc/gen/isinf.c#3 delete .. //depot/projects/trustedbsd/acl/lib/libc/powerpc/gen/ldexp.c#2 delete .. //depot/projects/trustedbsd/acl/lib/libc/powerpc/gen/makecontext.c#1 branch .. //depot/projects/trustedbsd/acl/lib/libc/powerpc/gen/signalcontext.c#1 branch .. //depot/projects/trustedbsd/acl/lib/libc/powerpc/gen/syncicache.c#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/powerpc/net/Makefile.inc#2 delete .. //depot/projects/trustedbsd/acl/lib/libc/powerpc/net/htonl.S#2 delete .. //depot/projects/trustedbsd/acl/lib/libc/powerpc/net/htons.S#2 delete .. //depot/projects/trustedbsd/acl/lib/libc/powerpc/net/ntohl.S#2 delete .. //depot/projects/trustedbsd/acl/lib/libc/powerpc/net/ntohs.S#2 delete .. //depot/projects/trustedbsd/acl/lib/libc/powerpc/stdlib/gdtoa.mk#2 delete .. //depot/projects/trustedbsd/acl/lib/libc/powerpc/sys/Makefile.inc#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/quad/Makefile.inc#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/quad/Symbol.map#1 branch .. //depot/projects/trustedbsd/acl/lib/libc/quad/TESTS/divrem.c#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/quad/TESTS/mul.c#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/quad/adddi3.c#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/quad/anddi3.c#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/quad/ashldi3.c#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/quad/ashrdi3.c#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/quad/cmpdi2.c#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/quad/divdi3.c#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/quad/fixdfdi.c#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/quad/fixsfdi.c#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/quad/fixunsdfdi.c#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/quad/fixunssfdi.c#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/quad/floatdidf.c#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/quad/floatdisf.c#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/quad/floatunsdidf.c#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/quad/iordi3.c#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/quad/lshldi3.c#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/quad/lshrdi3.c#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/quad/moddi3.c#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/quad/muldi3.c#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/quad/negdi2.c#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/quad/notdi2.c#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/quad/qdivrem.c#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/quad/quad.h#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/quad/subdi3.c#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/quad/ucmpdi2.c#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/quad/udivdi3.c#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/quad/umoddi3.c#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/quad/xordi3.c#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/regex/Makefile.inc#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/regex/Symbol.map#1 branch .. //depot/projects/trustedbsd/acl/lib/libc/regex/cclass.h#2 delete .. //depot/projects/trustedbsd/acl/lib/libc/regex/cname.h#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/regex/engine.c#3 integrate .. //depot/projects/trustedbsd/acl/lib/libc/regex/grot/Makefile#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/regex/grot/debug.c#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/regex/grot/limits.h#2 delete .. //depot/projects/trustedbsd/acl/lib/libc/regex/grot/stdlib.h#2 delete .. //depot/projects/trustedbsd/acl/lib/libc/regex/re_format.7#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/regex/regcomp.c#3 integrate .. //depot/projects/trustedbsd/acl/lib/libc/regex/regerror.c#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/regex/regex.3#3 integrate .. //depot/projects/trustedbsd/acl/lib/libc/regex/regex2.h#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/regex/regexec.c#3 integrate .. //depot/projects/trustedbsd/acl/lib/libc/regex/regfree.c#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/regex/utils.h#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/resolv/Makefile.inc#1 branch .. //depot/projects/trustedbsd/acl/lib/libc/resolv/Symbol.map#1 branch .. //depot/projects/trustedbsd/acl/lib/libc/resolv/h_errno.c#1 branch .. //depot/projects/trustedbsd/acl/lib/libc/resolv/herror.c#1 branch .. //depot/projects/trustedbsd/acl/lib/libc/resolv/mtctxres.c#1 branch .. //depot/projects/trustedbsd/acl/lib/libc/resolv/res_comp.c#1 branch .. //depot/projects/trustedbsd/acl/lib/libc/resolv/res_data.c#1 branch .. //depot/projects/trustedbsd/acl/lib/libc/resolv/res_debug.c#1 branch .. //depot/projects/trustedbsd/acl/lib/libc/resolv/res_debug.h#1 branch .. //depot/projects/trustedbsd/acl/lib/libc/resolv/res_findzonecut.c#1 branch .. //depot/projects/trustedbsd/acl/lib/libc/resolv/res_init.c#1 branch >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Feb 26 11:59: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 E746016A406; Mon, 26 Feb 2007 11:59: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 9236016A404 for ; Mon, 26 Feb 2007 11:59:32 +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 8328713C4A7 for ; Mon, 26 Feb 2007 11:59:32 +0000 (UTC) (envelope-from bushman@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l1QBxWrC040419 for ; Mon, 26 Feb 2007 11:59:32 GMT (envelope-from bushman@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l1QBxW1c040416 for perforce@freebsd.org; Mon, 26 Feb 2007 11:59:32 GMT (envelope-from bushman@freebsd.org) Date: Mon, 26 Feb 2007 11:59:32 GMT Message-Id: <200702261159.l1QBxW1c040416@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 115056 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 26 Feb 2007 11:59:33 -0000 http://perforce.freebsd.org/chv.cgi?CH=115056 Change 115056 by bushman@bushman_nss_ldap_cached on 2007/02/26 11:59:13 Minor fixes Affected files ... .. //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_ldap/ldapconf.c#19 edit .. //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_ldap/ldapconf.h#16 edit .. //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_ldap/ldapconn.c#17 edit .. //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_ldap/ldapconn.h#14 edit .. //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_ldap/nss_ldap.c#22 edit .. //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_ldap/nss_ldap.h#16 edit .. //depot/projects/soc2006/nss_ldap_cached_openldap/nss_ldap_port/port/Makefile#2 edit .. //depot/projects/soc2006/nss_ldap_cached_openldap/nss_ldap_port/src/Makefile#5 edit .. //depot/projects/soc2006/nss_ldap_cached_openldap/update_branches.sh#2 edit Differences ... ==== //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_ldap/ldapconf.c#19 (text+ko) ==== @@ -726,7 +726,6 @@ conf->port = LDAP_PORT; conf->proto_version = NSS_LDAP_PROTO_VERSION_3; conf->ssl_mode = NSS_LDAP_SSL_OFF; - conf->search_limit = 0; conf->bind_timelimit = 30; conf->idle_timelimit = 0; conf->search_timelimit = 0; ==== //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_ldap/ldapconf.h#16 (text+ko) ==== @@ -85,7 +85,6 @@ char *bind_dn; char *bind_pw; char *logdir; - size_t search_limit; time_t bind_timelimit; time_t idle_timelimit; time_t search_timelimit; ==== //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_ldap/ldapconn.c#17 (text+ko) ==== ==== //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_ldap/ldapconn.h#14 (text+ko) ==== ==== //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_ldap/nss_ldap.c#22 (text+ko) ==== ==== //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_ldap/nss_ldap.h#16 (text+ko) ==== ==== //depot/projects/soc2006/nss_ldap_cached_openldap/nss_ldap_port/port/Makefile#2 (text+ko) ==== @@ -1,7 +1,7 @@ # nss_ldap port stub PORTNAME= nss_ldap_bsd -PORTVERSION= 0.22 +PORTVERSION= 0.24 CATEGORIES= net MASTER_SITES= http://rsu.ru/~bushman/nss_ldap/ \ ${MASTER_SITE_LOCAL} ==== //depot/projects/soc2006/nss_ldap_cached_openldap/nss_ldap_port/src/Makefile#5 (text+ko) ==== @@ -13,12 +13,9 @@ CFLAGS+= -DLDAP_DEPRECATED LDADD+= -lldap -.if ${MK_INET6_SUPPORT} != "no" CFLAGS+=-DINET6 -I${PREFIX}/include\ -DNSS_LDAP_CONF_PATH=\"${PREFIX}/etc/nss_ldap.conf\" LDFLAGS+= -L${PREFIX}/lib -.endif - CFLAGS+= -DNSS_LDAP_START_TLS_ENABLED -DNSS_LDAP_SSL_ENABLED USE_OPENSSL= yes ==== //depot/projects/soc2006/nss_ldap_cached_openldap/update_branches.sh#2 (text+ko) ==== @@ -82,6 +82,6 @@ done if [ $resolve_error -eq 1 ]; then - echo " + echo "Resolve errors occured" exit 1 fi From owner-p4-projects@FreeBSD.ORG Mon Feb 26 12:10: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 D6DC416A403; Mon, 26 Feb 2007 12:10:47 +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 94FE016A400 for ; Mon, 26 Feb 2007 12:10:47 +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 8416113C441 for ; Mon, 26 Feb 2007 12:10:47 +0000 (UTC) (envelope-from bushman@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l1QCAl7V043387 for ; Mon, 26 Feb 2007 12:10:47 GMT (envelope-from bushman@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l1QCAkH8043384 for perforce@freebsd.org; Mon, 26 Feb 2007 12:10:46 GMT (envelope-from bushman@freebsd.org) Date: Mon, 26 Feb 2007 12:10:46 GMT Message-Id: <200702261210.l1QCAkH8043384@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 115057 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 26 Feb 2007 12:10:48 -0000 http://perforce.freebsd.org/chv.cgi?CH=115057 Change 115057 by bushman@bushman_nss_ldap_cached on 2007/02/26 12:10:36 IFC Affected files ... .. //depot/projects/soc2006/nss_ldap_cached/src/etc/defaults/rc.conf#13 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/etc/devd.conf#3 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/etc/network.subr#6 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/etc/periodic/security/800.loginfail#3 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/etc/periodic/weekly/310.locate#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/etc/rc.d/dhclient#6 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/etc/rc.d/hostname#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/etc/rc.d/netif#4 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/include/Makefile#8 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/getcap.3#3 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/tls.c#5 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/net/Makefile.inc#9 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/net/sctp_bindx.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/net/sctp_connectx.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/net/sctp_freepaddrs.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/net/sctp_getaddrlen.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/net/sctp_getassocid.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/net/sctp_getpaddrs.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/net/sctp_opt_info.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/net/sctp_recvmsg.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/net/sctp_send.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/net/sctp_sendmsg.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/net/sctp_sys_calls.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/stdlib/malloc.c#9 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/sys/Makefile.inc#3 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/sys/kse.2#4 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/sys/ntp_adjtime.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/sys/sctp_generic_recvmsg.2#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/sys/sctp_generic_sendmsg.2#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/sys/sctp_peeloff.2#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/usr.bin/gzip/Makefile#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.bin/gzip/zgrep#2 delete .. //depot/projects/soc2006/nss_ldap_cached/src/usr.bin/gzip/zgrep.1#2 delete .. //depot/projects/soc2006/nss_ldap_cached/src/usr.bin/ktrace/ktrace.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.bin/netstat/inet6.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.bin/netstat/mcast.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.bin/netstat/mroute.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.bin/netstat/mroute6.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.bin/netstat/route.c#3 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.bin/quota/quota.1#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.bin/quota/quota.c#4 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.bin/setchannel/setchannel.1#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.bin/setchannel/setchannel.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.bin/tar/tree.c#3 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.bin/tar/write.c#3 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.bin/tip/tip/value.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/bluetooth/sdpd/server.c#3 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/pkg_install/info/show.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/pstat/pstat.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/rpc.ypupdated/update.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/setfmac/setfmac.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/sysinstall/cdrom.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/sysinstall/install.cfg#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/sysinstall/sysinstall.8#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/sysinstall/system.c#2 integrate Differences ... ==== //depot/projects/soc2006/nss_ldap_cached/src/etc/defaults/rc.conf#13 (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.303 2007/01/20 04:24:19 mpp Exp $ +# $FreeBSD: src/etc/defaults/rc.conf,v 1.304 2007/02/09 12:11:27 flz Exp $ ############################################################## ### Important initial Boot-time options #################### @@ -178,11 +178,15 @@ sppp_interfaces="" # List of sppp interfaces. #sppp_interfaces="isp0" # example: sppp over ISDN #spppconfig_isp0="authproto=chap myauthname=foo myauthsecret='top secret' hisauthname=some-gw hisauthsecret='another secret'" -gif_interfaces="NO" # List of GIF tunnels (or "NO"). +gif_interfaces="" # List of GIF tunnels. #gif_interfaces="gif0 gif1" # Examples typically for a router. # Choose correct tunnel addrs. #gifconfig_gif0="10.1.1.1 10.1.2.1" # Examples typically for a router. #gifconfig_gif1="10.1.1.2 10.1.2.2" # Examples typically for a router. +fec_interfaces="" # List of Fast EtherChannels. +#fec_interfaces="fec0 fec1" +#fecconfig_fec0="fxp0 dc0" # Examples typically for two NICs +#fecconfig_fec1="em0 em1 bge0 bge1" # Examples typically for four NICs # User ppp configuration. ppp_enable="NO" # Start user-ppp (or NO). ==== //depot/projects/soc2006/nss_ldap_cached/src/etc/devd.conf#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/devd.conf,v 1.33 2006/06/01 00:41:07 thompsa Exp $ +# $FreeBSD: src/etc/devd.conf,v 1.35 2007/02/15 16:38:10 imp Exp $ # # Refer to devd.conf(5) and devd(8) man pages for the details on how to # run and configure devd. @@ -155,11 +155,42 @@ # Don't even try to second guess what to do about drivers that don't # match here. Instead, pass it off to syslog. Commented out for the -# moment, as pnpinfo isn't set in devd yet. +# moment, as the pnpinfo variable isn't set in devd yet. Individual +# variables within the bus supplied pnpinfo are set. nomatch 0 { # action "logger Unknown device: $pnpinfo $location $bus"; }; +# Various logging of unknown devices. +nomatch 10 { + match "bus" "uhub[0-9]+"; + action "logger Unknown USB device: vendor $vendor product $product \ + bus $bus"; +}; + +# Some PC-CARDs don't offer numerical manufacturer/product IDs, just +# show the CIS info there. +nomatch 20 { + match "bus" "pccard[0-9]+"; + match "manufacturer" "0xffffffff"; + match "product" "0xffffffff"; + action "logger Unknown PCCARD device: CISproduct $cisproduct \ + CIS-vendor $cisvendor bus $bus"; +}; + +nomatch 10 { + match "bus" "pccard[0-9]+"; + action "logger Unknown PCCARD device: manufacturer $manufacturer \ + product $product CISproduct $cisproduct CIS-vendor \ + $cisvendor bus $bus"; +}; + +nomatch 10 { + match "bus" "cardbus[0-9]+"; + action "logger Unknown Cardbus device: device $device class $class \ + vendor $vendor bus $bus"; +}; + # Switch power profiles when the AC line state changes. notify 10 { match "system" "ACPI"; ==== //depot/projects/soc2006/nss_ldap_cached/src/etc/network.subr#6 (text+ko) ==== @@ -22,7 +22,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/etc/network.subr,v 1.176 2006/10/29 13:29:49 mlaier Exp $ +# $FreeBSD: src/etc/network.subr,v 1.177 2007/02/09 12:11:26 flz Exp $ # # @@ -455,26 +455,89 @@ debug "Destroyed clones: ${_list}" } +# Create netgraph nodes. +# +ng_mkpeer() { + ngctl -f - 2> /dev/null </dev/null 2>&1 + ifconfig $i tunnel ${peers} + ifconfig $i up + ;; + esac + done +} + +# ng_fec_create ifn +# Configure Fast EtherChannel for interface $ifn. Returns 0 if FEC +# arguments were found and configured; returns !0 otherwise. +ng_fec_create() { + local req_iface iface bogus + req_iface="$1" + + ngctl shutdown ${req_iface}: > /dev/null 2>&1 + + bogus="" + while true; do + iface=`ng_create_one fec dummy fec` + if [ -z "${iface}" ]; then + exit 2 + fi + if [ "${iface}" = "${req_iface}" ]; then + break + fi + bogus="${bogus} ${iface}" + done + + for iface in ${bogus}; do + ngctl shutdown ${iface}: + done +} + +fec_up() { + for i in ${fec_interfaces}; do + ng_fec_create $i + for j in `get_if_var $i fecconfig_IF`; do + case ${j} in '') continue ;; *) - ifconfig $i create >/dev/null 2>&1 - ifconfig $i tunnel ${peers} - ifconfig $i up + ngctl msg ${i}: add_iface "\"${j}\"" ;; esac done - ;; - esac + done } # ==== //depot/projects/soc2006/nss_ldap_cached/src/etc/periodic/security/800.loginfail#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/etc/periodic/security/800.loginfail,v 1.7 2007/02/05 16:36:25 jdp Exp $ +# $FreeBSD: src/etc/periodic/security/800.loginfail,v 1.8 2007/02/23 21:42:54 remko Exp $ # # Show login failures @@ -59,7 +59,7 @@ [Yy][Ee][Ss]) echo "" echo "${host} login failures:" - n=$(catmsgs | egrep -ia "^$yesterday.*(fail|invalid|bad|illegal)" | + n=$(catmsgs | egrep -ia "^$yesterday.*: .* (fail|invalid|bad|illegal)" | tee /dev/stderr | wc -l) [ $n -gt 0 ] && rc=1 || rc=0;; *) rc=0;; ==== //depot/projects/soc2006/nss_ldap_cached/src/etc/periodic/weekly/310.locate#2 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh - # -# $FreeBSD: src/etc/periodic/weekly/310.locate,v 1.6 2000/09/14 17:19:13 brian Exp $ +# $FreeBSD: src/etc/periodic/weekly/310.locate,v 1.7 2007/02/23 18:44:20 remko Exp $ # # If there is a global system configuration file, suck it in. @@ -23,7 +23,7 @@ chmod 644 $locdb || rc=3 cd / - echo /usr/libexec/locate.updatedb | nice -5 su -fm nobody || rc=3 + echo /usr/libexec/locate.updatedb | nice -n 5 su -fm nobody || rc=3 chmod 444 $locdb || rc=3;; *) rc=0;; ==== //depot/projects/soc2006/nss_ldap_cached/src/etc/rc.d/dhclient#6 (text+ko) ==== @@ -1,7 +1,7 @@ #!/bin/sh # # $NetBSD: dhclient,v 1.8 2002/03/22 04:33:58 thorpej Exp $ -# $FreeBSD: src/etc/rc.d/dhclient,v 1.25 2006/10/02 18:50:58 brooks Exp $ +# $FreeBSD: src/etc/rc.d/dhclient,v 1.26 2007/02/15 06:51:31 yar Exp $ # # PROVIDE: dhclient @@ -19,9 +19,9 @@ dhclient_start() { # prevent unnecessary restarts - # XXX: should use a pidfile - if [ -x /usr/bin/pgrep ]; then - pids=`/usr/bin/pgrep -f "dhclient: $ifn(\$| .*)"` + # XXX: dhclient had better create a pidfile + if [ -x /bin/pgrep ]; then + pids=`/bin/pgrep -f "dhclient: $ifn(\$| .*)"` if [ -n "$pids" ]; then exit 0 fi ==== //depot/projects/soc2006/nss_ldap_cached/src/etc/rc.d/hostname#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/etc/rc.d/hostname,v 1.8 2004/10/07 13:55:25 mtm Exp $ +# $FreeBSD: src/etc/rc.d/hostname,v 1.11 2007/02/15 06:46:33 yar Exp $ # # PROVIDE: hostname @@ -31,6 +31,7 @@ # BEFORE: netif . /etc/rc.subr +. /etc/network.subr name="hostname" start_cmd="hostname_start" @@ -58,8 +59,21 @@ fi fi - /bin/hostname ${hostname} - echo "Setting hostname: `hostname`." + # Have we got a hostname yet? + # + if [ -z "${hostname}" ]; then + # Null hostname is probably OK if DHCP is in use. + # + if [ -z "`list_net_interfaces dhcp`" ]; then + warn "\$hostname is not set -- see ${rcvar_manpage}." + fi + return + fi + + # All right, it is safe to invoke hostname(1) now. + # + echo "Setting hostname: ${hostname}." + /bin/hostname "${hostname}" } load_rc_config $name ==== //depot/projects/soc2006/nss_ldap_cached/src/etc/rc.d/netif#4 (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/etc/rc.d/netif,v 1.21 2006/12/30 22:53:20 yar Exp $ +# $FreeBSD: src/etc/rc.d/netif,v 1.22 2007/02/09 12:11:26 flz Exp $ # # PROVIDE: netif @@ -57,6 +57,9 @@ # Create cloned interfaces clone_up + # Create Fast EtherChannel interfaces + fec_up + # Create IPv6<-->IPv4 tunnels gif_up ==== //depot/projects/soc2006/nss_ldap_cached/src/include/Makefile#8 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.2 (Berkeley) 1/4/94 -# $FreeBSD: src/include/Makefile,v 1.267 2007/01/25 22:38:04 peter Exp $ +# $FreeBSD: src/include/Makefile,v 1.268 2007/02/11 14:01:32 rodrigc Exp $ # # Doing a "make install" builds /usr/include. @@ -47,7 +47,6 @@ fs/unionfs \ geom/cache geom/concat geom/eli geom/gate geom/journal geom/label \ geom/mirror geom/nop geom/raid3 geom/shsec geom/stripe \ - isofs/cd9660 \ netatm/ipatm netatm/sigpvc netatm/spans netatm/uni \ netgraph/atm netgraph/netflow \ security/audit \ @@ -163,6 +162,9 @@ cd ${.CURDIR}/../sys/contrib/altq/altq; \ ${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 *.h \ ${DESTDIR}${INCLUDEDIR}/altq + cd ${.CURDIR}/../sys/fs/cd9660/; \ + ${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 *.h \ + ${DESTDIR}${INCLUDEDIR}/isofs/cd9660 .if ${MK_IPFILTER} != "no" cd ${.CURDIR}/../sys/contrib/ipfilter/netinet; \ ${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 *.h \ @@ -287,3 +289,8 @@ done .endif .endif + cd ${.CURDIR}/../sys/fs/cd9660; \ + for h in *.h; do \ + ln -fs ../../../../sys/fs/cd9660/$$h \ + ${DESTDIR}${INCLUDEDIR}/isofs/cd9660; \ + done ==== //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/getcap.3#3 (text+ko) ==== @@ -29,7 +29,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)getcap.3 8.4 (Berkeley) 5/13/94 -.\" $FreeBSD: src/lib/libc/gen/getcap.3,v 1.29 2007/01/09 00:27:53 imp Exp $ +.\" $FreeBSD: src/lib/libc/gen/getcap.3,v 1.30 2007/02/11 18:14:49 maxim Exp $ .\" .Dd March 22, 2002 .Dt GETCAP 3 @@ -527,7 +527,7 @@ The .Fn cgetent , and -.Fn cgetseq +.Fn cgetset functions may fail and set .Va errno for any of the errors specified for the library functions: ==== //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/tls.c#5 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libc/gen/tls.c,v 1.13 2006/10/08 02:50:33 kmacy Exp $ + * $FreeBSD: src/lib/libc/gen/tls.c,v 1.14 2007/02/25 21:23:50 kientzle Exp $ */ /* @@ -36,7 +36,6 @@ #include #include #include -#include #include "libc_private.h" @@ -207,7 +206,8 @@ size = round(tls_static_space, tcbalign); - assert(tcbsize >= 2*sizeof(Elf_Addr)); + if (tcbsize < 2 * sizeof(Elf_Addr)) + tcbsize = 2 * sizeof(Elf_Addr); tls = calloc(1, size + tcbsize); dtv = malloc(3 * sizeof(Elf_Addr)); ==== //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/net/Makefile.inc#9 (text+ko) ==== @@ -1,5 +1,5 @@ # from @(#)Makefile.inc 8.2 (Berkeley) 9/5/93 -# $FreeBSD: src/lib/libc/net/Makefile.inc,v 1.63 2006/12/15 12:01:50 rrs Exp $ +# $FreeBSD: src/lib/libc/net/Makefile.inc,v 1.64 2007/02/22 14:32:38 rrs Exp $ # machine-independent net sources .PATH: ${.CURDIR}/net @@ -49,7 +49,10 @@ inet.3 inet_net.3 \ inet6_opt_init.3 inet6_option_space.3 inet6_rth_space.3 \ inet6_rthdr_space.3 linkaddr.3 \ - nsdispatch.3 rcmd.3 rcmdsh.3 resolver.3 sockatmark.3 + nsdispatch.3 rcmd.3 rcmdsh.3 resolver.3 sockatmark.3 \ + sctp_bindx.3 sctp_connectx.3 sctp_freepaddrs.3 \ + sctp_getaddrlen.3 sctp_getassocid.3 sctp_getpaddrs.3 \ + sctp_opt_info.3 sctp_recvmsg.3 sctp_send.3 sctp_sendmsg.3 \ MLINKS+=addr2ascii.3 ascii2addr.3 MLINKS+=byteorder.3 htonl.3 byteorder.3 htons.3 byteorder.3 ntohl.3 \ @@ -79,6 +82,10 @@ inet.3 inet_network.3 inet.3 inet_ntoa.3 \ inet.3 inet_ntop.3 inet.3 inet_pton.3 \ inet.3 network.3 inet.3 ntoa.3 +MLINKS+= sctp_send.3 sctp_sendx.3 +MLINKS+= sctp_sendmsg.3 sctp_sendmsgx.3 +MLINKS+= sctp_freepaddrs.3 sctp_freeladdrs.3 +MLINKS+= sctp_getpaddrs.3 sctp_getladdrs.3 MLINKS+=inet_net.3 inet_net_ntop.3 inet_net.3 inet_net_pton.3 MLINKS+=inet6_opt_init.3 inet6_opt_append.3 \ inet6_opt_init.3 inet6_opt_find.3 \ ==== //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/net/sctp_sys_calls.c#2 (text+ko) ==== @@ -29,7 +29,7 @@ * SUCH DAMAGE. */ #include -__FBSDID("$FreeBSD: src/lib/libc/net/sctp_sys_calls.c,v 1.2 2006/12/16 06:03:43 rodrigc Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/net/sctp_sys_calls.c,v 1.5 2007/02/22 14:48:12 rrs Exp $"); #include #include #include @@ -54,14 +54,20 @@ (*(const u_int32_t *)(const void *)(&(a)->s6_addr[8]) == ntohl(0x0000ffff))) #endif + #define SCTP_CONTROL_VEC_SIZE_SND 8192 #define SCTP_CONTROL_VEC_SIZE_RCV 16384 +#define SCTP_STACK_BUF_SIZE 2048 +#define SCTP_SMALL_IOVEC_SIZE 2 #ifdef SCTP_DEBUG_PRINT_ADDRESS + +#define SCTP_STRING_BUF_SZ 256 + static void SCTPPrintAnAddress(struct sockaddr *a) { - char stringToPrint[256]; + char stringToPrint[SCTP_STRING_BUF_SZ]; u_short prt; char *srcaddr, *txt; @@ -79,8 +85,8 @@ txt = "IPv6 Address: "; } else if (a->sa_family == AF_LINK) { int i; - char tbuf[200]; - u_char adbuf[200]; + char tbuf[SCTP_STRING_BUF_SZ]; + u_char adbuf[SCTP_STRING_BUF_SZ]; struct sockaddr_dl *dl; dl = (struct sockaddr_dl *)a; @@ -101,10 +107,6 @@ printf(":"); } printf("\n"); - /* - * u_short sdl_route[16]; *//* source routing - * information - */ return; } else { return; @@ -164,7 +166,7 @@ int sctp_connectx(int sd, const struct sockaddr *addrs, int addrcnt) { - char buf[2048]; + char buf[SCTP_STACK_BUF_SIZE]; int i, ret, cnt, *aa; char *cpto; const struct sockaddr *at; @@ -298,14 +300,14 @@ asoc = id; siz = sizeof(sctp_assoc_t); if (getsockopt(sd, IPPROTO_SCTP, SCTP_GET_REMOTE_ADDR_SIZE, - &asoc, &siz) != 0) { + &asoc, &siz) != 0) { errno = ENOMEM; return (-1); } /* size required is returned in 'asoc' */ - siz = (uint32_t) asoc; + siz = (size_t)asoc; siz += sizeof(struct sctp_getaddresses); - addrs = calloc((unsigned long)1, (unsigned long)siz); + addrs = calloc(1, siz); if (addrs == NULL) { errno = ENOMEM; return (-1); @@ -314,7 +316,7 @@ addrs->sget_assoc_id = id; /* Now lets get the array of addresses */ if (getsockopt(sd, IPPROTO_SCTP, SCTP_GET_PEER_ADDRESSES, - addrs, (socklen_t *) & siz) != 0) { + addrs, &siz) != 0) { free(addrs); errno = ENOMEM; return (-1); @@ -370,7 +372,7 @@ } siz = size_of_addresses + sizeof(struct sockaddr_storage); siz += sizeof(struct sctp_getaddresses); - addrs = calloc((unsigned long)1, (unsigned long)siz); + addrs = calloc(1, siz); if (addrs == NULL) { errno = ENOMEM; return (-1); @@ -379,7 +381,7 @@ addrs->sget_assoc_id = id; /* Now lets get the array of addresses */ if (getsockopt(sd, IPPROTO_SCTP, SCTP_GET_LOCAL_ADDRESSES, addrs, - (socklen_t *) & siz) != 0) { + &siz) != 0) { free(addrs); errno = ENOMEM; return (-1); @@ -436,7 +438,7 @@ ssize_t sz; struct msghdr msg; struct sctp_sndrcvinfo *s_info; - struct iovec iov[2]; + struct iovec iov[SCTP_SMALL_IOVEC_SIZE]; char controlVector[SCTP_CONTROL_VEC_SIZE_RCV]; struct cmsghdr *cmsg; struct sockaddr *who = NULL; @@ -547,7 +549,7 @@ #else ssize_t sz; struct msghdr msg; - struct iovec iov[2]; + struct iovec iov[SCTP_SMALL_IOVEC_SIZE]; struct sctp_sndrcvinfo *s_info; char controlVector[SCTP_CONTROL_VEC_SIZE_SND]; struct cmsghdr *cmsg; @@ -595,6 +597,20 @@ int add_len, len, no_end_cx = 0; struct sockaddr *at; + +#ifdef SYS_sctp_generic_sendmsg + if (addrcnt < SCTP_SMALL_IOVEC_SIZE) { + socklen_t l; + + /* + * Quick way, we don't need to do a connectx so lets use the + * syscall directly. + */ + l = addrs->sa_len; + return (syscall(SYS_sctp_generic_sendmsg, sd, + msg, msg_len, addrs, l, sinfo, flags)); + } +#endif len = sizeof(int); at = addrs; cnt = 0; @@ -617,10 +633,6 @@ errno = EINVAL; return (-1); } - if (len > 2048) { - /* Never enough memory */ - return (E2BIG); - } buf = malloc(len); if (buf == NULL) { return (ENOMEM); @@ -693,7 +705,7 @@ { #ifdef SYS_sctp_generic_recvmsg - struct iovec iov[2]; + struct iovec iov[SCTP_SMALL_IOVEC_SIZE]; iov[0].iov_base = dbuf; iov[0].iov_len = len; @@ -704,7 +716,7 @@ ssize_t sz; int sinfo_found = 0; struct msghdr msg; - struct iovec iov[2]; + struct iovec iov[SCTP_SMALL_IOVEC_SIZE]; char controlVector[SCTP_CONTROL_VEC_SIZE_RCV]; struct cmsghdr *cmsg; @@ -826,3 +838,9 @@ } #endif + + +#undef SCTP_CONTROL_VEC_SIZE_SND +#undef SCTP_CONTROL_VEC_SIZE_RCV +#undef SCTP_STACK_BUF_SIZE +#undef SCTP_SMALL_IOVEC_SIZE ==== //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/stdlib/malloc.c#9 (text+ko) ==== @@ -185,7 +185,7 @@ #endif #include -__FBSDID("$FreeBSD: src/lib/libc/stdlib/malloc.c,v 1.139 2007/01/31 22:54:19 jasone Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/stdlib/malloc.c,v 1.140 2007/02/22 19:10:30 jasone Exp $"); #include "libc_private.h" #ifdef MALLOC_DEBUG @@ -1029,8 +1029,8 @@ malloc_mutex_unlock(&brk_mtx); base_chunk = brk_cur; base_next_addr = base_chunk; - base_past_addr = (void *)((uintptr_t)base_chunk + - incr); + base_past_addr = (void *)((uintptr_t)base_chunk + + incr); #ifdef MALLOC_STATS base_total += incr; #endif @@ -1042,8 +1042,8 @@ #endif /* - * Don't worry about chunk alignment here, since base_chunk doesn't really - * need to be aligned. + * Don't worry about chunk alignment here, since base_chunk doesn't + * really need to be aligned. */ base_chunk = pages_map(NULL, chunk_size); if (base_chunk == NULL) @@ -1067,8 +1067,12 @@ malloc_mutex_lock(&base_mtx); - /* Make sure there's enough space for the allocation. */ - if ((uintptr_t)base_next_addr + csize > (uintptr_t)base_past_addr) { + /* + * Make sure there's enough space for the allocation. + * base_chunk_alloc() does not guarantee that a newly allocated chunk + * is >= size, so loop here, rather than only trying once. + */ + while ((uintptr_t)base_next_addr + csize > (uintptr_t)base_past_addr) { if (base_chunk_alloc(csize)) { ret = NULL; goto RETURN; @@ -1299,6 +1303,36 @@ } } + /* + * Try to over-allocate, but allow the OS to place the allocation + * anywhere. Beware of size_t wrap-around. + */ + if (size + chunk_size > size) { + if ((ret = pages_map(NULL, size + chunk_size)) != NULL) { + size_t offset = CHUNK_ADDR2OFFSET(ret); + + /* + * Success. Clean up unneeded leading/trailing space. + */ + if (offset != 0) { + /* Leading space. */ + pages_unmap(ret, chunk_size - offset); + + ret = (void *)((uintptr_t)ret + (chunk_size - + offset)); + + /* Trailing space. */ + pages_unmap((void *)((uintptr_t)ret + size), + offset); + } else { + /* Trailing space only. */ + pages_unmap((void *)((uintptr_t)ret + size), + chunk_size); + } + goto RETURN; + } + } + #ifdef USE_BRK /* * Try to create allocations in brk, in order to make full use of @@ -1342,36 +1376,6 @@ } #endif - /* - * Try to over-allocate, but allow the OS to place the allocation - * anywhere. Beware of size_t wrap-around. - */ - if (size + chunk_size > size) { - if ((ret = pages_map(NULL, size + chunk_size)) != NULL) { - size_t offset = CHUNK_ADDR2OFFSET(ret); - - /* - * Success. Clean up unneeded leading/trailing space. - */ - if (offset != 0) { - /* Leading space. */ - pages_unmap(ret, chunk_size - offset); - - ret = (void *)((uintptr_t)ret + (chunk_size - - offset)); - - /* Trailing space. */ - pages_unmap((void *)((uintptr_t)ret + size), - offset); - } else { - /* Trailing space only. */ - pages_unmap((void *)((uintptr_t)ret + size), - chunk_size); - } - goto RETURN; - } - } - /* All strategies for allocation failed. */ ret = NULL; RETURN: ==== //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/sys/Makefile.inc#3 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile.inc 8.3 (Berkeley) 10/24/94 -# $FreeBSD: src/lib/libc/sys/Makefile.inc,v 1.122 2006/10/12 13:46:33 ru Exp $ +# $FreeBSD: src/lib/libc/sys/Makefile.inc,v 1.123 2007/02/22 14:32:38 rrs Exp $ # sys sources .PATH: ${.CURDIR}/${MACHINE_ARCH}/sys ${.CURDIR}/sys @@ -84,6 +84,7 @@ sigaction.2 sigaltstack.2 sigpending.2 sigprocmask.2 sigqueue.2 \ sigreturn.2 sigstack.2 sigsuspend.2 sigwait.2 sigwaitinfo.2 \ socket.2 socketpair.2 stat.2 statfs.2 \ + sctp_generic_recvmsg.2 sctp_generic_sendmsg.2 sctp_peeloff.2 \ swapon.2 symlink.2 sync.2 sysarch.2 syscall.2 \ timer_create.2 timer_delete.2 timer_settime.2 \ truncate.2 umask.2 undelete.2 \ ==== //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/sys/kse.2#4 (text+ko) ==== @@ -33,9 +33,9 @@ .\" THE USE OF THIS SOFTWARE, EVEN IF PACKET DESIGN IS ADVISED OF .\" THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libc/sys/kse.2,v 1.19 2006/12/12 08:13:02 julian Exp $ +.\" $FreeBSD: src/lib/libc/sys/kse.2,v 1.22 2007/02/14 07:38:39 brueffer Exp $ .\" -.Dd July 12, 2004 +.Dd February 13, 2007 .Dt KSE 2 .Os .Sh NAME @@ -47,7 +47,7 @@ .In sys/types.h .In sys/kse.h .Ft int -.Fn kse_create "struct kse_mailbox *mbx" "int newgroup" +.Fn kse_create "struct kse_mailbox *mbx" "int sys-scope" .Ft int .Fn kse_exit void .Ft int @@ -103,9 +103,6 @@ .It All operations that block in the kernel become asynchronous, allowing the user process to schedule another thread when any thread blocks. -.It -Multiple thread schedulers within the same process are possible, and they -may operate independently of each other. .El .\" .Ss Definitions @@ -124,6 +121,8 @@ The KSE is said to be .Sy assigned to the thread. +KSEs (a user abstraction) are implemented on top +of kernel threads using an 'upcall' entity. .Pp The KSE becomes .Sy unassigned , @@ -160,22 +159,13 @@ KSEs always complete as much work as possible in the kernel before becoming unassigned. .Pp -A -.Sy "KSE group" -is a collection of KSEs that are scheduled uniformly and which share -access to the same pool of threads, which are associated with the KSE group. -A KSE group is the smallest entity to which a kernel scheduling -priority may be assigned. -For the purposes of process scheduling and accounting, each -KSE group -counts similarly to a traditional unthreaded process. -Individual KSEs within a KSE group are effectively indistinguishable, -and any KSE in a KSE group may be assigned by the kernel to any runnable -(in the kernel) thread associated with that KSE group. +Individual KSEs within a process are effectively indistinguishable, +and any KSE in a process may be assigned by the kernel to any runnable +(in the kernel) thread associated with that process. In practice, the kernel attempts to preserve the affinity between threads and actual CPUs to optimize cache behavior, but this is invisible to the user process. -(Affinity is not yet implemented.) +(Affinity is not yet fully implemented.) .Pp Each KSE has a unique .Sy "KSE mailbox" @@ -199,17 +189,17 @@ This pointer is saved when the thread blocks in the kernel. .Pp Whenever a thread blocked in the kernel is ready to return to user space, -it is added to the KSE group's list of +it is added to the process's list of .Sy completed threads. This list is presented to the user code at the next upcall as a linked list of thread mailboxes. .Pp -There is a kernel-imposed limit on the number of threads in a KSE group +There is a kernel-imposed limit on the number of threads in a process that may be simultaneously blocked in the kernel (this number is not currently visible to the user). When this limit is reached, upcalls are blocked and no work is performed -for the KSE group until one of the threads completes (or a signal is +for the process until one of the threads completes (or a signal is received). .\" .Ss Managing KSEs @@ -223,27 +213,32 @@ The KSE will be associated with the mailbox pointed to by .Fa mbx . If -.Fa newgroup -is non-zero, a new KSE group is also created containing the KSE. -Otherwise, the new KSE is added to the current KSE group. -Newly created KSEs are initially unassigned; therefore, -they will upcall immediately. +.Fa sys_scope +is non-zero, then the new thread will be counted as a system scope +thread. Other things must be done as well to make a system scope thread +so this is not sufficient (yet). +System scope variables are not covered +in detail in this manual page yet, but briefly, they never perform +upcalls and do not return to the user thread scheduler. +Once launched they run autonomously. +The pthreads library knows how to make system +scope threads and users are encouraged to use the library interface. .Pp -Each process initially has a single KSE in a single KSE group executing -a single user thread. +Each process initially has a single KSE executing a single user thread. Since the KSE does not have an associated mailbox, it must remain assigned to the thread and does not perform any upcalls. +(It is by definition a system scope thread). The result is the traditional, unthreaded mode of operation. Therefore, as a special case, the first call to .Fn kse_create by this initial thread with -.Fa newgroup +.Fa sys_scope equal to zero does not create a new KSE; instead, it simply associates the current KSE with the supplied KSE mailbox, and no immediate upcall results. However, an upcall will be triggered the next time the thread blocks and the required conditions are met. .Pp -The kernel does not allow more KSEs to exist in a KSE group than the +The kernel does not allow more KSEs to exist in a process than the number of physical CPUs in the system (this number is available as the .Xr sysctl 3 variable @@ -261,8 +256,8 @@ .Fn kse_exit system call causes the KSE assigned to the currently running thread to be destroyed. -If this KSE is the last one in the KSE group, there must be no remaining -threads associated with the KSE group blocked in the kernel. +If this KSE is the last one in the process, there must be no remaining +threads associated with that process blocked in the kernel. This system call does not return unless there is an error. Calling .Fn kse_exit @@ -309,7 +304,7 @@ may be .Dv NULL to specify -.Dq "any KSE in the current KSE group" . +.Dq "any KSE in the current process" . .Pp The .Fn kse_thr_interrupt @@ -460,7 +455,7 @@ in the kernel since the last upcall. The user thread scheduler should put these threads back into its own runnable queue. -Each thread in a KSE group that completes a kernel operation +Each thread in a process that completes a kernel operation (synchronous or asynchronous) that results in an upcall is guaranteed to be linked into exactly one KSE's >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Feb 26 12:16: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 3633516A403; Mon, 26 Feb 2007 12:16: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 053AD16A401 for ; Mon, 26 Feb 2007 12:16:56 +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 E81B913C471 for ; Mon, 26 Feb 2007 12:16:55 +0000 (UTC) (envelope-from bushman@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l1QCGt0j046192 for ; Mon, 26 Feb 2007 12:16:55 GMT (envelope-from bushman@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l1QCGt8a046189 for perforce@freebsd.org; Mon, 26 Feb 2007 12:16:55 GMT (envelope-from bushman@freebsd.org) Date: Mon, 26 Feb 2007 12:16:55 GMT Message-Id: <200702261216.l1QCGt8a046189@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 115058 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 26 Feb 2007 12:16:56 -0000 http://perforce.freebsd.org/chv.cgi?CH=115058 Change 115058 by bushman@bushman_nss_ldap_cached on 2007/02/26 12:16:41 IFC Affected files ... .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/defaults/rc.conf#5 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/devd.conf#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/network.subr#3 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/periodic/security/800.loginfail#3 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/periodic/weekly/310.locate#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/rc.d/dhclient#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/rc.d/hostname#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/rc.d/netif#3 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/include/Makefile#4 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/getcap.3#3 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/tls.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/net/Makefile.inc#3 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/net/sctp_bindx.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/net/sctp_connectx.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/net/sctp_freepaddrs.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/net/sctp_getaddrlen.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/net/sctp_getassocid.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/net/sctp_getpaddrs.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/net/sctp_opt_info.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/net/sctp_recvmsg.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/net/sctp_send.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/net/sctp_sendmsg.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/net/sctp_sys_calls.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/stdlib/malloc.c#4 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/sys/Makefile.inc#3 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/sys/kse.2#3 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/sys/ntp_adjtime.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/sys/sctp_generic_recvmsg.2#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/sys/sctp_generic_sendmsg.2#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/sys/sctp_peeloff.2#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/usr.bin/gzip/Makefile#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/usr.bin/gzip/zgrep#2 delete .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/usr.bin/gzip/zgrep.1#2 delete .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/usr.bin/ktrace/ktrace.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/usr.bin/netstat/inet6.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/usr.bin/netstat/mcast.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/usr.bin/netstat/mroute.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/usr.bin/netstat/mroute6.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/usr.bin/netstat/route.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/usr.bin/quota/quota.1#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/usr.bin/quota/quota.c#4 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/usr.bin/setchannel/setchannel.1#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/usr.bin/setchannel/setchannel.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/usr.bin/tar/tree.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/usr.bin/tar/write.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/usr.bin/tip/tip/value.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/usr.sbin/bluetooth/sdpd/server.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/usr.sbin/pkg_install/info/show.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/usr.sbin/pstat/pstat.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/usr.sbin/rpc.ypupdated/update.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/usr.sbin/setfmac/setfmac.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/usr.sbin/sysinstall/cdrom.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/usr.sbin/sysinstall/install.cfg#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/usr.sbin/sysinstall/sysinstall.8#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/usr.sbin/sysinstall/system.c#2 integrate Differences ... ==== //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/defaults/rc.conf#5 (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.303 2007/01/20 04:24:19 mpp Exp $ +# $FreeBSD: src/etc/defaults/rc.conf,v 1.304 2007/02/09 12:11:27 flz Exp $ ############################################################## ### Important initial Boot-time options #################### @@ -178,11 +178,15 @@ sppp_interfaces="" # List of sppp interfaces. #sppp_interfaces="isp0" # example: sppp over ISDN #spppconfig_isp0="authproto=chap myauthname=foo myauthsecret='top secret' hisauthname=some-gw hisauthsecret='another secret'" -gif_interfaces="NO" # List of GIF tunnels (or "NO"). +gif_interfaces="" # List of GIF tunnels. #gif_interfaces="gif0 gif1" # Examples typically for a router. # Choose correct tunnel addrs. #gifconfig_gif0="10.1.1.1 10.1.2.1" # Examples typically for a router. #gifconfig_gif1="10.1.1.2 10.1.2.2" # Examples typically for a router. +fec_interfaces="" # List of Fast EtherChannels. +#fec_interfaces="fec0 fec1" +#fecconfig_fec0="fxp0 dc0" # Examples typically for two NICs +#fecconfig_fec1="em0 em1 bge0 bge1" # Examples typically for four NICs # User ppp configuration. ppp_enable="NO" # Start user-ppp (or NO). ==== //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/devd.conf#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/devd.conf,v 1.33 2006/06/01 00:41:07 thompsa Exp $ +# $FreeBSD: src/etc/devd.conf,v 1.35 2007/02/15 16:38:10 imp Exp $ # # Refer to devd.conf(5) and devd(8) man pages for the details on how to # run and configure devd. @@ -155,11 +155,42 @@ # Don't even try to second guess what to do about drivers that don't # match here. Instead, pass it off to syslog. Commented out for the -# moment, as pnpinfo isn't set in devd yet. +# moment, as the pnpinfo variable isn't set in devd yet. Individual +# variables within the bus supplied pnpinfo are set. nomatch 0 { # action "logger Unknown device: $pnpinfo $location $bus"; }; +# Various logging of unknown devices. +nomatch 10 { + match "bus" "uhub[0-9]+"; + action "logger Unknown USB device: vendor $vendor product $product \ + bus $bus"; +}; + +# Some PC-CARDs don't offer numerical manufacturer/product IDs, just +# show the CIS info there. +nomatch 20 { + match "bus" "pccard[0-9]+"; + match "manufacturer" "0xffffffff"; + match "product" "0xffffffff"; + action "logger Unknown PCCARD device: CISproduct $cisproduct \ + CIS-vendor $cisvendor bus $bus"; +}; + +nomatch 10 { + match "bus" "pccard[0-9]+"; + action "logger Unknown PCCARD device: manufacturer $manufacturer \ + product $product CISproduct $cisproduct CIS-vendor \ + $cisvendor bus $bus"; +}; + +nomatch 10 { + match "bus" "cardbus[0-9]+"; + action "logger Unknown Cardbus device: device $device class $class \ + vendor $vendor bus $bus"; +}; + # Switch power profiles when the AC line state changes. notify 10 { match "system" "ACPI"; ==== //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/network.subr#3 (text+ko) ==== @@ -22,7 +22,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/etc/network.subr,v 1.176 2006/10/29 13:29:49 mlaier Exp $ +# $FreeBSD: src/etc/network.subr,v 1.177 2007/02/09 12:11:26 flz Exp $ # # @@ -455,26 +455,89 @@ debug "Destroyed clones: ${_list}" } +# Create netgraph nodes. +# +ng_mkpeer() { + ngctl -f - 2> /dev/null </dev/null 2>&1 + ifconfig $i tunnel ${peers} + ifconfig $i up + ;; + esac + done +} + +# ng_fec_create ifn +# Configure Fast EtherChannel for interface $ifn. Returns 0 if FEC +# arguments were found and configured; returns !0 otherwise. +ng_fec_create() { + local req_iface iface bogus + req_iface="$1" + + ngctl shutdown ${req_iface}: > /dev/null 2>&1 + + bogus="" + while true; do + iface=`ng_create_one fec dummy fec` + if [ -z "${iface}" ]; then + exit 2 + fi + if [ "${iface}" = "${req_iface}" ]; then + break + fi + bogus="${bogus} ${iface}" + done + + for iface in ${bogus}; do + ngctl shutdown ${iface}: + done +} + +fec_up() { + for i in ${fec_interfaces}; do + ng_fec_create $i + for j in `get_if_var $i fecconfig_IF`; do + case ${j} in '') continue ;; *) - ifconfig $i create >/dev/null 2>&1 - ifconfig $i tunnel ${peers} - ifconfig $i up + ngctl msg ${i}: add_iface "\"${j}\"" ;; esac done - ;; - esac + done } # ==== //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/periodic/security/800.loginfail#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/etc/periodic/security/800.loginfail,v 1.7 2007/02/05 16:36:25 jdp Exp $ +# $FreeBSD: src/etc/periodic/security/800.loginfail,v 1.8 2007/02/23 21:42:54 remko Exp $ # # Show login failures @@ -59,7 +59,7 @@ [Yy][Ee][Ss]) echo "" echo "${host} login failures:" - n=$(catmsgs | egrep -ia "^$yesterday.*(fail|invalid|bad|illegal)" | + n=$(catmsgs | egrep -ia "^$yesterday.*: .* (fail|invalid|bad|illegal)" | tee /dev/stderr | wc -l) [ $n -gt 0 ] && rc=1 || rc=0;; *) rc=0;; ==== //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/periodic/weekly/310.locate#2 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh - # -# $FreeBSD: src/etc/periodic/weekly/310.locate,v 1.6 2000/09/14 17:19:13 brian Exp $ +# $FreeBSD: src/etc/periodic/weekly/310.locate,v 1.7 2007/02/23 18:44:20 remko Exp $ # # If there is a global system configuration file, suck it in. @@ -23,7 +23,7 @@ chmod 644 $locdb || rc=3 cd / - echo /usr/libexec/locate.updatedb | nice -5 su -fm nobody || rc=3 + echo /usr/libexec/locate.updatedb | nice -n 5 su -fm nobody || rc=3 chmod 444 $locdb || rc=3;; *) rc=0;; ==== //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/rc.d/dhclient#2 (text+ko) ==== @@ -1,7 +1,7 @@ #!/bin/sh # # $NetBSD: dhclient,v 1.8 2002/03/22 04:33:58 thorpej Exp $ -# $FreeBSD: src/etc/rc.d/dhclient,v 1.25 2006/10/02 18:50:58 brooks Exp $ +# $FreeBSD: src/etc/rc.d/dhclient,v 1.26 2007/02/15 06:51:31 yar Exp $ # # PROVIDE: dhclient @@ -19,9 +19,9 @@ dhclient_start() { # prevent unnecessary restarts - # XXX: should use a pidfile - if [ -x /usr/bin/pgrep ]; then - pids=`/usr/bin/pgrep -f "dhclient: $ifn(\$| .*)"` + # XXX: dhclient had better create a pidfile + if [ -x /bin/pgrep ]; then + pids=`/bin/pgrep -f "dhclient: $ifn(\$| .*)"` if [ -n "$pids" ]; then exit 0 fi ==== //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/rc.d/hostname#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/etc/rc.d/hostname,v 1.8 2004/10/07 13:55:25 mtm Exp $ +# $FreeBSD: src/etc/rc.d/hostname,v 1.11 2007/02/15 06:46:33 yar Exp $ # # PROVIDE: hostname @@ -31,6 +31,7 @@ # BEFORE: netif . /etc/rc.subr +. /etc/network.subr name="hostname" start_cmd="hostname_start" @@ -58,8 +59,21 @@ fi fi - /bin/hostname ${hostname} - echo "Setting hostname: `hostname`." + # Have we got a hostname yet? + # + if [ -z "${hostname}" ]; then + # Null hostname is probably OK if DHCP is in use. + # + if [ -z "`list_net_interfaces dhcp`" ]; then + warn "\$hostname is not set -- see ${rcvar_manpage}." + fi + return + fi + + # All right, it is safe to invoke hostname(1) now. + # + echo "Setting hostname: ${hostname}." + /bin/hostname "${hostname}" } load_rc_config $name ==== //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/rc.d/netif#3 (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/etc/rc.d/netif,v 1.21 2006/12/30 22:53:20 yar Exp $ +# $FreeBSD: src/etc/rc.d/netif,v 1.22 2007/02/09 12:11:26 flz Exp $ # # PROVIDE: netif @@ -57,6 +57,9 @@ # Create cloned interfaces clone_up + # Create Fast EtherChannel interfaces + fec_up + # Create IPv6<-->IPv4 tunnels gif_up ==== //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/include/Makefile#4 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.2 (Berkeley) 1/4/94 -# $FreeBSD: src/include/Makefile,v 1.267 2007/01/25 22:38:04 peter Exp $ +# $FreeBSD: src/include/Makefile,v 1.268 2007/02/11 14:01:32 rodrigc Exp $ # # Doing a "make install" builds /usr/include. @@ -47,7 +47,6 @@ fs/unionfs \ geom/cache geom/concat geom/eli geom/gate geom/journal geom/label \ geom/mirror geom/nop geom/raid3 geom/shsec geom/stripe \ - isofs/cd9660 \ netatm/ipatm netatm/sigpvc netatm/spans netatm/uni \ netgraph/atm netgraph/netflow \ security/audit \ @@ -163,6 +162,9 @@ cd ${.CURDIR}/../sys/contrib/altq/altq; \ ${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 *.h \ ${DESTDIR}${INCLUDEDIR}/altq + cd ${.CURDIR}/../sys/fs/cd9660/; \ + ${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 *.h \ + ${DESTDIR}${INCLUDEDIR}/isofs/cd9660 .if ${MK_IPFILTER} != "no" cd ${.CURDIR}/../sys/contrib/ipfilter/netinet; \ ${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 *.h \ @@ -287,3 +289,8 @@ done .endif .endif + cd ${.CURDIR}/../sys/fs/cd9660; \ + for h in *.h; do \ + ln -fs ../../../../sys/fs/cd9660/$$h \ + ${DESTDIR}${INCLUDEDIR}/isofs/cd9660; \ + done ==== //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/getcap.3#3 (text+ko) ==== @@ -29,7 +29,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)getcap.3 8.4 (Berkeley) 5/13/94 -.\" $FreeBSD: src/lib/libc/gen/getcap.3,v 1.29 2007/01/09 00:27:53 imp Exp $ +.\" $FreeBSD: src/lib/libc/gen/getcap.3,v 1.30 2007/02/11 18:14:49 maxim Exp $ .\" .Dd March 22, 2002 .Dt GETCAP 3 @@ -527,7 +527,7 @@ The .Fn cgetent , and -.Fn cgetseq +.Fn cgetset functions may fail and set .Va errno for any of the errors specified for the library functions: ==== //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/tls.c#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/lib/libc/gen/tls.c,v 1.13 2006/10/08 02:50:33 kmacy Exp $ + * $FreeBSD: src/lib/libc/gen/tls.c,v 1.14 2007/02/25 21:23:50 kientzle Exp $ */ /* @@ -36,7 +36,6 @@ #include #include #include -#include #include "libc_private.h" @@ -207,7 +206,8 @@ size = round(tls_static_space, tcbalign); - assert(tcbsize >= 2*sizeof(Elf_Addr)); + if (tcbsize < 2 * sizeof(Elf_Addr)) + tcbsize = 2 * sizeof(Elf_Addr); tls = calloc(1, size + tcbsize); dtv = malloc(3 * sizeof(Elf_Addr)); ==== //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/net/Makefile.inc#3 (text+ko) ==== @@ -1,5 +1,5 @@ # from @(#)Makefile.inc 8.2 (Berkeley) 9/5/93 -# $FreeBSD: src/lib/libc/net/Makefile.inc,v 1.63 2006/12/15 12:01:50 rrs Exp $ +# $FreeBSD: src/lib/libc/net/Makefile.inc,v 1.64 2007/02/22 14:32:38 rrs Exp $ # machine-independent net sources .PATH: ${.CURDIR}/net @@ -49,7 +49,10 @@ inet.3 inet_net.3 \ inet6_opt_init.3 inet6_option_space.3 inet6_rth_space.3 \ inet6_rthdr_space.3 linkaddr.3 \ - nsdispatch.3 rcmd.3 rcmdsh.3 resolver.3 sockatmark.3 + nsdispatch.3 rcmd.3 rcmdsh.3 resolver.3 sockatmark.3 \ + sctp_bindx.3 sctp_connectx.3 sctp_freepaddrs.3 \ + sctp_getaddrlen.3 sctp_getassocid.3 sctp_getpaddrs.3 \ + sctp_opt_info.3 sctp_recvmsg.3 sctp_send.3 sctp_sendmsg.3 \ MLINKS+=addr2ascii.3 ascii2addr.3 MLINKS+=byteorder.3 htonl.3 byteorder.3 htons.3 byteorder.3 ntohl.3 \ @@ -79,6 +82,10 @@ inet.3 inet_network.3 inet.3 inet_ntoa.3 \ inet.3 inet_ntop.3 inet.3 inet_pton.3 \ inet.3 network.3 inet.3 ntoa.3 +MLINKS+= sctp_send.3 sctp_sendx.3 +MLINKS+= sctp_sendmsg.3 sctp_sendmsgx.3 +MLINKS+= sctp_freepaddrs.3 sctp_freeladdrs.3 +MLINKS+= sctp_getpaddrs.3 sctp_getladdrs.3 MLINKS+=inet_net.3 inet_net_ntop.3 inet_net.3 inet_net_pton.3 MLINKS+=inet6_opt_init.3 inet6_opt_append.3 \ inet6_opt_init.3 inet6_opt_find.3 \ ==== //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/net/sctp_sys_calls.c#2 (text+ko) ==== @@ -29,7 +29,7 @@ * SUCH DAMAGE. */ #include -__FBSDID("$FreeBSD: src/lib/libc/net/sctp_sys_calls.c,v 1.2 2006/12/16 06:03:43 rodrigc Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/net/sctp_sys_calls.c,v 1.5 2007/02/22 14:48:12 rrs Exp $"); #include #include #include @@ -54,14 +54,20 @@ (*(const u_int32_t *)(const void *)(&(a)->s6_addr[8]) == ntohl(0x0000ffff))) #endif + #define SCTP_CONTROL_VEC_SIZE_SND 8192 #define SCTP_CONTROL_VEC_SIZE_RCV 16384 +#define SCTP_STACK_BUF_SIZE 2048 +#define SCTP_SMALL_IOVEC_SIZE 2 #ifdef SCTP_DEBUG_PRINT_ADDRESS + +#define SCTP_STRING_BUF_SZ 256 + static void SCTPPrintAnAddress(struct sockaddr *a) { - char stringToPrint[256]; + char stringToPrint[SCTP_STRING_BUF_SZ]; u_short prt; char *srcaddr, *txt; @@ -79,8 +85,8 @@ txt = "IPv6 Address: "; } else if (a->sa_family == AF_LINK) { int i; - char tbuf[200]; - u_char adbuf[200]; + char tbuf[SCTP_STRING_BUF_SZ]; + u_char adbuf[SCTP_STRING_BUF_SZ]; struct sockaddr_dl *dl; dl = (struct sockaddr_dl *)a; @@ -101,10 +107,6 @@ printf(":"); } printf("\n"); - /* - * u_short sdl_route[16]; *//* source routing - * information - */ return; } else { return; @@ -164,7 +166,7 @@ int sctp_connectx(int sd, const struct sockaddr *addrs, int addrcnt) { - char buf[2048]; + char buf[SCTP_STACK_BUF_SIZE]; int i, ret, cnt, *aa; char *cpto; const struct sockaddr *at; @@ -298,14 +300,14 @@ asoc = id; siz = sizeof(sctp_assoc_t); if (getsockopt(sd, IPPROTO_SCTP, SCTP_GET_REMOTE_ADDR_SIZE, - &asoc, &siz) != 0) { + &asoc, &siz) != 0) { errno = ENOMEM; return (-1); } /* size required is returned in 'asoc' */ - siz = (uint32_t) asoc; + siz = (size_t)asoc; siz += sizeof(struct sctp_getaddresses); - addrs = calloc((unsigned long)1, (unsigned long)siz); + addrs = calloc(1, siz); if (addrs == NULL) { errno = ENOMEM; return (-1); @@ -314,7 +316,7 @@ addrs->sget_assoc_id = id; /* Now lets get the array of addresses */ if (getsockopt(sd, IPPROTO_SCTP, SCTP_GET_PEER_ADDRESSES, - addrs, (socklen_t *) & siz) != 0) { + addrs, &siz) != 0) { free(addrs); errno = ENOMEM; return (-1); @@ -370,7 +372,7 @@ } siz = size_of_addresses + sizeof(struct sockaddr_storage); siz += sizeof(struct sctp_getaddresses); - addrs = calloc((unsigned long)1, (unsigned long)siz); + addrs = calloc(1, siz); if (addrs == NULL) { errno = ENOMEM; return (-1); @@ -379,7 +381,7 @@ addrs->sget_assoc_id = id; /* Now lets get the array of addresses */ if (getsockopt(sd, IPPROTO_SCTP, SCTP_GET_LOCAL_ADDRESSES, addrs, - (socklen_t *) & siz) != 0) { + &siz) != 0) { free(addrs); errno = ENOMEM; return (-1); @@ -436,7 +438,7 @@ ssize_t sz; struct msghdr msg; struct sctp_sndrcvinfo *s_info; - struct iovec iov[2]; + struct iovec iov[SCTP_SMALL_IOVEC_SIZE]; char controlVector[SCTP_CONTROL_VEC_SIZE_RCV]; struct cmsghdr *cmsg; struct sockaddr *who = NULL; @@ -547,7 +549,7 @@ #else ssize_t sz; struct msghdr msg; - struct iovec iov[2]; + struct iovec iov[SCTP_SMALL_IOVEC_SIZE]; struct sctp_sndrcvinfo *s_info; char controlVector[SCTP_CONTROL_VEC_SIZE_SND]; struct cmsghdr *cmsg; @@ -595,6 +597,20 @@ int add_len, len, no_end_cx = 0; struct sockaddr *at; + +#ifdef SYS_sctp_generic_sendmsg + if (addrcnt < SCTP_SMALL_IOVEC_SIZE) { + socklen_t l; + + /* + * Quick way, we don't need to do a connectx so lets use the + * syscall directly. + */ + l = addrs->sa_len; + return (syscall(SYS_sctp_generic_sendmsg, sd, + msg, msg_len, addrs, l, sinfo, flags)); + } +#endif len = sizeof(int); at = addrs; cnt = 0; @@ -617,10 +633,6 @@ errno = EINVAL; return (-1); } - if (len > 2048) { - /* Never enough memory */ - return (E2BIG); - } buf = malloc(len); if (buf == NULL) { return (ENOMEM); @@ -693,7 +705,7 @@ { #ifdef SYS_sctp_generic_recvmsg - struct iovec iov[2]; + struct iovec iov[SCTP_SMALL_IOVEC_SIZE]; iov[0].iov_base = dbuf; iov[0].iov_len = len; @@ -704,7 +716,7 @@ ssize_t sz; int sinfo_found = 0; struct msghdr msg; - struct iovec iov[2]; + struct iovec iov[SCTP_SMALL_IOVEC_SIZE]; char controlVector[SCTP_CONTROL_VEC_SIZE_RCV]; struct cmsghdr *cmsg; @@ -826,3 +838,9 @@ } #endif + + +#undef SCTP_CONTROL_VEC_SIZE_SND +#undef SCTP_CONTROL_VEC_SIZE_RCV +#undef SCTP_STACK_BUF_SIZE +#undef SCTP_SMALL_IOVEC_SIZE ==== //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/stdlib/malloc.c#4 (text+ko) ==== @@ -185,7 +185,7 @@ #endif #include -__FBSDID("$FreeBSD: src/lib/libc/stdlib/malloc.c,v 1.139 2007/01/31 22:54:19 jasone Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/stdlib/malloc.c,v 1.140 2007/02/22 19:10:30 jasone Exp $"); #include "libc_private.h" #ifdef MALLOC_DEBUG @@ -1029,8 +1029,8 @@ malloc_mutex_unlock(&brk_mtx); base_chunk = brk_cur; base_next_addr = base_chunk; - base_past_addr = (void *)((uintptr_t)base_chunk + - incr); + base_past_addr = (void *)((uintptr_t)base_chunk + + incr); #ifdef MALLOC_STATS base_total += incr; #endif @@ -1042,8 +1042,8 @@ #endif /* - * Don't worry about chunk alignment here, since base_chunk doesn't really - * need to be aligned. + * Don't worry about chunk alignment here, since base_chunk doesn't + * really need to be aligned. */ base_chunk = pages_map(NULL, chunk_size); if (base_chunk == NULL) @@ -1067,8 +1067,12 @@ malloc_mutex_lock(&base_mtx); - /* Make sure there's enough space for the allocation. */ - if ((uintptr_t)base_next_addr + csize > (uintptr_t)base_past_addr) { + /* + * Make sure there's enough space for the allocation. + * base_chunk_alloc() does not guarantee that a newly allocated chunk + * is >= size, so loop here, rather than only trying once. + */ + while ((uintptr_t)base_next_addr + csize > (uintptr_t)base_past_addr) { if (base_chunk_alloc(csize)) { ret = NULL; goto RETURN; @@ -1299,6 +1303,36 @@ } } + /* + * Try to over-allocate, but allow the OS to place the allocation + * anywhere. Beware of size_t wrap-around. + */ + if (size + chunk_size > size) { + if ((ret = pages_map(NULL, size + chunk_size)) != NULL) { + size_t offset = CHUNK_ADDR2OFFSET(ret); + + /* + * Success. Clean up unneeded leading/trailing space. + */ + if (offset != 0) { + /* Leading space. */ + pages_unmap(ret, chunk_size - offset); + + ret = (void *)((uintptr_t)ret + (chunk_size - + offset)); + + /* Trailing space. */ + pages_unmap((void *)((uintptr_t)ret + size), + offset); + } else { + /* Trailing space only. */ + pages_unmap((void *)((uintptr_t)ret + size), + chunk_size); + } + goto RETURN; + } + } + #ifdef USE_BRK /* * Try to create allocations in brk, in order to make full use of @@ -1342,36 +1376,6 @@ } #endif - /* - * Try to over-allocate, but allow the OS to place the allocation - * anywhere. Beware of size_t wrap-around. - */ - if (size + chunk_size > size) { - if ((ret = pages_map(NULL, size + chunk_size)) != NULL) { - size_t offset = CHUNK_ADDR2OFFSET(ret); - - /* - * Success. Clean up unneeded leading/trailing space. - */ - if (offset != 0) { - /* Leading space. */ - pages_unmap(ret, chunk_size - offset); - - ret = (void *)((uintptr_t)ret + (chunk_size - - offset)); - - /* Trailing space. */ - pages_unmap((void *)((uintptr_t)ret + size), - offset); - } else { - /* Trailing space only. */ - pages_unmap((void *)((uintptr_t)ret + size), - chunk_size); - } - goto RETURN; - } - } - /* All strategies for allocation failed. */ ret = NULL; RETURN: ==== //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/sys/Makefile.inc#3 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile.inc 8.3 (Berkeley) 10/24/94 -# $FreeBSD: src/lib/libc/sys/Makefile.inc,v 1.122 2006/10/12 13:46:33 ru Exp $ +# $FreeBSD: src/lib/libc/sys/Makefile.inc,v 1.123 2007/02/22 14:32:38 rrs Exp $ # sys sources .PATH: ${.CURDIR}/${MACHINE_ARCH}/sys ${.CURDIR}/sys @@ -84,6 +84,7 @@ sigaction.2 sigaltstack.2 sigpending.2 sigprocmask.2 sigqueue.2 \ sigreturn.2 sigstack.2 sigsuspend.2 sigwait.2 sigwaitinfo.2 \ socket.2 socketpair.2 stat.2 statfs.2 \ + sctp_generic_recvmsg.2 sctp_generic_sendmsg.2 sctp_peeloff.2 \ swapon.2 symlink.2 sync.2 sysarch.2 syscall.2 \ timer_create.2 timer_delete.2 timer_settime.2 \ truncate.2 umask.2 undelete.2 \ ==== //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/sys/kse.2#3 (text+ko) ==== @@ -33,9 +33,9 @@ .\" THE USE OF THIS SOFTWARE, EVEN IF PACKET DESIGN IS ADVISED OF .\" THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libc/sys/kse.2,v 1.19 2006/12/12 08:13:02 julian Exp $ +.\" $FreeBSD: src/lib/libc/sys/kse.2,v 1.22 2007/02/14 07:38:39 brueffer Exp $ .\" -.Dd July 12, 2004 +.Dd February 13, 2007 .Dt KSE 2 .Os .Sh NAME @@ -47,7 +47,7 @@ .In sys/types.h .In sys/kse.h .Ft int -.Fn kse_create "struct kse_mailbox *mbx" "int newgroup" +.Fn kse_create "struct kse_mailbox *mbx" "int sys-scope" .Ft int .Fn kse_exit void .Ft int @@ -103,9 +103,6 @@ .It All operations that block in the kernel become asynchronous, allowing the user process to schedule another thread when any thread blocks. -.It -Multiple thread schedulers within the same process are possible, and they -may operate independently of each other. .El .\" .Ss Definitions @@ -124,6 +121,8 @@ The KSE is said to be .Sy assigned to the thread. +KSEs (a user abstraction) are implemented on top +of kernel threads using an 'upcall' entity. .Pp The KSE becomes .Sy unassigned , @@ -160,22 +159,13 @@ KSEs always complete as much work as possible in the kernel before becoming unassigned. .Pp -A -.Sy "KSE group" -is a collection of KSEs that are scheduled uniformly and which share -access to the same pool of threads, which are associated with the KSE group. -A KSE group is the smallest entity to which a kernel scheduling -priority may be assigned. -For the purposes of process scheduling and accounting, each -KSE group -counts similarly to a traditional unthreaded process. -Individual KSEs within a KSE group are effectively indistinguishable, -and any KSE in a KSE group may be assigned by the kernel to any runnable -(in the kernel) thread associated with that KSE group. +Individual KSEs within a process are effectively indistinguishable, +and any KSE in a process may be assigned by the kernel to any runnable +(in the kernel) thread associated with that process. In practice, the kernel attempts to preserve the affinity between threads and actual CPUs to optimize cache behavior, but this is invisible to the user process. -(Affinity is not yet implemented.) +(Affinity is not yet fully implemented.) .Pp Each KSE has a unique .Sy "KSE mailbox" @@ -199,17 +189,17 @@ This pointer is saved when the thread blocks in the kernel. .Pp Whenever a thread blocked in the kernel is ready to return to user space, -it is added to the KSE group's list of +it is added to the process's list of .Sy completed threads. This list is presented to the user code at the next upcall as a linked list of thread mailboxes. .Pp -There is a kernel-imposed limit on the number of threads in a KSE group +There is a kernel-imposed limit on the number of threads in a process that may be simultaneously blocked in the kernel (this number is not currently visible to the user). When this limit is reached, upcalls are blocked and no work is performed -for the KSE group until one of the threads completes (or a signal is +for the process until one of the threads completes (or a signal is received). .\" .Ss Managing KSEs @@ -223,27 +213,32 @@ The KSE will be associated with the mailbox pointed to by .Fa mbx . If -.Fa newgroup -is non-zero, a new KSE group is also created containing the KSE. -Otherwise, the new KSE is added to the current KSE group. -Newly created KSEs are initially unassigned; therefore, -they will upcall immediately. +.Fa sys_scope +is non-zero, then the new thread will be counted as a system scope +thread. Other things must be done as well to make a system scope thread +so this is not sufficient (yet). +System scope variables are not covered +in detail in this manual page yet, but briefly, they never perform +upcalls and do not return to the user thread scheduler. +Once launched they run autonomously. +The pthreads library knows how to make system +scope threads and users are encouraged to use the library interface. .Pp -Each process initially has a single KSE in a single KSE group executing -a single user thread. +Each process initially has a single KSE executing a single user thread. Since the KSE does not have an associated mailbox, it must remain assigned to the thread and does not perform any upcalls. +(It is by definition a system scope thread). The result is the traditional, unthreaded mode of operation. Therefore, as a special case, the first call to .Fn kse_create by this initial thread with -.Fa newgroup +.Fa sys_scope equal to zero does not create a new KSE; instead, it simply associates the current KSE with the supplied KSE mailbox, and no immediate upcall results. However, an upcall will be triggered the next time the thread blocks and the required conditions are met. .Pp -The kernel does not allow more KSEs to exist in a KSE group than the +The kernel does not allow more KSEs to exist in a process than the number of physical CPUs in the system (this number is available as the .Xr sysctl 3 variable @@ -261,8 +256,8 @@ .Fn kse_exit system call causes the KSE assigned to the currently running thread to be destroyed. -If this KSE is the last one in the KSE group, there must be no remaining -threads associated with the KSE group blocked in the kernel. +If this KSE is the last one in the process, there must be no remaining +threads associated with that process blocked in the kernel. This system call does not return unless there is an error. Calling .Fn kse_exit @@ -309,7 +304,7 @@ may be .Dv NULL to specify -.Dq "any KSE in the current KSE group" . +.Dq "any KSE in the current process" . .Pp The .Fn kse_thr_interrupt @@ -460,7 +455,7 @@ in the kernel since the last upcall. The user thread scheduler should put these threads back into its own runnable queue. -Each thread in a KSE group that completes a kernel operation +Each thread in a process that completes a kernel operation (synchronous or asynchronous) that results in an upcall is guaranteed to be linked into exactly one KSE's >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Feb 26 12:22: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 A85F016A407; Mon, 26 Feb 2007 12:22: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 7C2E116A403 for ; Mon, 26 Feb 2007 12:22:03 +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 6B34C13C478 for ; Mon, 26 Feb 2007 12:22:03 +0000 (UTC) (envelope-from bushman@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l1QCM3wR047012 for ; Mon, 26 Feb 2007 12:22:03 GMT (envelope-from bushman@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l1QCM2DU047007 for perforce@freebsd.org; Mon, 26 Feb 2007 12:22:02 GMT (envelope-from bushman@freebsd.org) Date: Mon, 26 Feb 2007 12:22:02 GMT Message-Id: <200702261222.l1QCM2DU047007@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 115059 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 26 Feb 2007 12:22:04 -0000 http://perforce.freebsd.org/chv.cgi?CH=115059 Change 115059 by bushman@bushman_nss_ldap_cached on 2007/02/26 12:21:18 IFC Affected files ... .. //depot/projects/soc2006/nss_ldap_cached_openldap/nss_ldap_port/src/ldapconf.c#3 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/nss_ldap_port/src/ldapconf.h#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/nss_ldap_port/src/ldapconn.c#4 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/nss_ldap_port/src/ldapconn.h#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/nss_ldap_port/src/nss_ldap.c#4 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/nss_ldap_port/src/nss_ldap.h#3 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/defaults/rc.conf#8 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/devd.conf#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/network.subr#6 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/periodic/security/800.loginfail#3 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/periodic/weekly/310.locate#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/rc.d/dhclient#5 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/rc.d/hostname#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/rc.d/netif#3 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/include/Makefile#6 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/getcap.3#3 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/tls.c#4 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/net/Makefile.inc#3 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/net/sctp_bindx.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/net/sctp_connectx.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/net/sctp_freepaddrs.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/net/sctp_getaddrlen.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/net/sctp_getassocid.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/net/sctp_getpaddrs.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/net/sctp_opt_info.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/net/sctp_recvmsg.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/net/sctp_send.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/net/sctp_sendmsg.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/net/sctp_sys_calls.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/stdlib/malloc.c#6 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/sys/Makefile.inc#3 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/sys/kse.2#3 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/sys/ntp_adjtime.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/sys/sctp_generic_recvmsg.2#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/sys/sctp_generic_sendmsg.2#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/sys/sctp_peeloff.2#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.bin/gzip/Makefile#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.bin/gzip/zgrep#2 delete .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.bin/gzip/zgrep.1#2 delete .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.bin/ktrace/ktrace.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.bin/netstat/inet6.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.bin/netstat/mcast.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.bin/netstat/mroute.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.bin/netstat/mroute6.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.bin/netstat/route.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.bin/quota/quota.1#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.bin/quota/quota.c#4 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.bin/setchannel/setchannel.1#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.bin/setchannel/setchannel.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.bin/tar/tree.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.bin/tar/write.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.bin/tip/tip/value.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/bluetooth/sdpd/server.c#3 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/pkg_install/info/show.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/pstat/pstat.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/rpc.ypupdated/update.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/setfmac/setfmac.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/sysinstall/cdrom.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/sysinstall/install.cfg#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/sysinstall/sysinstall.8#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/sysinstall/system.c#2 integrate Differences ... ==== //depot/projects/soc2006/nss_ldap_cached_openldap/nss_ldap_port/src/ldapconf.c#3 (text+ko) ==== @@ -726,7 +726,6 @@ conf->port = LDAP_PORT; conf->proto_version = NSS_LDAP_PROTO_VERSION_3; conf->ssl_mode = NSS_LDAP_SSL_OFF; - conf->search_limit = 0; conf->bind_timelimit = 30; conf->idle_timelimit = 0; conf->search_timelimit = 0; ==== //depot/projects/soc2006/nss_ldap_cached_openldap/nss_ldap_port/src/ldapconf.h#2 (text+ko) ==== @@ -85,7 +85,6 @@ char *bind_dn; char *bind_pw; char *logdir; - size_t search_limit; time_t bind_timelimit; time_t idle_timelimit; time_t search_timelimit; ==== //depot/projects/soc2006/nss_ldap_cached_openldap/nss_ldap_port/src/ldapconn.c#4 (text+ko) ==== ==== //depot/projects/soc2006/nss_ldap_cached_openldap/nss_ldap_port/src/ldapconn.h#2 (text+ko) ==== ==== //depot/projects/soc2006/nss_ldap_cached_openldap/nss_ldap_port/src/nss_ldap.c#4 (text+ko) ==== ==== //depot/projects/soc2006/nss_ldap_cached_openldap/nss_ldap_port/src/nss_ldap.h#3 (text+ko) ==== ==== //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/defaults/rc.conf#8 (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.303 2007/01/20 04:24:19 mpp Exp $ +# $FreeBSD: src/etc/defaults/rc.conf,v 1.304 2007/02/09 12:11:27 flz Exp $ ############################################################## ### Important initial Boot-time options #################### @@ -178,11 +178,15 @@ sppp_interfaces="" # List of sppp interfaces. #sppp_interfaces="isp0" # example: sppp over ISDN #spppconfig_isp0="authproto=chap myauthname=foo myauthsecret='top secret' hisauthname=some-gw hisauthsecret='another secret'" -gif_interfaces="NO" # List of GIF tunnels (or "NO"). +gif_interfaces="" # List of GIF tunnels. #gif_interfaces="gif0 gif1" # Examples typically for a router. # Choose correct tunnel addrs. #gifconfig_gif0="10.1.1.1 10.1.2.1" # Examples typically for a router. #gifconfig_gif1="10.1.1.2 10.1.2.2" # Examples typically for a router. +fec_interfaces="" # List of Fast EtherChannels. +#fec_interfaces="fec0 fec1" +#fecconfig_fec0="fxp0 dc0" # Examples typically for two NICs +#fecconfig_fec1="em0 em1 bge0 bge1" # Examples typically for four NICs # User ppp configuration. ppp_enable="NO" # Start user-ppp (or NO). ==== //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/devd.conf#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/devd.conf,v 1.33 2006/06/01 00:41:07 thompsa Exp $ +# $FreeBSD: src/etc/devd.conf,v 1.35 2007/02/15 16:38:10 imp Exp $ # # Refer to devd.conf(5) and devd(8) man pages for the details on how to # run and configure devd. @@ -155,11 +155,42 @@ # Don't even try to second guess what to do about drivers that don't # match here. Instead, pass it off to syslog. Commented out for the -# moment, as pnpinfo isn't set in devd yet. +# moment, as the pnpinfo variable isn't set in devd yet. Individual +# variables within the bus supplied pnpinfo are set. nomatch 0 { # action "logger Unknown device: $pnpinfo $location $bus"; }; +# Various logging of unknown devices. +nomatch 10 { + match "bus" "uhub[0-9]+"; + action "logger Unknown USB device: vendor $vendor product $product \ + bus $bus"; +}; + +# Some PC-CARDs don't offer numerical manufacturer/product IDs, just +# show the CIS info there. +nomatch 20 { + match "bus" "pccard[0-9]+"; + match "manufacturer" "0xffffffff"; + match "product" "0xffffffff"; + action "logger Unknown PCCARD device: CISproduct $cisproduct \ + CIS-vendor $cisvendor bus $bus"; +}; + +nomatch 10 { + match "bus" "pccard[0-9]+"; + action "logger Unknown PCCARD device: manufacturer $manufacturer \ + product $product CISproduct $cisproduct CIS-vendor \ + $cisvendor bus $bus"; +}; + +nomatch 10 { + match "bus" "cardbus[0-9]+"; + action "logger Unknown Cardbus device: device $device class $class \ + vendor $vendor bus $bus"; +}; + # Switch power profiles when the AC line state changes. notify 10 { match "system" "ACPI"; ==== //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/network.subr#6 (text+ko) ==== @@ -22,7 +22,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/etc/network.subr,v 1.176 2006/10/29 13:29:49 mlaier Exp $ +# $FreeBSD: src/etc/network.subr,v 1.177 2007/02/09 12:11:26 flz Exp $ # # @@ -455,26 +455,89 @@ debug "Destroyed clones: ${_list}" } +# Create netgraph nodes. +# +ng_mkpeer() { + ngctl -f - 2> /dev/null </dev/null 2>&1 + ifconfig $i tunnel ${peers} + ifconfig $i up + ;; + esac + done +} + +# ng_fec_create ifn +# Configure Fast EtherChannel for interface $ifn. Returns 0 if FEC +# arguments were found and configured; returns !0 otherwise. +ng_fec_create() { + local req_iface iface bogus + req_iface="$1" + + ngctl shutdown ${req_iface}: > /dev/null 2>&1 + + bogus="" + while true; do + iface=`ng_create_one fec dummy fec` + if [ -z "${iface}" ]; then + exit 2 + fi + if [ "${iface}" = "${req_iface}" ]; then + break + fi + bogus="${bogus} ${iface}" + done + + for iface in ${bogus}; do + ngctl shutdown ${iface}: + done +} + +fec_up() { + for i in ${fec_interfaces}; do + ng_fec_create $i + for j in `get_if_var $i fecconfig_IF`; do + case ${j} in '') continue ;; *) - ifconfig $i create >/dev/null 2>&1 - ifconfig $i tunnel ${peers} - ifconfig $i up + ngctl msg ${i}: add_iface "\"${j}\"" ;; esac done - ;; - esac + done } # ==== //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/periodic/security/800.loginfail#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/etc/periodic/security/800.loginfail,v 1.7 2007/02/05 16:36:25 jdp Exp $ +# $FreeBSD: src/etc/periodic/security/800.loginfail,v 1.8 2007/02/23 21:42:54 remko Exp $ # # Show login failures @@ -59,7 +59,7 @@ [Yy][Ee][Ss]) echo "" echo "${host} login failures:" - n=$(catmsgs | egrep -ia "^$yesterday.*(fail|invalid|bad|illegal)" | + n=$(catmsgs | egrep -ia "^$yesterday.*: .* (fail|invalid|bad|illegal)" | tee /dev/stderr | wc -l) [ $n -gt 0 ] && rc=1 || rc=0;; *) rc=0;; ==== //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/periodic/weekly/310.locate#2 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh - # -# $FreeBSD: src/etc/periodic/weekly/310.locate,v 1.6 2000/09/14 17:19:13 brian Exp $ +# $FreeBSD: src/etc/periodic/weekly/310.locate,v 1.7 2007/02/23 18:44:20 remko Exp $ # # If there is a global system configuration file, suck it in. @@ -23,7 +23,7 @@ chmod 644 $locdb || rc=3 cd / - echo /usr/libexec/locate.updatedb | nice -5 su -fm nobody || rc=3 + echo /usr/libexec/locate.updatedb | nice -n 5 su -fm nobody || rc=3 chmod 444 $locdb || rc=3;; *) rc=0;; ==== //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/rc.d/dhclient#5 (text+ko) ==== @@ -1,7 +1,7 @@ #!/bin/sh # # $NetBSD: dhclient,v 1.8 2002/03/22 04:33:58 thorpej Exp $ -# $FreeBSD: src/etc/rc.d/dhclient,v 1.25 2006/10/02 18:50:58 brooks Exp $ +# $FreeBSD: src/etc/rc.d/dhclient,v 1.26 2007/02/15 06:51:31 yar Exp $ # # PROVIDE: dhclient @@ -19,9 +19,9 @@ dhclient_start() { # prevent unnecessary restarts - # XXX: should use a pidfile - if [ -x /usr/bin/pgrep ]; then - pids=`/usr/bin/pgrep -f "dhclient: $ifn(\$| .*)"` + # XXX: dhclient had better create a pidfile + if [ -x /bin/pgrep ]; then + pids=`/bin/pgrep -f "dhclient: $ifn(\$| .*)"` if [ -n "$pids" ]; then exit 0 fi ==== //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/rc.d/hostname#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/etc/rc.d/hostname,v 1.8 2004/10/07 13:55:25 mtm Exp $ +# $FreeBSD: src/etc/rc.d/hostname,v 1.11 2007/02/15 06:46:33 yar Exp $ # # PROVIDE: hostname @@ -31,6 +31,7 @@ # BEFORE: netif . /etc/rc.subr +. /etc/network.subr name="hostname" start_cmd="hostname_start" @@ -58,8 +59,21 @@ fi fi - /bin/hostname ${hostname} - echo "Setting hostname: `hostname`." + # Have we got a hostname yet? + # + if [ -z "${hostname}" ]; then + # Null hostname is probably OK if DHCP is in use. + # + if [ -z "`list_net_interfaces dhcp`" ]; then + warn "\$hostname is not set -- see ${rcvar_manpage}." + fi + return + fi + + # All right, it is safe to invoke hostname(1) now. + # + echo "Setting hostname: ${hostname}." + /bin/hostname "${hostname}" } load_rc_config $name ==== //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/rc.d/netif#3 (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/etc/rc.d/netif,v 1.21 2006/12/30 22:53:20 yar Exp $ +# $FreeBSD: src/etc/rc.d/netif,v 1.22 2007/02/09 12:11:26 flz Exp $ # # PROVIDE: netif @@ -57,6 +57,9 @@ # Create cloned interfaces clone_up + # Create Fast EtherChannel interfaces + fec_up + # Create IPv6<-->IPv4 tunnels gif_up ==== //depot/projects/soc2006/nss_ldap_cached_openldap/src/include/Makefile#6 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.2 (Berkeley) 1/4/94 -# $FreeBSD: src/include/Makefile,v 1.267 2007/01/25 22:38:04 peter Exp $ +# $FreeBSD: src/include/Makefile,v 1.268 2007/02/11 14:01:32 rodrigc Exp $ # # Doing a "make install" builds /usr/include. @@ -47,7 +47,6 @@ fs/unionfs \ geom/cache geom/concat geom/eli geom/gate geom/journal geom/label \ geom/mirror geom/nop geom/raid3 geom/shsec geom/stripe \ - isofs/cd9660 \ netatm/ipatm netatm/sigpvc netatm/spans netatm/uni \ netgraph/atm netgraph/netflow \ security/audit \ @@ -163,6 +162,9 @@ cd ${.CURDIR}/../sys/contrib/altq/altq; \ ${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 *.h \ ${DESTDIR}${INCLUDEDIR}/altq + cd ${.CURDIR}/../sys/fs/cd9660/; \ + ${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 *.h \ + ${DESTDIR}${INCLUDEDIR}/isofs/cd9660 .if ${MK_IPFILTER} != "no" cd ${.CURDIR}/../sys/contrib/ipfilter/netinet; \ ${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 *.h \ @@ -287,3 +289,8 @@ done .endif .endif + cd ${.CURDIR}/../sys/fs/cd9660; \ + for h in *.h; do \ + ln -fs ../../../../sys/fs/cd9660/$$h \ + ${DESTDIR}${INCLUDEDIR}/isofs/cd9660; \ + done ==== //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/getcap.3#3 (text+ko) ==== @@ -29,7 +29,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)getcap.3 8.4 (Berkeley) 5/13/94 -.\" $FreeBSD: src/lib/libc/gen/getcap.3,v 1.29 2007/01/09 00:27:53 imp Exp $ +.\" $FreeBSD: src/lib/libc/gen/getcap.3,v 1.30 2007/02/11 18:14:49 maxim Exp $ .\" .Dd March 22, 2002 .Dt GETCAP 3 @@ -527,7 +527,7 @@ The .Fn cgetent , and -.Fn cgetseq +.Fn cgetset functions may fail and set .Va errno for any of the errors specified for the library functions: ==== //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/tls.c#4 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libc/gen/tls.c,v 1.13 2006/10/08 02:50:33 kmacy Exp $ + * $FreeBSD: src/lib/libc/gen/tls.c,v 1.14 2007/02/25 21:23:50 kientzle Exp $ */ /* @@ -36,7 +36,6 @@ #include #include #include -#include #include "libc_private.h" @@ -207,7 +206,8 @@ size = round(tls_static_space, tcbalign); - assert(tcbsize >= 2*sizeof(Elf_Addr)); + if (tcbsize < 2 * sizeof(Elf_Addr)) + tcbsize = 2 * sizeof(Elf_Addr); tls = calloc(1, size + tcbsize); dtv = malloc(3 * sizeof(Elf_Addr)); ==== //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/net/Makefile.inc#3 (text+ko) ==== @@ -1,5 +1,5 @@ # from @(#)Makefile.inc 8.2 (Berkeley) 9/5/93 -# $FreeBSD: src/lib/libc/net/Makefile.inc,v 1.63 2006/12/15 12:01:50 rrs Exp $ +# $FreeBSD: src/lib/libc/net/Makefile.inc,v 1.64 2007/02/22 14:32:38 rrs Exp $ # machine-independent net sources .PATH: ${.CURDIR}/net @@ -49,7 +49,10 @@ inet.3 inet_net.3 \ inet6_opt_init.3 inet6_option_space.3 inet6_rth_space.3 \ inet6_rthdr_space.3 linkaddr.3 \ - nsdispatch.3 rcmd.3 rcmdsh.3 resolver.3 sockatmark.3 + nsdispatch.3 rcmd.3 rcmdsh.3 resolver.3 sockatmark.3 \ + sctp_bindx.3 sctp_connectx.3 sctp_freepaddrs.3 \ + sctp_getaddrlen.3 sctp_getassocid.3 sctp_getpaddrs.3 \ + sctp_opt_info.3 sctp_recvmsg.3 sctp_send.3 sctp_sendmsg.3 \ MLINKS+=addr2ascii.3 ascii2addr.3 MLINKS+=byteorder.3 htonl.3 byteorder.3 htons.3 byteorder.3 ntohl.3 \ @@ -79,6 +82,10 @@ inet.3 inet_network.3 inet.3 inet_ntoa.3 \ inet.3 inet_ntop.3 inet.3 inet_pton.3 \ inet.3 network.3 inet.3 ntoa.3 +MLINKS+= sctp_send.3 sctp_sendx.3 +MLINKS+= sctp_sendmsg.3 sctp_sendmsgx.3 +MLINKS+= sctp_freepaddrs.3 sctp_freeladdrs.3 +MLINKS+= sctp_getpaddrs.3 sctp_getladdrs.3 MLINKS+=inet_net.3 inet_net_ntop.3 inet_net.3 inet_net_pton.3 MLINKS+=inet6_opt_init.3 inet6_opt_append.3 \ inet6_opt_init.3 inet6_opt_find.3 \ ==== //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/net/sctp_sys_calls.c#2 (text+ko) ==== @@ -29,7 +29,7 @@ * SUCH DAMAGE. */ #include -__FBSDID("$FreeBSD: src/lib/libc/net/sctp_sys_calls.c,v 1.2 2006/12/16 06:03:43 rodrigc Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/net/sctp_sys_calls.c,v 1.5 2007/02/22 14:48:12 rrs Exp $"); #include #include #include @@ -54,14 +54,20 @@ (*(const u_int32_t *)(const void *)(&(a)->s6_addr[8]) == ntohl(0x0000ffff))) #endif + #define SCTP_CONTROL_VEC_SIZE_SND 8192 #define SCTP_CONTROL_VEC_SIZE_RCV 16384 +#define SCTP_STACK_BUF_SIZE 2048 +#define SCTP_SMALL_IOVEC_SIZE 2 #ifdef SCTP_DEBUG_PRINT_ADDRESS + +#define SCTP_STRING_BUF_SZ 256 + static void SCTPPrintAnAddress(struct sockaddr *a) { - char stringToPrint[256]; + char stringToPrint[SCTP_STRING_BUF_SZ]; u_short prt; char *srcaddr, *txt; @@ -79,8 +85,8 @@ txt = "IPv6 Address: "; } else if (a->sa_family == AF_LINK) { int i; - char tbuf[200]; - u_char adbuf[200]; + char tbuf[SCTP_STRING_BUF_SZ]; + u_char adbuf[SCTP_STRING_BUF_SZ]; struct sockaddr_dl *dl; dl = (struct sockaddr_dl *)a; @@ -101,10 +107,6 @@ printf(":"); } printf("\n"); - /* - * u_short sdl_route[16]; *//* source routing - * information - */ return; } else { return; @@ -164,7 +166,7 @@ int sctp_connectx(int sd, const struct sockaddr *addrs, int addrcnt) { - char buf[2048]; + char buf[SCTP_STACK_BUF_SIZE]; int i, ret, cnt, *aa; char *cpto; const struct sockaddr *at; @@ -298,14 +300,14 @@ asoc = id; siz = sizeof(sctp_assoc_t); if (getsockopt(sd, IPPROTO_SCTP, SCTP_GET_REMOTE_ADDR_SIZE, - &asoc, &siz) != 0) { + &asoc, &siz) != 0) { errno = ENOMEM; return (-1); } /* size required is returned in 'asoc' */ - siz = (uint32_t) asoc; + siz = (size_t)asoc; siz += sizeof(struct sctp_getaddresses); - addrs = calloc((unsigned long)1, (unsigned long)siz); + addrs = calloc(1, siz); if (addrs == NULL) { errno = ENOMEM; return (-1); @@ -314,7 +316,7 @@ addrs->sget_assoc_id = id; /* Now lets get the array of addresses */ if (getsockopt(sd, IPPROTO_SCTP, SCTP_GET_PEER_ADDRESSES, - addrs, (socklen_t *) & siz) != 0) { + addrs, &siz) != 0) { free(addrs); errno = ENOMEM; return (-1); @@ -370,7 +372,7 @@ } siz = size_of_addresses + sizeof(struct sockaddr_storage); siz += sizeof(struct sctp_getaddresses); - addrs = calloc((unsigned long)1, (unsigned long)siz); + addrs = calloc(1, siz); if (addrs == NULL) { errno = ENOMEM; return (-1); @@ -379,7 +381,7 @@ addrs->sget_assoc_id = id; /* Now lets get the array of addresses */ if (getsockopt(sd, IPPROTO_SCTP, SCTP_GET_LOCAL_ADDRESSES, addrs, - (socklen_t *) & siz) != 0) { + &siz) != 0) { free(addrs); errno = ENOMEM; return (-1); @@ -436,7 +438,7 @@ ssize_t sz; struct msghdr msg; struct sctp_sndrcvinfo *s_info; - struct iovec iov[2]; + struct iovec iov[SCTP_SMALL_IOVEC_SIZE]; char controlVector[SCTP_CONTROL_VEC_SIZE_RCV]; struct cmsghdr *cmsg; struct sockaddr *who = NULL; @@ -547,7 +549,7 @@ #else ssize_t sz; struct msghdr msg; - struct iovec iov[2]; + struct iovec iov[SCTP_SMALL_IOVEC_SIZE]; struct sctp_sndrcvinfo *s_info; char controlVector[SCTP_CONTROL_VEC_SIZE_SND]; struct cmsghdr *cmsg; @@ -595,6 +597,20 @@ int add_len, len, no_end_cx = 0; struct sockaddr *at; + +#ifdef SYS_sctp_generic_sendmsg + if (addrcnt < SCTP_SMALL_IOVEC_SIZE) { + socklen_t l; + + /* + * Quick way, we don't need to do a connectx so lets use the + * syscall directly. + */ + l = addrs->sa_len; + return (syscall(SYS_sctp_generic_sendmsg, sd, + msg, msg_len, addrs, l, sinfo, flags)); + } +#endif len = sizeof(int); at = addrs; cnt = 0; @@ -617,10 +633,6 @@ errno = EINVAL; return (-1); } - if (len > 2048) { - /* Never enough memory */ - return (E2BIG); - } buf = malloc(len); if (buf == NULL) { return (ENOMEM); @@ -693,7 +705,7 @@ { #ifdef SYS_sctp_generic_recvmsg - struct iovec iov[2]; + struct iovec iov[SCTP_SMALL_IOVEC_SIZE]; iov[0].iov_base = dbuf; iov[0].iov_len = len; @@ -704,7 +716,7 @@ ssize_t sz; int sinfo_found = 0; struct msghdr msg; - struct iovec iov[2]; + struct iovec iov[SCTP_SMALL_IOVEC_SIZE]; char controlVector[SCTP_CONTROL_VEC_SIZE_RCV]; struct cmsghdr *cmsg; @@ -826,3 +838,9 @@ } #endif + + +#undef SCTP_CONTROL_VEC_SIZE_SND +#undef SCTP_CONTROL_VEC_SIZE_RCV +#undef SCTP_STACK_BUF_SIZE +#undef SCTP_SMALL_IOVEC_SIZE ==== //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/stdlib/malloc.c#6 (text+ko) ==== @@ -185,7 +185,7 @@ #endif #include -__FBSDID("$FreeBSD: src/lib/libc/stdlib/malloc.c,v 1.139 2007/01/31 22:54:19 jasone Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/stdlib/malloc.c,v 1.140 2007/02/22 19:10:30 jasone Exp $"); #include "libc_private.h" #ifdef MALLOC_DEBUG @@ -1029,8 +1029,8 @@ malloc_mutex_unlock(&brk_mtx); base_chunk = brk_cur; base_next_addr = base_chunk; - base_past_addr = (void *)((uintptr_t)base_chunk + - incr); + base_past_addr = (void *)((uintptr_t)base_chunk + + incr); #ifdef MALLOC_STATS base_total += incr; #endif @@ -1042,8 +1042,8 @@ #endif /* - * Don't worry about chunk alignment here, since base_chunk doesn't really - * need to be aligned. + * Don't worry about chunk alignment here, since base_chunk doesn't + * really need to be aligned. */ base_chunk = pages_map(NULL, chunk_size); if (base_chunk == NULL) @@ -1067,8 +1067,12 @@ malloc_mutex_lock(&base_mtx); - /* Make sure there's enough space for the allocation. */ - if ((uintptr_t)base_next_addr + csize > (uintptr_t)base_past_addr) { + /* + * Make sure there's enough space for the allocation. + * base_chunk_alloc() does not guarantee that a newly allocated chunk + * is >= size, so loop here, rather than only trying once. + */ + while ((uintptr_t)base_next_addr + csize > (uintptr_t)base_past_addr) { if (base_chunk_alloc(csize)) { ret = NULL; goto RETURN; @@ -1299,6 +1303,36 @@ } } + /* + * Try to over-allocate, but allow the OS to place the allocation + * anywhere. Beware of size_t wrap-around. + */ + if (size + chunk_size > size) { + if ((ret = pages_map(NULL, size + chunk_size)) != NULL) { + size_t offset = CHUNK_ADDR2OFFSET(ret); + + /* + * Success. Clean up unneeded leading/trailing space. + */ + if (offset != 0) { + /* Leading space. */ + pages_unmap(ret, chunk_size - offset); + + ret = (void *)((uintptr_t)ret + (chunk_size - + offset)); + + /* Trailing space. */ + pages_unmap((void *)((uintptr_t)ret + size), + offset); + } else { + /* Trailing space only. */ + pages_unmap((void *)((uintptr_t)ret + size), + chunk_size); + } + goto RETURN; + } + } + #ifdef USE_BRK /* * Try to create allocations in brk, in order to make full use of @@ -1342,36 +1376,6 @@ } #endif - /* - * Try to over-allocate, but allow the OS to place the allocation - * anywhere. Beware of size_t wrap-around. - */ - if (size + chunk_size > size) { - if ((ret = pages_map(NULL, size + chunk_size)) != NULL) { - size_t offset = CHUNK_ADDR2OFFSET(ret); - - /* - * Success. Clean up unneeded leading/trailing space. - */ - if (offset != 0) { - /* Leading space. */ - pages_unmap(ret, chunk_size - offset); - - ret = (void *)((uintptr_t)ret + (chunk_size - - offset)); - - /* Trailing space. */ - pages_unmap((void *)((uintptr_t)ret + size), - offset); - } else { - /* Trailing space only. */ - pages_unmap((void *)((uintptr_t)ret + size), - chunk_size); - } - goto RETURN; - } - } - /* All strategies for allocation failed. */ ret = NULL; RETURN: ==== //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/sys/Makefile.inc#3 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile.inc 8.3 (Berkeley) 10/24/94 -# $FreeBSD: src/lib/libc/sys/Makefile.inc,v 1.122 2006/10/12 13:46:33 ru Exp $ +# $FreeBSD: src/lib/libc/sys/Makefile.inc,v 1.123 2007/02/22 14:32:38 rrs Exp $ # sys sources .PATH: ${.CURDIR}/${MACHINE_ARCH}/sys ${.CURDIR}/sys @@ -84,6 +84,7 @@ sigaction.2 sigaltstack.2 sigpending.2 sigprocmask.2 sigqueue.2 \ sigreturn.2 sigstack.2 sigsuspend.2 sigwait.2 sigwaitinfo.2 \ socket.2 socketpair.2 stat.2 statfs.2 \ + sctp_generic_recvmsg.2 sctp_generic_sendmsg.2 sctp_peeloff.2 \ swapon.2 symlink.2 sync.2 sysarch.2 syscall.2 \ timer_create.2 timer_delete.2 timer_settime.2 \ truncate.2 umask.2 undelete.2 \ ==== //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/sys/kse.2#3 (text+ko) ==== @@ -33,9 +33,9 @@ .\" THE USE OF THIS SOFTWARE, EVEN IF PACKET DESIGN IS ADVISED OF .\" THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libc/sys/kse.2,v 1.19 2006/12/12 08:13:02 julian Exp $ +.\" $FreeBSD: src/lib/libc/sys/kse.2,v 1.22 2007/02/14 07:38:39 brueffer Exp $ .\" -.Dd July 12, 2004 +.Dd February 13, 2007 .Dt KSE 2 .Os .Sh NAME @@ -47,7 +47,7 @@ .In sys/types.h .In sys/kse.h .Ft int -.Fn kse_create "struct kse_mailbox *mbx" "int newgroup" +.Fn kse_create "struct kse_mailbox *mbx" "int sys-scope" .Ft int .Fn kse_exit void .Ft int @@ -103,9 +103,6 @@ .It All operations that block in the kernel become asynchronous, allowing the user process to schedule another thread when any thread blocks. -.It -Multiple thread schedulers within the same process are possible, and they -may operate independently of each other. .El .\" .Ss Definitions @@ -124,6 +121,8 @@ The KSE is said to be .Sy assigned to the thread. +KSEs (a user abstraction) are implemented on top +of kernel threads using an 'upcall' entity. .Pp The KSE becomes .Sy unassigned , @@ -160,22 +159,13 @@ KSEs always complete as much work as possible in the kernel before becoming unassigned. .Pp -A -.Sy "KSE group" -is a collection of KSEs that are scheduled uniformly and which share -access to the same pool of threads, which are associated with the KSE group. -A KSE group is the smallest entity to which a kernel scheduling -priority may be assigned. -For the purposes of process scheduling and accounting, each -KSE group -counts similarly to a traditional unthreaded process. -Individual KSEs within a KSE group are effectively indistinguishable, -and any KSE in a KSE group may be assigned by the kernel to any runnable -(in the kernel) thread associated with that KSE group. +Individual KSEs within a process are effectively indistinguishable, +and any KSE in a process may be assigned by the kernel to any runnable +(in the kernel) thread associated with that process. In practice, the kernel attempts to preserve the affinity between threads and actual CPUs to optimize cache behavior, but this is invisible to the user process. -(Affinity is not yet implemented.) +(Affinity is not yet fully implemented.) .Pp Each KSE has a unique .Sy "KSE mailbox" @@ -199,17 +189,17 @@ This pointer is saved when the thread blocks in the kernel. .Pp Whenever a thread blocked in the kernel is ready to return to user space, -it is added to the KSE group's list of +it is added to the process's list of .Sy completed threads. This list is presented to the user code at the next upcall as a linked list of thread mailboxes. .Pp -There is a kernel-imposed limit on the number of threads in a KSE group +There is a kernel-imposed limit on the number of threads in a process that may be simultaneously blocked in the kernel (this number is not currently visible to the user). When this limit is reached, upcalls are blocked and no work is performed -for the KSE group until one of the threads completes (or a signal is +for the process until one of the threads completes (or a signal is received). .\" .Ss Managing KSEs @@ -223,27 +213,32 @@ The KSE will be associated with the mailbox pointed to by .Fa mbx . If -.Fa newgroup -is non-zero, a new KSE group is also created containing the KSE. -Otherwise, the new KSE is added to the current KSE group. -Newly created KSEs are initially unassigned; therefore, -they will upcall immediately. +.Fa sys_scope +is non-zero, then the new thread will be counted as a system scope +thread. Other things must be done as well to make a system scope thread +so this is not sufficient (yet). +System scope variables are not covered +in detail in this manual page yet, but briefly, they never perform +upcalls and do not return to the user thread scheduler. +Once launched they run autonomously. +The pthreads library knows how to make system +scope threads and users are encouraged to use the library interface. .Pp -Each process initially has a single KSE in a single KSE group executing -a single user thread. +Each process initially has a single KSE executing a single user thread. Since the KSE does not have an associated mailbox, it must remain assigned to the thread and does not perform any upcalls. +(It is by definition a system scope thread). The result is the traditional, unthreaded mode of operation. Therefore, as a special case, the first call to .Fn kse_create by this initial thread with >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Feb 26 14:45:04 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 62A6E16A403; Mon, 26 Feb 2007 14:45:04 +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 1C54116A400 for ; Mon, 26 Feb 2007 14:45:04 +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 0CBA513C467 for ; Mon, 26 Feb 2007 14:45:04 +0000 (UTC) (envelope-from bushman@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l1QEj38O098780 for ; Mon, 26 Feb 2007 14:45:03 GMT (envelope-from bushman@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l1QEj3JP098777 for perforce@freebsd.org; Mon, 26 Feb 2007 14:45:03 GMT (envelope-from bushman@freebsd.org) Date: Mon, 26 Feb 2007 14:45:03 GMT Message-Id: <200702261445.l1QEj3JP098777@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 115062 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 26 Feb 2007 14:45:05 -0000 http://perforce.freebsd.org/chv.cgi?CH=115062 Change 115062 by bushman@bushman_nss_ldap_cached on 2007/02/26 14:44:10 + more configuration options are now accessible from the config file (sleep and connection tries related options) + reconnection logic was changed so that one global reconnection counter is consulted for each connection session + ldap_msgtype() now used to properly identify the result message and not give it to the parser Affected files ... .. //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_ldap/ldapconf.c#20 edit .. //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_ldap/ldapconf.h#17 edit .. //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_ldap/ldapsearch.c#19 edit .. //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_ldap/nss_ldap.c#23 edit .. //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_ldap/nss_ldap.h#17 edit Differences ... ==== //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_ldap/ldapconf.c#20 (text+ko) ==== @@ -415,9 +415,28 @@ } } break; + case 'm': + case 'M': + if (strcasecmp(fields[0], "max_conntries") == 0) { + if ((field_count == 2) && + (get_number(fields[1], 0, -1, &value) == + NSS_LDAP_SUCCESS)) { + conf->max_conntries = value; + return (NSS_LDAP_SUCCESS); + } + } else if (strcasecmp(fields[0], + "max_reconnect_conntries") == 0) { + if ((field_count == 2) && + (get_number(fields[1], 0, -1, &value) == + NSS_LDAP_SUCCESS)) { + conf->max_reconnect_conntries = value; + return (NSS_LDAP_SUCCESS); + } + } + break; case 'n': case 'N': - if (strncmp(fields[0], NSS_BASE_PREFIX, + if (strncasecmp(fields[0], NSS_BASE_PREFIX, NSS_BASE_PREFIX_SIZE) == 0) { if ((field_count == 2) && (set_base_map(conf, @@ -559,7 +578,14 @@ break; case 'r': case 'R': - if (strcasecmp(fields[0], "rootbinddn") == 0) { + if (strcasecmp(fields[0], "reconnect_sleeptime") == 0) { + if ((field_count == 2) && + (get_number(fields[1], 0, -1, &value) == + NSS_LDAP_SUCCESS)) { + conf->reconnect_sleeptime = value; + return (NSS_LDAP_SUCCESS); + } + } else if (strcasecmp(fields[0], "rootbinddn") == 0) { if (field_count == 2) { free(conf->root_bind_dn); conf->root_bind_dn = strdup(fields[1]); @@ -730,7 +756,6 @@ conf->idle_timelimit = 0; conf->search_timelimit = 0; conf->reconnect_sleeptime = 4; - conf->max_reconnect_sleeptime = 8; conf->max_conntries = 5; conf->max_reconnect_conntries = 2; conf->deref = NSS_LDAP_DEREF_NEVER; @@ -738,7 +763,7 @@ conf->bind_policy = NSS_LDAP_BIND_POLICY_HARD; conf->connect_policy = NSS_LDAP_CONNECT_POLICY_PERSIST_PERTHREAD; conf->restart = 0; - conf->debug = 0; + conf->debug = NSS_LDAP_LL_ERR; conf->page_results = NSS_LDAP_OPTION_YES; conf->results_page_size = NSS_LDAP_DEFAULT_RESULTS_PAGE_SIZE; ==== //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_ldap/ldapconf.h#17 (text+ko) ==== @@ -89,7 +89,6 @@ time_t idle_timelimit; time_t search_timelimit; time_t reconnect_sleeptime; - time_t max_reconnect_sleeptime; int max_conntries; int max_reconnect_conntries; int port; ==== //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_ldap/ldapsearch.c#19 (text+ko) ==== @@ -517,9 +517,8 @@ case LDAP_RES_SEARCH_RESULT: case LDAP_RES_SEARCH_ENTRY: ctx->msg = ldap_first_message(ctx->conn->ld, - ctx->msg_first); - - return (NSS_LDAP_SUCCESS); + ctx->msg_first); + break; case LDAP_RES_SEARCH_REFERENCE: /* NOT IMPLEMENTED */ __nss_ldap_log(NSS_LDAP_LL_ERR_INT, "search_next_def: " @@ -539,72 +538,74 @@ ctx->search_request.filter); return (NSS_LDAP_GENERIC_ERROR); } - } else { -// printf("== %s %d\n", __FILE__, __LINE__); + } else + ctx->msg = ldap_next_message(ctx->conn->ld, ctx->msg); + + /* + * Cycling through the list of results, until we find the appropriate + * one + */ + while (ctx->msg != NULL && + ldap_msgtype(ctx->msg) != LDAP_RES_SEARCH_ENTRY) ctx->msg = ldap_next_message(ctx->conn->ld, ctx->msg); - if (ctx->msg != NULL) { -// printf("== %s %d\n", __FILE__, __LINE__); - return (NSS_LDAP_SUCCESS); - } else { -// printf("== %s %d\n", __FILE__, __LINE__); - rv = ldap_parse_result(ctx->conn->ld, - ctx->msg_first, &errcode, &matcheddn, - &errmsg, &referrals, &server_controls, - 0); - - ldap_msgfree(ctx->msg_first); - ctx->msg_first = NULL; + + if (ctx->msg != NULL) + return (NSS_LDAP_SUCCESS); + else { + rv = ldap_parse_result(ctx->conn->ld, + ctx->msg_first, &errcode, &matcheddn, + &errmsg, &referrals, &server_controls, + 0); + ldap_msgfree(ctx->msg_first); + ctx->msg_first = NULL; + // printf("== %s %d\n", __FILE__, __LINE__); - if (rv == LDAP_SUCCESS) { + if (rv == LDAP_SUCCESS) { // printf("== %s %d\n", __FILE__, __LINE__); - if (server_controls != NULL) { - if (ctx->cookie != NULL) { - ber_bvfree(ctx->cookie); - ctx->cookie = NULL; - } - -// printf("== %s %d\n", __FILE__, __LINE__); - rv = __nss_ldap_parse_page_control( - ctx->conn->ld, server_controls, - &abs_rescount, &ctx->cookie); - - if (rv != LDAP_SUCCESS) { -// printf("== %s %d\n", __FILE__, __LINE__); - // TODO: write to logs smth scary - } - - ldap_controls_free(server_controls); + if (server_controls != NULL) { + if (ctx->cookie != NULL) { + ber_bvfree(ctx->cookie); + ctx->cookie = NULL; } -// printf("== %s %d\n", __FILE__, __LINE__); - if (errmsg != NULL) - ldap_memfree(errmsg); - if (matcheddn != NULL) - ldap_memfree(matcheddn); - if (referrals != NULL) - ldap_value_free(referrals); - } else { // printf("== %s %d\n", __FILE__, __LINE__); - // TODO: signal to logs - } - - if (ctx->cookie && ctx->cookie->bv_val != NULL && - (strlen(ctx->cookie->bv_val) > 0)) { - rv = do_ldap_search_ext(ctx->conn, ctx->conf, - &ctx->search_request, ctx, &ctx->msgid); + rv = __nss_ldap_parse_page_control( + ctx->conn->ld, server_controls, + &abs_rescount, &ctx->cookie); + if (rv != LDAP_SUCCESS) { // printf("== %s %d\n", __FILE__, __LINE__); - /* TODO: check this place */ - return (NSS_LDAP_SUCCESS); - } - - goto st; - } else { + // TODO: write to logs smth scary + } + + ldap_controls_free(server_controls); + } + +// printf("== %s %d\n", __FILE__, __LINE__); + if (errmsg != NULL) + ldap_memfree(errmsg); + if (matcheddn != NULL) + ldap_memfree(matcheddn); + if (referrals != NULL) + ldap_value_free(referrals); + } else { // printf("== %s %d\n", __FILE__, __LINE__); + // TODO: signal to logs + } + + if (ctx->cookie && ctx->cookie->bv_val != NULL && + (strlen(ctx->cookie->bv_val) > 0)) { + rv = do_ldap_search_ext(ctx->conn, ctx->conf, + &ctx->search_request, ctx, &ctx->msgid); + if (rv != LDAP_SUCCESS) { + /* TODO: check this place */ return (NSS_LDAP_SUCCESS); - } - } + } + + goto st; + } else + return (NSS_LDAP_GENERIC_ERROR); } return (NSS_LDAP_GENERIC_ERROR); ==== //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_ldap/nss_ldap.c#23 (text+ko) ==== @@ -120,29 +120,38 @@ struct nss_ldap_configuration *__nss_ldap_conf = NULL; int __nss_ldap_debug_level = 1; -static int nss_ldap_configure(); -static void nss_ldap_atexit(); static void connection_destroy_func(struct nss_ldap_connection *); -static void parse_context_destroy_func(struct nss_ldap_parse_context *); - +static int init_connection_with_reconnect( + struct nss_ldap_connection_method *, struct nss_ldap_connection **, + int *, struct nss_ldap_connection_error *); +static int fill_conn_request_with_host(struct nss_ldap_connection_request *, + char const *, struct nss_ldap_configuration *); +static int fill_conn_request_with_uri(struct nss_ldap_connection_request *, + char const *, struct nss_ldap_configuration *); +static void nss_ldap_atexit(); +static int nss_ldap_configure(); static int nss_ldap_connection_init(struct nss_ldap_connection_method *, struct nss_ldap_tls_method *, struct nss_ldap_connection **, - struct nss_ldap_connection_error *); + int *, struct nss_ldap_connection_error *); static int nss_ldap_connection_done(struct nss_ldap_tls_method *, struct nss_ldap_connection *); - +static int nss_ldap_connection_reset(struct nss_ldap_tls_method *, + struct nss_ldap_connection *); static int nss_ldap_parse_context_init(struct nss_ldap_search_method *, struct nss_ldap_tls_method *, int, char const *, struct nss_ldap_parse_context **, struct nss_ldap_connection *, struct nss_ldap_parse_context *); static void nss_ldap_parse_context_done(struct nss_ldap_search_method *, struct nss_ldap_tls_method *, struct nss_ldap_parse_context *, - int); - + int); static int nss_ldap_get_common(int, char const *, void *, char *, size_t, nss_ldap_parse_next_fn, nss_ldap_parse_destroy_fn, int); +static int nss_ldap_set_sigpipe_mask(sigset_t *); +static int nss_ldap_unset_sigpipe_mask(sigset_t *); +static void parse_context_destroy_func(struct nss_ldap_parse_context *); + static int nss_ldap_configure() { @@ -293,28 +302,30 @@ static int init_connection_with_reconnect( struct nss_ldap_connection_method *connection_method, - struct nss_ldap_connection **conn, + struct nss_ldap_connection **conn, int *conn_tries, struct nss_ldap_connection_error *conn_error) { struct nss_ldap_connection_request conn_request; struct nss_ldap_connection_error l_conn_err; StringList *cur_sl; size_t k; - time_t sleep_time; - int tries, sleep_tries; + int sleep_tries; int rv; - tries = 0; - sleep_time = __nss_ldap_conf->reconnect_sleeptime; + /* + * We don't set + * *conn_tries = 0; + * here so that we can keep one connection counter for each connection + * session. + */ if (__nss_ldap_conf->hosts != NULL) cur_sl = __nss_ldap_conf->hosts; else cur_sl = __nss_ldap_conf->uris; - sleep_time = __nss_ldap_conf->reconnect_sleeptime; rv = NSS_LDAP_CONNECTION_ERROR; - while (tries++ < __nss_ldap_conf->max_conntries) { + while ((*conn_tries)++ < __nss_ldap_conf->max_conntries) { sleep_tries = 0; while (sleep_tries++ < __nss_ldap_conf->max_reconnect_conntries) { for (k = 0; k < cur_sl->sl_cur; ++k) { @@ -385,12 +396,11 @@ if (__nss_ldap_conf->bind_policy == NSS_LDAP_BIND_POLICY_SOFT) break; - if (sleep_time < __nss_ldap_conf->max_reconnect_sleeptime) { + if (*conn_tries < __nss_ldap_conf->max_conntries) { __nss_ldap_log(NSS_LDAP_LL_DEBUG_INT, "init_connection_with_reconnect: sleeping for" - " %d secs", sleep_time); - sleep(sleep_time); - sleep_time *= 2; + " %d secs", __nss_ldap_conf->reconnect_sleeptime); + sleep(__nss_ldap_conf->reconnect_sleeptime); } } @@ -401,7 +411,7 @@ static int nss_ldap_connection_init(struct nss_ldap_connection_method *connection_method, struct nss_ldap_tls_method *tls_method, - struct nss_ldap_connection **conn, + struct nss_ldap_connection **conn, int *conn_tries, struct nss_ldap_connection_error *conn_error) { int rv; @@ -436,7 +446,7 @@ if (*conn == NULL) { /* connection is not established yet */ rv = init_connection_with_reconnect(connection_method, - conn, conn_error); + conn, conn_tries, conn_error); if (rv != NSS_LDAP_SUCCESS) { *conn = NULL; rv = NS_UNAVAIL; @@ -661,7 +671,7 @@ struct nss_ldap_connection_error conn_error; struct nss_ldap_connection *conn; struct nss_ldap_parse_context *pctx, pctx_model; - int rv, conn_flag, signals_rv; + int conn_tries, rv, signals_rv; assert(map_id < NSS_LDAP_MAP_MAX); assert(filter != NULL); @@ -678,11 +688,11 @@ pctx = NULL; conn = NULL; - conn_flag = 0; + conn_tries = 0; memset(&conn_error, 0, sizeof(struct nss_ldap_connection_error)); - while (conn_flag < 2) { + while (conn_tries < __nss_ldap_conf->max_conntries) { rv = nss_ldap_connection_init(connection_method, tls_method, - &conn, &conn_error); + &conn, &conn_tries, &conn_error); if (rv != NS_SUCCESS) { __nss_ldap_log(NSS_LDAP_LL_ERR, "nss_ldap_get_common: can't initialize the connection " @@ -770,7 +780,7 @@ nss_ldap_connection_reset(tls_method, conn); conn = NULL; - ++conn_flag; + ++conn_tries; } else break; } ==== //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_ldap/nss_ldap.h#17 (text+ko) ==== From owner-p4-projects@FreeBSD.ORG Mon Feb 26 14:48: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 C478B16A407; Mon, 26 Feb 2007 14:48: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 8201D16A405 for ; Mon, 26 Feb 2007 14:48:08 +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 725CE13C46B for ; Mon, 26 Feb 2007 14:48:08 +0000 (UTC) (envelope-from bushman@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l1QEm8g8098898 for ; Mon, 26 Feb 2007 14:48:08 GMT (envelope-from bushman@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l1QEm8PZ098895 for perforce@freebsd.org; Mon, 26 Feb 2007 14:48:08 GMT (envelope-from bushman@freebsd.org) Date: Mon, 26 Feb 2007 14:48:08 GMT Message-Id: <200702261448.l1QEm8PZ098895@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 115063 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 26 Feb 2007 14:48:09 -0000 http://perforce.freebsd.org/chv.cgi?CH=115063 Change 115063 by bushman@bushman_nss_ldap_cached on 2007/02/26 14:47:33 IFC Affected files ... .. //depot/projects/soc2006/nss_ldap_cached_openldap/nss_ldap_port/src/ldapconf.c#4 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/nss_ldap_port/src/ldapconf.h#3 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/nss_ldap_port/src/ldapsearch.c#3 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/nss_ldap_port/src/nss_ldap.c#5 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/nss_ldap_port/src/nss_ldap.h#4 integrate Differences ... ==== //depot/projects/soc2006/nss_ldap_cached_openldap/nss_ldap_port/src/ldapconf.c#4 (text+ko) ==== @@ -415,9 +415,28 @@ } } break; + case 'm': + case 'M': + if (strcasecmp(fields[0], "max_conntries") == 0) { + if ((field_count == 2) && + (get_number(fields[1], 0, -1, &value) == + NSS_LDAP_SUCCESS)) { + conf->max_conntries = value; + return (NSS_LDAP_SUCCESS); + } + } else if (strcasecmp(fields[0], + "max_reconnect_conntries") == 0) { + if ((field_count == 2) && + (get_number(fields[1], 0, -1, &value) == + NSS_LDAP_SUCCESS)) { + conf->max_reconnect_conntries = value; + return (NSS_LDAP_SUCCESS); + } + } + break; case 'n': case 'N': - if (strncmp(fields[0], NSS_BASE_PREFIX, + if (strncasecmp(fields[0], NSS_BASE_PREFIX, NSS_BASE_PREFIX_SIZE) == 0) { if ((field_count == 2) && (set_base_map(conf, @@ -559,7 +578,14 @@ break; case 'r': case 'R': - if (strcasecmp(fields[0], "rootbinddn") == 0) { + if (strcasecmp(fields[0], "reconnect_sleeptime") == 0) { + if ((field_count == 2) && + (get_number(fields[1], 0, -1, &value) == + NSS_LDAP_SUCCESS)) { + conf->reconnect_sleeptime = value; + return (NSS_LDAP_SUCCESS); + } + } else if (strcasecmp(fields[0], "rootbinddn") == 0) { if (field_count == 2) { free(conf->root_bind_dn); conf->root_bind_dn = strdup(fields[1]); @@ -730,7 +756,6 @@ conf->idle_timelimit = 0; conf->search_timelimit = 0; conf->reconnect_sleeptime = 4; - conf->max_reconnect_sleeptime = 8; conf->max_conntries = 5; conf->max_reconnect_conntries = 2; conf->deref = NSS_LDAP_DEREF_NEVER; @@ -738,7 +763,7 @@ conf->bind_policy = NSS_LDAP_BIND_POLICY_HARD; conf->connect_policy = NSS_LDAP_CONNECT_POLICY_PERSIST_PERTHREAD; conf->restart = 0; - conf->debug = 0; + conf->debug = NSS_LDAP_LL_ERR; conf->page_results = NSS_LDAP_OPTION_YES; conf->results_page_size = NSS_LDAP_DEFAULT_RESULTS_PAGE_SIZE; ==== //depot/projects/soc2006/nss_ldap_cached_openldap/nss_ldap_port/src/ldapconf.h#3 (text+ko) ==== @@ -89,7 +89,6 @@ time_t idle_timelimit; time_t search_timelimit; time_t reconnect_sleeptime; - time_t max_reconnect_sleeptime; int max_conntries; int max_reconnect_conntries; int port; ==== //depot/projects/soc2006/nss_ldap_cached_openldap/nss_ldap_port/src/ldapsearch.c#3 (text+ko) ==== @@ -517,9 +517,8 @@ case LDAP_RES_SEARCH_RESULT: case LDAP_RES_SEARCH_ENTRY: ctx->msg = ldap_first_message(ctx->conn->ld, - ctx->msg_first); - - return (NSS_LDAP_SUCCESS); + ctx->msg_first); + break; case LDAP_RES_SEARCH_REFERENCE: /* NOT IMPLEMENTED */ __nss_ldap_log(NSS_LDAP_LL_ERR_INT, "search_next_def: " @@ -539,72 +538,74 @@ ctx->search_request.filter); return (NSS_LDAP_GENERIC_ERROR); } - } else { -// printf("== %s %d\n", __FILE__, __LINE__); + } else + ctx->msg = ldap_next_message(ctx->conn->ld, ctx->msg); + + /* + * Cycling through the list of results, until we find the appropriate + * one + */ + while (ctx->msg != NULL && + ldap_msgtype(ctx->msg) != LDAP_RES_SEARCH_ENTRY) ctx->msg = ldap_next_message(ctx->conn->ld, ctx->msg); - if (ctx->msg != NULL) { -// printf("== %s %d\n", __FILE__, __LINE__); - return (NSS_LDAP_SUCCESS); - } else { -// printf("== %s %d\n", __FILE__, __LINE__); - rv = ldap_parse_result(ctx->conn->ld, - ctx->msg_first, &errcode, &matcheddn, - &errmsg, &referrals, &server_controls, - 0); - - ldap_msgfree(ctx->msg_first); - ctx->msg_first = NULL; + + if (ctx->msg != NULL) + return (NSS_LDAP_SUCCESS); + else { + rv = ldap_parse_result(ctx->conn->ld, + ctx->msg_first, &errcode, &matcheddn, + &errmsg, &referrals, &server_controls, + 0); + ldap_msgfree(ctx->msg_first); + ctx->msg_first = NULL; + // printf("== %s %d\n", __FILE__, __LINE__); - if (rv == LDAP_SUCCESS) { + if (rv == LDAP_SUCCESS) { // printf("== %s %d\n", __FILE__, __LINE__); - if (server_controls != NULL) { - if (ctx->cookie != NULL) { - ber_bvfree(ctx->cookie); - ctx->cookie = NULL; - } - -// printf("== %s %d\n", __FILE__, __LINE__); - rv = __nss_ldap_parse_page_control( - ctx->conn->ld, server_controls, - &abs_rescount, &ctx->cookie); - - if (rv != LDAP_SUCCESS) { -// printf("== %s %d\n", __FILE__, __LINE__); - // TODO: write to logs smth scary - } - - ldap_controls_free(server_controls); + if (server_controls != NULL) { + if (ctx->cookie != NULL) { + ber_bvfree(ctx->cookie); + ctx->cookie = NULL; } -// printf("== %s %d\n", __FILE__, __LINE__); - if (errmsg != NULL) - ldap_memfree(errmsg); - if (matcheddn != NULL) - ldap_memfree(matcheddn); - if (referrals != NULL) - ldap_value_free(referrals); - } else { // printf("== %s %d\n", __FILE__, __LINE__); - // TODO: signal to logs - } - - if (ctx->cookie && ctx->cookie->bv_val != NULL && - (strlen(ctx->cookie->bv_val) > 0)) { - rv = do_ldap_search_ext(ctx->conn, ctx->conf, - &ctx->search_request, ctx, &ctx->msgid); + rv = __nss_ldap_parse_page_control( + ctx->conn->ld, server_controls, + &abs_rescount, &ctx->cookie); + if (rv != LDAP_SUCCESS) { // printf("== %s %d\n", __FILE__, __LINE__); - /* TODO: check this place */ - return (NSS_LDAP_SUCCESS); - } - - goto st; - } else { + // TODO: write to logs smth scary + } + + ldap_controls_free(server_controls); + } + +// printf("== %s %d\n", __FILE__, __LINE__); + if (errmsg != NULL) + ldap_memfree(errmsg); + if (matcheddn != NULL) + ldap_memfree(matcheddn); + if (referrals != NULL) + ldap_value_free(referrals); + } else { // printf("== %s %d\n", __FILE__, __LINE__); + // TODO: signal to logs + } + + if (ctx->cookie && ctx->cookie->bv_val != NULL && + (strlen(ctx->cookie->bv_val) > 0)) { + rv = do_ldap_search_ext(ctx->conn, ctx->conf, + &ctx->search_request, ctx, &ctx->msgid); + if (rv != LDAP_SUCCESS) { + /* TODO: check this place */ return (NSS_LDAP_SUCCESS); - } - } + } + + goto st; + } else + return (NSS_LDAP_GENERIC_ERROR); } return (NSS_LDAP_GENERIC_ERROR); ==== //depot/projects/soc2006/nss_ldap_cached_openldap/nss_ldap_port/src/nss_ldap.c#5 (text+ko) ==== @@ -120,29 +120,38 @@ struct nss_ldap_configuration *__nss_ldap_conf = NULL; int __nss_ldap_debug_level = 1; -static int nss_ldap_configure(); -static void nss_ldap_atexit(); static void connection_destroy_func(struct nss_ldap_connection *); -static void parse_context_destroy_func(struct nss_ldap_parse_context *); - +static int init_connection_with_reconnect( + struct nss_ldap_connection_method *, struct nss_ldap_connection **, + int *, struct nss_ldap_connection_error *); +static int fill_conn_request_with_host(struct nss_ldap_connection_request *, + char const *, struct nss_ldap_configuration *); +static int fill_conn_request_with_uri(struct nss_ldap_connection_request *, + char const *, struct nss_ldap_configuration *); +static void nss_ldap_atexit(); +static int nss_ldap_configure(); static int nss_ldap_connection_init(struct nss_ldap_connection_method *, struct nss_ldap_tls_method *, struct nss_ldap_connection **, - struct nss_ldap_connection_error *); + int *, struct nss_ldap_connection_error *); static int nss_ldap_connection_done(struct nss_ldap_tls_method *, struct nss_ldap_connection *); - +static int nss_ldap_connection_reset(struct nss_ldap_tls_method *, + struct nss_ldap_connection *); static int nss_ldap_parse_context_init(struct nss_ldap_search_method *, struct nss_ldap_tls_method *, int, char const *, struct nss_ldap_parse_context **, struct nss_ldap_connection *, struct nss_ldap_parse_context *); static void nss_ldap_parse_context_done(struct nss_ldap_search_method *, struct nss_ldap_tls_method *, struct nss_ldap_parse_context *, - int); - + int); static int nss_ldap_get_common(int, char const *, void *, char *, size_t, nss_ldap_parse_next_fn, nss_ldap_parse_destroy_fn, int); +static int nss_ldap_set_sigpipe_mask(sigset_t *); +static int nss_ldap_unset_sigpipe_mask(sigset_t *); +static void parse_context_destroy_func(struct nss_ldap_parse_context *); + static int nss_ldap_configure() { @@ -293,28 +302,30 @@ static int init_connection_with_reconnect( struct nss_ldap_connection_method *connection_method, - struct nss_ldap_connection **conn, + struct nss_ldap_connection **conn, int *conn_tries, struct nss_ldap_connection_error *conn_error) { struct nss_ldap_connection_request conn_request; struct nss_ldap_connection_error l_conn_err; StringList *cur_sl; size_t k; - time_t sleep_time; - int tries, sleep_tries; + int sleep_tries; int rv; - tries = 0; - sleep_time = __nss_ldap_conf->reconnect_sleeptime; + /* + * We don't set + * *conn_tries = 0; + * here so that we can keep one connection counter for each connection + * session. + */ if (__nss_ldap_conf->hosts != NULL) cur_sl = __nss_ldap_conf->hosts; else cur_sl = __nss_ldap_conf->uris; - sleep_time = __nss_ldap_conf->reconnect_sleeptime; rv = NSS_LDAP_CONNECTION_ERROR; - while (tries++ < __nss_ldap_conf->max_conntries) { + while ((*conn_tries)++ < __nss_ldap_conf->max_conntries) { sleep_tries = 0; while (sleep_tries++ < __nss_ldap_conf->max_reconnect_conntries) { for (k = 0; k < cur_sl->sl_cur; ++k) { @@ -385,12 +396,11 @@ if (__nss_ldap_conf->bind_policy == NSS_LDAP_BIND_POLICY_SOFT) break; - if (sleep_time < __nss_ldap_conf->max_reconnect_sleeptime) { + if (*conn_tries < __nss_ldap_conf->max_conntries) { __nss_ldap_log(NSS_LDAP_LL_DEBUG_INT, "init_connection_with_reconnect: sleeping for" - " %d secs", sleep_time); - sleep(sleep_time); - sleep_time *= 2; + " %d secs", __nss_ldap_conf->reconnect_sleeptime); + sleep(__nss_ldap_conf->reconnect_sleeptime); } } @@ -401,7 +411,7 @@ static int nss_ldap_connection_init(struct nss_ldap_connection_method *connection_method, struct nss_ldap_tls_method *tls_method, - struct nss_ldap_connection **conn, + struct nss_ldap_connection **conn, int *conn_tries, struct nss_ldap_connection_error *conn_error) { int rv; @@ -436,7 +446,7 @@ if (*conn == NULL) { /* connection is not established yet */ rv = init_connection_with_reconnect(connection_method, - conn, conn_error); + conn, conn_tries, conn_error); if (rv != NSS_LDAP_SUCCESS) { *conn = NULL; rv = NS_UNAVAIL; @@ -661,7 +671,7 @@ struct nss_ldap_connection_error conn_error; struct nss_ldap_connection *conn; struct nss_ldap_parse_context *pctx, pctx_model; - int rv, conn_flag, signals_rv; + int conn_tries, rv, signals_rv; assert(map_id < NSS_LDAP_MAP_MAX); assert(filter != NULL); @@ -678,11 +688,11 @@ pctx = NULL; conn = NULL; - conn_flag = 0; + conn_tries = 0; memset(&conn_error, 0, sizeof(struct nss_ldap_connection_error)); - while (conn_flag < 2) { + while (conn_tries < __nss_ldap_conf->max_conntries) { rv = nss_ldap_connection_init(connection_method, tls_method, - &conn, &conn_error); + &conn, &conn_tries, &conn_error); if (rv != NS_SUCCESS) { __nss_ldap_log(NSS_LDAP_LL_ERR, "nss_ldap_get_common: can't initialize the connection " @@ -770,7 +780,7 @@ nss_ldap_connection_reset(tls_method, conn); conn = NULL; - ++conn_flag; + ++conn_tries; } else break; } ==== //depot/projects/soc2006/nss_ldap_cached_openldap/nss_ldap_port/src/nss_ldap.h#4 (text+ko) ==== From owner-p4-projects@FreeBSD.ORG Mon Feb 26 15:09: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 E12AA16A407; Mon, 26 Feb 2007 15:09: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 8E22D16A401 for ; Mon, 26 Feb 2007 15:09:36 +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 7E13013C4B8 for ; Mon, 26 Feb 2007 15:09:36 +0000 (UTC) (envelope-from bushman@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l1QF9aVk003331 for ; Mon, 26 Feb 2007 15:09:36 GMT (envelope-from bushman@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l1QF9afb003328 for perforce@freebsd.org; Mon, 26 Feb 2007 15:09:36 GMT (envelope-from bushman@freebsd.org) Date: Mon, 26 Feb 2007 15:09:36 GMT Message-Id: <200702261509.l1QF9afb003328@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 115064 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 26 Feb 2007 15:09:37 -0000 http://perforce.freebsd.org/chv.cgi?CH=115064 Change 115064 by bushman@bushman_nss_ldap_cached on 2007/02/26 15:09:10 Change in port and fix in the script. Affected files ... .. //depot/projects/soc2006/nss_ldap_cached_openldap/nss_ldap_port/build_port.sh#3 edit .. //depot/projects/soc2006/nss_ldap_cached_openldap/nss_ldap_port/port/Makefile#3 edit Differences ... ==== //depot/projects/soc2006/nss_ldap_cached_openldap/nss_ldap_port/build_port.sh#3 (text+ko) ==== @@ -2,8 +2,8 @@ display_usage () { echo 'nss_ldap_bsd port build tool ' - echo "Usage: $0 port_dir src_dir dest_dir_archive dest_port_archive" - echo "Note: dest_dir_archive should be .tar archive and dest_port_archive" + echo "Usage: $0 port_dir src_dir dest_dist_archive dest_port_archive" + echo "Note: dest_port_archive should be .tar archive and dest_dist_archive" echo " should be .tar.gz archive" echo '' } ==== //depot/projects/soc2006/nss_ldap_cached_openldap/nss_ldap_port/port/Makefile#3 (text+ko) ==== @@ -1,7 +1,7 @@ # nss_ldap port stub PORTNAME= nss_ldap_bsd -PORTVERSION= 0.24 +PORTVERSION= 0.241 CATEGORIES= net MASTER_SITES= http://rsu.ru/~bushman/nss_ldap/ \ ${MASTER_SITE_LOCAL} From owner-p4-projects@FreeBSD.ORG Mon Feb 26 17:24: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 2F79516A407; Mon, 26 Feb 2007 17:24: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 E686116A405 for ; Mon, 26 Feb 2007 17:24: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 D6F0013C4AC for ; Mon, 26 Feb 2007 17:24:35 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l1QHOZF6036344 for ; Mon, 26 Feb 2007 17:24:35 GMT (envelope-from gonzo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l1QHOZvu036341 for perforce@freebsd.org; Mon, 26 Feb 2007 17:24:35 GMT (envelope-from gonzo@FreeBSD.org) Date: Mon, 26 Feb 2007 17:24:35 GMT Message-Id: <200702261724.l1QHOZvu036341@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 115070 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 26 Feb 2007 17:24:36 -0000 http://perforce.freebsd.org/chv.cgi?CH=115070 Change 115070 by gonzo@gonzo_jeeves on 2007/02/26 17:23:47 o Pass obj_main, ps_strings and cleanup procedure as arguments to __start. Affected files ... .. //depot/projects/mips2/src/lib/csu/mips/crt1.c#6 edit Differences ... ==== //depot/projects/mips2/src/lib/csu/mips/crt1.c#6 (text+ko) ==== @@ -51,7 +51,6 @@ #include "crtbrand.c" #include -typedef void (*fptr)(void); struct Struct_Obj_Entry; struct ps_strings; @@ -73,6 +72,7 @@ char **environ; const char *__progname = ""; +struct ps_strings *__ps_strings; /* The entry function. */ __asm(" .text \n" @@ -80,6 +80,10 @@ " .globl _start \n" " _start: \n" " .cpload $25 \n" +" /* Get cleanup routine and main object set by rtld */\n" +" /* Note that a2 is already set to ps_string by _rtld_start */\n" +" /* move a3, a0 */\n" +" /* move t0, a1 */\n" " /* Get argc, argv from stack */ \n" " /* lw a0, 0(sp) */\n" " /* move a1, sp */\n" @@ -89,12 +93,18 @@ " /* required by ABI to pass */\n" " /* 64-bits arguments */\n" " /* and sp, ~8 */\n" +" /* subu sp, sp, 20 */\n" +" /* sw t0, 16(sp) */\n" " \n" +" move $7, $4 /* atexit */\n" +" move $8, $5 /* main_obj entry */\n" " lw $4, 0($29) \n" " move $5, $29 \n" " addu $5, 4 \n" " \n" " and $29, 0xfffffff8 \n" +" subu $29, $29, 24 /* args slot + cleanup + 4 bytes padding */ \n" +" sw $8, 16($29) \n" "\n" " la $25, __start \n" " nop \n" @@ -102,12 +112,11 @@ /* ARGSUSED */ void -__start(int argc, char **argv) +__start(int argc, char **argv, struct ps_strings *ps_strings, + void (*cleanup)(void), const struct Struct_Obj_Entry *obj __unused) { char **env; const char *s; - /* XXXMIPS: proper set a cleanup procedure */ - fptr cleanup = NULL; env = argv + argc + 1; environ = env; @@ -119,10 +128,14 @@ __progname = s + 1; } + if (ps_strings != (struct ps_strings *)0) + __ps_strings = ps_strings; + if (&_DYNAMIC != NULL) atexit(cleanup); else _init_tls(); + #ifdef GCRT atexit(_mcleanup); #endif From owner-p4-projects@FreeBSD.ORG Mon Feb 26 17:38: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 88C1916A401; Mon, 26 Feb 2007 17: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 46DA716A403 for ; Mon, 26 Feb 2007 17:38:09 +0000 (UTC) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 34E6D13C442 for ; Mon, 26 Feb 2007 17:38:09 +0000 (UTC) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l1QHc9Sc038027 for ; Mon, 26 Feb 2007 17:38:09 GMT (envelope-from piso@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l1QHbqnr038002 for perforce@freebsd.org; Mon, 26 Feb 2007 17:37:52 GMT (envelope-from piso@freebsd.org) Date: Mon, 26 Feb 2007 17:37:52 GMT Message-Id: <200702261737.l1QHbqnr038002@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to piso@freebsd.org using -f From: Paolo Pisati To: Perforce Change Reviews Cc: Subject: PERFORCE change 115071 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 26 Feb 2007 17:38:10 -0000 http://perforce.freebsd.org/chv.cgi?CH=115071 Change 115071 by piso@piso_newluxor on 2007/02/26 17:37:20 IFC@115061 Affected files ... .. //depot/projects/soc2005/libalias/sys/netinet/ip_fw2.c#47 edit .. //depot/projects/soc2006/intr_filter/amd64/amd64/intr_machdep.c#23 integrate .. //depot/projects/soc2006/intr_filter/amd64/amd64/machdep.c#9 integrate .. //depot/projects/soc2006/intr_filter/amd64/amd64/mp_machdep.c#5 integrate .. //depot/projects/soc2006/intr_filter/amd64/amd64/mptable_pci.c#4 integrate .. //depot/projects/soc2006/intr_filter/amd64/amd64/msi.c#2 integrate .. //depot/projects/soc2006/intr_filter/amd64/amd64/nexus.c#6 integrate .. //depot/projects/soc2006/intr_filter/amd64/amd64/pmap.c#11 integrate .. //depot/projects/soc2006/intr_filter/amd64/amd64/uma_machdep.c#2 integrate .. //depot/projects/soc2006/intr_filter/amd64/conf/GENERIC#11 integrate .. //depot/projects/soc2006/intr_filter/amd64/include/clock.h#3 integrate .. //depot/projects/soc2006/intr_filter/amd64/include/gdb_machdep.h#2 integrate .. //depot/projects/soc2006/intr_filter/amd64/include/intr_machdep.h#7 integrate .. //depot/projects/soc2006/intr_filter/amd64/include/pcpu.h#2 integrate .. //depot/projects/soc2006/intr_filter/amd64/isa/clock.c#8 integrate .. //depot/projects/soc2006/intr_filter/amd64/isa/isa.c#3 integrate .. //depot/projects/soc2006/intr_filter/amd64/linux32/linux.h#6 integrate .. //depot/projects/soc2006/intr_filter/amd64/linux32/linux32_machdep.c#9 integrate .. //depot/projects/soc2006/intr_filter/amd64/linux32/linux32_proto.h#12 integrate .. //depot/projects/soc2006/intr_filter/amd64/linux32/linux32_syscall.h#12 integrate .. //depot/projects/soc2006/intr_filter/amd64/linux32/linux32_sysent.c#12 integrate .. //depot/projects/soc2006/intr_filter/amd64/linux32/syscalls.master#11 integrate .. //depot/projects/soc2006/intr_filter/amd64/pci/pci_bus.c#4 integrate .. //depot/projects/soc2006/intr_filter/arm/arm/busdma_machdep.c#4 integrate .. //depot/projects/soc2006/intr_filter/arm/arm/cpufunc.c#5 integrate .. //depot/projects/soc2006/intr_filter/arm/arm/db_interface.c#2 integrate .. //depot/projects/soc2006/intr_filter/arm/arm/elf_trampoline.c#8 integrate .. //depot/projects/soc2006/intr_filter/arm/arm/intr.c#20 integrate .. //depot/projects/soc2006/intr_filter/arm/arm/locore.S#3 integrate .. //depot/projects/soc2006/intr_filter/arm/arm/machdep.c#2 integrate .. //depot/projects/soc2006/intr_filter/arm/arm/mem.c#3 integrate .. //depot/projects/soc2006/intr_filter/arm/arm/nexus.c#5 integrate .. //depot/projects/soc2006/intr_filter/arm/arm/pmap.c#8 integrate .. //depot/projects/soc2006/intr_filter/arm/arm/support.S#2 integrate .. //depot/projects/soc2006/intr_filter/arm/arm/sys_machdep.c#2 integrate .. //depot/projects/soc2006/intr_filter/arm/arm/trap.c#4 integrate .. //depot/projects/soc2006/intr_filter/arm/at91/at91.c#7 integrate .. //depot/projects/soc2006/intr_filter/arm/at91/at91_mci.c#3 integrate .. //depot/projects/soc2006/intr_filter/arm/at91/at91_pio.c#8 integrate .. //depot/projects/soc2006/intr_filter/arm/at91/at91_rtc.c#6 integrate .. //depot/projects/soc2006/intr_filter/arm/at91/at91_spi.c#5 integrate .. //depot/projects/soc2006/intr_filter/arm/at91/at91_ssc.c#4 integrate .. //depot/projects/soc2006/intr_filter/arm/at91/at91_st.c#9 integrate .. //depot/projects/soc2006/intr_filter/arm/at91/at91_twi.c#6 integrate .. //depot/projects/soc2006/intr_filter/arm/at91/if_ate.c#8 integrate .. //depot/projects/soc2006/intr_filter/arm/conf/AVILA#2 integrate .. //depot/projects/soc2006/intr_filter/arm/conf/EP80219#4 integrate .. //depot/projects/soc2006/intr_filter/arm/conf/IQ31244#4 integrate .. //depot/projects/soc2006/intr_filter/arm/conf/SIMICS#4 integrate .. //depot/projects/soc2006/intr_filter/arm/include/intr.h#4 integrate .. //depot/projects/soc2006/intr_filter/arm/sa11x0/sa11x0.c#4 integrate .. //depot/projects/soc2006/intr_filter/arm/sa11x0/sa11x0_ost.c#6 integrate .. //depot/projects/soc2006/intr_filter/arm/xscale/i80321/i80321_pci.c#4 integrate .. //depot/projects/soc2006/intr_filter/arm/xscale/i80321/i80321_timer.c#6 integrate .. //depot/projects/soc2006/intr_filter/arm/xscale/i80321/iq80321.c#5 integrate .. //depot/projects/soc2006/intr_filter/arm/xscale/ixp425/avila_ata.c#2 integrate .. //depot/projects/soc2006/intr_filter/arm/xscale/ixp425/avila_machdep.c#3 integrate .. //depot/projects/soc2006/intr_filter/arm/xscale/ixp425/if_npe.c#3 integrate .. //depot/projects/soc2006/intr_filter/arm/xscale/ixp425/ixp425.c#3 integrate .. //depot/projects/soc2006/intr_filter/arm/xscale/ixp425/ixp425_mem.c#2 integrate .. //depot/projects/soc2006/intr_filter/arm/xscale/ixp425/ixp425_npe.c#2 integrate .. //depot/projects/soc2006/intr_filter/arm/xscale/ixp425/ixp425_pci.c#3 integrate .. //depot/projects/soc2006/intr_filter/arm/xscale/ixp425/ixp425_qmgr.c#2 integrate .. //depot/projects/soc2006/intr_filter/arm/xscale/ixp425/ixp425_timer.c#2 integrate .. //depot/projects/soc2006/intr_filter/boot/common/loader.8#5 integrate .. //depot/projects/soc2006/intr_filter/boot/forth/loader.conf#7 integrate .. //depot/projects/soc2006/intr_filter/boot/i386/cdboot/cdboot.s#2 integrate .. //depot/projects/soc2006/intr_filter/cam/cam_xpt.c#8 integrate .. //depot/projects/soc2006/intr_filter/cam/cam_xpt.h#3 integrate .. //depot/projects/soc2006/intr_filter/cam/scsi/scsi_da.c#7 integrate .. //depot/projects/soc2006/intr_filter/coda/coda_vfsops.h#2 integrate .. //depot/projects/soc2006/intr_filter/compat/linux/linux_emul.c#8 integrate .. //depot/projects/soc2006/intr_filter/compat/linux/linux_futex.c#3 integrate .. //depot/projects/soc2006/intr_filter/compat/linux/linux_futex.h#2 integrate .. //depot/projects/soc2006/intr_filter/compat/linux/linux_misc.c#11 integrate .. //depot/projects/soc2006/intr_filter/compat/linux/linux_socket.c#5 integrate .. //depot/projects/soc2006/intr_filter/compat/linux/linux_uid16.c#3 integrate .. //depot/projects/soc2006/intr_filter/compat/linux/linux_util.c#3 integrate .. //depot/projects/soc2006/intr_filter/compat/ndis/kern_ndis.c#4 integrate .. //depot/projects/soc2006/intr_filter/conf/NOTES#14 integrate .. //depot/projects/soc2006/intr_filter/conf/files#13 integrate .. //depot/projects/soc2006/intr_filter/conf/files.powerpc#6 integrate .. //depot/projects/soc2006/intr_filter/conf/kmod.mk#5 integrate .. //depot/projects/soc2006/intr_filter/conf/options#13 integrate .. //depot/projects/soc2006/intr_filter/conf/options.arm#7 integrate .. //depot/projects/soc2006/intr_filter/contrib/dev/oltr/if_oltr.c#3 integrate .. //depot/projects/soc2006/intr_filter/dev/aac/aac.c#8 integrate .. //depot/projects/soc2006/intr_filter/dev/aac/aacvar.h#3 integrate .. //depot/projects/soc2006/intr_filter/dev/acpica/Osd/OsdInterrupt.c#3 integrate .. //depot/projects/soc2006/intr_filter/dev/acpica/Osd/OsdSchedule.c#2 integrate .. //depot/projects/soc2006/intr_filter/dev/acpica/acpi.c#6 integrate .. //depot/projects/soc2006/intr_filter/dev/acpica/acpi_cpu.c#4 integrate .. //depot/projects/soc2006/intr_filter/dev/acpica/acpi_pcib_acpi.c#4 integrate .. //depot/projects/soc2006/intr_filter/dev/acpica/acpi_pcib_pci.c#3 integrate .. //depot/projects/soc2006/intr_filter/dev/adlink/adlink.c#5 integrate .. //depot/projects/soc2006/intr_filter/dev/advansys/adv_eisa.c#4 integrate .. //depot/projects/soc2006/intr_filter/dev/advansys/adv_isa.c#4 integrate .. //depot/projects/soc2006/intr_filter/dev/advansys/adv_pci.c#4 integrate .. //depot/projects/soc2006/intr_filter/dev/advansys/adwcam.c#5 integrate .. //depot/projects/soc2006/intr_filter/dev/aha/aha_isa.c#4 integrate .. //depot/projects/soc2006/intr_filter/dev/aha/aha_mca.c#3 integrate .. //depot/projects/soc2006/intr_filter/dev/ahb/ahb.c#5 integrate .. //depot/projects/soc2006/intr_filter/dev/aic/aic_cbus.c#3 integrate .. //depot/projects/soc2006/intr_filter/dev/aic/aic_isa.c#3 integrate .. //depot/projects/soc2006/intr_filter/dev/aic/aic_pccard.c#4 integrate .. //depot/projects/soc2006/intr_filter/dev/aic7xxx/aic79xx.seq#2 integrate .. //depot/projects/soc2006/intr_filter/dev/aic7xxx/aic79xx_osm.c#4 integrate .. //depot/projects/soc2006/intr_filter/dev/aic7xxx/aic7xxx_osm.c#5 integrate .. //depot/projects/soc2006/intr_filter/dev/amd/amd.c#5 integrate .. //depot/projects/soc2006/intr_filter/dev/amr/amr_pci.c#4 integrate .. //depot/projects/soc2006/intr_filter/dev/an/if_an_isa.c#3 integrate .. //depot/projects/soc2006/intr_filter/dev/an/if_an_pccard.c#3 integrate .. //depot/projects/soc2006/intr_filter/dev/an/if_an_pci.c#3 integrate .. //depot/projects/soc2006/intr_filter/dev/ar/if_ar.c#3 integrate .. //depot/projects/soc2006/intr_filter/dev/arcmsr/arcmsr.c#6 integrate .. //depot/projects/soc2006/intr_filter/dev/arcmsr/arcmsr.h#3 integrate .. //depot/projects/soc2006/intr_filter/dev/arl/if_arl_isa.c#3 integrate .. //depot/projects/soc2006/intr_filter/dev/asr/asr.c#5 integrate .. //depot/projects/soc2006/intr_filter/dev/ata/ata-all.c#6 integrate .. //depot/projects/soc2006/intr_filter/dev/ata/ata-all.h#3 integrate .. //depot/projects/soc2006/intr_filter/dev/ata/ata-card.c#2 integrate .. //depot/projects/soc2006/intr_filter/dev/ata/ata-cbus.c#6 integrate .. //depot/projects/soc2006/intr_filter/dev/ata/ata-chipset.c#11 integrate .. //depot/projects/soc2006/intr_filter/dev/ata/ata-disk.c#5 integrate .. //depot/projects/soc2006/intr_filter/dev/ata/ata-disk.h#2 integrate .. //depot/projects/soc2006/intr_filter/dev/ata/ata-dma.c#3 integrate .. //depot/projects/soc2006/intr_filter/dev/ata/ata-isa.c#2 integrate .. //depot/projects/soc2006/intr_filter/dev/ata/ata-lowlevel.c#3 integrate .. //depot/projects/soc2006/intr_filter/dev/ata/ata-pci.c#5 integrate .. //depot/projects/soc2006/intr_filter/dev/ata/ata-pci.h#9 integrate .. //depot/projects/soc2006/intr_filter/dev/ata/ata-queue.c#4 integrate .. //depot/projects/soc2006/intr_filter/dev/ata/ata-raid.c#4 integrate .. //depot/projects/soc2006/intr_filter/dev/ata/ata-raid.h#3 integrate .. //depot/projects/soc2006/intr_filter/dev/ata/ata-usb.c#3 integrate .. //depot/projects/soc2006/intr_filter/dev/ata/atapi-cd.c#4 integrate .. //depot/projects/soc2006/intr_filter/dev/ata/atapi-cd.h#2 integrate .. //depot/projects/soc2006/intr_filter/dev/ata/atapi-fd.c#2 integrate .. //depot/projects/soc2006/intr_filter/dev/ata/atapi-fd.h#2 integrate .. //depot/projects/soc2006/intr_filter/dev/ata/atapi-tape.c#2 integrate .. //depot/projects/soc2006/intr_filter/dev/ata/atapi-tape.h#2 integrate .. //depot/projects/soc2006/intr_filter/dev/ath/if_ath.c#12 integrate .. //depot/projects/soc2006/intr_filter/dev/ath/if_ath_pci.c#6 integrate .. //depot/projects/soc2006/intr_filter/dev/ath/if_athvar.h#10 integrate .. //depot/projects/soc2006/intr_filter/dev/atkbdc/atkbd_atkbdc.c#3 integrate .. //depot/projects/soc2006/intr_filter/dev/atkbdc/psm.c#4 integrate .. //depot/projects/soc2006/intr_filter/dev/awi/if_awi_pccard.c#4 integrate .. //depot/projects/soc2006/intr_filter/dev/bce/if_bce.c#12 integrate .. //depot/projects/soc2006/intr_filter/dev/bfe/if_bfe.c#9 integrate .. //depot/projects/soc2006/intr_filter/dev/bge/if_bge.c#12 integrate .. //depot/projects/soc2006/intr_filter/dev/bge/if_bgereg.h#11 integrate .. //depot/projects/soc2006/intr_filter/dev/bktr/bktr_os.c#3 integrate .. //depot/projects/soc2006/intr_filter/dev/buslogic/bt.c#5 integrate .. //depot/projects/soc2006/intr_filter/dev/ce/if_ce.c#5 integrate .. //depot/projects/soc2006/intr_filter/dev/ciss/ciss.c#5 integrate .. //depot/projects/soc2006/intr_filter/dev/cm/if_cm_isa.c#4 integrate .. //depot/projects/soc2006/intr_filter/dev/cnw/if_cnw.c#3 integrate .. //depot/projects/soc2006/intr_filter/dev/cp/if_cp.c#5 integrate .. //depot/projects/soc2006/intr_filter/dev/cs/if_cs_isa.c#3 integrate .. //depot/projects/soc2006/intr_filter/dev/cs/if_cs_pccard.c#3 integrate .. //depot/projects/soc2006/intr_filter/dev/ct/ct_isa.c#3 integrate .. //depot/projects/soc2006/intr_filter/dev/ctau/if_ct.c#5 integrate .. //depot/projects/soc2006/intr_filter/dev/cx/if_cx.c#5 integrate .. //depot/projects/soc2006/intr_filter/dev/cy/cy.c#4 integrate .. //depot/projects/soc2006/intr_filter/dev/cy/cy_isa.c#6 integrate .. //depot/projects/soc2006/intr_filter/dev/cy/cy_pci.c#6 integrate .. //depot/projects/soc2006/intr_filter/dev/cy/cyvar.h#3 integrate .. //depot/projects/soc2006/intr_filter/dev/dc/if_dc.c#7 integrate .. //depot/projects/soc2006/intr_filter/dev/de/if_de.c#4 integrate .. //depot/projects/soc2006/intr_filter/dev/dpt/dpt_eisa.c#5 integrate .. //depot/projects/soc2006/intr_filter/dev/dpt/dpt_pci.c#4 integrate .. //depot/projects/soc2006/intr_filter/dev/drm/drm_irq.c#3 integrate .. //depot/projects/soc2006/intr_filter/dev/ed/if_ed_cbus.c#3 integrate .. //depot/projects/soc2006/intr_filter/dev/ed/if_ed_isa.c#3 integrate .. //depot/projects/soc2006/intr_filter/dev/ed/if_ed_pccard.c#3 integrate .. //depot/projects/soc2006/intr_filter/dev/ed/if_ed_pci.c#3 integrate .. //depot/projects/soc2006/intr_filter/dev/em/if_em.c#16 integrate .. //depot/projects/soc2006/intr_filter/dev/en/if_en_pci.c#4 integrate .. //depot/projects/soc2006/intr_filter/dev/ep/if_ep_eisa.c#3 integrate .. //depot/projects/soc2006/intr_filter/dev/ep/if_ep_isa.c#3 integrate .. //depot/projects/soc2006/intr_filter/dev/ep/if_ep_mca.c#2 integrate .. //depot/projects/soc2006/intr_filter/dev/ep/if_ep_pccard.c#3 integrate .. //depot/projects/soc2006/intr_filter/dev/esp/esp_sbus.c#4 integrate .. //depot/projects/soc2006/intr_filter/dev/ex/if_ex_isa.c#3 integrate .. //depot/projects/soc2006/intr_filter/dev/ex/if_ex_pccard.c#3 integrate .. //depot/projects/soc2006/intr_filter/dev/exca/exca.c#3 integrate .. //depot/projects/soc2006/intr_filter/dev/fatm/if_fatm.c#3 integrate .. //depot/projects/soc2006/intr_filter/dev/fdc/fdc.c#9 integrate .. //depot/projects/soc2006/intr_filter/dev/fe/if_fe.c#4 integrate .. //depot/projects/soc2006/intr_filter/dev/firewire/fwohci_pci.c#4 integrate .. //depot/projects/soc2006/intr_filter/dev/fxp/if_fxp.c#7 integrate .. //depot/projects/soc2006/intr_filter/dev/gem/if_gem_pci.c#3 integrate .. //depot/projects/soc2006/intr_filter/dev/hatm/if_hatm.c#3 integrate .. //depot/projects/soc2006/intr_filter/dev/hfa/hfa_pci.c#3 integrate .. //depot/projects/soc2006/intr_filter/dev/hifn/hifn7751.c#3 integrate .. //depot/projects/soc2006/intr_filter/dev/hme/if_hme_pci.c#3 integrate .. //depot/projects/soc2006/intr_filter/dev/hme/if_hme_sbus.c#3 integrate .. //depot/projects/soc2006/intr_filter/dev/hptmv/entry.c#4 integrate .. //depot/projects/soc2006/intr_filter/dev/ichsmb/ichsmb.c#5 integrate .. //depot/projects/soc2006/intr_filter/dev/ida/ida_eisa.c#3 integrate .. //depot/projects/soc2006/intr_filter/dev/ida/ida_pci.c#3 integrate .. //depot/projects/soc2006/intr_filter/dev/idt/idt_pci.c#3 integrate .. //depot/projects/soc2006/intr_filter/dev/ie/if_ie_isa.c#3 integrate .. //depot/projects/soc2006/intr_filter/dev/ieee488/pcii.c#2 integrate .. //depot/projects/soc2006/intr_filter/dev/ieee488/tnt4882.c#2 integrate .. //depot/projects/soc2006/intr_filter/dev/iir/iir_pci.c#4 integrate .. //depot/projects/soc2006/intr_filter/dev/ipmi/ipmi.c#7 integrate .. //depot/projects/soc2006/intr_filter/dev/ips/ips_pci.c#3 integrate .. //depot/projects/soc2006/intr_filter/dev/ipw/if_ipw.c#4 integrate .. //depot/projects/soc2006/intr_filter/dev/ipw/if_ipwvar.h#3 integrate .. //depot/projects/soc2006/intr_filter/dev/isp/isp.c#13 integrate .. //depot/projects/soc2006/intr_filter/dev/isp/isp_freebsd.c#10 integrate .. //depot/projects/soc2006/intr_filter/dev/isp/isp_freebsd.h#8 integrate .. //depot/projects/soc2006/intr_filter/dev/isp/isp_pci.c#13 integrate .. //depot/projects/soc2006/intr_filter/dev/isp/isp_sbus.c#9 integrate .. //depot/projects/soc2006/intr_filter/dev/isp/ispmbox.h#7 integrate .. //depot/projects/soc2006/intr_filter/dev/isp/ispreg.h#4 integrate .. //depot/projects/soc2006/intr_filter/dev/iwi/if_iwi.c#10 integrate .. //depot/projects/soc2006/intr_filter/dev/iwi/if_iwireg.h#3 integrate .. //depot/projects/soc2006/intr_filter/dev/iwi/if_iwivar.h#4 integrate .. //depot/projects/soc2006/intr_filter/dev/ixgb/if_ixgb.c#5 integrate .. //depot/projects/soc2006/intr_filter/dev/le/if_le_cbus.c#4 integrate .. //depot/projects/soc2006/intr_filter/dev/le/if_le_isa.c#4 integrate .. //depot/projects/soc2006/intr_filter/dev/le/if_le_lebuffer.c#3 integrate .. //depot/projects/soc2006/intr_filter/dev/le/if_le_ledma.c#4 integrate .. //depot/projects/soc2006/intr_filter/dev/le/if_le_pci.c#4 integrate .. //depot/projects/soc2006/intr_filter/dev/lge/if_lge.c#4 integrate .. //depot/projects/soc2006/intr_filter/dev/lmc/if_lmc.c#5 integrate .. //depot/projects/soc2006/intr_filter/dev/mfi/mfi.c#12 integrate .. //depot/projects/soc2006/intr_filter/dev/mfi/mfi_pci.c#4 integrate .. //depot/projects/soc2006/intr_filter/dev/mii/brgphy.c#7 integrate .. //depot/projects/soc2006/intr_filter/dev/mii/brgphyreg.h#2 integrate .. //depot/projects/soc2006/intr_filter/dev/mii/gentbi.c#3 integrate .. //depot/projects/soc2006/intr_filter/dev/mii/miidevs#7 integrate .. //depot/projects/soc2006/intr_filter/dev/mii/rlphy.c#6 integrate .. //depot/projects/soc2006/intr_filter/dev/mlx/mlx.c#3 integrate .. //depot/projects/soc2006/intr_filter/dev/mly/mly.c#5 integrate .. //depot/projects/soc2006/intr_filter/dev/mpt/mpt.h#8 integrate .. //depot/projects/soc2006/intr_filter/dev/mpt/mpt_cam.c#11 integrate .. //depot/projects/soc2006/intr_filter/dev/mpt/mpt_cam.h#2 integrate .. //depot/projects/soc2006/intr_filter/dev/mpt/mpt_pci.c#10 integrate .. //depot/projects/soc2006/intr_filter/dev/mse/mse.c#3 integrate .. //depot/projects/soc2006/intr_filter/dev/msk/if_msk.c#5 integrate .. //depot/projects/soc2006/intr_filter/dev/mxge/if_mxge.c#7 integrate .. //depot/projects/soc2006/intr_filter/dev/mxge/if_mxge_var.h#4 integrate .. //depot/projects/soc2006/intr_filter/dev/my/if_my.c#5 integrate .. //depot/projects/soc2006/intr_filter/dev/ncv/ncr53c500_pccard.c#4 integrate .. //depot/projects/soc2006/intr_filter/dev/nfe/if_nfe.c#7 integrate .. //depot/projects/soc2006/intr_filter/dev/nge/if_nge.c#4 integrate .. //depot/projects/soc2006/intr_filter/dev/nsp/nsp_pccard.c#3 integrate .. //depot/projects/soc2006/intr_filter/dev/nve/if_nve.c#3 integrate .. //depot/projects/soc2006/intr_filter/dev/patm/if_patm_attach.c#3 integrate .. //depot/projects/soc2006/intr_filter/dev/pccard/pccard.c#5 integrate .. //depot/projects/soc2006/intr_filter/dev/pccard/pccarddevs#3 integrate .. //depot/projects/soc2006/intr_filter/dev/pccard/pccardvarp.h#3 integrate .. //depot/projects/soc2006/intr_filter/dev/pccbb/pccbb.c#8 integrate .. //depot/projects/soc2006/intr_filter/dev/pccbb/pccbb_pci.c#4 integrate .. //depot/projects/soc2006/intr_filter/dev/pccbb/pccbbvar.h#6 integrate .. //depot/projects/soc2006/intr_filter/dev/pcf/envctrl.c#3 integrate .. //depot/projects/soc2006/intr_filter/dev/pcf/pcf_ebus.c#3 integrate .. //depot/projects/soc2006/intr_filter/dev/pcf/pcf_isa.c#3 integrate .. //depot/projects/soc2006/intr_filter/dev/pci/pci.c#10 integrate .. //depot/projects/soc2006/intr_filter/dev/pci/pci_if.m#4 integrate .. //depot/projects/soc2006/intr_filter/dev/pci/pci_pci.c#5 integrate .. //depot/projects/soc2006/intr_filter/dev/pci/pci_private.h#5 integrate .. //depot/projects/soc2006/intr_filter/dev/pci/pcib_if.m#3 integrate .. //depot/projects/soc2006/intr_filter/dev/pci/pcib_private.h#5 integrate .. //depot/projects/soc2006/intr_filter/dev/pci/pcireg.h#6 integrate .. //depot/projects/soc2006/intr_filter/dev/pci/pcivar.h#7 integrate .. //depot/projects/soc2006/intr_filter/dev/pdq/if_fea.c#2 integrate .. //depot/projects/soc2006/intr_filter/dev/pdq/if_fpa.c#2 integrate .. //depot/projects/soc2006/intr_filter/dev/ppbus/if_plip.c#4 integrate .. //depot/projects/soc2006/intr_filter/dev/ppbus/lpt.c#3 integrate .. //depot/projects/soc2006/intr_filter/dev/ppbus/ppbconf.c#3 integrate .. //depot/projects/soc2006/intr_filter/dev/ppbus/ppi.c#2 integrate .. //depot/projects/soc2006/intr_filter/dev/ppbus/pps.c#5 integrate .. //depot/projects/soc2006/intr_filter/dev/ppc/ppc.c#4 integrate .. //depot/projects/soc2006/intr_filter/dev/ppc/ppcvar.h#3 integrate .. //depot/projects/soc2006/intr_filter/dev/pst/pst-iop.c#3 integrate .. //depot/projects/soc2006/intr_filter/dev/puc/puc.c#9 integrate .. //depot/projects/soc2006/intr_filter/dev/puc/puc_bfe.h#3 integrate .. //depot/projects/soc2006/intr_filter/dev/ral/if_ral_pci.c#3 integrate .. //depot/projects/soc2006/intr_filter/dev/ray/if_ray.c#4 integrate .. //depot/projects/soc2006/intr_filter/dev/rc/rc.c#3 integrate .. //depot/projects/soc2006/intr_filter/dev/re/if_re.c#15 integrate .. //depot/projects/soc2006/intr_filter/dev/rr232x/osm_bsd.c#3 integrate .. //depot/projects/soc2006/intr_filter/dev/safe/safe.c#3 integrate .. //depot/projects/soc2006/intr_filter/dev/sbni/if_sbni_isa.c#3 integrate .. //depot/projects/soc2006/intr_filter/dev/sbni/if_sbni_pci.c#3 integrate .. //depot/projects/soc2006/intr_filter/dev/sbsh/if_sbsh.c#4 integrate .. //depot/projects/soc2006/intr_filter/dev/scc/scc_bfe.h#5 integrate .. //depot/projects/soc2006/intr_filter/dev/scc/scc_core.c#12 integrate .. //depot/projects/soc2006/intr_filter/dev/si/si_eisa.c#2 integrate .. //depot/projects/soc2006/intr_filter/dev/si/si_isa.c#2 integrate .. //depot/projects/soc2006/intr_filter/dev/si/si_pci.c#2 integrate .. //depot/projects/soc2006/intr_filter/dev/sio/sio.c#7 integrate .. //depot/projects/soc2006/intr_filter/dev/sk/if_sk.c#8 integrate .. //depot/projects/soc2006/intr_filter/dev/sn/if_sn.c#3 integrate .. //depot/projects/soc2006/intr_filter/dev/snc/if_snc_cbus.c#3 integrate .. //depot/projects/soc2006/intr_filter/dev/snc/if_snc_pccard.c#3 integrate .. //depot/projects/soc2006/intr_filter/dev/sound/driver.c#5 integrate .. //depot/projects/soc2006/intr_filter/dev/sound/isa/ad1816.c#2 integrate .. //depot/projects/soc2006/intr_filter/dev/sound/isa/ad1816.h#2 integrate .. //depot/projects/soc2006/intr_filter/dev/sound/isa/ess.c#2 integrate .. //depot/projects/soc2006/intr_filter/dev/sound/isa/gusc.c#5 integrate .. //depot/projects/soc2006/intr_filter/dev/sound/isa/mss.c#2 integrate .. //depot/projects/soc2006/intr_filter/dev/sound/isa/mss.h#2 integrate .. //depot/projects/soc2006/intr_filter/dev/sound/isa/sb.h#2 integrate .. //depot/projects/soc2006/intr_filter/dev/sound/isa/sb16.c#2 integrate .. //depot/projects/soc2006/intr_filter/dev/sound/isa/sb8.c#2 integrate .. //depot/projects/soc2006/intr_filter/dev/sound/isa/sbc.c#7 integrate .. //depot/projects/soc2006/intr_filter/dev/sound/midi/midi.c#3 integrate .. //depot/projects/soc2006/intr_filter/dev/sound/midi/midi.h#2 integrate .. //depot/projects/soc2006/intr_filter/dev/sound/midi/midiq.h#2 integrate .. //depot/projects/soc2006/intr_filter/dev/sound/midi/mpu401.c#2 integrate .. //depot/projects/soc2006/intr_filter/dev/sound/midi/mpu401.h#2 integrate .. //depot/projects/soc2006/intr_filter/dev/sound/midi/mpu_if.m#2 integrate .. //depot/projects/soc2006/intr_filter/dev/sound/midi/mpufoi_if.m#2 integrate .. //depot/projects/soc2006/intr_filter/dev/sound/midi/sequencer.c#6 integrate .. //depot/projects/soc2006/intr_filter/dev/sound/midi/sequencer.h#2 integrate .. //depot/projects/soc2006/intr_filter/dev/sound/midi/synth_if.m#2 integrate .. //depot/projects/soc2006/intr_filter/dev/sound/pci/als4000.c#2 integrate .. //depot/projects/soc2006/intr_filter/dev/sound/pci/atiixp.c#4 integrate .. //depot/projects/soc2006/intr_filter/dev/sound/pci/au88x0.c#2 integrate .. //depot/projects/soc2006/intr_filter/dev/sound/pci/aureal.c#2 integrate .. //depot/projects/soc2006/intr_filter/dev/sound/pci/cmi.c#5 integrate .. //depot/projects/soc2006/intr_filter/dev/sound/pci/cs4281.c#2 integrate .. //depot/projects/soc2006/intr_filter/dev/sound/pci/csa.c#5 integrate .. //depot/projects/soc2006/intr_filter/dev/sound/pci/csapcm.c#2 integrate .. //depot/projects/soc2006/intr_filter/dev/sound/pci/ds1.c#2 integrate .. //depot/projects/soc2006/intr_filter/dev/sound/pci/emu10k1.c#4 integrate .. //depot/projects/soc2006/intr_filter/dev/sound/pci/emu10kx.c#5 integrate .. //depot/projects/soc2006/intr_filter/dev/sound/pci/envy24.c#5 integrate .. //depot/projects/soc2006/intr_filter/dev/sound/pci/envy24ht.c#3 integrate .. //depot/projects/soc2006/intr_filter/dev/sound/pci/es137x.c#4 integrate .. //depot/projects/soc2006/intr_filter/dev/sound/pci/fm801.c#2 integrate .. //depot/projects/soc2006/intr_filter/dev/sound/pci/hda/hdac.c#8 integrate .. //depot/projects/soc2006/intr_filter/dev/sound/pci/ich.c#6 integrate .. //depot/projects/soc2006/intr_filter/dev/sound/pci/maestro.c#3 integrate .. //depot/projects/soc2006/intr_filter/dev/sound/pci/maestro3.c#2 integrate .. //depot/projects/soc2006/intr_filter/dev/sound/pci/solo.c#3 integrate .. //depot/projects/soc2006/intr_filter/dev/sound/pci/spicds.c#2 integrate .. //depot/projects/soc2006/intr_filter/dev/sound/pci/t4dwave.c#2 integrate .. //depot/projects/soc2006/intr_filter/dev/sound/pci/via8233.c#4 integrate .. //depot/projects/soc2006/intr_filter/dev/sound/pci/via82c686.c#2 integrate .. //depot/projects/soc2006/intr_filter/dev/sound/pci/vibes.c#3 integrate .. //depot/projects/soc2006/intr_filter/dev/sound/pcm/ac97_patch.c#3 integrate .. //depot/projects/soc2006/intr_filter/dev/sound/pcm/ac97_patch.h#3 integrate .. //depot/projects/soc2006/intr_filter/dev/sound/pcm/buffer.c#5 integrate .. //depot/projects/soc2006/intr_filter/dev/sound/pcm/buffer.h#5 integrate .. //depot/projects/soc2006/intr_filter/dev/sound/pcm/dsp.h#3 integrate .. //depot/projects/soc2006/intr_filter/dev/sound/pcm/sound.c#7 integrate .. //depot/projects/soc2006/intr_filter/dev/sound/pcm/vchan.c#4 integrate .. //depot/projects/soc2006/intr_filter/dev/sound/sbus/cs4231.c#3 integrate .. //depot/projects/soc2006/intr_filter/dev/sound/usb/uaudio.c#5 integrate .. //depot/projects/soc2006/intr_filter/dev/sound/usb/uaudio_pcm.c#3 integrate .. //depot/projects/soc2006/intr_filter/dev/sr/if_sr.c#3 integrate .. //depot/projects/soc2006/intr_filter/dev/stg/tmc18c30_isa.c#3 integrate .. //depot/projects/soc2006/intr_filter/dev/stg/tmc18c30_pccard.c#3 integrate .. //depot/projects/soc2006/intr_filter/dev/stg/tmc18c30_pci.c#3 integrate .. //depot/projects/soc2006/intr_filter/dev/stge/if_stge.c#5 integrate .. //depot/projects/soc2006/intr_filter/dev/sym/sym_hipd.c#4 integrate .. //depot/projects/soc2006/intr_filter/dev/syscons/fire/fire_saver.c#2 integrate .. //depot/projects/soc2006/intr_filter/dev/syscons/logo/logo_saver.c#2 integrate .. //depot/projects/soc2006/intr_filter/dev/syscons/rain/rain_saver.c#2 integrate .. //depot/projects/soc2006/intr_filter/dev/syscons/warp/warp_saver.c#2 integrate .. //depot/projects/soc2006/intr_filter/dev/ti/if_ti.c#5 integrate .. //depot/projects/soc2006/intr_filter/dev/trm/trm.c#5 integrate .. //depot/projects/soc2006/intr_filter/dev/twa/tw_osl_freebsd.c#6 integrate .. //depot/projects/soc2006/intr_filter/dev/twe/twe_freebsd.c#3 integrate .. //depot/projects/soc2006/intr_filter/dev/tx/if_tx.c#3 integrate .. //depot/projects/soc2006/intr_filter/dev/txp/if_txp.c#4 integrate .. //depot/projects/soc2006/intr_filter/dev/uart/uart_core.c#5 integrate .. //depot/projects/soc2006/intr_filter/dev/ubsec/ubsec.c#6 integrate .. //depot/projects/soc2006/intr_filter/dev/usb/ehci_pci.c#4 integrate .. //depot/projects/soc2006/intr_filter/dev/usb/if_aue.c#8 integrate .. //depot/projects/soc2006/intr_filter/dev/usb/ohci_pci.c#4 integrate .. //depot/projects/soc2006/intr_filter/dev/usb/slhci_pccard.c#2 integrate .. //depot/projects/soc2006/intr_filter/dev/usb/ubsa.c#4 integrate .. //depot/projects/soc2006/intr_filter/dev/usb/uhci_pci.c#3 integrate .. //depot/projects/soc2006/intr_filter/dev/usb/uhub.c#3 integrate .. //depot/projects/soc2006/intr_filter/dev/usb/uipaq.c#1 branch .. //depot/projects/soc2006/intr_filter/dev/usb/umass.c#4 integrate .. //depot/projects/soc2006/intr_filter/dev/usb/usb_subr.c#3 integrate .. //depot/projects/soc2006/intr_filter/dev/usb/usbdevs#9 integrate .. //depot/projects/soc2006/intr_filter/dev/usb/uvisor.c#4 integrate .. //depot/projects/soc2006/intr_filter/dev/vge/if_vge.c#5 integrate .. //depot/projects/soc2006/intr_filter/dev/vx/if_vx_eisa.c#3 integrate .. //depot/projects/soc2006/intr_filter/dev/vx/if_vx_pci.c#3 integrate .. //depot/projects/soc2006/intr_filter/dev/wds/wd7000.c#3 integrate .. //depot/projects/soc2006/intr_filter/dev/wi/if_wi.c#6 integrate .. //depot/projects/soc2006/intr_filter/dev/wl/if_wl.c#4 integrate .. //depot/projects/soc2006/intr_filter/dev/xe/if_xe.c#3 integrate .. //depot/projects/soc2006/intr_filter/dev/zs/zs_macio.c#5 integrate .. //depot/projects/soc2006/intr_filter/fs/cd9660/TODO#1 branch .. //depot/projects/soc2006/intr_filter/fs/cd9660/TODO.hibler#1 branch .. //depot/projects/soc2006/intr_filter/fs/cd9660/cd9660_bmap.c#1 branch .. //depot/projects/soc2006/intr_filter/fs/cd9660/cd9660_iconv.c#1 branch .. //depot/projects/soc2006/intr_filter/fs/cd9660/cd9660_lookup.c#1 branch .. //depot/projects/soc2006/intr_filter/fs/cd9660/cd9660_mount.h#1 branch .. //depot/projects/soc2006/intr_filter/fs/cd9660/cd9660_node.c#1 branch .. //depot/projects/soc2006/intr_filter/fs/cd9660/cd9660_node.h#1 branch .. //depot/projects/soc2006/intr_filter/fs/cd9660/cd9660_rrip.c#1 branch .. //depot/projects/soc2006/intr_filter/fs/cd9660/cd9660_rrip.h#1 branch .. //depot/projects/soc2006/intr_filter/fs/cd9660/cd9660_util.c#1 branch .. //depot/projects/soc2006/intr_filter/fs/cd9660/cd9660_vfsops.c#1 branch .. //depot/projects/soc2006/intr_filter/fs/cd9660/cd9660_vnops.c#1 branch .. //depot/projects/soc2006/intr_filter/fs/cd9660/iso.h#1 branch .. //depot/projects/soc2006/intr_filter/fs/cd9660/iso_rrip.h#1 branch .. //depot/projects/soc2006/intr_filter/fs/deadfs/dead_vnops.c#2 integrate .. //depot/projects/soc2006/intr_filter/fs/hpfs/hpfs_vfsops.c#3 integrate .. //depot/projects/soc2006/intr_filter/fs/hpfs/hpfs_vnops.c#3 integrate .. //depot/projects/soc2006/intr_filter/fs/msdosfs/msdosfs_fat.c#3 integrate .. //depot/projects/soc2006/intr_filter/fs/msdosfs/msdosfs_vfsops.c#7 integrate .. //depot/projects/soc2006/intr_filter/fs/msdosfs/msdosfs_vnops.c#4 integrate .. //depot/projects/soc2006/intr_filter/fs/ntfs/ntfs_vfsops.c#3 integrate .. //depot/projects/soc2006/intr_filter/fs/ntfs/ntfs_vnops.c#4 integrate .. //depot/projects/soc2006/intr_filter/fs/nullfs/null_vfsops.c#3 integrate .. //depot/projects/soc2006/intr_filter/fs/nullfs/null_vnops.c#3 integrate .. //depot/projects/soc2006/intr_filter/fs/procfs/procfs.c#2 integrate .. //depot/projects/soc2006/intr_filter/fs/procfs/procfs_ioctl.c#5 integrate .. //depot/projects/soc2006/intr_filter/fs/udf/udf.h#2 integrate .. //depot/projects/soc2006/intr_filter/fs/udf/udf_vfsops.c#7 integrate .. //depot/projects/soc2006/intr_filter/fs/udf/udf_vnops.c#4 integrate .. //depot/projects/soc2006/intr_filter/fs/umapfs/umap_vfsops.c#4 integrate .. //depot/projects/soc2006/intr_filter/fs/umapfs/umap_vnops.c#2 integrate .. //depot/projects/soc2006/intr_filter/fs/unionfs/union_vfsops.c#4 integrate .. //depot/projects/soc2006/intr_filter/fs/unionfs/union_vnops.c#5 integrate .. //depot/projects/soc2006/intr_filter/geom/eli/g_eli.c#6 integrate .. //depot/projects/soc2006/intr_filter/geom/geom_apple.c#2 delete .. //depot/projects/soc2006/intr_filter/geom/geom_dev.c#3 integrate .. //depot/projects/soc2006/intr_filter/geom/geom_disk.c#3 integrate .. //depot/projects/soc2006/intr_filter/geom/geom_gpt.c#5 delete .. //depot/projects/soc2006/intr_filter/geom/geom_io.c#3 integrate .. //depot/projects/soc2006/intr_filter/geom/geom_vfs.c#2 integrate .. //depot/projects/soc2006/intr_filter/geom/part/g_part.c#1 branch .. //depot/projects/soc2006/intr_filter/geom/part/g_part.h#1 branch .. //depot/projects/soc2006/intr_filter/geom/part/g_part_apm.c#1 branch .. //depot/projects/soc2006/intr_filter/geom/part/g_part_gpt.c#1 branch .. //depot/projects/soc2006/intr_filter/geom/part/g_part_if.m#1 branch .. //depot/projects/soc2006/intr_filter/gnu/fs/ext2fs/ext2_vfsops.c#5 integrate .. //depot/projects/soc2006/intr_filter/gnu/fs/ext2fs/ext2_vnops.c#3 integrate .. //depot/projects/soc2006/intr_filter/gnu/fs/reiserfs/reiserfs_vfsops.c#4 integrate .. //depot/projects/soc2006/intr_filter/gnu/fs/reiserfs/reiserfs_vnops.c#2 integrate .. //depot/projects/soc2006/intr_filter/gnu/fs/xfs/FreeBSD/xfs_mountops.c#3 integrate .. //depot/projects/soc2006/intr_filter/gnu/fs/xfs/FreeBSD/xfs_vnops.c#3 integrate .. //depot/projects/soc2006/intr_filter/i386/conf/GENERIC#11 integrate .. //depot/projects/soc2006/intr_filter/i386/cpufreq/powernow.c#2 integrate .. //depot/projects/soc2006/intr_filter/i386/i386/db_trace.c#6 integrate .. //depot/projects/soc2006/intr_filter/i386/i386/intr_machdep.c#30 integrate .. //depot/projects/soc2006/intr_filter/i386/i386/machdep.c#10 integrate .. //depot/projects/soc2006/intr_filter/i386/i386/mp_machdep.c#5 integrate .. //depot/projects/soc2006/intr_filter/i386/i386/mptable_pci.c#4 integrate .. //depot/projects/soc2006/intr_filter/i386/i386/msi.c#2 integrate .. //depot/projects/soc2006/intr_filter/i386/i386/nexus.c#6 integrate .. //depot/projects/soc2006/intr_filter/i386/i386/pmap.c#10 integrate .. //depot/projects/soc2006/intr_filter/i386/i386/vm_machdep.c#2 integrate .. //depot/projects/soc2006/intr_filter/i386/include/clock.h#3 integrate .. //depot/projects/soc2006/intr_filter/i386/include/intr_machdep.h#7 integrate .. //depot/projects/soc2006/intr_filter/i386/include/pcpu.h#2 integrate .. //depot/projects/soc2006/intr_filter/i386/isa/clock.c#9 integrate .. //depot/projects/soc2006/intr_filter/i386/isa/isa.c#3 integrate .. //depot/projects/soc2006/intr_filter/i386/isa/npx.c#5 integrate .. //depot/projects/soc2006/intr_filter/i386/linux/imgact_linux.c#2 integrate .. //depot/projects/soc2006/intr_filter/i386/linux/linux.h#5 integrate .. //depot/projects/soc2006/intr_filter/i386/linux/linux_machdep.c#8 integrate .. //depot/projects/soc2006/intr_filter/i386/linux/linux_proto.h#12 integrate .. //depot/projects/soc2006/intr_filter/i386/linux/linux_syscall.h#11 integrate .. //depot/projects/soc2006/intr_filter/i386/linux/linux_sysent.c#11 integrate .. //depot/projects/soc2006/intr_filter/i386/linux/syscalls.master#11 integrate .. //depot/projects/soc2006/intr_filter/i386/pci/pci_bus.c#4 integrate .. //depot/projects/soc2006/intr_filter/i4b/capi/iavc/iavc_isa.c#2 integrate .. //depot/projects/soc2006/intr_filter/i4b/capi/iavc/iavc_pci.c#2 integrate .. //depot/projects/soc2006/intr_filter/i4b/layer1/ifpi/i4b_ifpi_pci.c#2 integrate .. //depot/projects/soc2006/intr_filter/i4b/layer1/ifpi2/i4b_ifpi2_pci.c#2 integrate .. //depot/projects/soc2006/intr_filter/i4b/layer1/ifpnp/i4b_ifpnp_avm.c#2 integrate .. //depot/projects/soc2006/intr_filter/i4b/layer1/ihfc/i4b_ihfc_pnp.c#2 integrate .. //depot/projects/soc2006/intr_filter/i4b/layer1/isic/i4b_avm_a1.c#2 integrate .. //depot/projects/soc2006/intr_filter/i4b/layer1/isic/i4b_elsa_pcc16.c#2 integrate .. //depot/projects/soc2006/intr_filter/i4b/layer1/isic/i4b_elsa_qs1p.c#2 integrate .. //depot/projects/soc2006/intr_filter/i4b/layer1/isic/i4b_isic_pnp.c#2 integrate .. //depot/projects/soc2006/intr_filter/i4b/layer1/isic/i4b_itk_ix1.c#2 integrate .. //depot/projects/soc2006/intr_filter/i4b/layer1/isic/i4b_tel_s016.c#2 integrate .. //depot/projects/soc2006/intr_filter/i4b/layer1/isic/i4b_tel_s0163.c#2 integrate .. //depot/projects/soc2006/intr_filter/i4b/layer1/isic/i4b_tel_s08.c#2 integrate .. //depot/projects/soc2006/intr_filter/i4b/layer1/isic/i4b_usr_sti.c#2 integrate .. //depot/projects/soc2006/intr_filter/i4b/layer1/itjc/i4b_itjc_pci.c#2 integrate .. //depot/projects/soc2006/intr_filter/i4b/layer1/iwic/i4b_iwic_pci.c#2 integrate .. //depot/projects/soc2006/intr_filter/ia64/conf/DEFAULTS#5 integrate .. //depot/projects/soc2006/intr_filter/ia64/conf/GENERIC#9 integrate .. //depot/projects/soc2006/intr_filter/ia64/ia64/interrupt.c#22 integrate .. //depot/projects/soc2006/intr_filter/ia64/ia64/nexus.c#5 integrate .. //depot/projects/soc2006/intr_filter/ia64/ia64/pmap.c#7 integrate .. //depot/projects/soc2006/intr_filter/ia64/ia64/uma_machdep.c#2 integrate .. //depot/projects/soc2006/intr_filter/ia64/include/intr.h#4 integrate .. //depot/projects/soc2006/intr_filter/ia64/isa/isa.c#3 integrate .. //depot/projects/soc2006/intr_filter/isa/isa_common.h#3 integrate .. //depot/projects/soc2006/intr_filter/isofs/cd9660/TODO#2 delete .. //depot/projects/soc2006/intr_filter/isofs/cd9660/TODO.hibler#2 delete .. //depot/projects/soc2006/intr_filter/isofs/cd9660/cd9660_bmap.c#2 delete .. //depot/projects/soc2006/intr_filter/isofs/cd9660/cd9660_iconv.c#2 delete .. //depot/projects/soc2006/intr_filter/isofs/cd9660/cd9660_lookup.c#2 delete .. //depot/projects/soc2006/intr_filter/isofs/cd9660/cd9660_mount.h#2 delete .. //depot/projects/soc2006/intr_filter/isofs/cd9660/cd9660_node.c#2 delete .. //depot/projects/soc2006/intr_filter/isofs/cd9660/cd9660_node.h#3 delete .. //depot/projects/soc2006/intr_filter/isofs/cd9660/cd9660_rrip.c#2 delete .. //depot/projects/soc2006/intr_filter/isofs/cd9660/cd9660_rrip.h#2 delete .. //depot/projects/soc2006/intr_filter/isofs/cd9660/cd9660_util.c#2 delete .. //depot/projects/soc2006/intr_filter/isofs/cd9660/cd9660_vfsops.c#4 delete .. //depot/projects/soc2006/intr_filter/isofs/cd9660/cd9660_vnops.c#2 delete .. //depot/projects/soc2006/intr_filter/isofs/cd9660/iso.h#2 delete .. //depot/projects/soc2006/intr_filter/isofs/cd9660/iso_rrip.h#2 delete .. //depot/projects/soc2006/intr_filter/kern/Make.tags.inc#3 integrate .. //depot/projects/soc2006/intr_filter/kern/bus_if.m#5 integrate .. //depot/projects/soc2006/intr_filter/kern/init_main.c#7 integrate .. //depot/projects/soc2006/intr_filter/kern/kern_conf.c#3 integrate .. //depot/projects/soc2006/intr_filter/kern/kern_descrip.c#9 integrate .. //depot/projects/soc2006/intr_filter/kern/kern_fork.c#7 integrate .. //depot/projects/soc2006/intr_filter/kern/kern_idle.c#5 integrate .. //depot/projects/soc2006/intr_filter/kern/kern_intr.c#32 integrate .. //depot/projects/soc2006/intr_filter/kern/kern_jail.c#4 integrate .. //depot/projects/soc2006/intr_filter/kern/kern_kse.c#4 integrate .. //depot/projects/soc2006/intr_filter/kern/kern_kthread.c#2 integrate .. //depot/projects/soc2006/intr_filter/kern/kern_ktrace.c#7 integrate .. //depot/projects/soc2006/intr_filter/kern/kern_linker.c#8 integrate .. //depot/projects/soc2006/intr_filter/kern/kern_lock.c#6 integrate .. //depot/projects/soc2006/intr_filter/kern/kern_mbuf.c#5 integrate .. //depot/projects/soc2006/intr_filter/kern/kern_mutex.c#6 integrate .. //depot/projects/soc2006/intr_filter/kern/kern_resource.c#8 integrate .. //depot/projects/soc2006/intr_filter/kern/kern_rwlock.c#4 integrate .. //depot/projects/soc2006/intr_filter/kern/kern_sig.c#7 integrate .. //depot/projects/soc2006/intr_filter/kern/kern_switch.c#6 integrate .. //depot/projects/soc2006/intr_filter/kern/kern_sx.c#5 integrate .. //depot/projects/soc2006/intr_filter/kern/kern_synch.c#6 integrate .. //depot/projects/soc2006/intr_filter/kern/kern_thr.c#7 integrate .. //depot/projects/soc2006/intr_filter/kern/sched_4bsd.c#9 integrate .. //depot/projects/soc2006/intr_filter/kern/sched_core.c#5 integrate .. //depot/projects/soc2006/intr_filter/kern/sched_ule.c#10 integrate .. //depot/projects/soc2006/intr_filter/kern/subr_bus.c#10 integrate .. //depot/projects/soc2006/intr_filter/kern/subr_firmware.c#6 integrate .. //depot/projects/soc2006/intr_filter/kern/subr_lock.c#4 integrate .. //depot/projects/soc2006/intr_filter/kern/subr_rman.c#6 integrate .. //depot/projects/soc2006/intr_filter/kern/subr_taskqueue.c#2 integrate .. //depot/projects/soc2006/intr_filter/kern/subr_turnstile.c#6 integrate .. //depot/projects/soc2006/intr_filter/kern/subr_witness.c#6 integrate .. //depot/projects/soc2006/intr_filter/kern/sysv_ipc.c#4 integrate .. //depot/projects/soc2006/intr_filter/kern/sysv_msg.c#7 integrate .. //depot/projects/soc2006/intr_filter/kern/sysv_shm.c#5 integrate .. //depot/projects/soc2006/intr_filter/kern/uipc_debug.c#1 branch .. //depot/projects/soc2006/intr_filter/kern/uipc_mbuf.c#6 integrate .. //depot/projects/soc2006/intr_filter/kern/uipc_socket.c#11 integrate .. //depot/projects/soc2006/intr_filter/kern/uipc_syscalls.c#8 integrate .. //depot/projects/soc2006/intr_filter/kern/uipc_usrreq.c#9 integrate .. //depot/projects/soc2006/intr_filter/kern/vfs_bio.c#8 integrate .. //depot/projects/soc2006/intr_filter/kern/vfs_default.c#4 integrate .. //depot/projects/soc2006/intr_filter/kern/vfs_export.c#5 integrate .. //depot/projects/soc2006/intr_filter/kern/vfs_init.c#4 integrate .. //depot/projects/soc2006/intr_filter/kern/vfs_lookup.c#5 integrate .. //depot/projects/soc2006/intr_filter/kern/vfs_mount.c#6 integrate .. //depot/projects/soc2006/intr_filter/kern/vfs_syscalls.c#7 integrate .. //depot/projects/soc2006/intr_filter/kern/vfs_vnops.c#5 integrate .. //depot/projects/soc2006/intr_filter/kern/vnode_if.src#3 integrate .. //depot/projects/soc2006/intr_filter/modules/Makefile#11 integrate .. //depot/projects/soc2006/intr_filter/modules/ath/Makefile#3 integrate .. //depot/projects/soc2006/intr_filter/modules/ath_rate_sample/Makefile#3 integrate .. //depot/projects/soc2006/intr_filter/modules/cd9660/Makefile#2 integrate .. //depot/projects/soc2006/intr_filter/modules/cd9660_iconv/Makefile#2 integrate .. //depot/projects/soc2006/intr_filter/modules/geom/Makefile#4 integrate .. //depot/projects/soc2006/intr_filter/modules/ip_mroute_mod/Makefile#2 integrate .. //depot/projects/soc2006/intr_filter/modules/msdosfs/Makefile#2 integrate .. //depot/projects/soc2006/intr_filter/modules/uipaq/Makefile#1 branch .. //depot/projects/soc2006/intr_filter/net/bpf.c#7 integrate .. //depot/projects/soc2006/intr_filter/net/bpf_compat.h#2 delete .. //depot/projects/soc2006/intr_filter/net/bpfdesc.h#2 integrate .. //depot/projects/soc2006/intr_filter/net/if.c#9 integrate .. //depot/projects/soc2006/intr_filter/net/if_bridge.c#11 integrate .. //depot/projects/soc2006/intr_filter/net/if_ethersubr.c#8 integrate .. //depot/projects/soc2006/intr_filter/net/if_loop.c#4 integrate .. //depot/projects/soc2006/intr_filter/net/if_ppp.c#6 integrate .. //depot/projects/soc2006/intr_filter/net/if_tap.c#5 integrate .. //depot/projects/soc2006/intr_filter/net/if_tun.c#5 integrate .. //depot/projects/soc2006/intr_filter/net80211/_ieee80211.h#4 integrate .. //depot/projects/soc2006/intr_filter/net80211/ieee80211_input.c#8 integrate .. //depot/projects/soc2006/intr_filter/netatalk/at_control.c#3 integrate .. //depot/projects/soc2006/intr_filter/netgraph/bluetooth/drivers/bt3c/ng_bt3c_pccard.c#4 integrate .. //depot/projects/soc2006/intr_filter/netgraph/ng_ksocket.c#3 integrate .. //depot/projects/soc2006/intr_filter/netgraph/ng_ppp.c#4 integrate .. //depot/projects/soc2006/intr_filter/netgraph/ng_pptpgre.c#2 integrate .. //depot/projects/soc2006/intr_filter/netinet/if_ether.c#6 integrate .. //depot/projects/soc2006/intr_filter/netinet/in.c#4 integrate .. //depot/projects/soc2006/intr_filter/netinet/in.h#3 integrate .. //depot/projects/soc2006/intr_filter/netinet/in_pcb.c#8 integrate .. //depot/projects/soc2006/intr_filter/netinet/in_pcb.h#3 integrate .. //depot/projects/soc2006/intr_filter/netinet/in_proto.c#3 integrate .. //depot/projects/soc2006/intr_filter/netinet/ip_carp.c#5 integrate .. //depot/projects/soc2006/intr_filter/netinet/ip_fastfwd.c#3 integrate .. //depot/projects/soc2006/intr_filter/netinet/ip_fw2.c#12 integrate .. //depot/projects/soc2006/intr_filter/netinet/ip_input.c#4 integrate .. //depot/projects/soc2006/intr_filter/netinet/ip_mroute.c#4 integrate .. //depot/projects/soc2006/intr_filter/netinet/ip_mroute.h#3 integrate .. //depot/projects/soc2006/intr_filter/netinet/sctp_asconf.c#6 integrate .. //depot/projects/soc2006/intr_filter/netinet/sctp_auth.c#4 integrate .. //depot/projects/soc2006/intr_filter/netinet/sctp_auth.h#2 integrate .. //depot/projects/soc2006/intr_filter/netinet/sctp_constants.h#5 integrate .. //depot/projects/soc2006/intr_filter/netinet/sctp_crc32.c#3 integrate .. //depot/projects/soc2006/intr_filter/netinet/sctp_indata.c#6 integrate .. //depot/projects/soc2006/intr_filter/netinet/sctp_input.c#6 integrate .. //depot/projects/soc2006/intr_filter/netinet/sctp_os.h#4 integrate .. //depot/projects/soc2006/intr_filter/netinet/sctp_os_bsd.h#5 integrate .. //depot/projects/soc2006/intr_filter/netinet/sctp_output.c#6 integrate .. //depot/projects/soc2006/intr_filter/netinet/sctp_pcb.c#6 integrate .. //depot/projects/soc2006/intr_filter/netinet/sctp_peeloff.c#4 integrate .. //depot/projects/soc2006/intr_filter/netinet/sctp_structs.h#6 integrate .. //depot/projects/soc2006/intr_filter/netinet/sctp_timer.c#5 integrate .. //depot/projects/soc2006/intr_filter/netinet/sctp_uio.h#5 integrate .. //depot/projects/soc2006/intr_filter/netinet/sctp_usrreq.c#6 integrate .. //depot/projects/soc2006/intr_filter/netinet/sctp_var.h#4 integrate .. //depot/projects/soc2006/intr_filter/netinet/sctputil.c#6 integrate .. //depot/projects/soc2006/intr_filter/netinet/sctputil.h#5 integrate .. //depot/projects/soc2006/intr_filter/netinet/tcp.h#2 integrate .. //depot/projects/soc2006/intr_filter/netinet/tcp_input.c#8 integrate .. //depot/projects/soc2006/intr_filter/netinet/tcp_output.c#4 integrate .. //depot/projects/soc2006/intr_filter/netinet/tcp_syncache.c#7 integrate .. //depot/projects/soc2006/intr_filter/netinet/tcp_usrreq.c#6 integrate .. //depot/projects/soc2006/intr_filter/netinet/tcp_var.h#5 integrate .. //depot/projects/soc2006/intr_filter/netinet/udp.h#2 integrate .. //depot/projects/soc2006/intr_filter/netinet/udp_usrreq.c#7 integrate .. //depot/projects/soc2006/intr_filter/netinet/udp_var.h#2 integrate .. //depot/projects/soc2006/intr_filter/netinet6/ah_core.c#3 integrate .. //depot/projects/soc2006/intr_filter/netinet6/icmp6.c#6 integrate .. //depot/projects/soc2006/intr_filter/netinet6/in6.c#8 integrate .. //depot/projects/soc2006/intr_filter/netinet6/in6_proto.c#4 integrate .. //depot/projects/soc2006/intr_filter/netinet6/ip6_input.c#4 integrate .. //depot/projects/soc2006/intr_filter/netinet6/ip6_mroute.c#4 integrate .. //depot/projects/soc2006/intr_filter/netinet6/ip6_mroute.h#3 integrate .. //depot/projects/soc2006/intr_filter/netinet6/ip6_var.h#2 integrate .. //depot/projects/soc2006/intr_filter/netinet6/nd6.c#7 integrate .. //depot/projects/soc2006/intr_filter/netinet6/raw_ip6.c#4 integrate .. //depot/projects/soc2006/intr_filter/netinet6/sctp6_usrreq.c#6 integrate .. //depot/projects/soc2006/intr_filter/netinet6/udp6_usrreq.c#6 integrate .. //depot/projects/soc2006/intr_filter/netipx/ipx_ip.c#3 integrate .. //depot/projects/soc2006/intr_filter/netipx/ipx_ip.h#3 integrate .. //depot/projects/soc2006/intr_filter/netsmb/smb_dev.c#2 integrate .. //depot/projects/soc2006/intr_filter/nfs4client/nfs4_vfs_subs.c#2 integrate .. //depot/projects/soc2006/intr_filter/nfs4client/nfs4_vfsops.c#3 integrate .. //depot/projects/soc2006/intr_filter/nfs4client/nfs4_vnops.c#4 integrate .. //depot/projects/soc2006/intr_filter/nfsclient/nfs.h#4 integrate .. //depot/projects/soc2006/intr_filter/nfsclient/nfs_socket.c#8 integrate .. //depot/projects/soc2006/intr_filter/nfsclient/nfs_vfsops.c#5 integrate .. //depot/projects/soc2006/intr_filter/nfsclient/nfs_vnops.c#6 integrate .. //depot/projects/soc2006/intr_filter/nfsserver/nfs_serv.c#4 integrate .. //depot/projects/soc2006/intr_filter/pc98/cbus/clock.c#7 integrate .. //depot/projects/soc2006/intr_filter/pc98/cbus/fdc.c#5 integrate .. //depot/projects/soc2006/intr_filter/pc98/cbus/olpt.c#2 integrate .. //depot/projects/soc2006/intr_filter/pc98/cbus/pckbd.c#4 integrate .. //depot/projects/soc2006/intr_filter/pc98/cbus/sio.c#7 integrate .. //depot/projects/soc2006/intr_filter/pc98/conf/GENERIC#9 integrate .. //depot/projects/soc2006/intr_filter/pc98/pc98/machdep.c#8 integrate .. //depot/projects/soc2006/intr_filter/pci/if_mn.c#2 integrate .. //depot/projects/soc2006/intr_filter/pci/if_pcn.c#5 integrate .. //depot/projects/soc2006/intr_filter/pci/if_rl.c#6 integrate .. //depot/projects/soc2006/intr_filter/pci/if_sf.c#4 integrate .. //depot/projects/soc2006/intr_filter/pci/if_sis.c#5 integrate .. //depot/projects/soc2006/intr_filter/pci/if_sisreg.h#3 integrate .. //depot/projects/soc2006/intr_filter/pci/if_ste.c#4 integrate .. //depot/projects/soc2006/intr_filter/pci/if_tl.c#4 integrate .. //depot/projects/soc2006/intr_filter/pci/if_vr.c#4 integrate .. //depot/projects/soc2006/intr_filter/pci/if_wb.c#4 integrate .. //depot/projects/soc2006/intr_filter/pci/if_xl.c#8 integrate .. //depot/projects/soc2006/intr_filter/pci/intpm.c#8 integrate .. //depot/projects/soc2006/intr_filter/pci/ncr.c#4 integrate .. //depot/projects/soc2006/intr_filter/powerpc/conf/DEFAULTS#4 integrate .. //depot/projects/soc2006/intr_filter/powerpc/conf/GENERIC#9 integrate .. //depot/projects/soc2006/intr_filter/powerpc/include/intr_machdep.h#4 integrate .. //depot/projects/soc2006/intr_filter/powerpc/include/ipl.h#2 delete .. //depot/projects/soc2006/intr_filter/powerpc/include/openpicvar.h#3 integrate .. //depot/projects/soc2006/intr_filter/powerpc/powermac/hrowpic.c#3 integrate .. //depot/projects/soc2006/intr_filter/powerpc/powermac/pswitch.c#5 integrate .. //depot/projects/soc2006/intr_filter/powerpc/powerpc/cpu.c#3 integrate .. //depot/projects/soc2006/intr_filter/powerpc/powerpc/intr_machdep.c#28 integrate .. //depot/projects/soc2006/intr_filter/powerpc/powerpc/machdep.c#6 integrate .. //depot/projects/soc2006/intr_filter/powerpc/powerpc/openpic.c#3 integrate .. //depot/projects/soc2006/intr_filter/security/audit/audit_arg.c#7 integrate .. //depot/projects/soc2006/intr_filter/security/mac/mac_framework.h#5 integrate .. //depot/projects/soc2006/intr_filter/security/mac/mac_inet.c#6 integrate .. //depot/projects/soc2006/intr_filter/security/mac/mac_internal.h#5 integrate .. //depot/projects/soc2006/intr_filter/security/mac/mac_label.c#4 integrate .. //depot/projects/soc2006/intr_filter/security/mac/mac_pipe.c#5 integrate .. //depot/projects/soc2006/intr_filter/security/mac/mac_policy.h#2 integrate .. //depot/projects/soc2006/intr_filter/security/mac/mac_posix_sem.c#6 integrate .. //depot/projects/soc2006/intr_filter/security/mac/mac_system.c#4 integrate .. //depot/projects/soc2006/intr_filter/security/mac/mac_sysv_msg.c#5 integrate .. //depot/projects/soc2006/intr_filter/security/mac/mac_sysv_sem.c#5 integrate .. //depot/projects/soc2006/intr_filter/security/mac/mac_sysv_shm.c#5 integrate .. //depot/projects/soc2006/intr_filter/security/mac/mac_vfs.c#6 integrate .. //depot/projects/soc2006/intr_filter/security/mac_biba/mac_biba.c#8 integrate .. //depot/projects/soc2006/intr_filter/security/mac_bsdextended/mac_bsdextended.c#4 integrate .. //depot/projects/soc2006/intr_filter/security/mac_ifoff/mac_ifoff.c#3 integrate .. //depot/projects/soc2006/intr_filter/security/mac_lomac/mac_lomac.c#6 integrate .. //depot/projects/soc2006/intr_filter/security/mac_mls/mac_mls.c#6 integrate .. //depot/projects/soc2006/intr_filter/security/mac_none/mac_none.c#3 integrate .. //depot/projects/soc2006/intr_filter/security/mac_partition/mac_partition.c#4 integrate .. //depot/projects/soc2006/intr_filter/security/mac_portacl/mac_portacl.c#5 integrate .. //depot/projects/soc2006/intr_filter/security/mac_seeotheruids/mac_seeotheruids.c#4 integrate .. //depot/projects/soc2006/intr_filter/security/mac_stub/mac_stub.c#5 integrate .. //depot/projects/soc2006/intr_filter/security/mac_test/mac_test.c#4 integrate .. //depot/projects/soc2006/intr_filter/sparc64/conf/GENERIC#10 integrate .. //depot/projects/soc2006/intr_filter/sparc64/fhc/fhc.c#5 integrate .. //depot/projects/soc2006/intr_filter/sparc64/include/intr_machdep.h#5 integrate .. //depot/projects/soc2006/intr_filter/sparc64/isa/isa.c#4 integrate .. //depot/projects/soc2006/intr_filter/sparc64/pci/psycho.c#11 integrate .. //depot/projects/soc2006/intr_filter/sparc64/sbus/sbus.c#9 integrate .. //depot/projects/soc2006/intr_filter/sparc64/sparc64/intr_machdep.c#22 integrate .. //depot/projects/soc2006/intr_filter/sparc64/sparc64/machdep.c#4 integrate .. //depot/projects/soc2006/intr_filter/sparc64/sparc64/nexus.c#3 integrate .. //depot/projects/soc2006/intr_filter/sparc64/sparc64/upa.c#4 integrate .. //depot/projects/soc2006/intr_filter/sun4v/conf/.cvsignore#1 branch .. //depot/projects/soc2006/intr_filter/sun4v/conf/GENERIC#6 integrate .. //depot/projects/soc2006/intr_filter/sun4v/include/intr_machdep.h#4 integrate .. //depot/projects/soc2006/intr_filter/sun4v/include/smp.h#4 integrate .. //depot/projects/soc2006/intr_filter/sun4v/sun4v/hvcons.c#5 integrate .. //depot/projects/soc2006/intr_filter/sun4v/sun4v/intr_machdep.c#6 integrate .. //depot/projects/soc2006/intr_filter/sun4v/sun4v/mp_machdep.c#5 integrate .. //depot/projects/soc2006/intr_filter/sun4v/sun4v/nexus.c#4 integrate .. //depot/projects/soc2006/intr_filter/sun4v/sun4v/tte.c#4 integrate .. //depot/projects/soc2006/intr_filter/sun4v/sun4v/vnex.c#5 integrate .. //depot/projects/soc2006/intr_filter/sys/_label.h#3 delete .. //depot/projects/soc2006/intr_filter/sys/apm.h#1 branch .. //depot/projects/soc2006/intr_filter/sys/ata.h#2 integrate .. //depot/projects/soc2006/intr_filter/sys/buf.h#3 integrate .. //depot/projects/soc2006/intr_filter/sys/bufobj.h#3 integrate .. //depot/projects/soc2006/intr_filter/sys/bus.h#7 integrate .. //depot/projects/soc2006/intr_filter/sys/conf.h#3 integrate .. //depot/projects/soc2006/intr_filter/sys/extattr.h#3 integrate .. //depot/projects/soc2006/intr_filter/sys/firmware.h#3 integrate .. //depot/projects/soc2006/intr_filter/sys/interrupt.h#17 integrate .. //depot/projects/soc2006/intr_filter/sys/lock.h#3 integrate .. //depot/projects/soc2006/intr_filter/sys/lock_profile.h#3 integrate .. //depot/projects/soc2006/intr_filter/sys/mac.h#4 integrate .. //depot/projects/soc2006/intr_filter/sys/mbuf.h#6 integrate .. //depot/projects/soc2006/intr_filter/sys/mount.h#5 integrate .. //depot/projects/soc2006/intr_filter/sys/mutex.h#5 integrate .. //depot/projects/soc2006/intr_filter/sys/param.h#8 integrate .. //depot/projects/soc2006/intr_filter/sys/priv.h#2 integrate .. //depot/projects/soc2006/intr_filter/sys/proc.h#7 integrate .. //depot/projects/soc2006/intr_filter/sys/runq.h#4 integrate .. //depot/projects/soc2006/intr_filter/sys/rwlock.h#4 integrate .. //depot/projects/soc2006/intr_filter/sys/sched.h#7 integrate .. //depot/projects/soc2006/intr_filter/sys/sleepqueue.h#4 integrate .. //depot/projects/soc2006/intr_filter/sys/socketvar.h#5 integrate .. //depot/projects/soc2006/intr_filter/sys/systm.h#8 integrate .. //depot/projects/soc2006/intr_filter/sys/vnode.h#5 integrate .. //depot/projects/soc2006/intr_filter/tools/fw_stub.awk#3 integrate .. //depot/projects/soc2006/intr_filter/ufs/ffs/README.softupdates#2 delete .. //depot/projects/soc2006/intr_filter/ufs/ffs/ffs_alloc.c#6 integrate .. //depot/projects/soc2006/intr_filter/ufs/ffs/ffs_extern.h#3 integrate .. //depot/projects/soc2006/intr_filter/ufs/ffs/ffs_rawread.c#2 integrate .. //depot/projects/soc2006/intr_filter/ufs/ffs/ffs_snapshot.c#5 integrate .. //depot/projects/soc2006/intr_filter/ufs/ffs/ffs_softdep.c#4 integrate .. //depot/projects/soc2006/intr_filter/ufs/ffs/ffs_vfsops.c#5 integrate .. //depot/projects/soc2006/intr_filter/ufs/ffs/ffs_vnops.c#5 integrate .. //depot/projects/soc2006/intr_filter/ufs/ufs/ufs_quota.c#5 integrate .. //depot/projects/soc2006/intr_filter/ufs/ufs/ufs_vfsops.c#2 integrate .. //depot/projects/soc2006/intr_filter/ufs/ufs/ufs_vnops.c#6 integrate .. //depot/projects/soc2006/intr_filter/vm/phys_pager.c#3 integrate .. //depot/projects/soc2006/intr_filter/vm/swap_pager.c#6 integrate .. //depot/projects/soc2006/intr_filter/vm/swap_pager.h#2 integrate .. //depot/projects/soc2006/intr_filter/vm/uma.h#3 integrate .. //depot/projects/soc2006/intr_filter/vm/uma_core.c#5 integrate .. //depot/projects/soc2006/intr_filter/vm/vm_contig.c#5 integrate .. //depot/projects/soc2006/intr_filter/vm/vm_glue.c#4 integrate .. //depot/projects/soc2006/intr_filter/vm/vm_kern.c#5 integrate .. //depot/projects/soc2006/intr_filter/vm/vm_map.c#6 integrate .. //depot/projects/soc2006/intr_filter/vm/vm_object.c#7 integrate .. //depot/projects/soc2006/intr_filter/vm/vm_page.c#9 integrate .. //depot/projects/soc2006/intr_filter/vm/vm_page.h#5 integrate .. //depot/projects/soc2006/intr_filter/vm/vm_pageout.c#5 integrate .. //depot/projects/soc2006/intr_filter/vm/vm_pageq.c#5 integrate .. //depot/projects/soc2006/intr_filter/vm/vm_zeroidle.c#5 integrate Differences ... ==== //depot/projects/soc2005/libalias/sys/netinet/ip_fw2.c#47 (text+ko) ==== @@ -121,6 +121,7 @@ static int fw_verbose; static int verbose_limit; +static int ldebug; static struct callout ipfw_timeout; static uma_zone_t ipfw_dyn_rule_zone; @@ -197,6 +198,8 @@ &fw_verbose, 0, "Log matches to ipfw rules"); SYSCTL_INT(_net_inet_ip_fw, OID_AUTO, verbose_limit, CTLFLAG_RW, &verbose_limit, 0, "Set upper limit of matches of ipfw rules logged"); +SYSCTL_INT(_net_inet_ip_fw, OID_AUTO, libalias_debug, CTLFLAG_RW, + &ldebug, 0, "LibAlias debug code"); /* * Description of dynamic rules. @@ -2236,6 +2239,66 @@ } #endif +int +m_csum(struct mbuf **m, struct libalias *la); + +int +m_csum(struct mbuf **m, struct libalias *la) +{ + struct ip *pip; + //struct tcphdr *th; + int off, len, sum = 0; + //u_short *ptr; + + *m = m_pullup(*m, sizeof(struct ip)); + pip = mtod(*m, struct ip *); + off = pip->ip_hl << 2; + len = ntohs(pip->ip_len); + if (ldebug != 0) + printf("off: %u len: %u\n", off, len); + if (pip->ip_p == IPPROTO_TCP) { + /* + m = m_pullup(m, off + sizeof(struct tcphdr)); + pip = mtod(m, struct ip *); + th = (struct tcphdr *)&(((char *)pip)[off]); + off += th->th_off << 2; + */ + } else if (pip->ip_p == IPPROTO_UDP) { + /* udp hdr is of fixed size - no opts */ + off += 8; + } else { + if (ldebug != 0) + printf("unkown protocol: %u\n", pip->ip_p); + return (-1); + } + if (len == off) + return (0); + if (len < off) { + if (ldebug != 0) + printf("len < off: %u, %u\n", len, off); + return (-1); + } + /* + len -= off; + m_copydata(m, off, len, la->buff); + ptr = (u_short *)la->buff; + sum = 0; + while (len > 1) { + sum += *ptr++; + len -= 2; + } + if (len == 1) { + oddbyte = 0; + ((u_char *) & oddbyte)[0] = *(u_char *) ptr; + ((u_char *) & oddbyte)[1] = 0; + sum += oddbyte; + } + sum = (sum >> 16) + (sum & 0xffff); + sum += (sum >> 16); + */ + return (~sum); +} + /* * The main check routine for the firewall. * @@ -3505,7 +3568,9 @@ ip->ip_len = htons(ip->ip_len); ip->ip_off = htons(ip->ip_off); } - + if (ldebug != 0) + printf("payload csum: %u\n", + m_csum(&m, t->lib)); /* * XXX - Libalias checksum offload 'duct tape': * @@ -3559,11 +3624,12 @@ CSUM_DELAY_DATA) ldt = 1; - printf("-----------START HERE-----------" + /*printf("-----------START HERE-----------" "---------------------------------\n"); printf("m->m_len: %u m->m_pkthdr.len: %u\n" "m->m_next: %p\n", m->m_len, m->m_pkthdr.len, m->m_next); + */ if (oif == NULL) retval = LibAliasIn(t->lib, &m, 0); else @@ -3582,14 +3648,14 @@ retval = IP_FW_DENY; goto done; } - printf("m->m_len: %u m->m_pkthdr.len: %u\n" + /*printf("m->m_len: %u m->m_pkthdr.len: %u\n" "m->m_next: %p\n", m->m_len, - m->m_pkthdr.len, m->m_next); + m->m_pkthdr.len, m->m_next);*/ if ((m = m_pullup(m, sizeof(struct ip))) == NULL) goto badnat; ip = mtod(m, struct ip *); - printf("ip->ip_id: %u\n", ntohs(ip->ip_id)); + //printf("ip->ip_id: %u\n", ntohs(ip->ip_id)); m->m_pkthdr.len = ntohs(ip->ip_len); /* @@ -3669,6 +3735,13 @@ ip->ip_len = htons(ip->ip_len); } + if (ldebug != 0) + printf("payload csum: %u\n", + m_csum(&m, t->lib)); + if ((m = m_pullup(m, sizeof(struct ip))) == + NULL) + goto badnat; + ip = mtod(m, struct ip *); if (args->eh == NULL) { ip->ip_len = ntohs(ip->ip_len); ip->ip_off = ntohs(ip->ip_off); @@ -3676,11 +3749,11 @@ args->m = m; retval = IP_FW_NAT; - printf("m->m_len: %u m->m_pkthdr.len: %u\n" + /*printf("m->m_len: %u m->m_pkthdr.len: %u\n" "m->m_next: %p\n", m->m_len, m->m_pkthdr.len, m->m_next); printf("-------------------------------" - "---------------------------------\n"); + "---------------------------------\n");*/ goto done; } #endif ==== //depot/projects/soc2006/intr_filter/amd64/amd64/intr_machdep.c#23 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/amd64/intr_machdep.c,v 1.27 2006/12/12 19:20:18 jhb Exp $ + * $FreeBSD: src/sys/amd64/amd64/intr_machdep.c,v 1.29 2007/02/23 20:03:23 jhb Exp $ */ /* @@ -169,8 +169,7 @@ int intr_add_handler(const char *name, int vector, driver_filter_t filter, - driver_intr_t handler, void *arg, enum intr_type flags, - void **cookiep) + driver_intr_t handler, void *arg, enum intr_type flags, void **cookiep) { struct intsrc *isrc; int error; @@ -178,7 +177,7 @@ isrc = intr_lookup_source(vector); if (isrc == NULL) return (EINVAL); - error = intr_event_add_handler(isrc->is_event, name, filter, handler, + error = intr_event_add_handler(isrc->is_event, name, filter, handler, arg, intr_priority(flags), flags, cookiep); if (error == 0) { intrcnt_updatename(isrc); ==== //depot/projects/soc2006/intr_filter/amd64/amd64/machdep.c#9 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.667 2006/12/20 04:40:38 davidxu Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.669 2007/01/27 18:13:24 jkoshy Exp $"); #include "opt_atalk.h" #include "opt_atpic.h" @@ -1176,7 +1176,6 @@ * under witness. */ mutex_init(); - mtx_init(&clock_lock, "clk", NULL, MTX_SPIN); mtx_init(&icu_lock, "icu", NULL, MTX_SPIN | MTX_NOWITNESS); /* exceptions */ @@ -1184,7 +1183,7 @@ setidt(x, &IDTVEC(rsvd), SDT_SYSIGT, SEL_KPL, 0); setidt(IDT_DE, &IDTVEC(div), SDT_SYSIGT, SEL_KPL, 0); setidt(IDT_DB, &IDTVEC(dbg), SDT_SYSIGT, SEL_KPL, 0); - setidt(IDT_NMI, &IDTVEC(nmi), SDT_SYSIGT, SEL_KPL, 0); >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Feb 26 17:56: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 A93A016A401; Mon, 26 Feb 2007 17:56: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 4B5B116A403 for ; Mon, 26 Feb 2007 17:56:33 +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 2AF2B13C4B2 for ; Mon, 26 Feb 2007 17:56:33 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l1QHuXf8041176 for ; Mon, 26 Feb 2007 17:56:33 GMT (envelope-from gonzo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l1QHuWFV041173 for perforce@freebsd.org; Mon, 26 Feb 2007 17:56:32 GMT (envelope-from gonzo@FreeBSD.org) Date: Mon, 26 Feb 2007 17:56:32 GMT Message-Id: <200702261756.l1QHuWFV041173@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 115073 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 26 Feb 2007 17:56:34 -0000 http://perforce.freebsd.org/chv.cgi?CH=115073 Change 115073 by gonzo@gonzo_jeeves on 2007/02/26 17:56:23 o Change registers naming convention in respect to selected ABI. Affected files ... .. //depot/projects/mips2/src/sys/mips/include/asm.h#9 edit Differences ... ==== //depot/projects/mips2/src/sys/mips/include/asm.h#9 (text+ko) ==== @@ -81,14 +81,29 @@ #define a1 $5 #define a2 $6 #define a3 $7 -#define a4 $8 /* (T) temporary registers */ -#define a5 $9 -#define a6 $10 -#define a7 $11 -#define t0 $12 -#define t1 $13 -#define t2 $14 -#define t3 $15 +/* + * There is neither n32 nor n64 ABI support on the moment, but we'll + * leave these defines to our descendants. + */ +#if defined(__mips_n32) || defined(__mips_n64) +#define a4 $8 +#define a5 $9 +#define a6 $10 +#define a7 $11 +#define t0 $12 /* temp registers (not saved across subroutine calls) */ +#define t1 $13 +#define t2 $14 +#define t3 $15 +#else +#define t0 $8 /* temp registers (not saved across subroutine calls) */ +#define t1 $9 +#define t2 $10 +#define t3 $11 +#define t4 $12 +#define t5 $13 +#define t6 $14 +#define t7 $15 +#endif /* __mips_n32 || __mips_n64 */ #define s0 $16 /* (S) call-safe registers */ #define s1 $17 #define s2 $18 From owner-p4-projects@FreeBSD.ORG Tue Feb 27 01:54: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 3DC5016A403; Tue, 27 Feb 2007 01:54: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 E2A0E16A400 for ; Tue, 27 Feb 2007 01:54:25 +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 D525513C474 for ; Tue, 27 Feb 2007 01:54:25 +0000 (UTC) (envelope-from jkim@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l1R1sPPb060883 for ; Tue, 27 Feb 2007 01:54:25 GMT (envelope-from jkim@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l1R1sPw5060880 for perforce@freebsd.org; Tue, 27 Feb 2007 01:54:25 GMT (envelope-from jkim@freebsd.org) Date: Tue, 27 Feb 2007 01:54:25 GMT Message-Id: <200702270154.l1R1sPw5060880@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 115094 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 27 Feb 2007 01:54:26 -0000 http://perforce.freebsd.org/chv.cgi?CH=115094 Change 115094 by jkim@jkim_hammer on 2007/02/27 01:54:21 Linux does not check file descriptor when MAP_ANONYMOUS is set. This should fix recent LTP test regressions. Affected files ... .. //depot/projects/linuxolator/src/sys/amd64/linux32/linux32_machdep.c#43 edit .. //depot/projects/linuxolator/src/sys/i386/linux/linux_machdep.c#34 edit Differences ... ==== //depot/projects/linuxolator/src/sys/amd64/linux32/linux32_machdep.c#43 (text+ko) ==== @@ -831,7 +831,9 @@ if (bsd_args.prot & (PROT_READ | PROT_WRITE | PROT_EXEC)) bsd_args.prot |= PROT_READ | PROT_EXEC; - if (linux_args->fd != -1) { + /* Linux does not check file descriptor when MAP_ANONYMOUS is set. */ + bsd_args.fd = (bsd_args.flags & MAP_ANON) ? -1 : linux_args->fd; + if (bsd_args.fd != -1) { /* * Linux follows Solaris mmap(2) description: * The file descriptor fildes is opened with @@ -839,7 +841,7 @@ * protection options specified. */ - if ((error = fget(td, linux_args->fd, &fp)) != 0) + if ((error = fget(td, bsd_args.fd, &fp)) != 0) return (error); if (fp->f_type != DTYPE_VNODE) { fdrop(fp, td); @@ -854,7 +856,6 @@ fdrop(fp, td); } - bsd_args.fd = linux_args->fd; if (linux_args->flags & LINUX_MAP_GROWSDOWN) { /* ==== //depot/projects/linuxolator/src/sys/i386/linux/linux_machdep.c#34 (text+ko) ==== @@ -669,7 +669,9 @@ if (bsd_args.prot & (PROT_READ | PROT_WRITE | PROT_EXEC)) bsd_args.prot |= PROT_READ | PROT_EXEC; - if (linux_args->fd != -1) { + /* Linux does not check file descriptor when MAP_ANONYMOUS is set. */ + bsd_args.fd = (bsd_args.flags & MAP_ANON) ? -1 : linux_args->fd; + if (bsd_args.fd != -1) { /* * Linux follows Solaris mmap(2) description: * The file descriptor fildes is opened with @@ -677,7 +679,7 @@ * protection options specified. */ - if ((error = fget(td, linux_args->fd, &fp)) != 0) + if ((error = fget(td, bsd_args.fd, &fp)) != 0) return (error); if (fp->f_type != DTYPE_VNODE) { fdrop(fp, td); @@ -692,7 +694,6 @@ fdrop(fp, td); } - bsd_args.fd = linux_args->fd; if (linux_args->flags & LINUX_MAP_GROWSDOWN) { /* From owner-p4-projects@FreeBSD.ORG Tue Feb 27 03:48: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 57FA916A407; Tue, 27 Feb 2007 03:48: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 2F4C216A401 for ; Tue, 27 Feb 2007 03:48:54 +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 219F113C428 for ; Tue, 27 Feb 2007 03:48:54 +0000 (UTC) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l1R3msqH082450 for ; Tue, 27 Feb 2007 03:48:54 GMT (envelope-from mjacob@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l1R3mrEw082447 for perforce@freebsd.org; Tue, 27 Feb 2007 03:48:53 GMT (envelope-from mjacob@freebsd.org) Date: Tue, 27 Feb 2007 03:48:53 GMT Message-Id: <200702270348.l1R3mrEw082447@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 115100 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 27 Feb 2007 03:48:54 -0000 http://perforce.freebsd.org/chv.cgi?CH=115100 Change 115100 by mjacob@mjexp on 2007/02/27 03:48:08 Minor cleanups. Affected files ... .. //depot/projects/mjexp/sys/geom/multipath/g_multipath.c#14 edit Differences ... ==== //depot/projects/mjexp/sys/geom/multipath/g_multipath.c#14 (text+ko) ==== @@ -158,11 +158,11 @@ static void g_multipath_done_error(struct bio *bp) { - struct bio *pbp = bp->bio_parent; - struct g_geom *gp = pbp->bio_to->geom; - struct g_multipath_softc *sc = gp->softc; - struct g_consumer *cp = bp->bio_from; - struct g_provider *pp = cp->provider; + struct bio *pbp; + struct g_geom *gp; + struct g_multipath_softc *sc; + struct g_consumer *cp; + struct g_provider *pp; /* * If we had a failure, we have to check first to see @@ -173,6 +173,12 @@ */ g_topology_lock(); + pbp = bp->bio_parent; + gp = pbp->bio_to->geom; + sc = gp->softc; + cp = bp->bio_from; + pp = cp->provider; + cp->index |= MP_BAD; if (cp->nend == cp->nstart && pp->nend == pp->nstart) { cp->index |= MP_POSTED; @@ -228,7 +234,7 @@ g_multipath_done_error(bp); mtx_lock(&gmtbq_mtx); } - msleep(&g_multipath_kt_state, &gmtbq_mtx,PRIBIO, + msleep(&g_multipath_kt_state, &gmtbq_mtx, PRIBIO, "gkt:wait", hz / 10); } mtx_unlock(&gmtbq_mtx); From owner-p4-projects@FreeBSD.ORG Tue Feb 27 10:41: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 C146016A406; Tue, 27 Feb 2007 10:41: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 979D916A402 for ; Tue, 27 Feb 2007 10:41: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 8560613C4A3 for ; Tue, 27 Feb 2007 10:41:32 +0000 (UTC) (envelope-from sephe@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l1RAfWn6093580 for ; Tue, 27 Feb 2007 10:41:32 GMT (envelope-from sephe@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l1RAfWV5093575 for perforce@freebsd.org; Tue, 27 Feb 2007 10:41:32 GMT (envelope-from sephe@FreeBSD.org) Date: Tue, 27 Feb 2007 10:41:32 GMT Message-Id: <200702271041.l1RAfWV5093575@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 115110 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 27 Feb 2007 10:41:33 -0000 http://perforce.freebsd.org/chv.cgi?CH=115110 Change 115110 by sephe@sephe_zealot:sam_wifi on 2007/02/27 10:41:29 Convert RSSI to receive signal strength for rt2661 part. Reviewed by: sam@ Approved by: sam@ Affected files ... .. //depot/projects/wifi/sys/dev/ral/rt2661.c#8 edit .. //depot/projects/wifi/sys/dev/ral/rt2661reg.h#2 edit Differences ... ==== //depot/projects/wifi/sys/dev/ral/rt2661.c#8 (text) ==== @@ -1008,6 +1008,8 @@ BUS_DMASYNC_POSTREAD); for (;;) { + int rssi; + desc = &sc->rxq.desc[sc->rxq.cur]; data = &sc->rxq.data[sc->rxq.cur]; @@ -1080,6 +1082,8 @@ m->m_pkthdr.len = m->m_len = (le32toh(desc->flags) >> 16) & 0xfff; + rssi = rt2661_get_rssi(sc, desc->rssi); + if (bpf_peers_present(sc->sc_drvbpf)) { struct rt2661_rx_radiotap_header *tap = &sc->sc_rxtap; uint32_t tsf_lo, tsf_hi; @@ -1094,7 +1098,7 @@ tap->wr_rate = rt2661_rxrate(desc); tap->wr_chan_freq = htole16(ic->ic_curchan->ic_freq); tap->wr_chan_flags = htole16(ic->ic_curchan->ic_flags); - tap->wr_antsignal = desc->rssi; + tap->wr_antsignal = rssi < 0 ? 0 : rssi; bpf_mtap2(sc->sc_drvbpf, tap, sc->sc_rxtap_len, m); } @@ -1104,15 +1108,18 @@ ni = ieee80211_find_rxnode(ic, (struct ieee80211_frame_min *)wh); + /* Error happened during RSSI conversion. */ + if (rssi < 0) + rssi = ni->ni_rssi; + /* send the frame to the 802.11 layer */ - ieee80211_input(ic, m, ni, desc->rssi, 0, 0); + ieee80211_input(ic, m, ni, rssi, RT2661_NOISE_FLOOR, 0); /* give rssi to the rate adatation algorithm */ rn = (struct rt2661_node *)ni; RAL_LOCK(sc); sc->sc_flags &= ~RAL_INPUT_RUNNING; - ral_rssadapt_input(ic, ni, &rn->rssadapt, - rt2661_get_rssi(sc, desc->rssi)); + ral_rssadapt_input(ic, ni, &rn->rssadapt, rssi); /* node is no longer needed */ ieee80211_free_node(ni); @@ -2334,10 +2341,18 @@ if ((val & 0xff) != 0xff) sc->rssi_2ghz_corr = (int8_t)(val & 0xff); /* signed */ + /* Only [-10, 10] is valid */ + if (sc->rssi_2ghz_corr < -10 || sc->rssi_2ghz_corr > 10) + sc->rssi_2ghz_corr = 0; + val = rt2661_eeprom_read(sc, RT2661_EEPROM_RSSI_5GHZ_OFFSET); if ((val & 0xff) != 0xff) sc->rssi_5ghz_corr = (int8_t)(val & 0xff); /* signed */ + /* Only [-10, 10] is valid */ + if (sc->rssi_5ghz_corr < -10 || sc->rssi_5ghz_corr > 10) + sc->rssi_5ghz_corr = 0; + /* adjust RSSI correction for external low-noise amplifier */ if (sc->ext_2ghz_lna) sc->rssi_2ghz_corr -= 14; @@ -2836,7 +2851,17 @@ lna = (raw >> 5) & 0x3; agc = raw & 0x1f; - rssi = 2 * agc; + if (lna == 0) { + /* + * No mapping available. + * + * NB: Since RSSI is relative to noise floor, -1 is + * adequate for caller to know error happened. + */ + return -1; + } + + rssi = (2 * agc) - RT2661_NOISE_FLOOR; if (IEEE80211_IS_CHAN_2GHZ(sc->sc_curchan)) { rssi += sc->rssi_2ghz_corr; ==== //depot/projects/wifi/sys/dev/ral/rt2661reg.h#2 (text) ==== @@ -17,6 +17,8 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ +#define RT2661_NOISE_FLOOR -95 + #define RT2661_TX_RING_COUNT 32 #define RT2661_MGT_RING_COUNT 32 #define RT2661_RX_RING_COUNT 64 From owner-p4-projects@FreeBSD.ORG Tue Feb 27 10:42: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 A95D816A406; Tue, 27 Feb 2007 10:42: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 6D05A16A401 for ; Tue, 27 Feb 2007 10:42:34 +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 5AFF513C481 for ; Tue, 27 Feb 2007 10:42:34 +0000 (UTC) (envelope-from sephe@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l1RAgY5D093874 for ; Tue, 27 Feb 2007 10:42:34 GMT (envelope-from sephe@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l1RAgXR6093871 for perforce@freebsd.org; Tue, 27 Feb 2007 10:42:34 GMT (envelope-from sephe@FreeBSD.org) Date: Tue, 27 Feb 2007 10:42:34 GMT Message-Id: <200702271042.l1RAgXR6093871@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 115111 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 27 Feb 2007 10:42:35 -0000 http://perforce.freebsd.org/chv.cgi?CH=115111 Change 115111 by sephe@sephe_zealot:sam_wifi on 2007/02/27 10:42:17 Convert RSSI to receive signal strength for ural(4) Reviewed by: sam@ Approved by: sam@ Affected files ... .. //depot/projects/wifi/sys/dev/usb/if_ural.c#15 edit .. //depot/projects/wifi/sys/dev/usb/if_uralreg.h#3 edit Differences ... ==== //depot/projects/wifi/sys/dev/usb/if_ural.c#15 (text+ko) ==== @@ -78,6 +78,10 @@ #define DPRINTFN(n, x) #endif +#define URAL_RSSI(rssi) \ + ((rssi) > (RAL_NOISE_FLOOR + RAL_RSSI_CORR) ? \ + ((rssi) - RAL_NOISE_FLOOR + RAL_RSSI_CORR) : 0) + /* various supported device vendors/products */ static const struct usb_devno ural_devs[] = { { USB_VENDOR_ASUS, USB_PRODUCT_ASUS_WL167G }, @@ -986,7 +990,7 @@ tap->wr_chan_freq = htole16(ic->ic_curchan->ic_freq); tap->wr_chan_flags = htole16(ic->ic_curchan->ic_flags); tap->wr_antenna = sc->rx_ant; - tap->wr_antsignal = desc->rssi; + tap->wr_antsignal = URAL_RSSI(desc->rssi); bpf_mtap2(sc->sc_drvbpf, tap, sc->sc_rxtap_len, m); } @@ -995,7 +999,7 @@ ni = ieee80211_find_rxnode(ic, (struct ieee80211_frame_min *)wh); /* send the frame to the 802.11 layer */ - ieee80211_input(ic, m, ni, desc->rssi, -95/*XXX*/, 0); + ieee80211_input(ic, m, ni, URAL_RSSI(desc->rssi), RAL_NOISE_FLOOR, 0); /* node is no longer needed */ ieee80211_free_node(ni); ==== //depot/projects/wifi/sys/dev/usb/if_uralreg.h#3 (text+ko) ==== @@ -17,6 +17,9 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ +#define RAL_NOISE_FLOOR -95 +#define RAL_RSSI_CORR 120 + #define RAL_RX_DESC_SIZE (sizeof (struct ural_rx_desc)) #define RAL_TX_DESC_SIZE (sizeof (struct ural_tx_desc)) From owner-p4-projects@FreeBSD.ORG Tue Feb 27 10:51:46 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 C222316A401; Tue, 27 Feb 2007 10:51:46 +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 550DE16A403 for ; Tue, 27 Feb 2007 10:51:46 +0000 (UTC) (envelope-from netchild@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 42AB313C4AA for ; Tue, 27 Feb 2007 10:51:46 +0000 (UTC) (envelope-from netchild@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l1RApk26012686 for ; Tue, 27 Feb 2007 10:51:46 GMT (envelope-from netchild@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l1RApk5m012674 for perforce@freebsd.org; Tue, 27 Feb 2007 10:51:46 GMT (envelope-from netchild@freebsd.org) Date: Tue, 27 Feb 2007 10:51:46 GMT Message-Id: <200702271051.l1RApk5m012674@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to netchild@freebsd.org using -f From: Alexander Leidinger To: Perforce Change Reviews Cc: Subject: PERFORCE change 115112 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 27 Feb 2007 10:51:47 -0000 http://perforce.freebsd.org/chv.cgi?CH=115112 Change 115112 by netchild@netchild_magellan on 2007/02/27 10:51:06 Make this compile on amd64 not only with LINT. Submitted by: Scot Hetzel Affected files ... .. //depot/projects/linuxolator/src/sys/modules/linuxaio/Makefile#2 edit Differences ... ==== //depot/projects/linuxolator/src/sys/modules/linuxaio/Makefile#2 (text+ko) ==== @@ -1,8 +1,12 @@ # $FreeBSD: src/linuxaio/Makefile,v 1.1 2007/01/25 14:39:24 admin Exp $ +.if ${MACHINE_ARCH} == "amd64" +CFLAGS+=-DCOMPAT_LINUX32 +.endif + .PATH: ${.CURDIR}/../../compat/linux KMOD= linuxaio -SRCS= linux_aio.c linux_aio.h +SRCS= linux_aio.c linux_aio.h opt_compat.h .include From owner-p4-projects@FreeBSD.ORG Tue Feb 27 11:33: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 EAD6116A407; Tue, 27 Feb 2007 11:33: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 A395316A404 for ; Tue, 27 Feb 2007 11:33:39 +0000 (UTC) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 7816E13C442 for ; Tue, 27 Feb 2007 11:33:39 +0000 (UTC) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l1RBXd1c021472 for ; Tue, 27 Feb 2007 11:33:39 GMT (envelope-from piso@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l1RBXd6J021466 for perforce@freebsd.org; Tue, 27 Feb 2007 11:33:39 GMT (envelope-from piso@freebsd.org) Date: Tue, 27 Feb 2007 11:33:39 GMT Message-Id: <200702271133.l1RBXd6J021466@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to piso@freebsd.org using -f From: Paolo Pisati To: Perforce Change Reviews Cc: Subject: PERFORCE change 115113 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 27 Feb 2007 11:33:40 -0000 http://perforce.freebsd.org/chv.cgi?CH=115113 Change 115113 by piso@piso_newluxor on 2007/02/27 11:32:46 Delete old cruft. Affected files ... .. //depot/projects/soc2006/intr_filter/notes#13 delete .. //depot/projects/soc2006/intr_filter/phase_1.patch#2 delete Differences ... From owner-p4-projects@FreeBSD.ORG Tue Feb 27 13:05: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 01E4916A405; Tue, 27 Feb 2007 13:05: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 AB17816A403 for ; Tue, 27 Feb 2007 13:05:35 +0000 (UTC) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 9543A13C47E for ; Tue, 27 Feb 2007 13:05:35 +0000 (UTC) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l1RD5Z9a048568 for ; Tue, 27 Feb 2007 13:05:35 GMT (envelope-from piso@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l1RD5YJX048565 for perforce@freebsd.org; Tue, 27 Feb 2007 13:05:34 GMT (envelope-from piso@freebsd.org) Date: Tue, 27 Feb 2007 13:05:34 GMT Message-Id: <200702271305.l1RD5YJX048565@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to piso@freebsd.org using -f From: Paolo Pisati To: Perforce Change Reviews Cc: Subject: PERFORCE change 115116 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 27 Feb 2007 13:05:36 -0000 http://perforce.freebsd.org/chv.cgi?CH=115116 Change 115116 by piso@piso_newluxor on 2007/02/27 13:04:52 Reduce diff against HEAD. Affected files ... .. //depot/projects/soc2006/intr_filter/dev/aac/aac.c#9 edit .. //depot/projects/soc2006/intr_filter/dev/aac/aacvar.h#4 edit .. //depot/projects/soc2006/intr_filter/dev/arcmsr/arcmsr.c#7 edit .. //depot/projects/soc2006/intr_filter/dev/bfe/if_bfe.c#10 edit .. //depot/projects/soc2006/intr_filter/dev/bfe/if_bfereg.h#4 edit .. //depot/projects/soc2006/intr_filter/dev/em/if_em.c#17 edit .. //depot/projects/soc2006/intr_filter/dev/em/if_em.h#8 edit .. //depot/projects/soc2006/intr_filter/dev/fxp/if_fxp.c#8 edit .. //depot/projects/soc2006/intr_filter/dev/ipmi/ipmi_pci.c#4 edit .. //depot/projects/soc2006/intr_filter/dev/iwi/if_iwi.c#11 edit .. //depot/projects/soc2006/intr_filter/dev/iwi/if_iwivar.h#5 edit .. //depot/projects/soc2006/intr_filter/dev/mlx/mlx.c#4 edit .. //depot/projects/soc2006/intr_filter/dev/mly/mly.c#6 edit .. //depot/projects/soc2006/intr_filter/dev/msk/if_msk.c#6 edit .. //depot/projects/soc2006/intr_filter/dev/mxge/if_mxge.c#8 edit .. //depot/projects/soc2006/intr_filter/dev/ncv/ncr53c500_pccard.c#5 edit .. //depot/projects/soc2006/intr_filter/dev/pccard/pccard.c#6 edit .. //depot/projects/soc2006/intr_filter/dev/pccard/pccardvarp.h#4 edit .. //depot/projects/soc2006/intr_filter/dev/pccbb/pccbb.c#9 edit .. //depot/projects/soc2006/intr_filter/dev/pccbb/pccbbvar.h#7 edit .. //depot/projects/soc2006/intr_filter/dev/ppbus/ppbconf.c#4 edit .. //depot/projects/soc2006/intr_filter/dev/ppbus/pps.c#6 edit .. //depot/projects/soc2006/intr_filter/dev/ppc/ppc.c#5 edit .. //depot/projects/soc2006/intr_filter/dev/puc/puc.c#10 edit .. //depot/projects/soc2006/intr_filter/dev/re/if_re.c#16 edit .. //depot/projects/soc2006/intr_filter/dev/scc/scc_bfe.h#6 edit .. //depot/projects/soc2006/intr_filter/dev/scc/scc_core.c#13 edit .. //depot/projects/soc2006/intr_filter/dev/sound/isa/gusc.c#6 edit .. //depot/projects/soc2006/intr_filter/dev/sound/pci/csa.c#6 edit .. //depot/projects/soc2006/intr_filter/dev/sound/pci/emu10kx.c#6 edit .. //depot/projects/soc2006/intr_filter/dev/sound/pci/vibes.c#4 edit .. //depot/projects/soc2006/intr_filter/dev/zs/z8530var.h#3 edit .. //depot/projects/soc2006/intr_filter/dev/zs/zs.c#4 edit Differences ... ==== //depot/projects/soc2006/intr_filter/dev/aac/aac.c#9 (text+ko) ==== ==== //depot/projects/soc2006/intr_filter/dev/aac/aacvar.h#4 (text+ko) ==== ==== //depot/projects/soc2006/intr_filter/dev/arcmsr/arcmsr.c#7 (text+ko) ==== @@ -2119,7 +2119,7 @@ bus_setup_intr(dev, irqres, INTR_TYPE_CAM|INTR_ENTROPY|INTR_MPSAFE , NULL, arcmsr_interrupt, acb, &acb->ih)) { arcmsr_free_resource(acb); - printf("arcmsr%d: unable to register interrupt handler!\n",unit); + printf("arcmsr%d: unable to register interrupt handler!\n", unit); return ENXIO; } acb->irqres=irqres; ==== //depot/projects/soc2006/intr_filter/dev/bfe/if_bfe.c#10 (text+ko) ==== ==== //depot/projects/soc2006/intr_filter/dev/bfe/if_bfereg.h#4 (text+ko) ==== ==== //depot/projects/soc2006/intr_filter/dev/em/if_em.c#17 (text+ko) ==== ==== //depot/projects/soc2006/intr_filter/dev/em/if_em.h#8 (text+ko) ==== ==== //depot/projects/soc2006/intr_filter/dev/fxp/if_fxp.c#8 (text+ko) ==== ==== //depot/projects/soc2006/intr_filter/dev/ipmi/ipmi_pci.c#4 (text) ==== @@ -262,6 +262,7 @@ break; case SMIC_MODE: device_printf(dev, "using SMIC interface\n"); + error = ipmi_smic_attach(sc); if (error) goto bad; ==== //depot/projects/soc2006/intr_filter/dev/iwi/if_iwi.c#11 (text+ko) ==== ==== //depot/projects/soc2006/intr_filter/dev/iwi/if_iwivar.h#5 (text+ko) ==== ==== //depot/projects/soc2006/intr_filter/dev/mlx/mlx.c#4 (text+ko) ==== @@ -364,8 +364,7 @@ device_printf(sc->mlx_dev, "can't allocate interrupt\n"); return(ENXIO); } - error = bus_setup_intr(sc->mlx_dev, sc->mlx_irq, INTR_TYPE_BIO | - INTR_ENTROPY, NULL, mlx_intr, sc, &sc->mlx_intr); + error = bus_setup_intr(sc->mlx_dev, sc->mlx_irq, INTR_TYPE_BIO | INTR_ENTROPY, NULL, mlx_intr, sc, &sc->mlx_intr); if (error) { device_printf(sc->mlx_dev, "can't set up interrupt\n"); return(ENXIO); ==== //depot/projects/soc2006/intr_filter/dev/mly/mly.c#6 (text+ko) ==== @@ -380,8 +380,7 @@ mly_printf(sc, "can't allocate interrupt\n"); goto fail; } - if (bus_setup_intr(sc->mly_dev, sc->mly_irq, INTR_TYPE_CAM | - INTR_ENTROPY, NULL, mly_intr, sc, &sc->mly_intr)) { + if (bus_setup_intr(sc->mly_dev, sc->mly_irq, INTR_TYPE_CAM | INTR_ENTROPY, NULL, mly_intr, sc, &sc->mly_intr)) { mly_printf(sc, "can't set up interrupt\n"); goto fail; } ==== //depot/projects/soc2006/intr_filter/dev/msk/if_msk.c#6 (text+ko) ==== @@ -1783,8 +1783,9 @@ taskqueue_start_threads(&sc->msk_tq, 1, PI_NET, "%s taskq", device_get_nameunit(sc->msk_dev)); /* Hook interrupt last to avoid having to lock softc. */ - error = bus_setup_intr(dev, sc->msk_res[0], INTR_TYPE_NET | + error = bus_setup_intr(dev, sc->msk_irq[0], INTR_TYPE_NET | INTR_MPSAFE, msk_intr, NULL, sc, &sc->msk_intrhand[0]); + if (error != 0) { device_printf(dev, "couldn't set up interrupt handler\n"); taskqueue_free(sc->msk_tq); ==== //depot/projects/soc2006/intr_filter/dev/mxge/if_mxge.c#8 (text+ko) ==== @@ -2422,18 +2422,6 @@ else sc->big_bytes = MJUMPAGESIZE; - err = mxge_alloc_rings(sc); - if (err != 0) { - device_printf(sc->dev, "failed to allocate rings\n"); - return err; - } - - err = bus_setup_intr(sc->dev, sc->irq_res, - INTR_TYPE_NET | INTR_MPSAFE, - NULL, mxge_intr, sc, &sc->ih); - if (err != 0) { - goto abort_with_rings; - } /* get the lanai pointers to the send and receive rings */ ==== //depot/projects/soc2006/intr_filter/dev/ncv/ncr53c500_pccard.c#5 (text+ko) ==== @@ -246,8 +246,7 @@ return(ENXIO); } error = bus_setup_intr(dev, sc->irq_res, INTR_TYPE_CAM | INTR_ENTROPY, - NULL, ncv_pccard_intr, (void *)sc, - &sc->ncv_intrhand); + NULL, ncv_pccard_intr, (void *)sc, &sc->ncv_intrhand); if (error) { ncv_release_resource(dev); return(error); ==== //depot/projects/soc2006/intr_filter/dev/pccard/pccard.c#6 (text+ko) ==== ==== //depot/projects/soc2006/intr_filter/dev/pccard/pccardvarp.h#4 (text+ko) ==== ==== //depot/projects/soc2006/intr_filter/dev/pccbb/pccbb.c#9 (text+ko) ==== ==== //depot/projects/soc2006/intr_filter/dev/pccbb/pccbbvar.h#7 (text+ko) ==== ==== //depot/projects/soc2006/intr_filter/dev/ppbus/ppbconf.c#4 (text+ko) ==== @@ -428,7 +428,7 @@ return (EINVAL); if ((error = BUS_SETUP_INTR(device_get_parent(bus), child, r, flags, - filt, ihand, arg, cookiep))) + filt, ihand, arg, cookiep))) return (error); /* store the resource and the cookie for eventually forcing ==== //depot/projects/soc2006/intr_filter/dev/ppbus/pps.c#6 (text+ko) ==== @@ -205,8 +205,8 @@ /* attach the interrupt handler */ if ((error = bus_setup_intr(ppsdev, sc->intr_resource, - INTR_TYPE_TTY, ppsintr, NULL, sc, - &sc->intr_cookie))) { + (INTR_TYPE_TTY | INTR_MPSAFE), ppsintr, NULL, + sc, &sc->intr_cookie))) { ppb_release_bus(ppbus, ppsdev); return (error); } ==== //depot/projects/soc2006/intr_filter/dev/ppc/ppc.c#5 (text+ko) ==== ==== //depot/projects/soc2006/intr_filter/dev/puc/puc.c#10 (text+ko) ==== ==== //depot/projects/soc2006/intr_filter/dev/re/if_re.c#16 (text+ko) ==== ==== //depot/projects/soc2006/intr_filter/dev/scc/scc_bfe.h#6 (text) ==== ==== //depot/projects/soc2006/intr_filter/dev/scc/scc_core.c#13 (text) ==== ==== //depot/projects/soc2006/intr_filter/dev/sound/isa/gusc.c#6 (text+ko) ==== @@ -316,8 +316,7 @@ } if (scp->irq != NULL) - bus_setup_intr(dev, scp->irq, INTR_TYPE_AV, NULL, - gusc_intr, scp, &ih); + snd_setup_intr(dev, scp->irq, 0, gusc_intr, scp, &ih); bus_generic_attach(dev); return (0); ==== //depot/projects/soc2006/intr_filter/dev/sound/pci/csa.c#6 (text+ko) ==== @@ -445,8 +445,7 @@ #if __FreeBSD_version >= 700031 driver_filter_t *filter, #endif - driver_filter_t *filter, driver_intr_t *intr, void *arg, - void **cookiep) + driver_intr_t *intr, void *arg, void **cookiep) { sc_p scp; csa_res *resp; ==== //depot/projects/soc2006/intr_filter/dev/sound/pci/emu10kx.c#6 (text+ko) ==== @@ -2835,8 +2835,7 @@ i = 0; sc->irq = bus_alloc_resource_any(dev, SYS_RES_IRQ, &i, RF_ACTIVE | RF_SHAREABLE); - if ((sc->irq == NULL) || bus_setup_intr(dev, sc->irq, INTR_MPSAFE | - INTR_TYPE_AV, NULL, emu_intr, sc, &sc->ih)) { + if ((sc->irq == NULL) || snd_setup_intr(dev, sc->irq, INTR_MPSAFE, emu_intr, sc, &sc->ih)) { device_printf(dev, "unable to map interrupt\n"); goto bad; } ==== //depot/projects/soc2006/intr_filter/dev/sound/pci/vibes.c#4 (text+ko) ==== @@ -762,7 +762,7 @@ sc->irq = bus_alloc_resource(dev, SYS_RES_IRQ, &sc->irqid, 0, ~0, 1, RF_ACTIVE | RF_SHAREABLE); if (!sc->irq || - bus_setup_intr(dev, sc->irq, INTR_TYPE_AV, NULL, sv_intr, sc, &sc->ih)) { + snd_setup_intr(dev, sc->irq, 0, sv_intr, sc, &sc->ih)) { device_printf(dev, "sv_attach: Unable to map interrupt\n"); goto fail; } ==== //depot/projects/soc2006/intr_filter/dev/zs/z8530var.h#3 (text+ko) ==== ==== //depot/projects/soc2006/intr_filter/dev/zs/zs.c#4 (text+ko) ==== From owner-p4-projects@FreeBSD.ORG Tue Feb 27 13:15: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 DA3FD16A406; Tue, 27 Feb 2007 13:15: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 6EE5716A404 for ; Tue, 27 Feb 2007 13:15:49 +0000 (UTC) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 597ED13C4A6 for ; Tue, 27 Feb 2007 13:15:49 +0000 (UTC) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l1RDFnfx050429 for ; Tue, 27 Feb 2007 13:15:49 GMT (envelope-from piso@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l1RDFnsC050426 for perforce@freebsd.org; Tue, 27 Feb 2007 13:15:49 GMT (envelope-from piso@freebsd.org) Date: Tue, 27 Feb 2007 13:15:49 GMT Message-Id: <200702271315.l1RDFnsC050426@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to piso@freebsd.org using -f From: Paolo Pisati To: Perforce Change Reviews Cc: Subject: PERFORCE change 115117 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 27 Feb 2007 13:15:50 -0000 http://perforce.freebsd.org/chv.cgi?CH=115117 Change 115117 by piso@piso_newluxor on 2007/02/27 13:15:32 Reduce diff against HEAD. Affected files ... .. //depot/projects/soc2006/intr_filter/i386/conf/NOTES#7 edit .. //depot/projects/soc2006/intr_filter/sys/bus.h#8 edit Differences ... ==== //depot/projects/soc2006/intr_filter/i386/conf/NOTES#7 (text+ko) ==== @@ -7,8 +7,6 @@ # $FreeBSD: src/sys/i386/conf/NOTES,v 1.1238 2006/10/31 07:22:24 takawata Exp $ # -ident NOTES - # # We want LINT to cover profiling as well. profile 2 @@ -313,6 +311,8 @@ # (default 9600). device speaker #Play IBM BASIC-style noises out your speaker +hint.speaker.0.at="isa" +hint.speaker.0.port="0x61" device gzip #Exec gzipped a.out's. REQUIRES COMPAT_AOUT! device apm_saver # Requires APM @@ -404,6 +404,8 @@ # # The Numeric Processing eXtension driver. This is non-optional. device npx +hint.npx.0.flags="0x0" +hint.npx.0.irq="13" # # `flags' for npx0: @@ -562,6 +564,9 @@ # mse: Logitech and ATI InPort bus mouse ports device mse +hint.mse.0.at="isa" +hint.mse.0.port="0x23c" +hint.mse.0.irq="5" # # Network interfaces: @@ -604,33 +609,70 @@ # Order for ISA/EISA devices is important here -device miibus device ar +hint.ar.0.at="isa" +hint.ar.0.port="0x300" +hint.ar.0.irq="10" +hint.ar.0.maddr="0xd0000" device arl +hint.arl.0.at="isa" +hint.arl.0.irq="9" +hint.arl.0.maddr="0xd0000" device ce device cp device cs +hint.cs.0.at="isa" +hint.cs.0.port="0x300" device ctau +hint.ctau.0.at="isa" +hint.ctau.0.port="0x240" +hint.ctau.0.irq="15" +hint.ctau.0.drq="7" device cx +hint.cx.0.at="isa" +hint.cx.0.port="0x240" +hint.cx.0.irq="15" +hint.cx.0.drq="7" #options NETGRAPH_CRONYX # Enable NETGRAPH support for Cronyx adapter(s) device ed options ED_3C503 options ED_HPP options ED_SIC +hint.ed.0.at="isa" +hint.ed.0.port="0x280" +hint.ed.0.irq="5" +hint.ed.0.maddr="0xd8000" device ie # Hints only required for Starlan +hint.ie.2.at="isa" +hint.ie.2.port="0x300" +hint.ie.2.irq="5" +hint.ie.2.maddr="0xd0000" device iwi device ipw # Hint for the i386-only ISA front-end of le(4). +hint.le.0.at="isa" +hint.le.0.port="0x280" +hint.le.0.irq="10" +hint.le.0.drq="0" device nfe # nVidia nForce MCP on-board Ethernet Networking device nve # nVidia nForce MCP on-board Ethernet Networking device oltr hint.oltr.0.at="isa" device ral device sbni +hint.sbni.0.at="isa" +hint.sbni.0.port="0x210" +hint.sbni.0.irq="0xefdead" +hint.sbni.0.flags="0" device sr +hint.sr.0.at="isa" +hint.sr.0.port="0x300" +hint.sr.0.irq="5" +hint.sr.0.maddr="0xd0000" device ural -device oltr device wl +hint.wl.0.at="isa" +hint.wl.0.port="0x300" options WLCACHE # enables the signal-strength cache options WLDEBUG # enables verbose debugging output @@ -670,6 +712,9 @@ device ncv device nsp device stg +hint.stg.0.at="isa" +hint.stg.0.port="0x140" +hint.stg.0.port="11" # # Adaptec FSA RAID controllers, including integrated DELL controllers, @@ -743,6 +788,7 @@ # of the Vaio extra features are controlled by this device. device apm +hint.apm.0.flags="0x20" device ipmi device smapi device smbios @@ -750,7 +796,14 @@ device pmtimer # Adjust system timer at wakeup time device cy options CY_PCI_FASTINTR # Use with cy_pci unless irq is shared +hint.cy.0.at="isa" +hint.cy.0.irq="10" +hint.cy.0.maddr="0xd4000" +hint.cy.0.msize="0x2000" device digi +hint.digi.0.at="isa" +hint.digi.0.port="0x104" +hint.digi.0.maddr="0xd0000" # BIOS & FEP/OS components of device digi. device digi_CX device digi_CX_PCI @@ -761,7 +814,11 @@ device digi_Xr # Parallel (8255 PPI) basic I/O (mode 0) port (e.g. Advantech PCL-724) device pbio +hint.pbio.0.at="isa" +hint.pbio.0.port="0x360" device spic +hint.spic.0.at="isa" +hint.spic.0.port="0x10a0" # HOT1 Xilinx 6200 card (http://www.vcc.com/) device xrpu @@ -786,6 +843,9 @@ # pcf Philips PCF8584 ISA-bus controller # device pcf +hint.pcf.0.at="isa" +hint.pcf.0.port="0x320" +hint.pcf.0.irq="5" # # Hardware watchdog timers: @@ -830,24 +890,53 @@ # # Teles S0/8 or Niccy 1008 options TEL_S0_8 +hint.isic.0.at="isa" +hint.isic.0.maddr="0xd0000" +hint.isic.0.irq="5" +hint.isic.0.flags="1" # # Teles S0/16 or Creatix ISDN-S0 or Niccy 1016 options TEL_S0_16 +hint.isic.0.at="isa" +hint.isic.0.port="0xd80" +hint.isic.0.maddr="0xd0000" +hint.isic.0.irq="5" +hint.isic.0.flags="2" # # Teles S0/16.3 options TEL_S0_16_3 +hint.isic.0.at="isa" +hint.isic.0.port="0xd80" +hint.isic.0.irq="5" +hint.isic.0.flags="3" # # AVM A1 or AVM Fritz!Card options AVM_A1 +hint.isic.0.at="isa" +hint.isic.0.port="0x340" +hint.isic.0.irq="5" +hint.isic.0.flags="4" # # USRobotics Sportster ISDN TA intern options USR_STI +hint.isic.0.at="isa" +hint.isic.0.port="0x268" +hint.isic.0.irq="5" +hint.isic.0.flags="7" # # ITK ix1 Micro ( < V.3, non-PnP version ) options ITKIX1 +hint.isic.0.at="isa" +hint.isic.0.port="0x398" +hint.isic.0.irq="10" +hint.isic.0.flags="18" # # ELSA PCC-16 options ELSA_PCC16 +hint.isic.0.at="isa" +hint.isic.0.port="0x360" +hint.isic.0.irq="10" +hint.isic.0.flags="20" # # ISA bus PnP Cards: # ------------------ @@ -934,6 +1023,9 @@ # # AVM B1 ISA bus (PnP mode not supported!) # ---------------------------------------- +hint.iavc.0.at="isa" +hint.iavc.0.port="0x150" +hint.iavc.0.irq="5" # #--------------------------------------------------------------------------- # ISDN Protocol Stack - mandatory for all hardware drivers ==== //depot/projects/soc2006/intr_filter/sys/bus.h#8 (text+ko) ==== @@ -121,7 +121,6 @@ */ #define device_method_t kobj_method_t -#ifdef INTR_FILTER /** * @brief Driver interrupt filter return values * @@ -143,29 +142,8 @@ #define FILTER_STRAY 0x01 #define FILTER_HANDLED 0x02 #define FILTER_SCHEDULE_THREAD 0x04 -#endif /** - * @brief Driver interrupt filter return values - * - * If a driver provides an interrupt filter routine it must return an - * integer consisting of oring together zero or more of the following - * flags: - * - * FILTER_STRAY - this device did not trigger the interrupt - * FILTER_HANDLED - the interrupt has been fully handled and can be EOId - * FILTER_SCHEDULE_THREAD - the threaded interrupt handler should be - * scheduled to execute - * - * If the driver does not provide a filter, then the interrupt code will - * act is if the filter had returned FILTER_SCHEDULE_THREAD. Note that it - * is illegal to specify any other flag with FILTER_STRAY and that it is - * illegal to not specify either of FILTER_HANDLED or FILTER_SCHEDULE_THREAD - * if FILTER_STRAY is not specified. - */ -#define FILTER_STRAY 0x01 -#define FILTER_HANDLED 0x02 -#define FILTER_SCHEDULE_THREAD 0x04 * @brief Driver interrupt service routines * * The filter routine is run in primary interrupt context and may not @@ -208,6 +186,7 @@ INTR_TYPE_MISC = 16, INTR_TYPE_CLK = 32, INTR_TYPE_AV = 64, + INTR_FAST = 128, INTR_EXCL = 256, /* exclusive interrupt */ INTR_MPSAFE = 512, /* this interrupt is SMP safe */ INTR_ENTROPY = 1024 /* this interrupt provides entropy */ From owner-p4-projects@FreeBSD.ORG Tue Feb 27 19:53: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 8ADAE16A414; Tue, 27 Feb 2007 19:53:59 +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 3FD4D16A405; Tue, 27 Feb 2007 19:53:59 +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 DF25C13C4B3; Tue, 27 Feb 2007 19:53:58 +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 l1RJrrlO052947; Tue, 27 Feb 2007 14:53:54 -0500 (EST) (envelope-from jhb@freebsd.org) From: John Baldwin To: Paolo Pisati Date: Tue, 27 Feb 2007 14:42:59 -0500 User-Agent: KMail/1.9.1 References: <200702271315.l1RDFnsC050426@repoman.freebsd.org> In-Reply-To: <200702271315.l1RDFnsC050426@repoman.freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset="iso-8859-15" Content-Transfer-Encoding: 7bit Content-Disposition: inline Message-Id: <200702271442.59674.jhb@freebsd.org> X-Greylist: Sender succeeded SMTP AUTH authentication, not delayed by milter-greylist-2.0.2 (server.baldwin.cx [127.0.0.1]); Tue, 27 Feb 2007 14:53:54 -0500 (EST) X-Virus-Scanned: ClamAV 0.88.3/2665/Tue Feb 27 11:26:03 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 115117 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 27 Feb 2007 19:54:00 -0000 On Tuesday 27 February 2007 08:15, Paolo Pisati wrote: > http://perforce.freebsd.org/chv.cgi?CH=115117 > > Change 115117 by piso@piso_newluxor on 2007/02/27 13:15:32 > > Reduce diff against HEAD. > > Affected files ... > > .. //depot/projects/soc2006/intr_filter/i386/conf/NOTES#7 edit > .. //depot/projects/soc2006/intr_filter/sys/bus.h#8 edit > > Differences ... > > ==== //depot/projects/soc2006/intr_filter/sys/bus.h#8 (text+ko) ==== > > @@ -208,6 +186,7 @@ > INTR_TYPE_MISC = 16, > INTR_TYPE_CLK = 32, > INTR_TYPE_AV = 64, > + INTR_FAST = 128, > INTR_EXCL = 256, /* exclusive interrupt */ > INTR_MPSAFE = 512, /* this interrupt is SMP safe */ > INTR_ENTROPY = 1024 /* this interrupt provides entropy */ > I don't think you meant to readd this. :) -- John Baldwin From owner-p4-projects@FreeBSD.ORG Tue Feb 27 20:54: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 23AEC16A408; Tue, 27 Feb 2007 20:54: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 BA99816A401 for ; Tue, 27 Feb 2007 20:54:39 +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 A8C0813C494 for ; Tue, 27 Feb 2007 20:54:39 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l1RKsdfv078502 for ; Tue, 27 Feb 2007 20:54:39 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l1RKsbFZ078496 for perforce@freebsd.org; Tue, 27 Feb 2007 20:54:37 GMT (envelope-from jhb@freebsd.org) Date: Tue, 27 Feb 2007 20:54:37 GMT Message-Id: <200702272054.l1RKsbFZ078496@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 115142 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 27 Feb 2007 20:54:40 -0000 http://perforce.freebsd.org/chv.cgi?CH=115142 Change 115142 by jhb@jhb_mutex on 2007/02/27 20:53:48 IFC @115141. Affected files ... .. //depot/projects/smpng/sys/amd64/linux32/linux.h#10 integrate .. //depot/projects/smpng/sys/amd64/linux32/linux32_machdep.c#19 integrate .. //depot/projects/smpng/sys/arm/arm/db_interface.c#7 integrate .. //depot/projects/smpng/sys/arm/arm/locore.S#14 integrate .. //depot/projects/smpng/sys/arm/arm/support.S#11 integrate .. //depot/projects/smpng/sys/arm/arm/trap.c#27 integrate .. //depot/projects/smpng/sys/arm/at91/at91.c#9 integrate .. //depot/projects/smpng/sys/arm/at91/at91_rtc.c#4 integrate .. //depot/projects/smpng/sys/arm/at91/at91_spi.c#6 integrate .. //depot/projects/smpng/sys/arm/conf/AVILA#2 integrate .. //depot/projects/smpng/sys/arm/sa11x0/sa11x0_ost.c#7 integrate .. //depot/projects/smpng/sys/arm/xscale/ixp425/avila_ata.c#2 integrate .. //depot/projects/smpng/sys/arm/xscale/ixp425/ixp425_qmgr.c#2 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_target.c#23 integrate .. //depot/projects/smpng/sys/compat/linux/linux_emul.c#8 integrate .. //depot/projects/smpng/sys/compat/linux/linux_futex.c#3 integrate .. //depot/projects/smpng/sys/compat/linux/linux_futex.h#2 integrate .. //depot/projects/smpng/sys/compat/linux/linux_misc.c#80 integrate .. //depot/projects/smpng/sys/compat/linux/linux_uid16.c#23 integrate .. //depot/projects/smpng/sys/compat/linux/linux_util.c#17 integrate .. //depot/projects/smpng/sys/conf/NOTES#137 integrate .. //depot/projects/smpng/sys/conf/files#199 integrate .. //depot/projects/smpng/sys/conf/options#136 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_ec.c#41 integrate .. //depot/projects/smpng/sys/dev/ata/atapi-cam.c#30 integrate .. //depot/projects/smpng/sys/dev/ath/if_ath.c#50 integrate .. //depot/projects/smpng/sys/dev/ath/if_athvar.h#30 integrate .. //depot/projects/smpng/sys/dev/exca/exca.c#22 integrate .. //depot/projects/smpng/sys/dev/fdc/fdc.c#29 integrate .. //depot/projects/smpng/sys/dev/firewire/fwohci.c#36 integrate .. //depot/projects/smpng/sys/dev/firewire/sbp.c#40 integrate .. //depot/projects/smpng/sys/dev/hptmv/entry.c#13 integrate .. //depot/projects/smpng/sys/dev/hptmv/ioctl.c#5 integrate .. //depot/projects/smpng/sys/dev/hwpmc/hwpmc_mod.c#20 integrate .. //depot/projects/smpng/sys/dev/ipmi/ipmi_ssif.c#2 integrate .. //depot/projects/smpng/sys/dev/mii/rlphy.c#22 integrate .. //depot/projects/smpng/sys/dev/pccard/pccard_cis.c#25 integrate .. //depot/projects/smpng/sys/dev/pccbb/pccbb.c#63 integrate .. //depot/projects/smpng/sys/dev/random/randomdev_soft.c#13 integrate .. //depot/projects/smpng/sys/dev/re/if_re.c#52 integrate .. //depot/projects/smpng/sys/dev/scd/scd.c#13 integrate .. //depot/projects/smpng/sys/dev/sound/midi/midi.c#13 integrate .. //depot/projects/smpng/sys/dev/sound/midi/midi.h#10 integrate .. //depot/projects/smpng/sys/dev/sound/midi/midiq.h#3 integrate .. //depot/projects/smpng/sys/dev/sound/midi/mpu401.c#3 integrate .. //depot/projects/smpng/sys/dev/sound/midi/mpu401.h#3 integrate .. //depot/projects/smpng/sys/dev/sound/midi/mpu_if.m#3 integrate .. //depot/projects/smpng/sys/dev/sound/midi/mpufoi_if.m#3 integrate .. //depot/projects/smpng/sys/dev/sound/midi/sequencer.c#17 integrate .. //depot/projects/smpng/sys/dev/sound/midi/sequencer.h#6 integrate .. //depot/projects/smpng/sys/dev/sound/midi/synth_if.m#3 integrate .. //depot/projects/smpng/sys/dev/sound/pci/hda/hdac.c#10 integrate .. //depot/projects/smpng/sys/dev/usb/sl811hs.c#5 integrate .. //depot/projects/smpng/sys/dev/usb/sl811hsvar.h#4 integrate .. //depot/projects/smpng/sys/dev/usb/usb_subr.c#39 integrate .. //depot/projects/smpng/sys/dev/usb/uvscom.c#20 integrate .. //depot/projects/smpng/sys/dev/zs/z8530var.h#3 integrate .. //depot/projects/smpng/sys/dev/zs/zs.c#25 integrate .. //depot/projects/smpng/sys/dev/zs/zs_macio.c#6 integrate .. //depot/projects/smpng/sys/fs/smbfs/smbfs_smb.c#16 integrate .. //depot/projects/smpng/sys/geom/geom_dev.c#43 integrate .. //depot/projects/smpng/sys/geom/geom_io.c#46 integrate .. //depot/projects/smpng/sys/geom/multipath/g_multipath.c#1 branch .. //depot/projects/smpng/sys/geom/multipath/g_multipath.h#1 branch .. //depot/projects/smpng/sys/i386/ibcs2/ibcs2_xenix.c#22 integrate .. //depot/projects/smpng/sys/i386/linux/imgact_linux.c#18 integrate .. //depot/projects/smpng/sys/i386/linux/linux.h#17 integrate .. //depot/projects/smpng/sys/i386/linux/linux_machdep.c#44 integrate .. //depot/projects/smpng/sys/ia64/isa/isa.c#4 integrate .. //depot/projects/smpng/sys/isa/syscons_isa.c#12 integrate .. //depot/projects/smpng/sys/kern/kern_fork.c#106 integrate .. //depot/projects/smpng/sys/kern/kern_intr.c#84 integrate .. //depot/projects/smpng/sys/kern/kern_linker.c#85 integrate .. //depot/projects/smpng/sys/kern/kern_lock.c#58 integrate .. //depot/projects/smpng/sys/kern/kern_mutex.c#140 integrate .. //depot/projects/smpng/sys/kern/kern_resource.c#69 integrate .. //depot/projects/smpng/sys/kern/kern_rwlock.c#10 integrate .. //depot/projects/smpng/sys/kern/kern_sx.c#40 integrate .. //depot/projects/smpng/sys/kern/kern_synch.c#112 integrate .. //depot/projects/smpng/sys/kern/link_elf.c#42 integrate .. //depot/projects/smpng/sys/kern/sched_4bsd.c#68 integrate .. //depot/projects/smpng/sys/kern/sched_ule.c#74 integrate .. //depot/projects/smpng/sys/kern/subr_bus.c#65 integrate .. //depot/projects/smpng/sys/kern/subr_lock.c#6 integrate .. //depot/projects/smpng/sys/kern/uipc_socket.c#101 integrate .. //depot/projects/smpng/sys/kern/uipc_usrreq.c#73 integrate .. //depot/projects/smpng/sys/modules/geom/Makefile#16 integrate .. //depot/projects/smpng/sys/modules/geom/geom_multipath/Makefile#1 branch .. //depot/projects/smpng/sys/net/bpf.c#67 integrate .. //depot/projects/smpng/sys/net/bpf.h#20 integrate .. //depot/projects/smpng/sys/net/bpfdesc.h#18 integrate .. //depot/projects/smpng/sys/netinet/in.h#38 integrate .. //depot/projects/smpng/sys/netinet/ip_mroute.c#53 integrate .. //depot/projects/smpng/sys/netinet/tcp_input.c#95 integrate .. //depot/projects/smpng/sys/netinet/tcp_subr.c#87 integrate .. //depot/projects/smpng/sys/netinet/tcp_timer.c#32 integrate .. //depot/projects/smpng/sys/netinet/tcp_timer.h#13 integrate .. //depot/projects/smpng/sys/netinet/tcp_usrreq.c#57 integrate .. //depot/projects/smpng/sys/netinet/tcp_var.h#47 integrate .. //depot/projects/smpng/sys/netinet6/ip6_mroute.c#29 integrate .. //depot/projects/smpng/sys/netinet6/raw_ip6.c#43 integrate .. //depot/projects/smpng/sys/netipx/ipx_ip.c#17 integrate .. //depot/projects/smpng/sys/netipx/ipx_ip.h#6 integrate .. //depot/projects/smpng/sys/netncp/ncp_sock.c#10 integrate .. //depot/projects/smpng/sys/nfsclient/bootp_subr.c#34 integrate .. //depot/projects/smpng/sys/pc98/cbus/clock.c#8 integrate .. //depot/projects/smpng/sys/pc98/cbus/syscons_cbus.c#3 integrate .. //depot/projects/smpng/sys/powerpc/powermac/pswitch.c#4 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/machdep.c#84 integrate .. //depot/projects/smpng/sys/sys/extattr.h#9 integrate .. //depot/projects/smpng/sys/sys/lock.h#42 integrate .. //depot/projects/smpng/sys/sys/lock_profile.h#4 integrate .. //depot/projects/smpng/sys/sys/mutex.h#69 integrate .. //depot/projects/smpng/sys/sys/rwlock.h#6 integrate .. //depot/projects/smpng/sys/sys/unpcb.h#12 integrate .. //depot/projects/smpng/sys/tools/fw_stub.awk#4 integrate .. //depot/projects/smpng/sys/vm/phys_pager.c#15 integrate .. //depot/projects/smpng/sys/vm/swap_pager.c#69 integrate .. //depot/projects/smpng/sys/vm/vm_kern.c#36 integrate .. //depot/projects/smpng/sys/vm/vm_map.c#83 integrate .. //depot/projects/smpng/sys/vm/vm_object.c#92 integrate .. //depot/projects/smpng/sys/vm/vm_page.c#90 integrate .. //depot/projects/smpng/sys/vm/vm_page.h#38 integrate Differences ... ==== //depot/projects/smpng/sys/amd64/linux32/linux.h#10 (text+ko) ==== @@ -27,7 +27,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/amd64/linux32/linux.h,v 1.12 2007/02/15 00:54:40 jkim Exp $ + * $FreeBSD: src/sys/amd64/linux32/linux.h,v 1.13 2007/02/24 16:49:24 netchild Exp $ */ #ifndef _AMD64_LINUX_LINUX_H_ @@ -783,7 +783,7 @@ /* * macros which does the same thing as those in linux include/asm-um/ldt-i386.h - * these convert linux user-space descriptor to machine one + * these convert linux user space descriptor to machine one */ #define LDT_entry_a(info) \ ((((info)->base_addr & LINUX_LOWERWORD) << 16) | ((info)->limit & LINUX_LOWERWORD)) ==== //depot/projects/smpng/sys/amd64/linux32/linux32_machdep.c#19 (text+ko) ==== @@ -29,7 +29,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_machdep.c,v 1.33 2007/02/15 01:20:43 jkim Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_machdep.c,v 1.35 2007/02/27 02:08:00 jkim Exp $"); #include #include @@ -568,8 +568,8 @@ /* * XXX: in linux sharing of fs info (chroot/cwd/umask) * and open files is independant. in fbsd its in one - * structure but in reality it doesnt make any problems - * because both this flags are set at once usually. + * structure but in reality it doesn't cause any problems + * because both of these flags are usually set together. */ if (!(args->flags & (CLONE_FILES | CLONE_FS))) ff |= RFFDG; @@ -579,7 +579,7 @@ * kernel threads. Unfortunately despite the existence of the * CLONE_THREAD flag, version of linuxthreads package used in * most popular distros as of beginning of 2005 doesn't make - * any use of it. Therefore, this detection relay fully on + * any use of it. Therefore, this detection relies on * empirical observation that linuxthreads sets certain * combination of flags, so that we can make more or less * precise detection and notify the FreeBSD kernel that several @@ -793,7 +793,9 @@ if (bsd_args.prot & (PROT_READ | PROT_WRITE | PROT_EXEC)) bsd_args.prot |= PROT_READ | PROT_EXEC; - if (linux_args->fd != -1) { + /* Linux does not check file descriptor when MAP_ANONYMOUS is set. */ + bsd_args.fd = (bsd_args.flags & MAP_ANON) ? -1 : linux_args->fd; + if (bsd_args.fd != -1) { /* * Linux follows Solaris mmap(2) description: * The file descriptor fildes is opened with @@ -801,7 +803,7 @@ * protection options specified. */ - if ((error = fget(td, linux_args->fd, &fp)) != 0) + if ((error = fget(td, bsd_args.fd, &fp)) != 0) return (error); if (fp->f_type != DTYPE_VNODE) { fdrop(fp, td); @@ -816,7 +818,6 @@ fdrop(fp, td); } - bsd_args.fd = linux_args->fd; if (linux_args->flags & LINUX_MAP_GROWSDOWN) { /* @@ -833,7 +834,7 @@ * Our mmap with MAP_STACK takes addr as the maximum * downsize limit on BOS, and as len the max size of * the region. It them maps the top SGROWSIZ bytes, - * and autgrows the region down, up to the limit + * and auto grows the region down, up to the limit * in addr. * * If we don't use the MAP_STACK option, the effect ==== //depot/projects/smpng/sys/arm/arm/db_interface.c#7 (text+ko) ==== @@ -35,7 +35,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/arm/db_interface.c,v 1.6 2007/02/14 01:25:41 kevlo Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/db_interface.c,v 1.7 2007/02/26 05:17:47 kevlo Exp $"); #include "opt_ddb.h" #include @@ -53,7 +53,6 @@ #include #include -#include #include #include ==== //depot/projects/smpng/sys/arm/arm/locore.S#14 (text+ko) ==== @@ -37,7 +37,7 @@ #include #include #include -__FBSDID("$FreeBSD: src/sys/arm/arm/locore.S,v 1.15 2007/02/19 00:57:27 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/locore.S,v 1.16 2007/02/26 02:03:48 cognet Exp $"); /* What size should this really be ? It is only used by initarm() */ #define INIT_ARM_STACK_SIZE 2048 @@ -95,11 +95,6 @@ sub r0, r0, r9 add r0, r0, r8 mov r4, r0 - /* Make sure _arm_memcpy is NULL */ - ldr r3, .L_arm_memcpy - ldr r3, [r3] - mov r5, #0 - str r5, [r3] bl memcpy ldr r0, Lram_offset add pc, r4, r0 ==== //depot/projects/smpng/sys/arm/arm/support.S#11 (text+ko) ==== @@ -26,7 +26,7 @@ #include #include -__FBSDID("$FreeBSD: src/sys/arm/arm/support.S,v 1.11 2005/10/23 23:09:14 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/support.S,v 1.12 2007/02/26 02:03:48 cognet Exp $"); #include "assym.s" @@ -871,6 +871,18 @@ #if !defined(__XSCALE__) ENTRY(memcpy) /* save leaf functions having to store this away */ + /* Do not check arm_memcpy if we're running from flash */ +#ifdef FLASHADDR +#if FLASHADDR > PHYSADDR + ldr r3, =FLASHADDR + cmp r3, pc + bls .Lnormal +#else + ldr r3, =FLASHADDR + cmp r3, pc + bhi .Lnormal +#endif +#endif ldr r3, .L_arm_memcpy ldr r3, [r3] cmp r3, #0 @@ -1096,6 +1108,17 @@ pld [r1] cmp r2, #0x0c ble .Lmemcpy_short /* <= 12 bytes */ +#ifdef FLASHADDR +#if FLASHADDR > PHYSADDR + ldr r3, =FLASHADDR + cmp r3, pc + bls .Lnormal +#else + ldr r3, =FLASHADDR + cmp r3, pc + bhi .Lnormal +#endif +#endif ldr r3, .L_arm_memcpy ldr r3, [r3] cmp r3, #0 ==== //depot/projects/smpng/sys/arm/arm/trap.c#27 (text+ko) ==== @@ -82,7 +82,7 @@ #include "opt_ktrace.h" #include -__FBSDID("$FreeBSD: src/sys/arm/arm/trap.c,v 1.32 2006/10/26 21:42:16 jb Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/trap.c,v 1.33 2007/02/26 05:17:47 kevlo Exp $"); #include #include @@ -110,7 +110,6 @@ #include #include #include -#include #include #include #include ==== //depot/projects/smpng/sys/arm/at91/at91.c#9 (text) ==== @@ -23,7 +23,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/at91/at91.c,v 1.11 2007/02/23 12:18:27 piso Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/at91/at91.c,v 1.12 2007/02/25 14:34:59 piso Exp $"); #include #include @@ -548,7 +548,7 @@ { struct at91_softc *sc = device_get_softc(dev); - if (rman_get_start(ires) == AT91RM92_IRQ_SYSTEM && !(flags & INTR_FAST)) + if (rman_get_start(ires) == AT91RM92_IRQ_SYSTEM && filt == NULL) panic("All system interrupt ISRs must be type INTR_FAST"); BUS_SETUP_INTR(device_get_parent(dev), child, ires, flags, filt, intr, arg, cookiep); ==== //depot/projects/smpng/sys/arm/at91/at91_rtc.c#4 (text) ==== @@ -23,7 +23,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/at91/at91_rtc.c,v 1.3 2007/02/23 12:18:27 piso Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/at91/at91_rtc.c,v 1.4 2007/02/27 13:39:34 piso Exp $"); #include #include @@ -80,7 +80,7 @@ static int at91_rtc_probe(device_t dev); static int at91_rtc_attach(device_t dev); static int at91_rtc_detach(device_t dev); -static void at91_rtc_intr(void *); +static int at91_rtc_intr(void *); /* helper routines */ static int at91_rtc_activate(device_t dev); ==== //depot/projects/smpng/sys/arm/at91/at91_spi.c#6 (text) ==== @@ -23,7 +23,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/at91/at91_spi.c,v 1.5 2007/02/23 12:18:27 piso Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/at91/at91_spi.c,v 1.6 2007/02/27 17:15:39 jhb Exp $"); #include #include @@ -248,7 +248,7 @@ rxdone = sc->rxdone; do { - err = msleep(&sc->rxdone, NULL, PCATCH | PZERO, "spi", hz); + err = tsleep(&sc->rxdone, PCATCH | PZERO, "spi", hz); } while (rxdone == sc->rxdone && err != EINTR); WR4(sc, PDC_PTCR, PDC_PTCR_TXTDIS | PDC_PTCR_RXTDIS); if (err == 0) { ==== //depot/projects/smpng/sys/arm/conf/AVILA#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/arm/conf/AVILA,v 1.2 2006/11/22 12:57:17 kevlo Exp $ +# $FreeBSD: src/sys/arm/conf/AVILA,v 1.3 2007/02/26 02:04:24 cognet Exp $ machine arm ident AVILA @@ -24,6 +24,8 @@ options PHYSADDR=0x10000000 options KERNPHYSADDR=0x10200000 options KERNVIRTADDR=0xc0200000 # Used in ldscript.arm +options FLASHADDR=0x50000000 +options LOADERRAMADDR=0x00000000 options STARTUP_PAGETABLE_ADDR=0x10000000 include "../xscale/ixp425/std.avila" ==== //depot/projects/smpng/sys/arm/sa11x0/sa11x0_ost.c#7 (text+ko) ==== @@ -38,7 +38,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/sa11x0/sa11x0_ost.c,v 1.6 2007/02/23 12:18:28 piso Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/sa11x0/sa11x0_ost.c,v 1.7 2007/02/26 05:17:47 kevlo Exp $"); #include #include @@ -57,8 +57,6 @@ #include #include -#include - #include #include #include ==== //depot/projects/smpng/sys/arm/xscale/ixp425/avila_ata.c#2 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/xscale/ixp425/avila_ata.c,v 1.1 2006/11/19 23:55:23 sam Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/xscale/ixp425/avila_ata.c,v 1.2 2007/02/25 22:17:54 cognet Exp $"); /* * Compact Flash Support for the Avila Gateworks XScale boards. @@ -160,7 +160,7 @@ panic("Unable to allocate irq %u.\n", AVILA_IDE_IRQ); bus_setup_intr(dev, sc->sc_irq, INTR_TYPE_BIO | INTR_MPSAFE | INTR_ENTROPY, - ata_avila_intr, sc, &sc->sc_ih); + NULL, ata_avila_intr, sc, &sc->sc_ih); /* attach channel on this controller */ device_add_child(dev, "ata", devclass_find_free_unit(ata_devclass, 0)); @@ -225,8 +225,8 @@ static int ata_avila_setup_intr(device_t dev, device_t child, struct resource *irq, - int flags, driver_intr_t *function, void *argument, - void **cookiep) + int flags, driver_filter_t *filt, + driver_intr_t *function, void *argument, void **cookiep) { struct ata_avila_softc *sc = device_get_softc(dev); int unit = ((struct ata_channel *)device_get_softc(child))->unit; ==== //depot/projects/smpng/sys/arm/xscale/ixp425/ixp425_qmgr.c#2 (text+ko) ==== @@ -57,7 +57,7 @@ * SUCH DAMAGE. */ #include -__FBSDID("$FreeBSD: src/sys/arm/xscale/ixp425/ixp425_qmgr.c,v 1.1 2006/11/19 23:55:23 sam Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/xscale/ixp425/ixp425_qmgr.c,v 1.2 2007/02/25 22:17:54 cognet Exp $"); /* * Intel XScale Queue Manager support. @@ -225,7 +225,7 @@ panic("Unable to allocate the qmgr irqs.\n"); /* XXX could be a source of entropy */ bus_setup_intr(dev, sc->sc_irq, INTR_TYPE_NET | INTR_MPSAFE, - ixpqmgr_intr, NULL, &sc->sc_ih); + NULL, ixpqmgr_intr, NULL, &sc->sc_ih); /* NB: softc is pre-zero'd */ for (i = 0; i < IX_QMGR_MAX_NUM_QUEUES; i++) { ==== //depot/projects/smpng/sys/cam/scsi/scsi_target.c#23 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_target.c,v 1.71 2006/12/05 07:45:28 mjacob Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_target.c,v 1.72 2007/02/27 17:15:39 jhb Exp $"); #include @@ -810,8 +810,8 @@ user_descr = TAILQ_FIRST(abort_queue); while (ccb_h == NULL && user_descr == NULL) { if ((ioflag & IO_NDELAY) == 0) { - error = msleep(user_queue, NULL, - PRIBIO | PCATCH, "targrd", 0); + error = tsleep(user_queue, + PRIBIO | PCATCH, "targrd", 0); ccb_h = TAILQ_FIRST(user_queue); user_descr = TAILQ_FIRST(abort_queue); if (error != 0) { @@ -1037,7 +1037,7 @@ /* If we aborted at least one pending CCB ok, wait for it. */ if (cab.ccb_h.status == CAM_REQ_CMP) { - msleep(&softc->pending_ccb_queue, NULL, + tsleep(&softc->pending_ccb_queue, PRIBIO | PCATCH, "tgabrt", 0); } ==== //depot/projects/smpng/sys/compat/linux/linux_emul.c#8 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/linux/linux_emul.c,v 1.17 2007/02/23 22:39:26 netchild Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linux/linux_emul.c,v 1.18 2007/02/24 16:49:24 netchild Exp $"); #include "opt_compat.h" @@ -212,7 +212,7 @@ error = linux_sys_futex(FIRST_THREAD_IN_PROC(p), &cup); /* * this cannot happen at the moment and if this happens it - * probably mean there is a userspace bug + * probably means there is a user space bug */ if (error) printf(LMSG("futex stuff in proc_exit failed.\n")); ==== //depot/projects/smpng/sys/compat/linux/linux_futex.c#3 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $NetBSD: linux_futex.c,v 1.5 2005/11/23 16:14:57 manu Exp $ */ +/* $NetBSD: linux_futex.c,v 1.7 2006/07/24 19:01:49 manu Exp $ */ /*- * Copyright (c) 2005 Emmanuel Dreyfus, all rights reserved. @@ -14,14 +14,14 @@ * 3. All advertising materials mentioning features or use of this software * must display the following acknowledgement: * This product includes software developed by Emmanuel Dreyfus - * 4. The name of the author may not be used to endorse or promote - * products derived from this software without specific prior written + * 4. The name of the author may not be used to endorse or promote + * products derived from this software without specific prior written * permission. * - * THIS SOFTWARE IS PROVIDED BY THE THE AUTHOR AND CONTRIBUTORS ``AS IS'' - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, + * THIS SOFTWARE IS PROVIDED BY THE THE AUTHOR AND CONTRIBUTORS ``AS IS'' + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS @@ -32,9 +32,9 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/linux/linux_futex.c,v 1.6 2006/09/09 16:25:25 netchild Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linux/linux_futex.c,v 1.8 2007/02/25 12:43:07 netchild Exp $"); #if 0 - __KERNEL_RCSID(1, "$NetBSD: linux_futex.c,v 1.5 2005/11/23 16:14:57 manu Exp $"); +__KERNEL_RCSID(1, "$NetBSD: linux_futex.c,v 1.7 2006/07/24 19:01:49 manu Exp $"); #endif #include "opt_compat.h" @@ -67,8 +67,8 @@ TAILQ_ENTRY(waiting_proc) wp_list; }; struct futex { - void *f_uaddr; - int f_refcount; + void *f_uaddr; + int f_refcount; LIST_ENTRY(futex) f_list; TAILQ_HEAD(lf_waiting_proc, waiting_proc) f_waiting_proc; }; @@ -85,7 +85,7 @@ #define FUTEX_SYSTEM_LOCK mtx_lock(&Giant) #define FUTEX_SYSTEM_UNLOCK mtx_unlock(&Giant) -static struct futex *futex_get(void *, int); +static struct futex *futex_get(void *, int); static void futex_put(struct futex *); static int futex_sleep(struct futex *, struct thread *, unsigned long); static int futex_wake(struct futex *, int, struct futex *); @@ -105,7 +105,7 @@ { int val; int ret; - struct l_timespec timeout = { 0, 0 }; + struct l_timespec timeout = {0, 0}; int error = 0; struct futex *f; struct futex *newf; @@ -118,56 +118,57 @@ #ifdef DEBUG if (ldebug(sys_futex)) - printf(ARGS(futex,"%p, %i, %i"), args->uaddr, args->op, args->val); + printf(ARGS(futex, "%p, %i, %i"), args->uaddr, args->op, + args->val); #endif switch (args->op) { case LINUX_FUTEX_WAIT: - FUTEX_SYSTEM_LOCK; + FUTEX_SYSTEM_LOCK; - if ((error = copyin(args->uaddr, + if ((error = copyin(args->uaddr, &val, sizeof(val))) != 0) { - FUTEX_SYSTEM_UNLOCK; + FUTEX_SYSTEM_UNLOCK; return error; } if (val != args->val) { - FUTEX_SYSTEM_UNLOCK; + FUTEX_SYSTEM_UNLOCK; return EWOULDBLOCK; } if (args->timeout != NULL) { - if ((error = copyin(args->timeout, + if ((error = copyin(args->timeout, &timeout, sizeof(timeout))) != 0) { - FUTEX_SYSTEM_UNLOCK; + FUTEX_SYSTEM_UNLOCK; return error; } } #ifdef DEBUG if (ldebug(sys_futex)) - printf("FUTEX_WAIT %d: val = %d, uaddr = %p, " - "*uaddr = %d, timeout = %d.%09lu\n", - td->td_proc->p_pid, args->val, - args->uaddr, val, timeout.tv_sec, - (unsigned long)timeout.tv_nsec); + printf("FUTEX_WAIT %d: val = %d, uaddr = %p, " + "*uaddr = %d, timeout = %d.%09lu\n", + td->td_proc->p_pid, args->val, + args->uaddr, val, timeout.tv_sec, + (unsigned long)timeout.tv_nsec); #endif tv.tv_usec = timeout.tv_sec * 1000000 + timeout.tv_nsec / 1000; timeout_hz = tvtohz(&tv); if (timeout.tv_sec == 0 && timeout.tv_nsec == 0) - timeout_hz = 0; - /* - * If the user process requests a non null timeout, - * make sure we do not turn it into an infinite - * timeout because timeout_hz gets null. - * - * We use a minimal timeout of 1/hz. Maybe it would - * make sense to just return ETIMEDOUT without sleeping. - */ - if (((timeout.tv_sec != 0) || (timeout.tv_nsec != 0)) && - (timeout_hz == 0)) - timeout_hz = 1; + timeout_hz = 0; + /* + * If the user process requests a non null timeout, + * make sure we do not turn it into an infinite + * timeout because timeout_hz gets null. + * + * We use a minimal timeout of 1/hz. Maybe it would + * make sense to just return ETIMEDOUT without sleeping. + */ + if (((timeout.tv_sec != 0) || (timeout.tv_nsec != 0)) && + (timeout_hz == 0)) + timeout_hz = 1; f = futex_get(args->uaddr, FUTEX_UNLOCKED); @@ -176,8 +177,8 @@ #ifdef DEBUG if (ldebug(sys_futex)) - printf("FUTEX_WAIT %d: uaddr = %p, " - "ret = %d\n", td->td_proc->p_pid, args->uaddr, ret); + printf("FUTEX_WAIT %d: uaddr = %p, " + "ret = %d\n", td->td_proc->p_pid, args->uaddr, ret); #endif FUTEX_SYSTEM_UNLOCK; @@ -188,37 +189,37 @@ case EINTR: /* signal */ return EINTR; break; - case 0: /* FUTEX_WAKE received */ + case 0: /* FUTEX_WAKE received */ #ifdef DEBUG if (ldebug(sys_futex)) printf("FUTEX_WAIT %d: uaddr = %p, got FUTEX_WAKE\n", - td->td_proc->p_pid, args->uaddr); + td->td_proc->p_pid, args->uaddr); #endif return 0; break; default: #ifdef DEBUG if (ldebug(sys_futex)) - printf("FUTEX_WAIT: unexpected ret = %d\n", ret); + printf("FUTEX_WAIT: unexpected ret = %d\n", ret); #endif break; } /* NOTREACHED */ break; - + case LINUX_FUTEX_WAKE: FUTEX_SYSTEM_LOCK; - /* - * XXX: Linux is able cope with different addresses - * corresponding to the same mapped memory in the sleeping + /* + * XXX: Linux is able cope with different addresses + * corresponding to the same mapped memory in the sleeping * and the waker process. */ #ifdef DEBUG if (ldebug(sys_futex)) - printf("FUTEX_WAKE %d: uaddr = %p, val = %d\n", - td->td_proc->p_pid, args->uaddr, args->val); + printf("FUTEX_WAKE %d: uaddr = %p, val = %d\n", + td->td_proc->p_pid, args->uaddr, args->val); #endif f = futex_get(args->uaddr, FUTEX_UNLOCKED); td->td_retval[0] = futex_wake(f, args->val, NULL); @@ -230,14 +231,14 @@ case LINUX_FUTEX_CMP_REQUEUE: FUTEX_SYSTEM_LOCK; - if ((error = copyin(args->uaddr, + if ((error = copyin(args->uaddr, &val, sizeof(val))) != 0) { - FUTEX_SYSTEM_UNLOCK; + FUTEX_SYSTEM_UNLOCK; return error; } if (val != args->val3) { - FUTEX_SYSTEM_UNLOCK; + FUTEX_SYSTEM_UNLOCK; return EAGAIN; } @@ -272,30 +273,32 @@ FUTEX_SYSTEM_LOCK; #ifdef DEBUG if (ldebug(sys_futex)) - printf("FUTEX_WAKE_OP: %d: uaddr = %p, op = %d, val = %d, uaddr2 = %p, val3 = %d\n", - td->td_proc->p_pid, args->uaddr, args->op, args->val, args->uaddr2, args->val3); + printf("FUTEX_WAKE_OP: %d: uaddr = %p, op = %d, val = %d, uaddr2 = %p, val3 = %d\n", + td->td_proc->p_pid, args->uaddr, args->op, args->val, + args->uaddr2, args->val3); #endif f = futex_get(args->uaddr, FUTEX_UNLOCKED); f2 = futex_get(args->uaddr2, FUTEX_UNLOCKED); - /* This function returns positive number as results - * and negative as errors + /* + * This function returns positive number as results and + * negative as errors */ op_ret = futex_atomic_op(td, args->val3, args->uaddr2); if (op_ret < 0) { - /* XXX: we dont handle the EFAULT yet */ - if (op_ret != -EFAULT) { - futex_put(f); - futex_put(f2); + /* XXX: we dont handle the EFAULT yet */ + if (op_ret != -EFAULT) { + futex_put(f); + futex_put(f2); FUTEX_SYSTEM_UNLOCK; - return (-op_ret); + return (-op_ret); } futex_put(f); futex_put(f2); - FUTEX_SYSTEM_UNLOCK; + FUTEX_SYSTEM_UNLOCK; return (EFAULT); } @@ -335,12 +338,12 @@ struct futex *f; if (locked == FUTEX_UNLOCKED) - FUTEX_LOCK; + FUTEX_LOCK; LIST_FOREACH(f, &futex_list, f_list) { if (f->f_uaddr == uaddr) { f->f_refcount++; if (locked == FUTEX_UNLOCKED) - FUTEX_UNLOCK; + FUTEX_UNLOCK; return f; } } @@ -351,17 +354,17 @@ TAILQ_INIT(&f->f_waiting_proc); LIST_INSERT_HEAD(&futex_list, f, f_list); if (locked == FUTEX_UNLOCKED) - FUTEX_UNLOCK; + FUTEX_UNLOCK; return f; } -static void +static void futex_put(f) struct futex *f; { - FUTEX_LOCK; - f->f_refcount--; + FUTEX_LOCK; + f->f_refcount--; if (f->f_refcount == 0) { LIST_REMOVE(f, f_list); free(f, M_LINUX); @@ -371,7 +374,7 @@ return; } -static int +static int futex_sleep(struct futex *f, struct thread *td, unsigned long timeout) { struct waiting_proc *wp; @@ -386,10 +389,15 @@ #ifdef DEBUG if (ldebug(sys_futex)) - printf("FUTEX --> %d tlseep timeout = %ld\n", td->td_proc->p_pid, - timeout); + printf("FUTEX --> %d tlseep timeout = %ld\n", td->td_proc->p_pid, + timeout); +#endif + ret = tsleep(wp, PCATCH | PZERO, "linuxfutex", timeout); +#ifdef DEBUG + if (ldebug(sys_futex)) + printf("FUTEX -> %d tsleep returns %d\n", + td->td_proc->p_pid, ret); #endif - ret = tsleep(wp, PCATCH|PZERO, "linuxfutex", timeout); FUTEX_LOCK; TAILQ_REMOVE(&f->f_waiting_proc, wp, wp_list); @@ -397,7 +405,7 @@ if ((ret == 0) && (wp->wp_new_futex != NULL)) { ret = futex_sleep(wp->wp_new_futex, td, timeout); - futex_put(wp->wp_new_futex); /* futex_get called in wakeup */ + futex_put(wp->wp_new_futex); /* futex_get called in wakeup */ } free(wp, M_LINUX); @@ -409,7 +417,7 @@ futex_wake(struct futex *f, int n, struct futex *newf) { struct waiting_proc *wp; - int count = 0; + int count = 0; FUTEX_LOCK; TAILQ_FOREACH(wp, &f->f_waiting_proc, wp_list) { ==== //depot/projects/smpng/sys/compat/linux/linux_futex.h#2 (text+ko) ==== @@ -14,14 +14,14 @@ * 3. All advertising materials mentioning features or use of this software * must display the following acknowledgement: * This product includes software developed by Emmanuel Dreyfus - * 4. The name of the author may not be used to endorse or promote - * products derived from this software without specific prior written + * 4. The name of the author may not be used to endorse or promote + * products derived from this software without specific prior written * permission. * - * THIS SOFTWARE IS PROVIDED BY THE THE AUTHOR AND CONTRIBUTORS ``AS IS'' - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, + * THIS SOFTWARE IS PROVIDED BY THE THE AUTHOR AND CONTRIBUTORS ``AS IS'' + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS @@ -30,32 +30,32 @@ * 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_futex.h,v 1.1 2006/08/15 12:20:59 netchild Exp $ + * $FreeBSD: src/sys/compat/linux/linux_futex.h,v 1.2 2007/02/25 12:40:35 netchild Exp $ */ #ifndef _LINUX_FUTEX_H #define _LINUX_FUTEX_H -#define LINUX_FUTEX_WAIT 0 +#define LINUX_FUTEX_WAIT 0 #define LINUX_FUTEX_WAKE 1 #define LINUX_FUTEX_FD 2 #define LINUX_FUTEX_REQUEUE 3 #define LINUX_FUTEX_CMP_REQUEUE 4 #define LINUX_FUTEX_WAKE_OP 5 -#define FUTEX_OP_SET 0 /* *(int *)UADDR2 = OPARG; */ -#define FUTEX_OP_ADD 1 /* *(int *)UADDR2 += OPARG; */ -#define FUTEX_OP_OR 2 /* *(int *)UADDR2 |= OPARG; */ -#define FUTEX_OP_ANDN 3 /* *(int *)UADDR2 &= ~OPARG; */ -#define FUTEX_OP_XOR 4 /* *(int *)UADDR2 ^= OPARG; */ +#define FUTEX_OP_SET 0 /* *(int *)UADDR2 = OPARG; */ +#define FUTEX_OP_ADD 1 /* *(int *)UADDR2 += OPARG; */ +#define FUTEX_OP_OR 2 /* *(int *)UADDR2 |= OPARG; */ +#define FUTEX_OP_ANDN 3 /* *(int *)UADDR2 &= ~OPARG; */ +#define FUTEX_OP_XOR 4 /* *(int *)UADDR2 ^= OPARG; */ -#define FUTEX_OP_OPARG_SHIFT 8 /* Use (1 << OPARG) instead of OPARG. */ +#define FUTEX_OP_OPARG_SHIFT 8 /* Use (1 << OPARG) instead of OPARG. */ -#define FUTEX_OP_CMP_EQ 0 /* if (oldval == CMPARG) wake */ -#define FUTEX_OP_CMP_NE 1 /* if (oldval != CMPARG) wake */ -#define FUTEX_OP_CMP_LT 2 /* if (oldval < CMPARG) wake */ -#define FUTEX_OP_CMP_LE 3 /* if (oldval <= CMPARG) wake */ -#define FUTEX_OP_CMP_GT 4 /* if (oldval > CMPARG) wake */ -#define FUTEX_OP_CMP_GE 5 /* if (oldval >= CMPARG) wake */ +#define FUTEX_OP_CMP_EQ 0 /* if (oldval == CMPARG) wake */ +#define FUTEX_OP_CMP_NE 1 /* if (oldval != CMPARG) wake */ +#define FUTEX_OP_CMP_LT 2 /* if (oldval < CMPARG) wake */ +#define FUTEX_OP_CMP_LE 3 /* if (oldval <= CMPARG) wake */ +#define FUTEX_OP_CMP_GT 4 /* if (oldval > CMPARG) wake */ +#define FUTEX_OP_CMP_GE 5 /* if (oldval >= CMPARG) wake */ -#endif /* !_LINUX_FUTEX_H */ +#endif /* !_LINUX_FUTEX_H */ ==== //depot/projects/smpng/sys/compat/linux/linux_misc.c#80 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/linux/linux_misc.c,v 1.207 2007/02/23 22:39:26 netchild Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linux/linux_misc.c,v 1.208 2007/02/24 16:49:24 netchild Exp $"); #include "opt_compat.h" #include "opt_mac.h" @@ -833,7 +833,7 @@ args->pid, (void *)args->status, args->options); #endif /* - * this is necessary because the test in kern_wait doesnt work + * this is necessary because the test in kern_wait doesn't work * because we mess with the options here */ if (args->options & ~(WUNTRACED | WNOHANG | WCONTINUED | __WCLONE)) @@ -1418,10 +1418,9 @@ /* * The FreeBSD native getpid(2), getgid(2) and getuid(2) also modify - * td->td_retval[1] when COMPAT_43 is defined. This - * globbers registers that are assumed to be preserved. The following - * lightweight syscalls fixes this. See also linux_getgid16() and - * linux_getuid16() in linux_uid16.c. + * td->td_retval[1] when COMPAT_43 is defined. This clobbers registers that >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Feb 28 12:25: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 CB26516A404; Wed, 28 Feb 2007 12:25: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 89CEC16A400 for ; Wed, 28 Feb 2007 12:25:28 +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 79E2113C4A8 for ; Wed, 28 Feb 2007 12:25:28 +0000 (UTC) (envelope-from sephe@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l1SCPS4e029849 for ; Wed, 28 Feb 2007 12:25:28 GMT (envelope-from sephe@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l1SCPS0g029846 for perforce@freebsd.org; Wed, 28 Feb 2007 12:25:28 GMT (envelope-from sephe@FreeBSD.org) Date: Wed, 28 Feb 2007 12:25:28 GMT Message-Id: <200702281225.l1SCPS0g029846@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 115162 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 28 Feb 2007 12:25:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=115162 Change 115162 by sephe@sephe_zealot:sam_wifi on 2007/02/28 12:25:19 - Implement TXCB mechanism for ral(4), without this, net80211 internal state machine will not run correctly. - Minor style changes. Reviewed-by: sam@ Affected files ... .. //depot/projects/wifi/sys/dev/ral/rt2560.c#14 edit .. //depot/projects/wifi/sys/dev/ral/rt2661.c#9 edit Differences ... ==== //depot/projects/wifi/sys/dev/ral/rt2560.c#14 (text) ==== @@ -1002,6 +1002,9 @@ struct ifnet *ifp = ic->ic_ifp; struct rt2560_tx_desc *desc; struct rt2560_tx_data *data; + struct ieee80211_node *ni; + struct mbuf *m; + int flags; bus_dmamap_sync(sc->prioq.desc_dmat, sc->prioq.desc_map, BUS_DMASYNC_POSTREAD); @@ -1010,18 +1013,18 @@ desc = &sc->prioq.desc[sc->prioq.next]; data = &sc->prioq.data[sc->prioq.next]; - if ((le32toh(desc->flags) & RT2560_TX_BUSY) || - !(le32toh(desc->flags) & RT2560_TX_VALID)) + flags = le32toh(desc->flags); + if ((flags & RT2560_TX_BUSY) || (flags & RT2560_TX_VALID) == 0) break; - switch (le32toh(desc->flags) & RT2560_TX_RESULT_MASK) { + switch (flags & RT2560_TX_RESULT_MASK) { case RT2560_TX_SUCCESS: DPRINTFN(10, ("mgt frame sent successfully\n")); break; case RT2560_TX_SUCCESS_RETRY: DPRINTFN(9, ("mgt frame sent after %u retries\n", - (le32toh(desc->flags) >> 5) & 0x7)); + (flags >> 5) & 0x7)); break; case RT2560_TX_FAIL_RETRY: @@ -1033,15 +1036,17 @@ case RT2560_TX_FAIL_OTHER: default: device_printf(sc->sc_dev, "sending mgt frame failed " - "0x%08x\n", le32toh(desc->flags)); + "0x%08x\n", flags); + break; } bus_dmamap_sync(sc->prioq.data_dmat, data->map, BUS_DMASYNC_POSTWRITE); bus_dmamap_unload(sc->prioq.data_dmat, data->map); - m_freem(data->m); + + m = data->m; data->m = NULL; - ieee80211_free_node(data->ni); + ni = data->ni; data->ni = NULL; /* descriptor is no longer valid */ @@ -1051,6 +1056,13 @@ sc->prioq.queued--; sc->prioq.next = (sc->prioq.next + 1) % RT2560_PRIO_RING_COUNT; + + if (m->m_flags & M_TXCB) + ieee80211_process_callback(ni, m, + (flags & RT2560_TX_RESULT_MASK) &~ + (RT2560_TX_SUCCESS | RT2560_TX_SUCCESS_RETRY)); + m_freem(m); + ieee80211_free_node(ni); } bus_dmamap_sync(sc->prioq.desc_dmat, sc->prioq.desc_map, ==== //depot/projects/wifi/sys/dev/ral/rt2661.c#9 (text) ==== @@ -894,6 +894,9 @@ int qid, retrycnt; for (;;) { + struct ieee80211_node *ni; + struct mbuf *m; + val = RAL_READ(sc, RT2661_STA_CSR4); if (!(val & RT2661_TX_STAT_VALID)) break; @@ -904,12 +907,17 @@ /* retrieve rate control algorithm context */ data = &txq->data[txq->stat]; - rn = (struct rt2661_node *)data->ni; + m = data->m; + data->m = NULL; + ni = data->ni; + data->ni = NULL; /* if no frame has been sent, ignore */ - if (rn == NULL) + if (ni == NULL) continue; + rn = (struct rt2661_node *)ni; + switch (RT2661_TX_RESULT(val)) { case RT2661_TX_SUCCESS: retrycnt = RT2661_TX_RETRYCNT(val); @@ -927,7 +935,7 @@ DPRINTFN(9, ("sending data frame failed (too much " "retries)\n")); if (data->id.id_node != NULL) { - ral_rssadapt_lower_rate(ic, data->ni, + ral_rssadapt_lower_rate(ic, ni, &rn->rssadapt, &data->id); } ifp->if_oerrors++; @@ -940,14 +948,17 @@ ifp->if_oerrors++; } - ieee80211_free_node(data->ni); - data->ni = NULL; - DPRINTFN(15, ("tx done q=%d idx=%u\n", qid, txq->stat)); txq->queued--; if (++txq->stat >= txq->count) /* faster than % count */ txq->stat = 0; + + if (m->m_flags & M_TXCB) + ieee80211_process_callback(ni, m, + RT2661_TX_RESULT(val) != RT2661_TX_SUCCESS); + m_freem(m); + ieee80211_free_node(ni); } sc->sc_tx_timer = 0; @@ -974,9 +985,6 @@ bus_dmamap_sync(txq->data_dmat, data->map, BUS_DMASYNC_POSTWRITE); bus_dmamap_unload(txq->data_dmat, data->map); - m_freem(data->m); - data->m = NULL; - /* node reference is released in rt2661_tx_intr() */ /* descriptor is no longer valid */ desc->flags &= ~htole32(RT2661_TX_VALID); From owner-p4-projects@FreeBSD.ORG Wed Feb 28 12:32: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 29FF516A404; Wed, 28 Feb 2007 12:32: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 D8EE016A401 for ; Wed, 28 Feb 2007 12:32:38 +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 C8EF113C4A5 for ; Wed, 28 Feb 2007 12:32:38 +0000 (UTC) (envelope-from sephe@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l1SCWcVI030851 for ; Wed, 28 Feb 2007 12:32:38 GMT (envelope-from sephe@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l1SCWcMD030847 for perforce@freebsd.org; Wed, 28 Feb 2007 12:32:38 GMT (envelope-from sephe@FreeBSD.org) Date: Wed, 28 Feb 2007 12:32:38 GMT Message-Id: <200702281232.l1SCWcMD030847@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 115163 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 28 Feb 2007 12:32:39 -0000 http://perforce.freebsd.org/chv.cgi?CH=115163 Change 115163 by sephe@sephe_zealot:sam_wifi on 2007/02/28 12:31:47 Add sc_newstate_arg to ural_softc, through it we can pass ieee80211_new_state() 'arg' along following code path: ural_newstate()->ural_task()->ieee80211_newstate() 'arg' is quite important to let ieee80211_newstate() make correct decision during certain state changes, e.g. RUN->AUTH Reviewed-by: sam@ Affected files ... .. //depot/projects/wifi/sys/dev/usb/if_ural.c#16 edit .. //depot/projects/wifi/sys/dev/usb/if_uralvar.h#8 edit Differences ... ==== //depot/projects/wifi/sys/dev/usb/if_ural.c#16 (text+ko) ==== @@ -733,13 +733,14 @@ } static void -ural_task(void *arg) +ural_task(void *xarg) { - struct ural_softc *sc = arg; + struct ural_softc *sc = xarg; struct ieee80211com *ic = &sc->sc_ic; enum ieee80211_state ostate; struct ieee80211_node *ni; struct mbuf *m; + int arg = sc->sc_newstate_arg; ostate = ic->ic_state; @@ -799,7 +800,7 @@ } RAL_UNLOCK(sc); - sc->sc_newstate(ic, sc->sc_state, -1); + sc->sc_newstate(ic, sc->sc_state, arg); } static void @@ -836,6 +837,7 @@ /* do it in a process context */ sc->sc_state = nstate; + sc->sc_newstate_arg = arg; usb_add_task(sc->sc_udev, &sc->sc_task, USB_TASKQ_DRIVER); return 0; ==== //depot/projects/wifi/sys/dev/usb/if_uralvar.h#8 (text+ko) ==== @@ -103,6 +103,7 @@ usbd_pipe_handle sc_tx_pipeh; enum ieee80211_state sc_state; + int sc_newstate_arg; int sc_scan_action; /* should be an enum */ struct usb_task sc_task; struct usb_task sc_scantask; From owner-p4-projects@FreeBSD.ORG Thu Mar 1 13:54: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 0947416A404; Thu, 1 Mar 2007 13:54:59 +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 BBABF16A400 for ; Thu, 1 Mar 2007 13:54:58 +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 B129813C4A8 for ; Thu, 1 Mar 2007 13:54:58 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l21Dsw6M085894 for ; Thu, 1 Mar 2007 13:54:58 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l21Dst1k085884 for perforce@freebsd.org; Thu, 1 Mar 2007 13:54:55 GMT (envelope-from jhb@freebsd.org) Date: Thu, 1 Mar 2007 13:54:55 GMT Message-Id: <200703011354.l21Dst1k085884@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 115202 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 01 Mar 2007 13:54:59 -0000 http://perforce.freebsd.org/chv.cgi?CH=115202 Change 115202 by jhb@jhb_zion on 2007/03/01 13:54:06 IFC @115200. Affected files ... .. //depot/projects/smpng/sys/arm/at91/ohci_atmelarm.c#2 integrate .. //depot/projects/smpng/sys/dev/em/if_em.c#80 integrate .. //depot/projects/smpng/sys/dev/usb/umass.c#61 integrate .. //depot/projects/smpng/sys/dev/usb/usbdevs#101 integrate .. //depot/projects/smpng/sys/kern/kern_mutex.c#141 integrate .. //depot/projects/smpng/sys/kern/kern_sx.c#41 integrate .. //depot/projects/smpng/sys/kern/uipc_usrreq.c#74 integrate .. //depot/projects/smpng/sys/net/if_vlan_var.h#18 integrate .. //depot/projects/smpng/sys/netinet/ip_mroute.c#54 integrate .. //depot/projects/smpng/sys/netinet/ip_output.c#90 integrate .. //depot/projects/smpng/sys/netinet/tcp_input.c#96 integrate .. //depot/projects/smpng/sys/netinet/tcp_output.c#43 integrate .. //depot/projects/smpng/sys/netinet6/ip6_mroute.c#30 integrate .. //depot/projects/smpng/sys/netinet6/ip6_mroute.h#7 integrate .. //depot/projects/smpng/sys/sys/priv.h#3 integrate .. //depot/projects/smpng/sys/sys/systm.h#80 integrate Differences ... ==== //depot/projects/smpng/sys/arm/at91/ohci_atmelarm.c#2 (text) ==== @@ -23,7 +23,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/at91/ohci_atmelarm.c,v 1.1 2006/03/18 01:45:29 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/at91/ohci_atmelarm.c,v 1.2 2007/03/01 09:10:55 piso Exp $"); #include #include @@ -99,8 +99,8 @@ } device_set_ivars(sc->sc_ohci.sc_bus.bdev, &sc->sc_ohci.sc_bus); - err = bus_setup_intr(dev, sc->sc_ohci.irq_res, INTR_TYPE_BIO, ohci_intr, sc, - &sc->sc_ohci.ih); + err = bus_setup_intr(dev, sc->sc_ohci.irq_res, INTR_TYPE_BIO, NULL, + ohci_intr, sc, &sc->sc_ohci.ih); if (err) { err = ENXIO; goto error; ==== //depot/projects/smpng/sys/dev/em/if_em.c#80 (text+ko) ==== @@ -31,7 +31,7 @@ ***************************************************************************/ -/*$FreeBSD: src/sys/dev/em/if_em.c,v 1.169 2007/02/23 12:18:38 piso Exp $*/ +/*$FreeBSD: src/sys/dev/em/if_em.c,v 1.171 2007/02/28 09:04:46 ru Exp $*/ #ifdef HAVE_KERNEL_OPTION_HEADERS #include "opt_device_polling.h" ==== //depot/projects/smpng/sys/dev/usb/umass.c#61 (text+ko) ==== @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/usb/umass.c,v 1.141 2007/02/21 07:46:40 n_hibma Exp $ + * $FreeBSD: src/sys/dev/usb/umass.c,v 1.142 2007/02/27 22:33:50 imp Exp $ * $NetBSD: umass.c,v 1.28 2000/04/02 23:46:53 augustss Exp $ */ @@ -317,6 +317,10 @@ # define NO_INQUIRY_EVPD 0x0800 /* Pad all RBC requests to 12 bytes. */ # define RBC_PAD_TO_12 0x1000 + /* Device reports number of sectors from READ_CAPACITY, not max + * sector number. + */ +# define READ_CAPACITY_OFFBY1 0x2000 }; static struct umass_devdescr_t umass_devdescrs[] = { @@ -446,6 +450,10 @@ UMASS_PROTO_SCSI | UMASS_PROTO_BBB, IGNORE_RESIDUE | NO_START_STOP }, + { USB_VENDOR_SANDISK, USB_PRODUCT_SANDISK_SDDR31, RID_WILDCARD, + UMASS_PROTO_SCSI | UMASS_PROTO_BBB, + READ_CAPACITY_OFFBY1 + }, { USB_VENDOR_SANDISK, USB_PRODUCT_SANDISK_SDCZ2_256, RID_WILDCARD, UMASS_PROTO_SCSI | UMASS_PROTO_BBB, IGNORE_RESIDUE @@ -2698,6 +2706,16 @@ switch (status) { case STATUS_CMD_OK: ccb->ccb_h.status = CAM_REQ_CMP; + if ((sc->quirks & READ_CAPACITY_OFFBY1) && + (ccb->ccb_h.func_code == XPT_SCSI_IO) && + (csio->cdb_io.cdb_bytes[0] == READ_CAPACITY)) { + struct scsi_read_capacity_data *rcap; + uint32_t maxsector; + + rcap = (struct scsi_read_capacity_data *)csio->data_ptr; + maxsector = scsi_4btoul(rcap->addr) - 1; + scsi_ulto4b(maxsector, rcap->addr); + } xpt_done(ccb); break; ==== //depot/projects/smpng/sys/dev/usb/usbdevs#101 (text+ko) ==== @@ -1,4 +1,4 @@ -$FreeBSD: src/sys/dev/usb/usbdevs,v 1.287 2007/02/09 15:59:28 le Exp $ +$FreeBSD: src/sys/dev/usb/usbdevs,v 1.288 2007/02/27 22:27:53 imp Exp $ /* $NetBSD: usbdevs,v 1.392 2004/12/29 08:38:44 imp Exp $ */ /*- @@ -1545,8 +1545,8 @@ /* SanDisk products */ product SANDISK SDDR05A 0x0001 ImageMate SDDR-05a +product SANDISK SDDR31 0x0002 ImageMate SDDR-31 product SANDISK SDDR05 0x0005 ImageMate SDDR-05 -product SANDISK SDDR31 0x0002 ImageMate SDDR-31 product SANDISK SDDR12 0x0100 ImageMate SDDR-12 product SANDISK SDDR09 0x0200 ImageMate SDDR-09 product SANDISK SDDR75 0x0810 ImageMate SDDR-75 ==== //depot/projects/smpng/sys/kern/kern_mutex.c#141 (text+ko) ==== @@ -34,7 +34,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/kern_mutex.c,v 1.181 2007/02/27 06:42:04 kmacy Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_mutex.c,v 1.182 2007/03/01 09:35:48 kmacy Exp $"); #include "opt_adaptive_mutexes.h" #include "opt_ddb.h" @@ -157,9 +157,9 @@ void _mtx_unlock_flags(struct mtx *m, int opts, const char *file, int line) { - +#ifdef LOCK_PROFILING struct lock_object lo; - +#endif MPASS(curthread != NULL); KASSERT(m->mtx_lock != MTX_DESTROYED, ("mtx_unlock() of destroyed mutex @ %s:%d", file, line)); @@ -176,7 +176,9 @@ m->mtx_object.lo_flags &= ~LO_CONTESTED; #endif _rel_sleep_lock(m, curthread, opts, file, line); +#ifdef LOCK_PROFILING lock_profile_release_lock(&lo); +#endif } void @@ -200,9 +202,9 @@ void _mtx_unlock_spin_flags(struct mtx *m, int opts, const char *file, int line) { - +#ifdef LOCK_PROFILING struct lock_object lo; - +#endif MPASS(curthread != NULL); KASSERT(m->mtx_lock != MTX_DESTROYED, ("mtx_unlock_spin() of destroyed mutex @ %s:%d", file, line)); @@ -218,7 +220,9 @@ m->mtx_object.lo_flags &= ~LO_CONTESTED; #endif _rel_spin_lock(m); +#ifdef LOCK_PROFILING lock_profile_release_lock(&lo); +#endif } /* ==== //depot/projects/smpng/sys/kern/kern_sx.c#41 (text+ko) ==== @@ -34,7 +34,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/kern_sx.c,v 1.34 2007/02/27 06:42:04 kmacy Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_sx.c,v 1.35 2007/03/01 09:35:48 kmacy Exp $"); #include "opt_ddb.h" @@ -228,9 +228,10 @@ void _sx_sunlock(struct sx *sx, const char *file, int line) { +#ifdef LOCK_PROFILING struct lock_object lo; int count = -1; - +#endif _sx_assert(sx, SX_SLOCKED, file, line); mtx_lock(sx->sx_lock); @@ -262,15 +263,18 @@ LOCK_LOG_LOCK("SUNLOCK", &sx->sx_object, 0, 0, file, line); mtx_unlock(sx->sx_lock); +#ifdef LOCK_PROFILING if (count == 0) lock_profile_release_lock(&lo); - +#endif } void _sx_xunlock(struct sx *sx, const char *file, int line) { +#ifdef LOCK_PROFILING struct lock_object lo; +#endif _sx_assert(sx, SX_XLOCKED, file, line); mtx_lock(sx->sx_lock); @@ -298,7 +302,9 @@ LOCK_LOG_LOCK("XUNLOCK", &sx->sx_object, 0, 0, file, line); mtx_unlock(sx->sx_lock); +#ifdef LOCK_PROFILING lock_profile_release_lock(&lo); +#endif } int ==== //depot/projects/smpng/sys/kern/uipc_usrreq.c#74 (text+ko) ==== @@ -57,7 +57,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/uipc_usrreq.c,v 1.197 2007/02/26 20:47:52 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/uipc_usrreq.c,v 1.199 2007/03/01 09:00:42 rwatson Exp $"); #include "opt_mac.h" @@ -774,21 +774,18 @@ unp2 = unp->unp_conn; if (nam != NULL) { + UNP_GLOBAL_WLOCK_ASSERT(); if (unp2 != NULL) { error = EISCONN; - UNP_PCB_LOCK(unp); break; } error = unp_connect(so, nam, td); - UNP_PCB_LOCK(unp); if (error) break; unp2 = unp->unp_conn; } else { - UNP_PCB_LOCK(unp); if (unp2 == NULL) { error = ENOTCONN; - UNP_PCB_LOCK(unp); break; } } @@ -799,19 +796,19 @@ * return the slightly counter-intuitive but otherwise * correct error that the socket is not connected. */ - UNP_PCB_LOCK_ASSERT(unp); - UNP_PCB_LOCK(unp2); if (unp2 == NULL) { error = ENOTCONN; break; } - so2 = unp2->unp_socket; + /* Lockless read. */ + if (unp2->unp_flags & UNP_WANTCRED) + control = unp_addsockcred(td, control); + UNP_PCB_LOCK(unp); if (unp->unp_addr != NULL) from = (struct sockaddr *)unp->unp_addr; else from = &sun_noname; - if (unp2->unp_flags & UNP_WANTCRED) - control = unp_addsockcred(td, control); + so2 = unp2->unp_socket; SOCKBUF_LOCK(&so2->so_rcv); if (sbappendaddr_locked(&so2->so_rcv, from, m, control)) { sorwakeup_locked(so2); @@ -821,9 +818,13 @@ SOCKBUF_UNLOCK(&so2->so_rcv); error = ENOBUFS; } - if (nam != NULL) + if (nam != NULL) { + UNP_GLOBAL_WLOCK_ASSERT(); + UNP_PCB_LOCK(unp2); unp_disconnect(unp, unp2); - UNP_PCB_UNLOCK(unp2); + UNP_PCB_UNLOCK(unp2); + } + UNP_PCB_UNLOCK(unp); break; } @@ -836,18 +837,15 @@ */ if ((so->so_state & SS_ISCONNECTED) == 0) { if (nam != NULL) { + UNP_GLOBAL_WLOCK_ASSERT(); error = unp_connect(so, nam, td); - UNP_PCB_LOCK(unp); if (error) break; /* XXX */ } else { error = ENOTCONN; - UNP_PCB_LOCK(unp); break; } - } else - UNP_PCB_LOCK(unp); - UNP_PCB_LOCK_ASSERT(unp); + } /* Lockless read. */ if (so->so_snd.sb_state & SBS_CANTSENDMORE) { @@ -874,13 +872,12 @@ error = ENOTCONN; break; } + so2 = unp2->unp_socket; UNP_PCB_LOCK(unp2); - so2 = unp2->unp_socket; SOCKBUF_LOCK(&so2->so_rcv); if (unp2->unp_flags & UNP_WANTCRED) { /* - * Credentials are passed only once on - * SOCK_STREAM. + * Credentials are passed only once on SOCK_STREAM. */ unp2->unp_flags &= ~UNP_WANTCRED; control = unp_addsockcred(td, control); @@ -915,14 +912,14 @@ } /* - * SEND_EOF is equivalent to a SEND followed by - * a SHUTDOWN. + * SEND_EOF is equivalent to a SEND followed by a SHUTDOWN. */ if (flags & PRUS_EOF) { + UNP_PCB_LOCK(unp); socantsendmore(so); unp_shutdown(unp); + UNP_PCB_UNLOCK(unp); } - UNP_PCB_UNLOCK(unp); if ((nam != NULL) || (flags & PRUS_EOF)) UNP_GLOBAL_WUNLOCK(); ==== //depot/projects/smpng/sys/net/if_vlan_var.h#18 (text+ko) ==== @@ -26,7 +26,7 @@ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/net/if_vlan_var.h,v 1.25 2006/09/17 13:33:29 andre Exp $ + * $FreeBSD: src/sys/net/if_vlan_var.h,v 1.26 2007/02/28 22:05:30 bms Exp $ */ #ifndef _NET_IF_VLAN_VAR_H_ @@ -40,9 +40,40 @@ u_int16_t evl_proto; }; -#define EVL_VLID_MASK 0x0FFF -#define EVL_VLANOFTAG(tag) ((tag) & EVL_VLID_MASK) -#define EVL_PRIOFTAG(tag) (((tag) >> 13) & 7) +#define EVL_VLID_MASK 0x0FFF +#define EVL_PRI_MASK 0xE000 +#define EVL_VLANOFTAG(tag) ((tag) & EVL_VLID_MASK) +#define EVL_PRIOFTAG(tag) (((tag) >> 13) & 7) +#define EVL_CFIOFTAG(tag) (((tag) >> 12) & 1) +#define EVL_MAKETAG(vlid, pri, cfi) \ + ((((((pri) & 7) << 1) | ((cfi) & 1)) << 12) | ((vlid) & EVL_VLID_MASK)) + +/* Set the VLAN ID in an mbuf packet header non-destructively. */ +#define EVL_APPLY_VLID(m, vlid) \ + do { \ + if ((m)->m_flags & M_VLANTAG) { \ + (m)->m_pkthdr.ether_vtag &= EVL_VLID_MASK; \ + (m)->m_pkthdr.ether_vtag |= (vlid); \ + } else { \ + (m)->m_pkthdr.ether_vtag = (vlid); \ + (m)->m_flags |= M_VLANTAG; \ + } \ + } while (0) + +/* Set the priority ID in an mbuf packet header non-destructively. */ +#define EVL_APPLY_PRI(m, pri) \ + do { \ + if ((m)->m_flags & M_VLANTAG) { \ + uint16_t __vlantag = (m)->m_pkthdr.ether_vtag; \ + (m)->m_pkthdr.ether_vtag |= EVL_MAKETAG( \ + EVL_VLANOFTAG(__vlantag), (pri), \ + EVL_CFIOFTAG(__vlantag)); \ + } else { \ + (m)->m_pkthdr.ether_vtag = \ + EVL_MAKETAG(0, (pri), 0); \ + (m)->m_flags |= M_VLANTAG; \ + } \ + } while (0) /* sysctl(3) tags, for compatibility purposes */ #define VLANCTL_PROTO 1 ==== //depot/projects/smpng/sys/netinet/ip_mroute.c#54 (text+ko) ==== @@ -52,7 +52,7 @@ * and PIM-SMv2 and PIM-DM support, advanced API support, * bandwidth metering and signaling * - * $FreeBSD: src/sys/netinet/ip_mroute.c,v 1.131 2007/02/25 14:22:03 bms Exp $ + * $FreeBSD: src/sys/netinet/ip_mroute.c,v 1.132 2007/02/28 20:02:24 bms Exp $ */ #include "opt_inet.h" @@ -146,6 +146,17 @@ &mfctable, sizeof(mfctable), "S,*mfc[MFCTBLSIZ]", "Multicast Forwarding Table (struct *mfc[MFCTBLSIZ], netinet/ip_mroute.h)"); +static struct mtx mrouter_mtx; +#define MROUTER_LOCK() mtx_lock(&mrouter_mtx) +#define MROUTER_UNLOCK() mtx_unlock(&mrouter_mtx) +#define MROUTER_LOCK_ASSERT() do { \ + mtx_assert(&mrouter_mtx, MA_OWNED); \ + NET_ASSERT_GIANT(); \ +} while (0) +#define MROUTER_LOCK_INIT() \ + mtx_init(&mrouter_mtx, "IPv4 multicast forwarding", NULL, MTX_DEF) +#define MROUTER_LOCK_DESTROY() mtx_destroy(&mrouter_mtx) + static struct mtx mfc_mtx; #define MFC_LOCK() mtx_lock(&mfc_mtx) #define MFC_UNLOCK() mtx_unlock(&mfc_mtx) @@ -637,8 +648,6 @@ callout_init(&bw_meter_ch, NET_CALLOUT_MPSAFE); } -static struct mtx mrouter_mtx; - static void if_detached_event(void *arg __unused, struct ifnet *ifp) { @@ -650,9 +659,9 @@ struct rtdetq *pq; struct rtdetq *npq; - mtx_lock(&mrouter_mtx); + MROUTER_LOCK(); if (ip_mrouter == NULL) { - mtx_unlock(&mrouter_mtx); + MROUTER_UNLOCK(); } /* @@ -696,7 +705,7 @@ MFC_UNLOCK(); VIF_UNLOCK(); - mtx_unlock(&mrouter_mtx); + MROUTER_UNLOCK(); } /* @@ -715,17 +724,17 @@ if (version != 1) return ENOPROTOOPT; - mtx_lock(&mrouter_mtx); + MROUTER_LOCK(); if (ip_mrouter != NULL) { - mtx_unlock(&mrouter_mtx); + MROUTER_UNLOCK(); return EADDRINUSE; } if_detach_event_tag = EVENTHANDLER_REGISTER(ifnet_departure_event, if_detached_event, NULL, EVENTHANDLER_PRI_ANY); if (if_detach_event_tag == NULL) { - mtx_unlock(&mrouter_mtx); + MROUTER_UNLOCK(); return (ENOMEM); } @@ -737,7 +746,7 @@ ip_mrouter = so; - mtx_unlock(&mrouter_mtx); + MROUTER_UNLOCK(); if (mrtdebug) log(LOG_DEBUG, "ip_mrouter_init\n"); @@ -758,10 +767,10 @@ struct mfc *rt; struct rtdetq *rte; - mtx_lock(&mrouter_mtx); + MROUTER_LOCK(); if (ip_mrouter == NULL) { - mtx_unlock(&mrouter_mtx); + MROUTER_UNLOCK(); return EINVAL; } @@ -826,7 +835,7 @@ reg_vif_num = VIFI_INVALID; - mtx_unlock(&mrouter_mtx); + MROUTER_UNLOCK(); if (mrtdebug) log(LOG_DEBUG, "ip_mrouter_done\n"); @@ -3027,7 +3036,7 @@ { switch (type) { case MOD_LOAD: - mtx_init(&mrouter_mtx, "mrouter initialization", NULL, MTX_DEF); + MROUTER_LOCK_INIT(); MFC_LOCK_INIT(); VIF_LOCK_INIT(); ip_mrouter_reset(); @@ -3040,7 +3049,7 @@ printf("ip_mroute: unable to attach pim encap\n"); VIF_LOCK_DESTROY(); MFC_LOCK_DESTROY(); - mtx_destroy(&mrouter_mtx); + MROUTER_LOCK_DESTROY(); return (EINVAL); } @@ -3055,7 +3064,7 @@ } VIF_LOCK_DESTROY(); MFC_LOCK_DESTROY(); - mtx_destroy(&mrouter_mtx); + MROUTER_LOCK_DESTROY(); return (EINVAL); } #endif @@ -3131,7 +3140,7 @@ VIF_LOCK_DESTROY(); MFC_LOCK_DESTROY(); - mtx_destroy(&mrouter_mtx); + MROUTER_LOCK_DESTROY(); break; default: ==== //depot/projects/smpng/sys/netinet/ip_output.c#90 (text+ko) ==== @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * @(#)ip_output.c 8.3 (Berkeley) 1/21/94 - * $FreeBSD: src/sys/netinet/ip_output.c,v 1.269 2006/12/10 13:44:00 bms Exp $ + * $FreeBSD: src/sys/netinet/ip_output.c,v 1.270 2007/03/01 13:29:30 bms Exp $ */ #include "opt_ipfw.h" @@ -188,30 +188,33 @@ dst->sin_addr = ip->ip_dst; } /* - * If routing to interface only, - * short circuit routing lookup. + * If routing to interface only, short circuit routing lookup. + * The use of an all-ones broadcast address implies this; an + * interface is specified by the broadcast address of an interface, + * or the destination address of a ptp interface. */ - if (flags & IP_ROUTETOIF) { - if ((ia = ifatoia(ifa_ifwithdstaddr(sintosa(dst)))) == NULL && - (ia = ifatoia(ifa_ifwithnet(sintosa(dst)))) == NULL) { + if (flags & IP_SENDONES) { + if ((ia = ifatoia(ifa_ifwithbroadaddr(sintosa(dst)))) == NULL && + (ia = ifatoia(ifa_ifwithdstaddr(sintosa(dst)))) == NULL) { ipstat.ips_noroute++; error = ENETUNREACH; goto bad; } + ip->ip_dst.s_addr = INADDR_BROADCAST; + dst->sin_addr = ip->ip_dst; ifp = ia->ia_ifp; ip->ip_ttl = 1; - isbroadcast = in_broadcast(dst->sin_addr, ifp); - } else if (flags & IP_SENDONES) { - if ((ia = ifatoia(ifa_ifwithbroadaddr(sintosa(dst)))) == NULL) { + isbroadcast = 1; + } else if (flags & IP_ROUTETOIF) { + if ((ia = ifatoia(ifa_ifwithdstaddr(sintosa(dst)))) == NULL && + (ia = ifatoia(ifa_ifwithnet(sintosa(dst)))) == NULL) { ipstat.ips_noroute++; error = ENETUNREACH; goto bad; } ifp = ia->ia_ifp; - ip->ip_dst.s_addr = INADDR_BROADCAST; - dst->sin_addr = ip->ip_dst; ip->ip_ttl = 1; - isbroadcast = 1; + isbroadcast = in_broadcast(dst->sin_addr, ifp); } else if (IN_MULTICAST(ntohl(ip->ip_dst.s_addr)) && imo != NULL && imo->imo_multicast_ifp != NULL) { /* ==== //depot/projects/smpng/sys/netinet/tcp_input.c#96 (text+ko) ==== @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * @(#)tcp_input.c 8.12 (Berkeley) 5/24/95 - * $FreeBSD: src/sys/netinet/tcp_input.c,v 1.314 2007/02/26 22:25:20 mohans Exp $ + * $FreeBSD: src/sys/netinet/tcp_input.c,v 1.315 2007/02/28 20:48:00 mohans Exp $ */ #include "opt_ipfw.h" /* for ipfw_fwd */ @@ -1155,6 +1155,8 @@ tp->ts_recent = to.to_tsval; tp->ts_recent_age = ticks; } + /* Initial send window, already scaled. */ + tp->snd_wnd = th->th_win; if (to.to_flags & TOF_MSS) tcp_mss(tp, to.to_mss); if (tp->sack_enable) { @@ -1484,9 +1486,6 @@ if ((thflags & TH_SYN) == 0) goto drop; - /* Initial send window, already scaled. */ - tp->snd_wnd = th->th_win; - tp->irs = th->th_seq; tcp_rcvseqinit(tp); if (thflags & TH_ACK) { ==== //depot/projects/smpng/sys/netinet/tcp_output.c#43 (text+ko) ==== @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * @(#)tcp_output.c 8.4 (Berkeley) 5/24/95 - * $FreeBSD: src/sys/netinet/tcp_output.c,v 1.122 2007/02/01 18:32:13 andre Exp $ + * $FreeBSD: src/sys/netinet/tcp_output.c,v 1.125 2007/03/01 13:12:09 andre Exp $ */ #include "opt_inet.h" @@ -801,13 +801,14 @@ * IP, TCP and Options length to keep ip->ip_len from * overflowing. Prevent the last segment from being * fractional thus making them all equal sized and set - * the flag to continue sending. + * the flag to continue sending. TSO is disabled when + * IP options or IPSEC are present. */ if (len + optlen + ipoptlen > tp->t_maxopd) { flags &= ~TH_FIN; if (tso) { if (len > TCP_MAXWIN - hdrlen) { - len = TCP_MAXWIN - hdrlen; + len = TCP_MAXWIN - hdrlen - optlen; len = len - (len % (tp->t_maxopd - optlen)); sendalot = 1; } else if (tp->t_flags & TF_NEEDFIN) @@ -1214,39 +1215,32 @@ * XXX: It is a POLA question whether calling tcp_drop right * away would be the really correct behavior instead. */ - if (error != EPERM && ((tp->t_flags & TF_FORCEDATA) == 0 || - !callout_active(tp->tt_persist))) { - /* - * No need to check for TH_FIN here because - * the TF_SENTFIN flag handles that case. - */ - if ((flags & TH_SYN) == 0) { - if (sack_rxmit) { - p->rxmit -= len; - tp->sackhint.sack_bytes_rexmit -= len; - KASSERT(tp->sackhint.sack_bytes_rexmit - >= 0, - ("sackhint bytes rtx >= 0")); - } else - tp->snd_nxt -= len; - } + if (((tp->t_flags & TF_FORCEDATA) == 0 || + !callout_active(tp->tt_persist)) && + ((flags & TH_SYN) == 0) && + (error != EPERM)) { + if (sack_rxmit) { + p->rxmit -= len; + tp->sackhint.sack_bytes_rexmit -= len; + KASSERT(tp->sackhint.sack_bytes_rexmit >= 0, + ("sackhint bytes rtx >= 0")); + } else + tp->snd_nxt -= len; } - if (error == EPERM) { +out: + SOCKBUF_UNLOCK_ASSERT(&so->so_snd); /* Check gotos. */ + switch (error) { + case EPERM: tp->t_softerror = error; return (error); - } - -out: - SOCKBUF_UNLOCK_ASSERT(&so->so_snd); /* Check gotos. */ - if (error == ENOBUFS) { + case ENOBUFS: if (!callout_active(tp->tt_rexmt) && !callout_active(tp->tt_persist)) callout_reset(tp->tt_rexmt, tp->t_rxtcur, tcp_timer_rexmt, tp); tp->snd_cwnd = tp->t_maxseg; return (0); - } - if (error == EMSGSIZE) { + case EMSGSIZE: /* * For some reason the interface we used initially * to send segments changed to another or lowered @@ -1265,14 +1259,19 @@ if (tso) tp->t_flags &= ~TF_TSO; tcp_mtudisc(tp->t_inpcb, 0); - return 0; - } - if ((error == EHOSTUNREACH || error == ENETDOWN) - && TCPS_HAVERCVDSYN(tp->t_state)) { - tp->t_softerror = error; return (0); + case EHOSTDOWN: + case EHOSTUNREACH: + case ENETDOWN: + case ENETUNREACH: + if (TCPS_HAVERCVDSYN(tp->t_state)) { + tp->t_softerror = error; + return (0); + } + /* FALLTHROUGH */ + default: + return (error); } - return (error); } tcpstat.tcps_sndtotal++; ==== //depot/projects/smpng/sys/netinet6/ip6_mroute.c#30 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/netinet6/ip6_mroute.c,v 1.41 2007/02/24 21:09:35 bms Exp $ */ +/* $FreeBSD: src/sys/netinet6/ip6_mroute.c,v 1.44 2007/02/28 21:58:37 bms Exp $ */ /* $KAME: ip6_mroute.c,v 1.58 2001/12/18 02:36:31 itojun Exp $ */ /*- @@ -121,6 +121,7 @@ static MALLOC_DEFINE(M_MRTABLE6, "mf6c", "multicast forwarding cache entry"); +/* XXX: this is a very common idiom; move to ? */ #define M_HASCL(m) ((m)->m_flags & M_EXT) static int ip6_mdq __P((struct mbuf *, struct ifnet *, struct mf6c *)); @@ -133,6 +134,8 @@ struct mbuf *)); extern struct domain inet6domain; + +/* XXX: referenced from ip_mroute.c for dynamically loading this code. */ struct ip6protosw in6_pim_protosw = { .pr_type = SOCK_RAW, .pr_domain = &inet6domain, @@ -144,18 +147,13 @@ .pr_usrreqs = &rip6_usrreqs }; -/* - * Globals. All but ip6_mrtproto and mrt6stat could be static, - * except for netstat or debugging purposes. - */ -int ip6_mrouter_ver = 0; -int ip6_mrtproto = IPPROTO_PIM; /* for netstat only */ +static int ip6_mrouter_ver = 0; SYSCTL_DECL(_net_inet6); SYSCTL_DECL(_net_inet6_ip6); SYSCTL_NODE(_net_inet6, IPPROTO_PIM, pim, CTLFLAG_RW, 0, "PIM"); -struct mrt6stat mrt6stat; +static struct mrt6stat mrt6stat; SYSCTL_STRUCT(_net_inet6_ip6, OID_AUTO, mrt6stat, CTLFLAG_RW, &mrt6stat, mrt6stat, "Multicast Routing Statistics (struct mrt6stat, netinet6/ip6_mroute.h)"); @@ -163,13 +161,13 @@ #define NO_RTE_FOUND 0x1 #define RTE_FOUND 0x2 -struct mf6c *mf6ctable[MF6CTBLSIZ]; +static struct mf6c *mf6ctable[MF6CTBLSIZ]; SYSCTL_OPAQUE(_net_inet6_ip6, OID_AUTO, mf6ctable, CTLFLAG_RD, &mf6ctable, sizeof(mf6ctable), "S,*mf6ctable[MF6CTBLSIZ]", "Multicast Forwarding Table (struct *mf6ctable[MF6CTBLSIZ], " "netinet6/ip6_mroute.h)"); -u_char n6expire[MF6CTBLSIZ]; +static u_char n6expire[MF6CTBLSIZ]; static struct mif6 mif6table[MAXMIFS]; SYSCTL_OPAQUE(_net_inet6_ip6, OID_AUTO, mif6table, CTLFLAG_RD, @@ -177,7 +175,7 @@ "Multicast Interfaces (struct mif[MAXMIFS], netinet6/ip6_mroute.h)"); #ifdef MRT6DEBUG -u_int mrt6debug = 0; /* debug level */ +static u_int mrt6debug = 0; /* debug level */ #define DEBUG_MFC 0x02 #define DEBUG_FORWARD 0x04 #define DEBUG_EXPIRE 0x08 @@ -234,9 +232,7 @@ /* * Find a route for a given origin IPv6 address and Multicast group address. - * Quality of service parameter to be added in the future!!! */ - #define MF6CFIND(o, g, rt) do { \ struct mf6c *_rt = mf6ctable[MF6CHASH(o,g)]; \ rt = NULL; \ @@ -258,6 +254,7 @@ /* * Macros to compute elapsed time efficiently * Borrowed from Van Jacobson's scheduling code + * XXX: replace with timersub() ? */ #define TV_DELTA(a, b, delta) do { \ int xxs; \ @@ -277,12 +274,13 @@ } \ } while (/*CONSTCOND*/ 0) +/* XXX: replace with timercmp(a, b, <) ? */ #define TV_LT(a, b) (((a).tv_usec < (b).tv_usec && \ (a).tv_sec <= (b).tv_sec) || (a).tv_sec < (b).tv_sec) #ifdef UPCALL_TIMING #define UPCALL_MAX 50 -u_long upcall_data[UPCALL_MAX + 1]; +static u_long upcall_data[UPCALL_MAX + 1]; static void collate(); #endif /* UPCALL_TIMING */ @@ -546,10 +544,6 @@ } } } -#ifdef notyet - bzero((caddr_t)qtable, sizeof(qtable)); - bzero((caddr_t)tbftable, sizeof(tbftable)); -#endif bzero((caddr_t)mif6table, sizeof(mif6table)); nummifs = 0; @@ -615,9 +609,6 @@ struct mif6 *mifp; struct ifnet *ifp; int error, s; -#ifdef notyet - struct tbf *m_tbf = tbftable + mifcp->mif6c_mifi; -#endif if (mifcp->mif6c_mifi >= MAXMIFS) return (EINVAL); @@ -663,10 +654,7 @@ s = splnet(); mifp->m6_flags = mifcp->mif6c_flags; mifp->m6_ifp = ifp; -#ifdef notyet - /* scaling up here allows division by 1024 in critical code */ - mifp->m6_rate_limit = mifcp->mif6c_rate_limit * 1024 / 1000; -#endif + /* initialize per mif pkt counters */ mifp->m6_pkt_in = 0; mifp->m6_pkt_out = 0; @@ -726,10 +714,6 @@ } } -#ifdef notyet - bzero((caddr_t)qtable[*mifip], sizeof(qtable[*mifip])); - bzero((caddr_t)mifp->m6_tbf, sizeof(*(mifp->m6_tbf))); -#endif bzero((caddr_t)mifp, sizeof(*mifp)); /* Adjust nummifs down */ ==== //depot/projects/smpng/sys/netinet6/ip6_mroute.h#7 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/netinet6/ip6_mroute.h,v 1.10 2007/02/24 11:38:47 bms Exp $ */ +/* $FreeBSD: src/sys/netinet6/ip6_mroute.h,v 1.11 2007/02/28 20:32:25 bms Exp $ */ /* $KAME: ip6_mroute.h,v 1.19 2001/06/14 06:12:55 suz Exp $ */ /*- @@ -103,9 +103,6 @@ mifi_t mif6c_mifi; /* the index of the mif to be added */ u_char mif6c_flags; /* MIFF_ flags defined below */ u_short mif6c_pifi; /* the index of the physical IF */ -#ifdef notyet - u_int mif6c_rate_limit; /* max rate */ -#endif }; #define MIFF_REGISTER 0x1 /* mif represents a register end-point */ @@ -209,9 +206,6 @@ struct mif6 { u_char m6_flags; /* MIFF_ flags defined above */ u_int m6_rate_limit; /* max rate */ -#ifdef notyet - struct tbf *m6_tbf; /* token bucket structure at intf. */ -#endif struct in6_addr m6_lcl_addr; /* local interface address */ struct ifnet *m6_ifp; /* pointer to interface */ u_quad_t m6_pkt_in; /* # pkts in on interface */ ==== //depot/projects/smpng/sys/sys/priv.h#3 (text+ko) ==== @@ -26,7 +26,7 @@ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/sys/priv.h,v 1.5 2007/02/20 23:49:31 rwatson Exp $ + * $FreeBSD: src/sys/sys/priv.h,v 1.6 2007/02/27 23:38:58 pjd Exp $ */ /* @@ -303,7 +303,7 @@ #define PRIV_NET_ADDMULTI 405 /* Add multicast addr. to ifnet. */ #define PRIV_NET_DELMULTI 406 /* Delete multicast addr. from ifnet. */ #define PRIV_NET_HWIOCTL 407 /* Issue hardware ioctl on ifnet. */ -#define PRIV_NET_SETLLADDR 408 +#define PRIV_NET_SETLLADDR 408 /* Set interface link-level address. */ #define PRIV_NET_ADDIFGROUP 409 /* Add new interface group. */ #define PRIV_NET_DELIFGROUP 410 /* Delete interface group. */ #define PRIV_NET_IFCREATE 411 /* Create cloned interface. */ ==== //depot/projects/smpng/sys/sys/systm.h#80 (text+ko) ==== @@ -32,7 +32,7 @@ * SUCH DAMAGE. * * @(#)systm.h 8.7 (Berkeley) 3/29/95 - * $FreeBSD: src/sys/sys/systm.h,v 1.250 2007/02/23 16:22:09 jhb Exp $ + * $FreeBSD: src/sys/sys/systm.h,v 1.251 2007/02/28 16:51:52 thomas Exp $ */ #ifndef _SYS_SYSTM_H_ @@ -271,7 +271,7 @@ void cpu_initclocks(void); void usrinfoinit(void); -/* Finalize the world. */ +/* Finalize the world */ void shutdown_nice(int); /* Timeouts */ @@ -285,7 +285,7 @@ caddr_t kern_timeout_callwheel_alloc(caddr_t v); void kern_timeout_callwheel_init(void); -/* Stubs for obsolete functions that used to be for interrupt management */ +/* Stubs for obsolete functions that used to be for interrupt management */ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Mar 1 15:49: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 2EDFD16A408; Thu, 1 Mar 2007 15:49: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 D8C9D16A405 for ; Thu, 1 Mar 2007 15:49:28 +0000 (UTC) (envelope-from mlaier@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id CD2FF13C441 for ; Thu, 1 Mar 2007 15:49:28 +0000 (UTC) (envelope-from mlaier@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l21FnStK008493 for ; Thu, 1 Mar 2007 15:49:28 GMT (envelope-from mlaier@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l21FnS2O008490 for perforce@freebsd.org; Thu, 1 Mar 2007 15:49:28 GMT (envelope-from mlaier@freebsd.org) Date: Thu, 1 Mar 2007 15:49:28 GMT Message-Id: <200703011549.l21FnS2O008490@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to mlaier@freebsd.org using -f From: Max Laier To: Perforce Change Reviews Cc: Subject: PERFORCE change 115208 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 01 Mar 2007 15:49:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=115208 Change 115208 by mlaier@mlaier_amd64 on 2007/03/01 15:48:38 Catch up with ic_modcaps change in 114933. Affected files ... .. //depot/projects/wifi/sys/dev/if_ndis/if_ndis.c#27 edit Differences ... ==== //depot/projects/wifi/sys/dev/if_ndis/if_ndis.c#27 (text+ko) ==== @@ -687,7 +687,7 @@ ic->ic_opmode = IEEE80211_M_STA; ic->ic_caps = IEEE80211_C_IBSS; ic->ic_state = IEEE80211_S_ASSOC; - ic->ic_modecaps = (1<ic_modecaps, IEEE80211_MODE_AUTO); len = 0; r = ndis_get_info(sc, OID_802_11_NETWORK_TYPES_SUPPORTED, NULL, &len); @@ -705,13 +705,13 @@ switch (ntl->ntl_type[i]) { case NDIS_80211_NETTYPE_11FH: case NDIS_80211_NETTYPE_11DS: - ic->ic_modecaps |= (1<ic_modecaps, IEEE80211_MODE_11B); break; case NDIS_80211_NETTYPE_11OFDM5: - ic->ic_modecaps |= (1<ic_modecaps, IEEE80211_MODE_11A); break; case NDIS_80211_NETTYPE_11OFDM24: - ic->ic_modecaps |= (1<ic_modecaps, IEEE80211_MODE_11G); break; default: break; @@ -750,11 +750,11 @@ ic->ic_sup_rates[x].rs_nrates++ ic->ic_curmode = IEEE80211_MODE_AUTO; - if (ic->ic_modecaps & (1<ic_modecaps, IEEE80211_MODE_11A)) ic->ic_sup_rates[IEEE80211_MODE_11A].rs_nrates = 0; - if (ic->ic_modecaps & (1<ic_modecaps, IEEE80211_MODE_11B)) ic->ic_sup_rates[IEEE80211_MODE_11B].rs_nrates = 0; - if (ic->ic_modecaps & (1<ic_modecaps, IEEE80211_MODE_11G)) ic->ic_sup_rates[IEEE80211_MODE_11G].rs_nrates = 0; for (i = 0; i < len; i++) { switch (rates[i] & IEEE80211_RATE_VAL) { @@ -763,11 +763,11 @@ case 11: case 10: case 22: - if (!(ic->ic_modecaps & - (1<ic_modecaps, + IEEE80211_MODE_11B)) { /* Lazy-init 802.11b. */ - ic->ic_modecaps |= - (1<ic_modecaps, + IEEE80211_MODE_11B); ic->ic_sup_rates[IEEE80211_MODE_11B]. rs_nrates = 0; } @@ -775,11 +775,13 @@ INCRATE(IEEE80211_MODE_11B); break; default: - if (ic->ic_modecaps & (1<ic_modecaps, + IEEE80211_MODE_11A)) { SETRATE(IEEE80211_MODE_11A, rates[i]); INCRATE(IEEE80211_MODE_11A); } - if (ic->ic_modecaps & (1<ic_modecaps, + IEEE80211_MODE_11G)) { SETRATE(IEEE80211_MODE_11G, rates[i]); INCRATE(IEEE80211_MODE_11G); } @@ -794,7 +796,7 @@ * just cheat here. Just how in the heck do * we detect turbo modes, though? */ - if (ic->ic_modecaps & (1<ic_modecaps, IEEE80211_MODE_11B)) { TESTSETRATE(IEEE80211_MODE_11B, IEEE80211_RATE_BASIC|2); TESTSETRATE(IEEE80211_MODE_11B, @@ -804,13 +806,13 @@ TESTSETRATE(IEEE80211_MODE_11B, IEEE80211_RATE_BASIC|22); } - if (ic->ic_modecaps & (1<ic_modecaps, IEEE80211_MODE_11G)) { TESTSETRATE(IEEE80211_MODE_11G, 47); TESTSETRATE(IEEE80211_MODE_11G, 72); TESTSETRATE(IEEE80211_MODE_11G, 96); TESTSETRATE(IEEE80211_MODE_11G, 108); } - if (ic->ic_modecaps & (1<ic_modecaps, IEEE80211_MODE_11A)) { TESTSETRATE(IEEE80211_MODE_11A, 47); TESTSETRATE(IEEE80211_MODE_11A, 72); TESTSETRATE(IEEE80211_MODE_11A, 96); @@ -2632,7 +2634,7 @@ device_printf (sc->ndis_dev, "get link speed failed: %d\n", rval); - if (ic->ic_modecaps & (1<ic_modecaps, IEEE80211_MODE_11B)) { ic->ic_bss->ni_rates = ic->ic_sup_rates[IEEE80211_MODE_11B]; for (i = 0; i < ic->ic_bss->ni_rates.rs_nrates; i++) { if ((ic->ic_bss->ni_rates.rs_rates[i] & @@ -2642,7 +2644,7 @@ } if (i == ic->ic_bss->ni_rates.rs_nrates && - ic->ic_modecaps & (1<ic_modecaps, IEEE80211_MODE_11G)) { ic->ic_bss->ni_rates = ic->ic_sup_rates[IEEE80211_MODE_11G]; for (i = 0; i < ic->ic_bss->ni_rates.rs_nrates; i++) { if ((ic->ic_bss->ni_rates.rs_rates[i] & From owner-p4-projects@FreeBSD.ORG Thu Mar 1 15:55: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 B681C16A407; Thu, 1 Mar 2007 15:55: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 7465216A405 for ; Thu, 1 Mar 2007 15:55:37 +0000 (UTC) (envelope-from flz@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 6797113C4BA for ; Thu, 1 Mar 2007 15:55:37 +0000 (UTC) (envelope-from flz@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l21Ftbjp010098 for ; Thu, 1 Mar 2007 15:55:37 GMT (envelope-from flz@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l21Fta07010095 for perforce@freebsd.org; Thu, 1 Mar 2007 15:55:36 GMT (envelope-from flz@freebsd.org) Date: Thu, 1 Mar 2007 15:55:36 GMT Message-Id: <200703011555.l21Fta07010095@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to flz@freebsd.org using -f From: Florent Thoumie To: Perforce Change Reviews Cc: Subject: PERFORCE change 115209 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 01 Mar 2007 15:55:38 -0000 http://perforce.freebsd.org/chv.cgi?CH=115209 Change 115209 by flz@flz_work on 2007/03/01 15:55:01 IFC. Affected files ... .. //depot/projects/soc2005/launchd/includes/launchd.h#13 edit .. //depot/user/flz/intel_fw/src/sys/arm/at91/ohci_atmelarm.c#2 integrate .. //depot/user/flz/intel_fw/src/sys/kern/kern_mutex.c#3 integrate .. //depot/user/flz/intel_fw/src/sys/kern/kern_sx.c#3 integrate .. //depot/user/flz/intel_fw/src/sys/kern/uipc_usrreq.c#3 integrate .. //depot/user/flz/intel_fw/src/sys/net/if_vlan_var.h#2 integrate .. //depot/user/flz/intel_fw/src/sys/netinet/ip_mroute.c#2 integrate .. //depot/user/flz/intel_fw/src/sys/netinet/ip_output.c#2 integrate .. //depot/user/flz/intel_fw/src/sys/netinet/tcp_input.c#3 integrate .. //depot/user/flz/intel_fw/src/sys/netinet/tcp_output.c#3 integrate .. //depot/user/flz/intel_fw/src/sys/netinet6/ip6_mroute.c#2 integrate .. //depot/user/flz/intel_fw/src/sys/netinet6/ip6_mroute.h#2 integrate .. //depot/user/flz/intel_fw/src/sys/sys/mbuf.h#2 integrate .. //depot/user/flz/v4l/src/sys/dev/v4l/v4l_var.h#2 edit .. //depot/user/flz/v4l/src/sys/dev/v4l/videodev.h#2 edit Differences ... ==== //depot/projects/soc2005/launchd/includes/launchd.h#13 (text+ko) ==== @@ -41,7 +41,7 @@ * Use launchd_assert() for core initialization routines. */ #define launchd_assumes(e) \ - (__builtin_expect(!(e), 0) ? syslog(LOG_NOTICE, "Please file a bug report: %s:%u in %s(): (%s) == %u", __FILE__, __LINE__, __func__, #e, errno), false : true) + (__builtin_expect(!(e), 0) ? syslog(LOG_NOTICE, "Please file a bug report: %s:%u in %s(): (%s) == %u (%s)", __FILE__, __LINE__, __func__, #e, errno, strerror(errno)), false : true) #define launchd_assert(e) launchd_assumes(e) ? true : abort(); ==== //depot/user/flz/intel_fw/src/sys/arm/at91/ohci_atmelarm.c#2 (text) ==== @@ -23,7 +23,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/at91/ohci_atmelarm.c,v 1.1 2006/03/18 01:45:29 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/at91/ohci_atmelarm.c,v 1.2 2007/03/01 09:10:55 piso Exp $"); #include #include @@ -99,8 +99,8 @@ } device_set_ivars(sc->sc_ohci.sc_bus.bdev, &sc->sc_ohci.sc_bus); - err = bus_setup_intr(dev, sc->sc_ohci.irq_res, INTR_TYPE_BIO, ohci_intr, sc, - &sc->sc_ohci.ih); + err = bus_setup_intr(dev, sc->sc_ohci.irq_res, INTR_TYPE_BIO, NULL, + ohci_intr, sc, &sc->sc_ohci.ih); if (err) { err = ENXIO; goto error; ==== //depot/user/flz/intel_fw/src/sys/kern/kern_mutex.c#3 (text+ko) ==== @@ -34,7 +34,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/kern_mutex.c,v 1.181 2007/02/27 06:42:04 kmacy Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_mutex.c,v 1.182 2007/03/01 09:35:48 kmacy Exp $"); #include "opt_adaptive_mutexes.h" #include "opt_ddb.h" @@ -157,9 +157,9 @@ void _mtx_unlock_flags(struct mtx *m, int opts, const char *file, int line) { - +#ifdef LOCK_PROFILING struct lock_object lo; - +#endif MPASS(curthread != NULL); KASSERT(m->mtx_lock != MTX_DESTROYED, ("mtx_unlock() of destroyed mutex @ %s:%d", file, line)); @@ -176,7 +176,9 @@ m->mtx_object.lo_flags &= ~LO_CONTESTED; #endif _rel_sleep_lock(m, curthread, opts, file, line); +#ifdef LOCK_PROFILING lock_profile_release_lock(&lo); +#endif } void @@ -200,9 +202,9 @@ void _mtx_unlock_spin_flags(struct mtx *m, int opts, const char *file, int line) { - +#ifdef LOCK_PROFILING struct lock_object lo; - +#endif MPASS(curthread != NULL); KASSERT(m->mtx_lock != MTX_DESTROYED, ("mtx_unlock_spin() of destroyed mutex @ %s:%d", file, line)); @@ -218,7 +220,9 @@ m->mtx_object.lo_flags &= ~LO_CONTESTED; #endif _rel_spin_lock(m); +#ifdef LOCK_PROFILING lock_profile_release_lock(&lo); +#endif } /* ==== //depot/user/flz/intel_fw/src/sys/kern/kern_sx.c#3 (text+ko) ==== @@ -34,7 +34,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/kern_sx.c,v 1.34 2007/02/27 06:42:04 kmacy Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_sx.c,v 1.35 2007/03/01 09:35:48 kmacy Exp $"); #include "opt_ddb.h" @@ -228,9 +228,10 @@ void _sx_sunlock(struct sx *sx, const char *file, int line) { +#ifdef LOCK_PROFILING struct lock_object lo; int count = -1; - +#endif _sx_assert(sx, SX_SLOCKED, file, line); mtx_lock(sx->sx_lock); @@ -262,15 +263,18 @@ LOCK_LOG_LOCK("SUNLOCK", &sx->sx_object, 0, 0, file, line); mtx_unlock(sx->sx_lock); +#ifdef LOCK_PROFILING if (count == 0) lock_profile_release_lock(&lo); - +#endif } void _sx_xunlock(struct sx *sx, const char *file, int line) { +#ifdef LOCK_PROFILING struct lock_object lo; +#endif _sx_assert(sx, SX_XLOCKED, file, line); mtx_lock(sx->sx_lock); @@ -298,7 +302,9 @@ LOCK_LOG_LOCK("XUNLOCK", &sx->sx_object, 0, 0, file, line); mtx_unlock(sx->sx_lock); +#ifdef LOCK_PROFILING lock_profile_release_lock(&lo); +#endif } int ==== //depot/user/flz/intel_fw/src/sys/kern/uipc_usrreq.c#3 (text+ko) ==== @@ -57,7 +57,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/uipc_usrreq.c,v 1.198 2007/02/28 08:08:50 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/uipc_usrreq.c,v 1.199 2007/03/01 09:00:42 rwatson Exp $"); #include "opt_mac.h" @@ -774,21 +774,18 @@ unp2 = unp->unp_conn; if (nam != NULL) { + UNP_GLOBAL_WLOCK_ASSERT(); if (unp2 != NULL) { error = EISCONN; - UNP_PCB_LOCK(unp); break; } error = unp_connect(so, nam, td); - UNP_PCB_LOCK(unp); if (error) break; unp2 = unp->unp_conn; } else { - UNP_PCB_LOCK(unp); if (unp2 == NULL) { error = ENOTCONN; - UNP_PCB_LOCK(unp); break; } } @@ -799,19 +796,19 @@ * return the slightly counter-intuitive but otherwise * correct error that the socket is not connected. */ - UNP_PCB_LOCK_ASSERT(unp); if (unp2 == NULL) { error = ENOTCONN; break; } - UNP_PCB_LOCK(unp2); - so2 = unp2->unp_socket; + /* Lockless read. */ + if (unp2->unp_flags & UNP_WANTCRED) + control = unp_addsockcred(td, control); + UNP_PCB_LOCK(unp); if (unp->unp_addr != NULL) from = (struct sockaddr *)unp->unp_addr; else from = &sun_noname; - if (unp2->unp_flags & UNP_WANTCRED) - control = unp_addsockcred(td, control); + so2 = unp2->unp_socket; SOCKBUF_LOCK(&so2->so_rcv); if (sbappendaddr_locked(&so2->so_rcv, from, m, control)) { sorwakeup_locked(so2); @@ -821,9 +818,13 @@ SOCKBUF_UNLOCK(&so2->so_rcv); error = ENOBUFS; } - if (nam != NULL) + if (nam != NULL) { + UNP_GLOBAL_WLOCK_ASSERT(); + UNP_PCB_LOCK(unp2); unp_disconnect(unp, unp2); - UNP_PCB_UNLOCK(unp2); + UNP_PCB_UNLOCK(unp2); + } + UNP_PCB_UNLOCK(unp); break; } @@ -836,18 +837,15 @@ */ if ((so->so_state & SS_ISCONNECTED) == 0) { if (nam != NULL) { + UNP_GLOBAL_WLOCK_ASSERT(); error = unp_connect(so, nam, td); - UNP_PCB_LOCK(unp); if (error) break; /* XXX */ } else { error = ENOTCONN; - UNP_PCB_LOCK(unp); break; } - } else - UNP_PCB_LOCK(unp); - UNP_PCB_LOCK_ASSERT(unp); + } /* Lockless read. */ if (so->so_snd.sb_state & SBS_CANTSENDMORE) { @@ -874,13 +872,12 @@ error = ENOTCONN; break; } + so2 = unp2->unp_socket; UNP_PCB_LOCK(unp2); - so2 = unp2->unp_socket; SOCKBUF_LOCK(&so2->so_rcv); if (unp2->unp_flags & UNP_WANTCRED) { /* - * Credentials are passed only once on - * SOCK_STREAM. + * Credentials are passed only once on SOCK_STREAM. */ unp2->unp_flags &= ~UNP_WANTCRED; control = unp_addsockcred(td, control); @@ -915,14 +912,14 @@ } /* - * SEND_EOF is equivalent to a SEND followed by - * a SHUTDOWN. + * SEND_EOF is equivalent to a SEND followed by a SHUTDOWN. */ if (flags & PRUS_EOF) { + UNP_PCB_LOCK(unp); socantsendmore(so); unp_shutdown(unp); + UNP_PCB_UNLOCK(unp); } - UNP_PCB_UNLOCK(unp); if ((nam != NULL) || (flags & PRUS_EOF)) UNP_GLOBAL_WUNLOCK(); ==== //depot/user/flz/intel_fw/src/sys/net/if_vlan_var.h#2 (text+ko) ==== @@ -26,7 +26,7 @@ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/net/if_vlan_var.h,v 1.25 2006/09/17 13:33:29 andre Exp $ + * $FreeBSD: src/sys/net/if_vlan_var.h,v 1.26 2007/02/28 22:05:30 bms Exp $ */ #ifndef _NET_IF_VLAN_VAR_H_ @@ -40,9 +40,40 @@ u_int16_t evl_proto; }; -#define EVL_VLID_MASK 0x0FFF -#define EVL_VLANOFTAG(tag) ((tag) & EVL_VLID_MASK) -#define EVL_PRIOFTAG(tag) (((tag) >> 13) & 7) +#define EVL_VLID_MASK 0x0FFF +#define EVL_PRI_MASK 0xE000 +#define EVL_VLANOFTAG(tag) ((tag) & EVL_VLID_MASK) +#define EVL_PRIOFTAG(tag) (((tag) >> 13) & 7) +#define EVL_CFIOFTAG(tag) (((tag) >> 12) & 1) +#define EVL_MAKETAG(vlid, pri, cfi) \ + ((((((pri) & 7) << 1) | ((cfi) & 1)) << 12) | ((vlid) & EVL_VLID_MASK)) + +/* Set the VLAN ID in an mbuf packet header non-destructively. */ +#define EVL_APPLY_VLID(m, vlid) \ + do { \ + if ((m)->m_flags & M_VLANTAG) { \ + (m)->m_pkthdr.ether_vtag &= EVL_VLID_MASK; \ + (m)->m_pkthdr.ether_vtag |= (vlid); \ + } else { \ + (m)->m_pkthdr.ether_vtag = (vlid); \ + (m)->m_flags |= M_VLANTAG; \ + } \ + } while (0) + +/* Set the priority ID in an mbuf packet header non-destructively. */ +#define EVL_APPLY_PRI(m, pri) \ + do { \ + if ((m)->m_flags & M_VLANTAG) { \ + uint16_t __vlantag = (m)->m_pkthdr.ether_vtag; \ + (m)->m_pkthdr.ether_vtag |= EVL_MAKETAG( \ + EVL_VLANOFTAG(__vlantag), (pri), \ + EVL_CFIOFTAG(__vlantag)); \ + } else { \ + (m)->m_pkthdr.ether_vtag = \ + EVL_MAKETAG(0, (pri), 0); \ + (m)->m_flags |= M_VLANTAG; \ + } \ + } while (0) /* sysctl(3) tags, for compatibility purposes */ #define VLANCTL_PROTO 1 ==== //depot/user/flz/intel_fw/src/sys/netinet/ip_mroute.c#2 (text+ko) ==== @@ -52,7 +52,7 @@ * and PIM-SMv2 and PIM-DM support, advanced API support, * bandwidth metering and signaling * - * $FreeBSD: src/sys/netinet/ip_mroute.c,v 1.131 2007/02/25 14:22:03 bms Exp $ + * $FreeBSD: src/sys/netinet/ip_mroute.c,v 1.132 2007/02/28 20:02:24 bms Exp $ */ #include "opt_inet.h" @@ -146,6 +146,17 @@ &mfctable, sizeof(mfctable), "S,*mfc[MFCTBLSIZ]", "Multicast Forwarding Table (struct *mfc[MFCTBLSIZ], netinet/ip_mroute.h)"); +static struct mtx mrouter_mtx; +#define MROUTER_LOCK() mtx_lock(&mrouter_mtx) +#define MROUTER_UNLOCK() mtx_unlock(&mrouter_mtx) +#define MROUTER_LOCK_ASSERT() do { \ + mtx_assert(&mrouter_mtx, MA_OWNED); \ + NET_ASSERT_GIANT(); \ +} while (0) +#define MROUTER_LOCK_INIT() \ + mtx_init(&mrouter_mtx, "IPv4 multicast forwarding", NULL, MTX_DEF) +#define MROUTER_LOCK_DESTROY() mtx_destroy(&mrouter_mtx) + static struct mtx mfc_mtx; #define MFC_LOCK() mtx_lock(&mfc_mtx) #define MFC_UNLOCK() mtx_unlock(&mfc_mtx) @@ -637,8 +648,6 @@ callout_init(&bw_meter_ch, NET_CALLOUT_MPSAFE); } -static struct mtx mrouter_mtx; - static void if_detached_event(void *arg __unused, struct ifnet *ifp) { @@ -650,9 +659,9 @@ struct rtdetq *pq; struct rtdetq *npq; - mtx_lock(&mrouter_mtx); + MROUTER_LOCK(); if (ip_mrouter == NULL) { - mtx_unlock(&mrouter_mtx); + MROUTER_UNLOCK(); } /* @@ -696,7 +705,7 @@ MFC_UNLOCK(); VIF_UNLOCK(); - mtx_unlock(&mrouter_mtx); + MROUTER_UNLOCK(); } /* @@ -715,17 +724,17 @@ if (version != 1) return ENOPROTOOPT; - mtx_lock(&mrouter_mtx); + MROUTER_LOCK(); if (ip_mrouter != NULL) { - mtx_unlock(&mrouter_mtx); + MROUTER_UNLOCK(); return EADDRINUSE; } if_detach_event_tag = EVENTHANDLER_REGISTER(ifnet_departure_event, if_detached_event, NULL, EVENTHANDLER_PRI_ANY); if (if_detach_event_tag == NULL) { - mtx_unlock(&mrouter_mtx); + MROUTER_UNLOCK(); return (ENOMEM); } @@ -737,7 +746,7 @@ ip_mrouter = so; - mtx_unlock(&mrouter_mtx); + MROUTER_UNLOCK(); if (mrtdebug) log(LOG_DEBUG, "ip_mrouter_init\n"); @@ -758,10 +767,10 @@ struct mfc *rt; struct rtdetq *rte; - mtx_lock(&mrouter_mtx); + MROUTER_LOCK(); if (ip_mrouter == NULL) { - mtx_unlock(&mrouter_mtx); + MROUTER_UNLOCK(); return EINVAL; } @@ -826,7 +835,7 @@ reg_vif_num = VIFI_INVALID; - mtx_unlock(&mrouter_mtx); + MROUTER_UNLOCK(); if (mrtdebug) log(LOG_DEBUG, "ip_mrouter_done\n"); @@ -3027,7 +3036,7 @@ { switch (type) { case MOD_LOAD: - mtx_init(&mrouter_mtx, "mrouter initialization", NULL, MTX_DEF); + MROUTER_LOCK_INIT(); MFC_LOCK_INIT(); VIF_LOCK_INIT(); ip_mrouter_reset(); @@ -3040,7 +3049,7 @@ printf("ip_mroute: unable to attach pim encap\n"); VIF_LOCK_DESTROY(); MFC_LOCK_DESTROY(); - mtx_destroy(&mrouter_mtx); + MROUTER_LOCK_DESTROY(); return (EINVAL); } @@ -3055,7 +3064,7 @@ } VIF_LOCK_DESTROY(); MFC_LOCK_DESTROY(); - mtx_destroy(&mrouter_mtx); + MROUTER_LOCK_DESTROY(); return (EINVAL); } #endif @@ -3131,7 +3140,7 @@ VIF_LOCK_DESTROY(); MFC_LOCK_DESTROY(); - mtx_destroy(&mrouter_mtx); + MROUTER_LOCK_DESTROY(); break; default: ==== //depot/user/flz/intel_fw/src/sys/netinet/ip_output.c#2 (text+ko) ==== @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * @(#)ip_output.c 8.3 (Berkeley) 1/21/94 - * $FreeBSD: src/sys/netinet/ip_output.c,v 1.269 2006/12/10 13:44:00 bms Exp $ + * $FreeBSD: src/sys/netinet/ip_output.c,v 1.270 2007/03/01 13:29:30 bms Exp $ */ #include "opt_ipfw.h" @@ -188,30 +188,33 @@ dst->sin_addr = ip->ip_dst; } /* - * If routing to interface only, - * short circuit routing lookup. + * If routing to interface only, short circuit routing lookup. + * The use of an all-ones broadcast address implies this; an + * interface is specified by the broadcast address of an interface, + * or the destination address of a ptp interface. */ - if (flags & IP_ROUTETOIF) { - if ((ia = ifatoia(ifa_ifwithdstaddr(sintosa(dst)))) == NULL && - (ia = ifatoia(ifa_ifwithnet(sintosa(dst)))) == NULL) { + if (flags & IP_SENDONES) { + if ((ia = ifatoia(ifa_ifwithbroadaddr(sintosa(dst)))) == NULL && + (ia = ifatoia(ifa_ifwithdstaddr(sintosa(dst)))) == NULL) { ipstat.ips_noroute++; error = ENETUNREACH; goto bad; } + ip->ip_dst.s_addr = INADDR_BROADCAST; + dst->sin_addr = ip->ip_dst; ifp = ia->ia_ifp; ip->ip_ttl = 1; - isbroadcast = in_broadcast(dst->sin_addr, ifp); - } else if (flags & IP_SENDONES) { - if ((ia = ifatoia(ifa_ifwithbroadaddr(sintosa(dst)))) == NULL) { + isbroadcast = 1; + } else if (flags & IP_ROUTETOIF) { + if ((ia = ifatoia(ifa_ifwithdstaddr(sintosa(dst)))) == NULL && + (ia = ifatoia(ifa_ifwithnet(sintosa(dst)))) == NULL) { ipstat.ips_noroute++; error = ENETUNREACH; goto bad; } ifp = ia->ia_ifp; - ip->ip_dst.s_addr = INADDR_BROADCAST; - dst->sin_addr = ip->ip_dst; ip->ip_ttl = 1; - isbroadcast = 1; + isbroadcast = in_broadcast(dst->sin_addr, ifp); } else if (IN_MULTICAST(ntohl(ip->ip_dst.s_addr)) && imo != NULL && imo->imo_multicast_ifp != NULL) { /* ==== //depot/user/flz/intel_fw/src/sys/netinet/tcp_input.c#3 (text+ko) ==== @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * @(#)tcp_input.c 8.12 (Berkeley) 5/24/95 - * $FreeBSD: src/sys/netinet/tcp_input.c,v 1.314 2007/02/26 22:25:20 mohans Exp $ + * $FreeBSD: src/sys/netinet/tcp_input.c,v 1.315 2007/02/28 20:48:00 mohans Exp $ */ #include "opt_ipfw.h" /* for ipfw_fwd */ @@ -1155,6 +1155,8 @@ tp->ts_recent = to.to_tsval; tp->ts_recent_age = ticks; } + /* Initial send window, already scaled. */ + tp->snd_wnd = th->th_win; if (to.to_flags & TOF_MSS) tcp_mss(tp, to.to_mss); if (tp->sack_enable) { @@ -1484,9 +1486,6 @@ if ((thflags & TH_SYN) == 0) goto drop; - /* Initial send window, already scaled. */ - tp->snd_wnd = th->th_win; - tp->irs = th->th_seq; tcp_rcvseqinit(tp); if (thflags & TH_ACK) { ==== //depot/user/flz/intel_fw/src/sys/netinet/tcp_output.c#3 (text+ko) ==== @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * @(#)tcp_output.c 8.4 (Berkeley) 5/24/95 - * $FreeBSD: src/sys/netinet/tcp_output.c,v 1.124 2007/02/28 12:47:49 glebius Exp $ + * $FreeBSD: src/sys/netinet/tcp_output.c,v 1.125 2007/03/01 13:12:09 andre Exp $ */ #include "opt_inet.h" @@ -801,13 +801,14 @@ * IP, TCP and Options length to keep ip->ip_len from * overflowing. Prevent the last segment from being * fractional thus making them all equal sized and set - * the flag to continue sending. + * the flag to continue sending. TSO is disabled when + * IP options or IPSEC are present. */ if (len + optlen + ipoptlen > tp->t_maxopd) { flags &= ~TH_FIN; if (tso) { if (len > TCP_MAXWIN - hdrlen) { - len = TCP_MAXWIN - hdrlen; + len = TCP_MAXWIN - hdrlen - optlen; len = len - (len % (tp->t_maxopd - optlen)); sendalot = 1; } else if (tp->t_flags & TF_NEEDFIN) ==== //depot/user/flz/intel_fw/src/sys/netinet6/ip6_mroute.c#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/netinet6/ip6_mroute.c,v 1.41 2007/02/24 21:09:35 bms Exp $ */ +/* $FreeBSD: src/sys/netinet6/ip6_mroute.c,v 1.44 2007/02/28 21:58:37 bms Exp $ */ /* $KAME: ip6_mroute.c,v 1.58 2001/12/18 02:36:31 itojun Exp $ */ /*- @@ -121,6 +121,7 @@ static MALLOC_DEFINE(M_MRTABLE6, "mf6c", "multicast forwarding cache entry"); +/* XXX: this is a very common idiom; move to ? */ #define M_HASCL(m) ((m)->m_flags & M_EXT) static int ip6_mdq __P((struct mbuf *, struct ifnet *, struct mf6c *)); @@ -133,6 +134,8 @@ struct mbuf *)); extern struct domain inet6domain; + +/* XXX: referenced from ip_mroute.c for dynamically loading this code. */ struct ip6protosw in6_pim_protosw = { .pr_type = SOCK_RAW, .pr_domain = &inet6domain, @@ -144,18 +147,13 @@ .pr_usrreqs = &rip6_usrreqs }; -/* - * Globals. All but ip6_mrtproto and mrt6stat could be static, - * except for netstat or debugging purposes. - */ -int ip6_mrouter_ver = 0; -int ip6_mrtproto = IPPROTO_PIM; /* for netstat only */ +static int ip6_mrouter_ver = 0; SYSCTL_DECL(_net_inet6); SYSCTL_DECL(_net_inet6_ip6); SYSCTL_NODE(_net_inet6, IPPROTO_PIM, pim, CTLFLAG_RW, 0, "PIM"); -struct mrt6stat mrt6stat; +static struct mrt6stat mrt6stat; SYSCTL_STRUCT(_net_inet6_ip6, OID_AUTO, mrt6stat, CTLFLAG_RW, &mrt6stat, mrt6stat, "Multicast Routing Statistics (struct mrt6stat, netinet6/ip6_mroute.h)"); @@ -163,13 +161,13 @@ #define NO_RTE_FOUND 0x1 #define RTE_FOUND 0x2 -struct mf6c *mf6ctable[MF6CTBLSIZ]; +static struct mf6c *mf6ctable[MF6CTBLSIZ]; SYSCTL_OPAQUE(_net_inet6_ip6, OID_AUTO, mf6ctable, CTLFLAG_RD, &mf6ctable, sizeof(mf6ctable), "S,*mf6ctable[MF6CTBLSIZ]", "Multicast Forwarding Table (struct *mf6ctable[MF6CTBLSIZ], " "netinet6/ip6_mroute.h)"); -u_char n6expire[MF6CTBLSIZ]; +static u_char n6expire[MF6CTBLSIZ]; static struct mif6 mif6table[MAXMIFS]; SYSCTL_OPAQUE(_net_inet6_ip6, OID_AUTO, mif6table, CTLFLAG_RD, @@ -177,7 +175,7 @@ "Multicast Interfaces (struct mif[MAXMIFS], netinet6/ip6_mroute.h)"); #ifdef MRT6DEBUG -u_int mrt6debug = 0; /* debug level */ +static u_int mrt6debug = 0; /* debug level */ #define DEBUG_MFC 0x02 #define DEBUG_FORWARD 0x04 #define DEBUG_EXPIRE 0x08 @@ -234,9 +232,7 @@ /* * Find a route for a given origin IPv6 address and Multicast group address. - * Quality of service parameter to be added in the future!!! */ - #define MF6CFIND(o, g, rt) do { \ struct mf6c *_rt = mf6ctable[MF6CHASH(o,g)]; \ rt = NULL; \ @@ -258,6 +254,7 @@ /* * Macros to compute elapsed time efficiently * Borrowed from Van Jacobson's scheduling code + * XXX: replace with timersub() ? */ #define TV_DELTA(a, b, delta) do { \ int xxs; \ @@ -277,12 +274,13 @@ } \ } while (/*CONSTCOND*/ 0) +/* XXX: replace with timercmp(a, b, <) ? */ #define TV_LT(a, b) (((a).tv_usec < (b).tv_usec && \ (a).tv_sec <= (b).tv_sec) || (a).tv_sec < (b).tv_sec) #ifdef UPCALL_TIMING #define UPCALL_MAX 50 -u_long upcall_data[UPCALL_MAX + 1]; +static u_long upcall_data[UPCALL_MAX + 1]; static void collate(); #endif /* UPCALL_TIMING */ @@ -546,10 +544,6 @@ } } } -#ifdef notyet - bzero((caddr_t)qtable, sizeof(qtable)); - bzero((caddr_t)tbftable, sizeof(tbftable)); -#endif bzero((caddr_t)mif6table, sizeof(mif6table)); nummifs = 0; @@ -615,9 +609,6 @@ struct mif6 *mifp; struct ifnet *ifp; int error, s; -#ifdef notyet - struct tbf *m_tbf = tbftable + mifcp->mif6c_mifi; -#endif if (mifcp->mif6c_mifi >= MAXMIFS) return (EINVAL); @@ -663,10 +654,7 @@ s = splnet(); mifp->m6_flags = mifcp->mif6c_flags; mifp->m6_ifp = ifp; -#ifdef notyet - /* scaling up here allows division by 1024 in critical code */ - mifp->m6_rate_limit = mifcp->mif6c_rate_limit * 1024 / 1000; -#endif + /* initialize per mif pkt counters */ mifp->m6_pkt_in = 0; mifp->m6_pkt_out = 0; @@ -726,10 +714,6 @@ } } -#ifdef notyet - bzero((caddr_t)qtable[*mifip], sizeof(qtable[*mifip])); - bzero((caddr_t)mifp->m6_tbf, sizeof(*(mifp->m6_tbf))); -#endif bzero((caddr_t)mifp, sizeof(*mifp)); /* Adjust nummifs down */ ==== //depot/user/flz/intel_fw/src/sys/netinet6/ip6_mroute.h#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/netinet6/ip6_mroute.h,v 1.10 2007/02/24 11:38:47 bms Exp $ */ +/* $FreeBSD: src/sys/netinet6/ip6_mroute.h,v 1.11 2007/02/28 20:32:25 bms Exp $ */ /* $KAME: ip6_mroute.h,v 1.19 2001/06/14 06:12:55 suz Exp $ */ /*- @@ -103,9 +103,6 @@ mifi_t mif6c_mifi; /* the index of the mif to be added */ u_char mif6c_flags; /* MIFF_ flags defined below */ u_short mif6c_pifi; /* the index of the physical IF */ -#ifdef notyet - u_int mif6c_rate_limit; /* max rate */ -#endif }; #define MIFF_REGISTER 0x1 /* mif represents a register end-point */ @@ -209,9 +206,6 @@ struct mif6 { u_char m6_flags; /* MIFF_ flags defined above */ u_int m6_rate_limit; /* max rate */ -#ifdef notyet - struct tbf *m6_tbf; /* token bucket structure at intf. */ -#endif struct in6_addr m6_lcl_addr; /* local interface address */ struct ifnet *m6_ifp; /* pointer to interface */ u_quad_t m6_pkt_in; /* # pkts in on interface */ ==== //depot/user/flz/intel_fw/src/sys/sys/mbuf.h#2 (text+ko) ==== @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * @(#)mbuf.h 8.5 (Berkeley) 2/19/95 - * $FreeBSD: src/sys/sys/mbuf.h,v 1.202 2007/01/25 01:05:23 mohans Exp $ + * $FreeBSD: src/sys/sys/mbuf.h,v 1.203 2007/03/01 14:38:08 bms Exp $ */ #ifndef _SYS_MBUF_H_ @@ -182,6 +182,7 @@ #define M_FIRSTFRAG 0x1000 /* packet is first fragment */ #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 */ /* * External buffer types: identify ext_buf type. @@ -203,7 +204,7 @@ #define M_COPYFLAGS (M_PKTHDR|M_EOR|M_RDONLY|M_PROTO1|M_PROTO1|M_PROTO2|\ M_PROTO3|M_PROTO4|M_PROTO5|M_SKIP_FIREWALL|\ M_BCAST|M_MCAST|M_FRAG|M_FIRSTFRAG|M_LASTFRAG|\ - M_VLANTAG) + M_VLANTAG|M_PROMISC) /* * Flags to purge when crossing layers. ==== //depot/user/flz/v4l/src/sys/dev/v4l/v4l_var.h#2 (text+ko) ==== @@ -36,6 +36,32 @@ #define DPRINTF(x, params) if (v4l_debug >= x) printf params +struct v4l2_device +{ + char name[32]; + int type; + int minor; + + int (*open)(struct v4l2_device *v, int flag, int otyp, struct thread *td); + void (*close)(struct v4l2_device *v, int flag, int otyp, struct thread *td); + long (*read)(struct v4l2_device *v, struct uio *uio, int ioflag); + long (*write)(struct v4l2_device *v, struct uio *uio, int ioflag); + int (*ioctl)(struct v4l2_device *v, u_long cmd, caddr_t arg, int mode, struct thread *td); + int (*mmap)(void /*struct vm_area_struct *vma*/); + int (*poll)(void /*struct file *file, poll_table *table*/); + + int (*initialize)(struct v4l2_device *v); + void *priv; /* may be used by the driver */ + + int busy; /* open count maintained by videodev.c */ + void *v4l2_priv; /* for V4L2 use */ + int v4l2_reserved[4]; /* for V4L2 use */ + + struct cdev * devfs_handle; + char devfs_devname[16]; + struct mtx mtx; +}; + extern int v4l_debug; extern struct cdevsw v4l_cdevsw; extern struct v4l2_device *video_devices[V4L_NUM_DEVICES]; ==== //depot/user/flz/v4l/src/sys/dev/v4l/videodev.h#2 (text+ko) ==== @@ -910,35 +910,6 @@ #define V4L2_STD_SECAM_L 28 /* (France, Luxembourg, Monaco) */ #define V4L2_STD_SECAM_M 29 /* (Jamaica) */ -/* - * D E V I C E D R I V E R R E G I S T R A T I O N - * - */ -struct v4l2_device -{ - char name[32]; - int type; - int minor; - - int (*open)(struct v4l2_device *v, int flag, int otyp, struct thread *td); - void (*close)(struct v4l2_device *v, int flag, int otyp, struct thread *td); - long (*read)(struct v4l2_device *v, struct uio *uio, int ioflag); - long (*write)(struct v4l2_device *v, struct uio *uio, int ioflag); - int (*ioctl)(struct v4l2_device *v, u_long cmd, caddr_t arg, int mode, struct thread *td); - int (*mmap)(void /*struct vm_area_struct *vma*/); - int (*poll)(void /*struct file *file, poll_table *table*/); - - int (*initialize)(struct v4l2_device *v); - void *priv; /* may be used by the driver */ - - int busy; /* open count maintained by videodev.c */ - void *v4l2_priv; /* for V4L2 use */ - int v4l2_reserved[4]; /* for V4L2 use */ - - struct cdev * devfs_handle; - char devfs_devname[16]; -}; - /* Size of kernel ioctl arg buffer used in ioctl handler */ #define V4L2_MAX_IOCTL_SIZE 256 From owner-p4-projects@FreeBSD.ORG Thu Mar 1 20:04: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 3CAA116A403; Thu, 1 Mar 2007 20:04: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 EDBF216A400 for ; Thu, 1 Mar 2007 20:04:51 +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 D2D6B13C46B for ; Thu, 1 Mar 2007 20:04:51 +0000 (UTC) (envelope-from jkim@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l21K4pHB071757 for ; Thu, 1 Mar 2007 20:04:51 GMT (envelope-from jkim@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l21K4nGh071754 for perforce@freebsd.org; Thu, 1 Mar 2007 20:04:49 GMT (envelope-from jkim@freebsd.org) Date: Thu, 1 Mar 2007 20:04:49 GMT Message-Id: <200703012004.l21K4nGh071754@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 115215 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 01 Mar 2007 20:04:52 -0000 http://perforce.freebsd.org/chv.cgi?CH=115215 Change 115215 by jkim@jkim_hammer on 2007/03/01 20:04:24 IFC Affected files ... .. //depot/projects/linuxolator/src/sys/amd64/linux32/linux32_machdep.c#44 integrate .. //depot/projects/linuxolator/src/sys/arm/arm/db_interface.c#3 integrate .. //depot/projects/linuxolator/src/sys/arm/arm/locore.S#3 integrate .. //depot/projects/linuxolator/src/sys/arm/arm/support.S#2 integrate .. //depot/projects/linuxolator/src/sys/arm/arm/trap.c#4 integrate .. //depot/projects/linuxolator/src/sys/arm/at91/at91.c#4 integrate .. //depot/projects/linuxolator/src/sys/arm/at91/at91_rtc.c#3 integrate .. //depot/projects/linuxolator/src/sys/arm/at91/at91_spi.c#5 integrate .. //depot/projects/linuxolator/src/sys/arm/at91/ohci_atmelarm.c#2 integrate .. //depot/projects/linuxolator/src/sys/arm/conf/AVILA#2 integrate .. //depot/projects/linuxolator/src/sys/arm/sa11x0/sa11x0_ost.c#4 integrate .. //depot/projects/linuxolator/src/sys/arm/xscale/ixp425/avila_ata.c#2 integrate .. //depot/projects/linuxolator/src/sys/arm/xscale/ixp425/ixp425_qmgr.c#2 integrate .. //depot/projects/linuxolator/src/sys/cam/scsi/scsi_target.c#3 integrate .. //depot/projects/linuxolator/src/sys/compat/linux/linux_futex.c#14 integrate .. //depot/projects/linuxolator/src/sys/compat/linux/linux_futex.h#3 integrate .. //depot/projects/linuxolator/src/sys/conf/NOTES#19 integrate .. //depot/projects/linuxolator/src/sys/conf/files#21 integrate .. //depot/projects/linuxolator/src/sys/conf/options#18 integrate .. //depot/projects/linuxolator/src/sys/dev/acpica/acpi_ec.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/ata/atapi-cam.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/ath/if_ath.c#8 integrate .. //depot/projects/linuxolator/src/sys/dev/ath/if_athvar.h#7 integrate .. //depot/projects/linuxolator/src/sys/dev/em/if_em.c#13 integrate .. //depot/projects/linuxolator/src/sys/dev/fdc/fdc.c#5 integrate .. //depot/projects/linuxolator/src/sys/dev/firewire/fwohci.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/firewire/sbp.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/hptmv/entry.c#4 integrate .. //depot/projects/linuxolator/src/sys/dev/hptmv/ioctl.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/hwpmc/hwpmc_mod.c#4 integrate .. //depot/projects/linuxolator/src/sys/dev/ipmi/ipmi_ssif.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/mii/rlphy.c#6 integrate .. //depot/projects/linuxolator/src/sys/dev/pccard/pccard_cis.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/pccbb/pccbb.c#4 integrate .. //depot/projects/linuxolator/src/sys/dev/random/randomdev_soft.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/re/if_re.c#9 integrate .. //depot/projects/linuxolator/src/sys/dev/scd/scd.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/sound/midi/midi.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/sound/midi/midi.h#3 integrate .. //depot/projects/linuxolator/src/sys/dev/sound/midi/midiq.h#3 integrate .. //depot/projects/linuxolator/src/sys/dev/sound/midi/mpu401.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/sound/midi/mpu401.h#3 integrate .. //depot/projects/linuxolator/src/sys/dev/sound/midi/mpu_if.m#3 integrate .. //depot/projects/linuxolator/src/sys/dev/sound/midi/mpufoi_if.m#3 integrate .. //depot/projects/linuxolator/src/sys/dev/sound/midi/sequencer.c#5 integrate .. //depot/projects/linuxolator/src/sys/dev/sound/midi/sequencer.h#3 integrate .. //depot/projects/linuxolator/src/sys/dev/sound/midi/synth_if.m#3 integrate .. //depot/projects/linuxolator/src/sys/dev/sound/pci/hda/hdac.c#14 integrate .. //depot/projects/linuxolator/src/sys/dev/usb/sl811hs.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/usb/sl811hsvar.h#2 integrate .. //depot/projects/linuxolator/src/sys/dev/usb/umass.c#5 integrate .. //depot/projects/linuxolator/src/sys/dev/usb/usb_subr.c#5 integrate .. //depot/projects/linuxolator/src/sys/dev/usb/usbdevs#10 integrate .. //depot/projects/linuxolator/src/sys/dev/usb/uvscom.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/zs/z8530var.h#2 integrate .. //depot/projects/linuxolator/src/sys/dev/zs/zs.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/zs/zs_macio.c#2 integrate .. //depot/projects/linuxolator/src/sys/fs/smbfs/smbfs_smb.c#3 integrate .. //depot/projects/linuxolator/src/sys/geom/geom_dev.c#3 integrate .. //depot/projects/linuxolator/src/sys/geom/geom_io.c#5 integrate .. //depot/projects/linuxolator/src/sys/geom/multipath/g_multipath.c#1 branch .. //depot/projects/linuxolator/src/sys/geom/multipath/g_multipath.h#1 branch .. //depot/projects/linuxolator/src/sys/i386/ibcs2/ibcs2_xenix.c#3 integrate .. //depot/projects/linuxolator/src/sys/i386/linux/linux_machdep.c#35 integrate .. //depot/projects/linuxolator/src/sys/isa/syscons_isa.c#2 integrate .. //depot/projects/linuxolator/src/sys/kern/kern_fork.c#12 integrate .. //depot/projects/linuxolator/src/sys/kern/kern_intr.c#7 integrate .. //depot/projects/linuxolator/src/sys/kern/kern_linker.c#5 integrate .. //depot/projects/linuxolator/src/sys/kern/kern_lock.c#5 integrate .. //depot/projects/linuxolator/src/sys/kern/kern_mutex.c#5 integrate .. //depot/projects/linuxolator/src/sys/kern/kern_resource.c#9 integrate .. //depot/projects/linuxolator/src/sys/kern/kern_rwlock.c#4 integrate .. //depot/projects/linuxolator/src/sys/kern/kern_sx.c#4 integrate .. //depot/projects/linuxolator/src/sys/kern/kern_synch.c#8 integrate .. //depot/projects/linuxolator/src/sys/kern/link_elf.c#3 integrate .. //depot/projects/linuxolator/src/sys/kern/sched_4bsd.c#11 integrate .. //depot/projects/linuxolator/src/sys/kern/sched_ule.c#9 integrate .. //depot/projects/linuxolator/src/sys/kern/subr_bus.c#4 integrate .. //depot/projects/linuxolator/src/sys/kern/subr_lock.c#5 integrate .. //depot/projects/linuxolator/src/sys/kern/sys_generic.c#4 integrate .. //depot/projects/linuxolator/src/sys/kern/uipc_socket.c#13 integrate .. //depot/projects/linuxolator/src/sys/kern/uipc_usrreq.c#10 integrate .. //depot/projects/linuxolator/src/sys/modules/geom/Makefile#5 integrate .. //depot/projects/linuxolator/src/sys/modules/geom/geom_multipath/Makefile#1 branch .. //depot/projects/linuxolator/src/sys/net/bpf.c#5 integrate .. //depot/projects/linuxolator/src/sys/net/bpf.h#2 integrate .. //depot/projects/linuxolator/src/sys/net/bpfdesc.h#3 integrate .. //depot/projects/linuxolator/src/sys/net/if_vlan_var.h#3 integrate .. //depot/projects/linuxolator/src/sys/netinet/in.h#4 integrate .. //depot/projects/linuxolator/src/sys/netinet/ip_mroute.c#9 integrate .. //depot/projects/linuxolator/src/sys/netinet/ip_output.c#8 integrate .. //depot/projects/linuxolator/src/sys/netinet/tcp_input.c#9 integrate .. //depot/projects/linuxolator/src/sys/netinet/tcp_output.c#6 integrate .. //depot/projects/linuxolator/src/sys/netinet/tcp_subr.c#6 integrate .. //depot/projects/linuxolator/src/sys/netinet/tcp_timer.c#2 integrate .. //depot/projects/linuxolator/src/sys/netinet/tcp_timer.h#3 integrate .. //depot/projects/linuxolator/src/sys/netinet/tcp_usrreq.c#7 integrate .. //depot/projects/linuxolator/src/sys/netinet/tcp_var.h#4 integrate .. //depot/projects/linuxolator/src/sys/netinet6/ip6_mroute.c#4 integrate .. //depot/projects/linuxolator/src/sys/netinet6/ip6_mroute.h#4 integrate .. //depot/projects/linuxolator/src/sys/netinet6/raw_ip6.c#3 integrate .. //depot/projects/linuxolator/src/sys/netipx/ipx_ip.c#3 integrate .. //depot/projects/linuxolator/src/sys/netipx/ipx_ip.h#3 integrate .. //depot/projects/linuxolator/src/sys/netncp/ncp_sock.c#2 integrate .. //depot/projects/linuxolator/src/sys/nfsclient/bootp_subr.c#4 integrate .. //depot/projects/linuxolator/src/sys/pc98/cbus/clock.c#5 integrate .. //depot/projects/linuxolator/src/sys/pc98/cbus/syscons_cbus.c#2 integrate .. //depot/projects/linuxolator/src/sys/powerpc/powermac/pswitch.c#2 integrate .. //depot/projects/linuxolator/src/sys/sparc64/sparc64/machdep.c#5 integrate .. //depot/projects/linuxolator/src/sys/sys/extattr.h#2 integrate .. //depot/projects/linuxolator/src/sys/sys/lock.h#5 integrate .. //depot/projects/linuxolator/src/sys/sys/lock_profile.h#4 integrate .. //depot/projects/linuxolator/src/sys/sys/mbuf.h#7 integrate .. //depot/projects/linuxolator/src/sys/sys/mutex.h#5 integrate .. //depot/projects/linuxolator/src/sys/sys/priv.h#5 integrate .. //depot/projects/linuxolator/src/sys/sys/rwlock.h#3 integrate .. //depot/projects/linuxolator/src/sys/sys/systm.h#9 integrate .. //depot/projects/linuxolator/src/sys/sys/unpcb.h#3 integrate .. //depot/projects/linuxolator/src/sys/tools/fw_stub.awk#3 integrate .. //depot/projects/linuxolator/src/sys/vm/phys_pager.c#3 integrate .. //depot/projects/linuxolator/src/sys/vm/swap_pager.c#7 integrate .. //depot/projects/linuxolator/src/sys/vm/vm_kern.c#5 integrate .. //depot/projects/linuxolator/src/sys/vm/vm_map.c#3 integrate .. //depot/projects/linuxolator/src/sys/vm/vm_object.c#7 integrate .. //depot/projects/linuxolator/src/sys/vm/vm_page.c#10 integrate .. //depot/projects/linuxolator/src/sys/vm/vm_page.h#4 integrate Differences ... ==== //depot/projects/linuxolator/src/sys/amd64/linux32/linux32_machdep.c#44 (text+ko) ==== @@ -29,7 +29,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_machdep.c,v 1.34 2007/02/24 16:49:24 netchild Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_machdep.c,v 1.35 2007/02/27 02:08:00 jkim Exp $"); #include #include ==== //depot/projects/linuxolator/src/sys/arm/arm/db_interface.c#3 (text+ko) ==== @@ -35,7 +35,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/arm/db_interface.c,v 1.6 2007/02/14 01:25:41 kevlo Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/db_interface.c,v 1.7 2007/02/26 05:17:47 kevlo Exp $"); #include "opt_ddb.h" #include @@ -53,7 +53,6 @@ #include #include -#include #include #include ==== //depot/projects/linuxolator/src/sys/arm/arm/locore.S#3 (text+ko) ==== @@ -37,7 +37,7 @@ #include #include #include -__FBSDID("$FreeBSD: src/sys/arm/arm/locore.S,v 1.15 2007/02/19 00:57:27 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/locore.S,v 1.16 2007/02/26 02:03:48 cognet Exp $"); /* What size should this really be ? It is only used by initarm() */ #define INIT_ARM_STACK_SIZE 2048 @@ -95,11 +95,6 @@ sub r0, r0, r9 add r0, r0, r8 mov r4, r0 - /* Make sure _arm_memcpy is NULL */ - ldr r3, .L_arm_memcpy - ldr r3, [r3] - mov r5, #0 - str r5, [r3] bl memcpy ldr r0, Lram_offset add pc, r4, r0 ==== //depot/projects/linuxolator/src/sys/arm/arm/support.S#2 (text+ko) ==== @@ -26,7 +26,7 @@ #include #include -__FBSDID("$FreeBSD: src/sys/arm/arm/support.S,v 1.11 2005/10/23 23:09:14 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/support.S,v 1.12 2007/02/26 02:03:48 cognet Exp $"); #include "assym.s" @@ -871,6 +871,18 @@ #if !defined(__XSCALE__) ENTRY(memcpy) /* save leaf functions having to store this away */ + /* Do not check arm_memcpy if we're running from flash */ +#ifdef FLASHADDR +#if FLASHADDR > PHYSADDR + ldr r3, =FLASHADDR + cmp r3, pc + bls .Lnormal +#else + ldr r3, =FLASHADDR + cmp r3, pc + bhi .Lnormal +#endif +#endif ldr r3, .L_arm_memcpy ldr r3, [r3] cmp r3, #0 @@ -1096,6 +1108,17 @@ pld [r1] cmp r2, #0x0c ble .Lmemcpy_short /* <= 12 bytes */ +#ifdef FLASHADDR +#if FLASHADDR > PHYSADDR + ldr r3, =FLASHADDR + cmp r3, pc + bls .Lnormal +#else + ldr r3, =FLASHADDR + cmp r3, pc + bhi .Lnormal +#endif +#endif ldr r3, .L_arm_memcpy ldr r3, [r3] cmp r3, #0 ==== //depot/projects/linuxolator/src/sys/arm/arm/trap.c#4 (text+ko) ==== @@ -82,7 +82,7 @@ #include "opt_ktrace.h" #include -__FBSDID("$FreeBSD: src/sys/arm/arm/trap.c,v 1.32 2006/10/26 21:42:16 jb Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/trap.c,v 1.33 2007/02/26 05:17:47 kevlo Exp $"); #include #include @@ -110,7 +110,6 @@ #include #include #include -#include #include #include #include ==== //depot/projects/linuxolator/src/sys/arm/at91/at91.c#4 (text) ==== @@ -23,7 +23,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/at91/at91.c,v 1.11 2007/02/23 12:18:27 piso Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/at91/at91.c,v 1.12 2007/02/25 14:34:59 piso Exp $"); #include #include @@ -548,7 +548,7 @@ { struct at91_softc *sc = device_get_softc(dev); - if (rman_get_start(ires) == AT91RM92_IRQ_SYSTEM && !(flags & INTR_FAST)) + if (rman_get_start(ires) == AT91RM92_IRQ_SYSTEM && filt == NULL) panic("All system interrupt ISRs must be type INTR_FAST"); BUS_SETUP_INTR(device_get_parent(dev), child, ires, flags, filt, intr, arg, cookiep); ==== //depot/projects/linuxolator/src/sys/arm/at91/at91_rtc.c#3 (text) ==== @@ -23,7 +23,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/at91/at91_rtc.c,v 1.3 2007/02/23 12:18:27 piso Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/at91/at91_rtc.c,v 1.4 2007/02/27 13:39:34 piso Exp $"); #include #include @@ -80,7 +80,7 @@ static int at91_rtc_probe(device_t dev); static int at91_rtc_attach(device_t dev); static int at91_rtc_detach(device_t dev); -static void at91_rtc_intr(void *); +static int at91_rtc_intr(void *); /* helper routines */ static int at91_rtc_activate(device_t dev); ==== //depot/projects/linuxolator/src/sys/arm/at91/at91_spi.c#5 (text) ==== @@ -23,7 +23,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/at91/at91_spi.c,v 1.5 2007/02/23 12:18:27 piso Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/at91/at91_spi.c,v 1.6 2007/02/27 17:15:39 jhb Exp $"); #include #include @@ -248,7 +248,7 @@ rxdone = sc->rxdone; do { - err = msleep(&sc->rxdone, NULL, PCATCH | PZERO, "spi", hz); + err = tsleep(&sc->rxdone, PCATCH | PZERO, "spi", hz); } while (rxdone == sc->rxdone && err != EINTR); WR4(sc, PDC_PTCR, PDC_PTCR_TXTDIS | PDC_PTCR_RXTDIS); if (err == 0) { ==== //depot/projects/linuxolator/src/sys/arm/at91/ohci_atmelarm.c#2 (text) ==== @@ -23,7 +23,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/at91/ohci_atmelarm.c,v 1.1 2006/03/18 01:45:29 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/at91/ohci_atmelarm.c,v 1.2 2007/03/01 09:10:55 piso Exp $"); #include #include @@ -99,8 +99,8 @@ } device_set_ivars(sc->sc_ohci.sc_bus.bdev, &sc->sc_ohci.sc_bus); - err = bus_setup_intr(dev, sc->sc_ohci.irq_res, INTR_TYPE_BIO, ohci_intr, sc, - &sc->sc_ohci.ih); + err = bus_setup_intr(dev, sc->sc_ohci.irq_res, INTR_TYPE_BIO, NULL, + ohci_intr, sc, &sc->sc_ohci.ih); if (err) { err = ENXIO; goto error; ==== //depot/projects/linuxolator/src/sys/arm/conf/AVILA#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/arm/conf/AVILA,v 1.2 2006/11/22 12:57:17 kevlo Exp $ +# $FreeBSD: src/sys/arm/conf/AVILA,v 1.3 2007/02/26 02:04:24 cognet Exp $ machine arm ident AVILA @@ -24,6 +24,8 @@ options PHYSADDR=0x10000000 options KERNPHYSADDR=0x10200000 options KERNVIRTADDR=0xc0200000 # Used in ldscript.arm +options FLASHADDR=0x50000000 +options LOADERRAMADDR=0x00000000 options STARTUP_PAGETABLE_ADDR=0x10000000 include "../xscale/ixp425/std.avila" ==== //depot/projects/linuxolator/src/sys/arm/sa11x0/sa11x0_ost.c#4 (text+ko) ==== @@ -38,7 +38,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/sa11x0/sa11x0_ost.c,v 1.6 2007/02/23 12:18:28 piso Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/sa11x0/sa11x0_ost.c,v 1.7 2007/02/26 05:17:47 kevlo Exp $"); #include #include @@ -57,8 +57,6 @@ #include #include -#include - #include #include #include ==== //depot/projects/linuxolator/src/sys/arm/xscale/ixp425/avila_ata.c#2 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/xscale/ixp425/avila_ata.c,v 1.1 2006/11/19 23:55:23 sam Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/xscale/ixp425/avila_ata.c,v 1.2 2007/02/25 22:17:54 cognet Exp $"); /* * Compact Flash Support for the Avila Gateworks XScale boards. @@ -160,7 +160,7 @@ panic("Unable to allocate irq %u.\n", AVILA_IDE_IRQ); bus_setup_intr(dev, sc->sc_irq, INTR_TYPE_BIO | INTR_MPSAFE | INTR_ENTROPY, - ata_avila_intr, sc, &sc->sc_ih); + NULL, ata_avila_intr, sc, &sc->sc_ih); /* attach channel on this controller */ device_add_child(dev, "ata", devclass_find_free_unit(ata_devclass, 0)); @@ -225,8 +225,8 @@ static int ata_avila_setup_intr(device_t dev, device_t child, struct resource *irq, - int flags, driver_intr_t *function, void *argument, - void **cookiep) + int flags, driver_filter_t *filt, + driver_intr_t *function, void *argument, void **cookiep) { struct ata_avila_softc *sc = device_get_softc(dev); int unit = ((struct ata_channel *)device_get_softc(child))->unit; ==== //depot/projects/linuxolator/src/sys/arm/xscale/ixp425/ixp425_qmgr.c#2 (text+ko) ==== @@ -57,7 +57,7 @@ * SUCH DAMAGE. */ #include -__FBSDID("$FreeBSD: src/sys/arm/xscale/ixp425/ixp425_qmgr.c,v 1.1 2006/11/19 23:55:23 sam Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/xscale/ixp425/ixp425_qmgr.c,v 1.2 2007/02/25 22:17:54 cognet Exp $"); /* * Intel XScale Queue Manager support. @@ -225,7 +225,7 @@ panic("Unable to allocate the qmgr irqs.\n"); /* XXX could be a source of entropy */ bus_setup_intr(dev, sc->sc_irq, INTR_TYPE_NET | INTR_MPSAFE, - ixpqmgr_intr, NULL, &sc->sc_ih); + NULL, ixpqmgr_intr, NULL, &sc->sc_ih); /* NB: softc is pre-zero'd */ for (i = 0; i < IX_QMGR_MAX_NUM_QUEUES; i++) { ==== //depot/projects/linuxolator/src/sys/cam/scsi/scsi_target.c#3 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_target.c,v 1.71 2006/12/05 07:45:28 mjacob Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_target.c,v 1.72 2007/02/27 17:15:39 jhb Exp $"); #include @@ -810,8 +810,8 @@ user_descr = TAILQ_FIRST(abort_queue); while (ccb_h == NULL && user_descr == NULL) { if ((ioflag & IO_NDELAY) == 0) { - error = msleep(user_queue, NULL, - PRIBIO | PCATCH, "targrd", 0); + error = tsleep(user_queue, + PRIBIO | PCATCH, "targrd", 0); ccb_h = TAILQ_FIRST(user_queue); user_descr = TAILQ_FIRST(abort_queue); if (error != 0) { @@ -1037,7 +1037,7 @@ /* If we aborted at least one pending CCB ok, wait for it. */ if (cab.ccb_h.status == CAM_REQ_CMP) { - msleep(&softc->pending_ccb_queue, NULL, + tsleep(&softc->pending_ccb_queue, PRIBIO | PCATCH, "tgabrt", 0); } ==== //depot/projects/linuxolator/src/sys/compat/linux/linux_futex.c#14 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/linux/linux_futex.c,v 1.6 2006/09/09 16:25:25 netchild Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linux/linux_futex.c,v 1.8 2007/02/25 12:43:07 netchild Exp $"); #if 0 __KERNEL_RCSID(1, "$NetBSD: linux_futex.c,v 1.7 2006/07/24 19:01:49 manu Exp $"); #endif @@ -283,7 +283,7 @@ op_ret = futex_atomic_op(td, args->val3, args->uaddr2); if (op_ret < 0) { - /* XXX: we don't handle the EFAULT yet */ + /* XXX: We don't handle the EFAULT yet. */ if (op_ret != -EFAULT) { futex_put(f); futex_put(f2); @@ -416,10 +416,7 @@ * all operations BUT requeue ones where its N+1 * mimic this. */ - if (newf) - count = 0; - else - count = 1; + count = newf ? 0 : 1; FUTEX_LOCK; TAILQ_FOREACH(wp, &f->f_waiting_proc, wp_list) { ==== //depot/projects/linuxolator/src/sys/compat/linux/linux_futex.h#3 (text+ko) ==== @@ -30,7 +30,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/compat/linux/linux_futex.h,v 1.1 2006/08/15 12:20:59 netchild Exp $ + * $FreeBSD: src/sys/compat/linux/linux_futex.h,v 1.2 2007/02/25 12:40:35 netchild Exp $ */ #ifndef _LINUX_FUTEX_H ==== //depot/projects/linuxolator/src/sys/conf/NOTES#19 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/NOTES,v 1.1410 2007/02/10 13:59:13 bms Exp $ +# $FreeBSD: src/sys/conf/NOTES,v 1.1411 2007/02/27 04:01:57 mjacob Exp $ # # NOTES -- Lines that can be cut/pasted into kernel and hints configs. # @@ -147,6 +147,7 @@ options GEOM_LABEL # Providers labelization. options GEOM_MBR # DOS/MBR partitioning options GEOM_MIRROR # Disk mirroring. +options GEOM_MULTIPATH # Disk multipath options GEOM_NOP # Test class. options GEOM_PART_APM # Apple partitioning options GEOM_PART_GPT # GPT partitioning ==== //depot/projects/linuxolator/src/sys/conf/files#21 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.1178 2007/02/24 11:38:47 bms Exp $ +# $FreeBSD: src/sys/conf/files,v 1.1180 2007/02/27 04:01:57 mjacob Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -1210,6 +1210,7 @@ geom/label/g_label_ufs.c optional geom_label geom/mirror/g_mirror.c optional geom_mirror geom/mirror/g_mirror_ctl.c optional geom_mirror +geom/multipath/g_multipath.c optional geom_multipath geom/nop/g_nop.c optional geom_nop geom/part/g_part.c standard geom/part/g_part_if.m standard @@ -1846,7 +1847,7 @@ netipx/ipx.c optional ipx netipx/ipx_cksum.c optional ipx netipx/ipx_input.c optional ipx -netipx/ipx_ip.c optional ipx +netipx/ipx_ip.c optional ipx ipxip netipx/ipx_outputfl.c optional ipx netipx/ipx_pcb.c optional ipx netipx/ipx_proto.c optional ipx ==== //depot/projects/linuxolator/src/sys/conf/options#18 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options,v 1.576 2007/02/10 13:59:13 bms Exp $ +# $FreeBSD: src/sys/conf/options,v 1.578 2007/02/27 12:05:25 des Exp $ # # On the handling of kernel options # @@ -85,6 +85,7 @@ GEOM_LABEL opt_geom.h GEOM_MBR opt_geom.h GEOM_MIRROR opt_geom.h +GEOM_MULTIPATH opt_geom.h GEOM_NOP opt_geom.h GEOM_PART_APM opt_geom.h GEOM_PART_GPT opt_geom.h @@ -548,6 +549,7 @@ MUTEX_DEBUG opt_global.h MUTEX_NOINLINE opt_global.h LOCK_PROFILING opt_global.h +LOCK_PROFILING_FAST opt_global.h MSIZE opt_global.h REGRESSION opt_global.h RESTARTABLE_PANICS opt_global.h ==== //depot/projects/linuxolator/src/sys/dev/acpica/acpi_ec.c#2 (text+ko) ==== @@ -136,7 +136,7 @@ *****************************************************************************/ #include -__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_ec.c,v 1.68 2005/12/06 14:51:55 njl Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_ec.c,v 1.69 2007/02/27 00:14:20 njl Exp $"); #include "opt_acpi.h" #include @@ -187,15 +187,15 @@ * | | | +--------- Burst Mode Enabled? * | | +----------- SCI Event? * | +------------- SMI Event? - * +--------------- + * +--------------- * */ typedef UINT8 EC_STATUS; #define EC_FLAG_OUTPUT_BUFFER ((EC_STATUS) 0x01) #define EC_FLAG_INPUT_BUFFER ((EC_STATUS) 0x02) +#define EC_FLAG_DATA_IS_CMD ((EC_STATUS) 0x08) #define EC_FLAG_BURST_MODE ((EC_STATUS) 0x10) -#define EC_FLAG_SCI ((EC_STATUS) 0x20) /* * EC_EVENT: @@ -207,6 +207,10 @@ #define EC_EVENT_OUTPUT_BUFFER_FULL ((EC_EVENT) 0x01) #define EC_EVENT_INPUT_BUFFER_EMPTY ((EC_EVENT) 0x02) #define EC_EVENT_SCI ((EC_EVENT) 0x20) +#define EC_EVENT_SMI ((EC_EVENT) 0x40) + +/* Data byte returned after burst enable indicating it was successful. */ +#define EC_BURST_ACK 0x90 /* * Register access primitives @@ -265,8 +269,11 @@ bus_space_tag_t ec_csr_tag; bus_space_handle_t ec_csr_handle; + struct mtx ec_mtx; int ec_glk; int ec_glkhandle; + int ec_burstactive; + int ec_sci_pend; }; /* @@ -276,11 +283,14 @@ */ #define EC_LOCK_TIMEOUT 1000 -/* Default interval in microseconds for the status polling loop. */ +/* Default delay in microseconds between each run of the status polling loop. */ #define EC_POLL_DELAY 10 -/* Total time in ms spent in the poll loop waiting for a response. */ -#define EC_POLL_TIMEOUT 100 +/* Default time in microseconds spent polling before sleep waiting. */ +#define EC_POLL_TIME 500 + +/* Total time in ms spent waiting for a response from EC. */ +#define EC_TIMEOUT 500 #define EVENT_READY(event, status) \ (((event) == EC_EVENT_OUTPUT_BUFFER_FULL && \ @@ -288,25 +298,47 @@ ((event) == EC_EVENT_INPUT_BUFFER_EMPTY && \ ((status) & EC_FLAG_INPUT_BUFFER) == 0)) -static int ec_poll_timeout = EC_POLL_TIMEOUT; -TUNABLE_INT("hw.acpi.ec.poll_timeout", &ec_poll_timeout); +ACPI_SERIAL_DECL(ec, "ACPI embedded controller"); + +SYSCTL_DECL(_debug_acpi); +SYSCTL_NODE(_debug_acpi, OID_AUTO, ec, CTLFLAG_RD, NULL, "EC debugging"); -ACPI_SERIAL_DECL(ec, "ACPI embedded controller"); +static int ec_burst_mode = TRUE; +TUNABLE_INT("debug.acpi.ec.burst", &ec_burst_mode); +SYSCTL_INT(_debug_acpi_ec, OID_AUTO, burst, CTLFLAG_RW, &ec_burst_mode, TRUE, + "Enable use of burst mode (faster for nearly all systems)"); +static int ec_poll_time = EC_POLL_TIME; +TUNABLE_INT("debug.acpi.ec.poll_time", &ec_poll_time); +SYSCTL_INT(_debug_acpi_ec, OID_AUTO, poll_time, CTLFLAG_RW, &ec_poll_time, + EC_POLL_TIME, "Time spent polling vs. sleeping (CPU intensive)"); +static int ec_timeout = EC_TIMEOUT; +TUNABLE_INT("debug.acpi.ec.timeout", &ec_timeout); +SYSCTL_INT(_debug_acpi_ec, OID_AUTO, timeout, CTLFLAG_RW, &ec_timeout, + EC_TIMEOUT, "Total time spent waiting for a response (poll+sleep)"); static __inline ACPI_STATUS -EcLock(struct acpi_ec_softc *sc) +EcLock(struct acpi_ec_softc *sc, int serialize) { ACPI_STATUS status; - /* Always acquire the exclusive lock. */ + /* + * If caller is executing a series of commands, acquire the exclusive lock + * to serialize with other users. + * To sync with bottom-half interrupt handler, always acquire the mutex. + */ status = AE_OK; - ACPI_SERIAL_BEGIN(ec); + if (serialize) + ACPI_SERIAL_BEGIN(ec); + mtx_lock(&sc->ec_mtx); /* If _GLK is non-zero, also acquire the global lock. */ if (sc->ec_glk) { status = AcpiAcquireGlobalLock(EC_LOCK_TIMEOUT, &sc->ec_glkhandle); - if (ACPI_FAILURE(status)) - ACPI_SERIAL_END(ec); + if (ACPI_FAILURE(status)) { + mtx_unlock(&sc->ec_mtx); + if (serialize) + ACPI_SERIAL_END(ec); + } } return (status); @@ -317,7 +349,9 @@ { if (sc->ec_glk) AcpiReleaseGlobalLock(sc->ec_glkhandle); - ACPI_SERIAL_END(ec); + mtx_unlock(&sc->ec_mtx); + if (sx_xlocked(&ec_sxlock)) + ACPI_SERIAL_END(ec); } static uint32_t EcGpeHandler(void *Context); @@ -558,6 +592,7 @@ params = acpi_get_private(dev); sc->ec_dev = dev; sc->ec_handle = acpi_get_handle(dev); + mtx_init(&sc->ec_mtx, "ACPI EC lock", NULL, MTX_DEF); /* Retrieve previously probed values via device ivars. */ sc->ec_glk = params->glk; @@ -640,6 +675,7 @@ if (sc->ec_data_res) bus_release_resource(sc->ec_dev, SYS_RES_IOPORT, sc->ec_data_rid, sc->ec_data_res); + mtx_destroy(&sc->ec_mtx); return (ENXIO); } @@ -687,13 +723,13 @@ struct acpi_ec_softc *sc = (struct acpi_ec_softc *)Context; UINT8 Data; ACPI_STATUS Status; - EC_STATUS EcStatus; char qxx[5]; ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__); KASSERT(Context != NULL, ("EcGpeQueryHandler called with NULL")); - Status = EcLock(sc); + /* Serialize user access with EcSpaceHandler(). */ + Status = EcLock(sc, TRUE); if (ACPI_FAILURE(Status)) { ACPI_VPRINT(sc->ec_dev, acpi_device_get_parent_softc(sc->ec_dev), "GpeQuery lock error: %s\n", AcpiFormatException(Status)); @@ -701,19 +737,6 @@ } /* - * If the EC_SCI bit of the status register is not set, then pass - * it along to any potential waiters as it may be an IBE/OBF event. - */ - EcStatus = EC_GET_CSR(sc); - if ((EcStatus & EC_EVENT_SCI) == 0) { - CTR1(KTR_ACPI, "ec event was not SCI, status %#x", EcStatus); - sc->ec_csrvalue = EcStatus; - wakeup(&sc->ec_csrvalue); - EcUnlock(sc); - goto re_enable; - } - - /* * Send a query command to the EC to find out which _Qxx call it * wants to make. This command clears the SCI bit and also the * interrupt source since we are edge-triggered. @@ -726,6 +749,9 @@ goto re_enable; } Data = EC_GET_DATA(sc); + sc->ec_sci_pend = FALSE; + + /* Drop locks before evaluating _Qxx method since it may trigger GPEs. */ EcUnlock(sc); /* Ignore the value for "no outstanding event". (13.3.5) */ @@ -734,7 +760,7 @@ goto re_enable; /* Evaluate _Qxx to respond to the controller. */ - sprintf(qxx, "_Q%02x", Data); + snprintf(qxx, sizeof(qxx), "_Q%02x", Data); AcpiUtStrupr(qxx); Status = AcpiEvaluateObject(sc->ec_handle, qxx, NULL, NULL); if (ACPI_FAILURE(Status) && Status != AE_NOT_FOUND) { @@ -745,7 +771,7 @@ re_enable: /* Re-enable the GPE event so we'll get future requests. */ - Status = AcpiEnableGpe(sc->ec_gpehandle, sc->ec_gpebit, ACPI_NOT_ISR); + Status = AcpiEnableGpe(sc->ec_gpehandle, sc->ec_gpebit, ACPI_ISR); if (ACPI_FAILURE(Status)) printf("EcGpeQueryHandler: AcpiEnableEvent failed\n"); } @@ -760,27 +786,61 @@ { struct acpi_ec_softc *sc = Context; ACPI_STATUS Status; + EC_STATUS EcStatus; KASSERT(Context != NULL, ("EcGpeHandler called with NULL")); /* * Disable further GPEs while we handle this one. Since we are directly * called by ACPI-CA and it may have unknown locks held, we specify the - * ACPI_ISR flag to keep it from acquiring any more mutexes (which could - * potentially sleep.) + * ACPI_ISR flag to keep it from acquiring any more mutexes (although + * sleeping would be ok since we're in an ithread.) */ AcpiDisableGpe(sc->ec_gpehandle, sc->ec_gpebit, ACPI_ISR); - /* Schedule the GPE query handler. */ - Status = AcpiOsQueueForExecution(OSD_PRIORITY_GPE, EcGpeQueryHandler, - Context); + /* For interrupt (GPE) handler, don't acquire serialization lock. */ + Status = EcLock(sc, FALSE); if (ACPI_FAILURE(Status)) { - printf("Queuing GPE query handler failed.\n"); - Status = AcpiEnableGpe(sc->ec_gpehandle, sc->ec_gpebit, ACPI_ISR); - if (ACPI_FAILURE(Status)) - printf("EcGpeHandler: AcpiEnableEvent failed\n"); + ACPI_VPRINT(sc->ec_dev, acpi_device_get_parent_softc(sc->ec_dev), + "GpeQuery lock error: %s\n", AcpiFormatException(Status)); + return (-1); + } + + /* + * If burst was active, but the status bit was cleared, the EC had to + * exit burst mode for some reason. Record this for later. + */ + EcStatus = EC_GET_CSR(sc); + if (sc->ec_burstactive && (EcStatus & EC_FLAG_BURST_MODE) == 0) { + CTR0(KTR_ACPI, "ec burst disabled in query handler"); + sc->ec_burstactive = FALSE; + } + + /* + * If the EC_SCI bit of the status register is not set, then pass + * it along to any potential waiters as it may be an IBE/OBF event. + * If it is set, queue a query handler. + */ + if ((EcStatus & EC_EVENT_SCI) == 0) { + CTR1(KTR_ACPI, "ec event was IBE/OBF, status %#x", EcStatus); + sc->ec_csrvalue = EcStatus; + wakeup(&sc->ec_csrvalue); + } else if (!sc->ec_sci_pend) { + /* SCI bit set and no pending query handler, so schedule one. */ + CTR0(KTR_ACPI, "ec queueing gpe handler"); + Status = AcpiOsQueueForExecution(OSD_PRIORITY_GPE, EcGpeQueryHandler, + Context); + if (ACPI_SUCCESS(Status)) { + sc->ec_sci_pend = TRUE; + } else { + printf("Queuing GPE query handler failed.\n"); + Status = AcpiEnableGpe(sc->ec_gpehandle, sc->ec_gpebit, ACPI_ISR); + if (ACPI_FAILURE(Status)) + printf("EcGpeHandler: AcpiEnableEvent failed\n"); + } } + EcUnlock(sc); return (0); } @@ -824,7 +884,8 @@ EcAddr = Address; Status = AE_ERROR; - Status = EcLock(sc); + /* Grab serialization lock to hold across command sequence. */ + Status = EcLock(sc, TRUE); if (ACPI_FAILURE(Status)) return_ACPI_STATUS (Status); @@ -859,87 +920,103 @@ { EC_STATUS EcStatus; ACPI_STATUS Status; - int count, i, period, retval, slp_ival; + int count, i, retval, slp_ival; ACPI_SERIAL_ASSERT(ec); Status = AE_NO_HARDWARE_RESPONSE; + EcStatus = 0; - /* - * Wait for 1 us before checking the CSR. Testing shows about - * 50% of requests complete in 1 us and 90% of them complete - * in 5 us or less. - */ - AcpiOsStall(1); - /* - * Poll the EC status register for up to 1 ms in chunks of 10 us - * to detect completion of the last command. + * Poll for up to ec_poll_time microseconds since many ECs complete + * the command quickly, especially if in burst mode. */ - for (i = 0; i < 1000 / EC_POLL_DELAY; i++) { +#if 0 /* Enable this as a possible workaround if EC times out. */ + AcpiOsStall(EC_POLL_DELAY); +#endif + count = ec_poll_time / EC_POLL_DELAY; + if (count <= 0) + count = 1; + for (i = 0; i < count; i++) { EcStatus = EC_GET_CSR(sc); + if (sc->ec_burstactive && (EcStatus & EC_FLAG_BURST_MODE) == 0) { + CTR0(KTR_ACPI, "ec burst disabled in waitevent (poll)"); + sc->ec_burstactive = FALSE; + } if (EVENT_READY(Event, EcStatus)) { + CTR1(KTR_ACPI, "ec poll wait ready, status %#x", EcStatus); Status = AE_OK; break; } AcpiOsStall(EC_POLL_DELAY); } - period = i * EC_POLL_DELAY; /* * If we still don't have a response and we're up and running, wait up - * to ec_poll_timeout ms for completion, sleeping for chunks of 10 ms. + * to ec_timeout ms for completion, sleeping for chunks of 1 ms or the + * smallest resolution hz supports. */ slp_ival = 0; if (Status != AE_OK) { retval = ENXIO; - count = ec_poll_timeout / 10; - if (count == 0) - count = 1; - slp_ival = hz / 100; - if (slp_ival == 0) - slp_ival = 1; + if (!cold) { + slp_ival = hz / 1000; + if (slp_ival != 0) { + count = ec_timeout / slp_ival; + } else { + /* hz has less than 1000 Hz resolution so scale timeout. */ + slp_ival = 1; + count = ec_timeout / (1000 / hz); + } + } else + count = ec_timeout; for (i = 0; i < count; i++) { if (retval != 0) EcStatus = EC_GET_CSR(sc); else EcStatus = sc->ec_csrvalue; + if (sc->ec_burstactive && (EcStatus & EC_FLAG_BURST_MODE) == 0) { + CTR0(KTR_ACPI, "ec burst disabled in waitevent (slp)"); + sc->ec_burstactive = FALSE; + } if (EVENT_READY(Event, EcStatus)) { + CTR1(KTR_ACPI, "ec sleep wait ready, status %#x", EcStatus); Status = AE_OK; break; } - if (!cold) - retval = tsleep(&sc->ec_csrvalue, PZERO, "ecpoll", slp_ival); - else - AcpiOsStall(10000); + if (!cold) { + retval = msleep(&sc->ec_csrvalue, &sc->ec_mtx, PZERO, "ecpoll", + slp_ival); + } else + AcpiOsStall(1000); } } - /* Calculate new delay and log it. */ - if (slp_ival > 0) - period += i * 10000; - CTR2(KTR_ACPI, "ec got event %#x after %d us", EcStatus, period); - return (Status); } static ACPI_STATUS EcCommand(struct acpi_ec_softc *sc, EC_COMMAND cmd) { - ACPI_STATUS Status; - EC_EVENT Event; + ACPI_STATUS status; + EC_EVENT event; + EC_STATUS ec_status; ACPI_SERIAL_ASSERT(ec); >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Mar 1 21:35: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 0118D16A405; Thu, 1 Mar 2007 21:35:47 +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 BED7616A400 for ; Thu, 1 Mar 2007 21:35:47 +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 9D06113C442 for ; Thu, 1 Mar 2007 21:35:47 +0000 (UTC) (envelope-from jkim@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l21LZlEP099591 for ; Thu, 1 Mar 2007 21:35:47 GMT (envelope-from jkim@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l21LZlIs099588 for perforce@freebsd.org; Thu, 1 Mar 2007 21:35:47 GMT (envelope-from jkim@freebsd.org) Date: Thu, 1 Mar 2007 21:35:47 GMT Message-Id: <200703012135.l21LZlIs099588@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 115220 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 01 Mar 2007 21:35:48 -0000 http://perforce.freebsd.org/chv.cgi?CH=115220 Change 115220 by jkim@jkim_hammer on 2007/03/01 21:34:54 Fix style(9) and diff reduction between amd64 and i386. Affected files ... .. //depot/projects/linuxolator/src/sys/amd64/linux32/linux.h#22 edit .. //depot/projects/linuxolator/src/sys/i386/linux/linux.h#18 edit Differences ... ==== //depot/projects/linuxolator/src/sys/amd64/linux32/linux.h#22 (text+ko) ==== @@ -8,7 +8,7 @@ * modification, are permitted provided that the following conditions * are met: * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer + * notice, this list of conditions and the following disclaimer * in this position and unchanged. * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the @@ -39,20 +39,20 @@ * debugging support */ extern u_char linux_debug_map[]; -#define ldebug(name) isclr(linux_debug_map, LINUX_SYS_linux_ ## name) -#define ARGS(nm, fmt) "linux(%ld): "#nm"("fmt")\n", (long)td->td_proc->p_pid -#define LMSG(fmt) "linux(%ld): "fmt"\n", (long)td->td_proc->p_pid +#define ldebug(name) isclr(linux_debug_map, LINUX_SYS_linux_ ## name) +#define ARGS(nm, fmt) "linux(%ld): "#nm"("fmt")\n", (long)td->td_proc->p_pid +#define LMSG(fmt) "linux(%ld): "fmt"\n", (long)td->td_proc->p_pid #ifdef MALLOC_DECLARE MALLOC_DECLARE(M_LINUX); #endif -#define LINUX32_USRSTACK ((1ul << 32) - PAGE_SIZE) +#define LINUX32_USRSTACK ((1ul << 32) - PAGE_SIZE) /* XXX 16 = sizeof(linux32_ps_strings) */ -#define LINUX32_PS_STRINGS (LINUX32_USRSTACK - 16) -#define LINUX32_MAXDSIZ (512*1024*1024) /* 512MB */ -#define LINUX32_MAXSSIZ (64*1024*1024) /* 64MB */ -#define LINUX32_MAXVMEM 0 /* Unlimited */ +#define LINUX32_PS_STRINGS (LINUX32_USRSTACK - 16) +#define LINUX32_MAXDSIZ (512 * 1024 * 1024) /* 512MB */ +#define LINUX32_MAXSSIZ (64 * 1024 * 1024) /* 64MB */ +#define LINUX32_MAXVMEM 0 /* Unlimited */ #define PTRIN(v) (void *)(uintptr_t)(v) #define PTROUT(v) (l_uintptr_t)(uintptr_t)(v) @@ -132,7 +132,7 @@ #define LINUX_RLIMIT_NPROC 6 #define LINUX_RLIMIT_NOFILE 7 #define LINUX_RLIMIT_MEMLOCK 8 -#define LINUX_RLIMIT_AS 9 /* address space limit */ +#define LINUX_RLIMIT_AS 9 /* Address space limit */ #define LINUX_RLIM_NLIMITS 10 @@ -205,21 +205,21 @@ } __packed; struct l_stat { - l_ushort st_dev; - l_ulong st_ino; - l_ushort st_mode; - l_ushort st_nlink; - l_ushort st_uid; - l_ushort st_gid; - l_ushort st_rdev; - l_long st_size; - struct l_timespec st_atimespec; - struct l_timespec st_mtimespec; - struct l_timespec st_ctimespec; - l_long st_blksize; - l_long st_blocks; - l_ulong st_flags; - l_ulong st_gen; + l_ushort st_dev; + l_ulong st_ino; + l_ushort st_mode; + l_ushort st_nlink; + l_ushort st_uid; + l_ushort st_gid; + l_ushort st_rdev; + l_long st_size; + struct l_timespec st_atimespec; + struct l_timespec st_mtimespec; + struct l_timespec st_ctimespec; + l_long st_blksize; + l_long st_blocks; + l_ulong st_flags; + l_ulong st_gen; }; struct l_stat64 { @@ -315,9 +315,9 @@ #define LINUX_SIGADDSET(set, sig) SIGADDSET(set, sig) /* sigaltstack */ -#define LINUX_MINSIGSTKSZ 2048 -#define LINUX_SS_ONSTACK 1 -#define LINUX_SS_DISABLE 2 +#define LINUX_MINSIGSTKSZ 2048 +#define LINUX_SS_ONSTACK 1 +#define LINUX_SS_DISABLE 2 int linux_to_bsd_sigaltstack(int lsa); int bsd_to_linux_sigaltstack(int bsa); @@ -380,11 +380,11 @@ l_uintptr_t uc_link; l_stack_t uc_stack; struct l_sigcontext uc_mcontext; - l_sigset_t uc_sigmask; + l_sigset_t uc_sigmask; } __packed; -#define LINUX_SI_MAX_SIZE 128 -#define LINUX_SI_PAD_SIZE ((LINUX_SI_MAX_SIZE/sizeof(l_int)) - 3) +#define LINUX_SI_MAX_SIZE 128 +#define LINUX_SI_PAD_SIZE ((LINUX_SI_MAX_SIZE/sizeof(l_int)) - 3) union l_sigval { l_int sival_int; @@ -423,41 +423,41 @@ } __packed _sigchld; struct { - l_uintptr_t _addr; /* faulting insn/memory ref. */ + l_uintptr_t _addr; /* Faulting insn/memory ref. */ } __packed _sigfault; struct { - l_int _band; /* POLL_IN,POLL_OUT,POLL_MSG */ + l_int _band; /* POLL_IN,POLL_OUT,POLL_MSG */ l_int _fd; } __packed _sigpoll; } _sifields; } __packed l_siginfo_t; -#define lsi_pid _sifields._kill._pid -#define lsi_uid _sifields._kill._uid -#define lsi_status _sifields._sigchld._status -#define lsi_utime _sifields._sigchld._utime -#define lsi_stime _sifields._sigchld._stime -#define lsi_value _sifields._rt._sigval -#define lsi_int _sifields._rt._sigval.sival_int -#define lsi_ptr _sifields._rt._sigval.sival_ptr -#define lsi_addr _sifields._sigfault._addr -#define lsi_band _sifields._sigpoll._band -#define lsi_fd _sifields._sigpoll._fd +#define lsi_pid _sifields._kill._pid +#define lsi_uid _sifields._kill._uid +#define lsi_status _sifields._sigchld._status +#define lsi_utime _sifields._sigchld._utime +#define lsi_stime _sifields._sigchld._stime +#define lsi_value _sifields._rt._sigval +#define lsi_int _sifields._rt._sigval.sival_int +#define lsi_ptr _sifields._rt._sigval.sival_ptr +#define lsi_addr _sifields._sigfault._addr +#define lsi_band _sifields._sigpoll._band +#define lsi_fd _sifields._sigpoll._fd struct l_fpreg { - u_int16_t significand[4]; - u_int16_t exponent; + u_int16_t significand[4]; + u_int16_t exponent; } __packed; struct l_fpxreg { - u_int16_t significand[4]; - u_int16_t exponent; - u_int16_t padding[3]; + u_int16_t significand[4]; + u_int16_t exponent; + u_int16_t padding[3]; } __packed; struct l_xmmreg { - u_int32_t element[4]; + u_int32_t element[4]; } __packed; struct l_fpstate { @@ -471,13 +471,13 @@ u_int32_t datasel; struct l_fpreg _st[8]; u_int16_t status; - u_int16_t magic; /* 0xffff = regular FPU data */ + u_int16_t magic; /* 0xffff = regular FPU data */ /* FXSR FPU environment */ - u_int32_t _fxsr_env[6]; /* env is ignored */ + u_int32_t _fxsr_env[6]; /* env is ignored. */ u_int32_t mxcsr; u_int32_t reserved; - struct l_fpxreg _fxsr_st[8]; /* reg data is ignored */ + struct l_fpxreg _fxsr_st[8]; /* reg data is ignored. */ struct l_xmmreg _xmm[8]; u_int32_t padding[56]; } __packed; @@ -528,22 +528,22 @@ /* * open/fcntl flags */ -#define LINUX_O_RDONLY 00 -#define LINUX_O_WRONLY 01 -#define LINUX_O_RDWR 02 -#define LINUX_O_CREAT 0100 -#define LINUX_O_EXCL 0200 -#define LINUX_O_NOCTTY 0400 -#define LINUX_O_TRUNC 01000 -#define LINUX_O_APPEND 02000 -#define LINUX_O_NONBLOCK 04000 +#define LINUX_O_RDONLY 00000000 +#define LINUX_O_WRONLY 00000001 +#define LINUX_O_RDWR 00000002 +#define LINUX_O_CREAT 00000100 +#define LINUX_O_EXCL 00000200 +#define LINUX_O_NOCTTY 00000400 +#define LINUX_O_TRUNC 00001000 +#define LINUX_O_APPEND 00002000 +#define LINUX_O_NONBLOCK 00004000 #define LINUX_O_NDELAY LINUX_O_NONBLOCK -#define LINUX_O_SYNC 010000 -#define LINUX_FASYNC 020000 -#define LINUX_O_DIRECT 040000 /* direct disk access hint */ -#define LINUX_O_LARGEFILE 0100000 -#define LINUX_O_DIRECTORY 0200000 /* must be a directory */ -#define LINUX_O_NOFOLLOW 0400000 /* don't follow links */ +#define LINUX_O_SYNC 00010000 +#define LINUX_FASYNC 00020000 +#define LINUX_O_DIRECT 00040000 /* Direct disk access hint */ +#define LINUX_O_LARGEFILE 00100000 +#define LINUX_O_DIRECTORY 00200000 /* Must be a directory */ +#define LINUX_O_NOFOLLOW 00400000 /* Do not follow links */ #define LINUX_O_NOATIME 01000000 #define LINUX_F_DUPFD 0 @@ -565,17 +565,17 @@ #define LINUX_F_WRLCK 1 #define LINUX_F_UNLCK 2 -#define LINUX_AT_FDCWD -100 +#define LINUX_AT_FDCWD -100 /* * mount flags */ -#define LINUX_MS_RDONLY 0x0001 -#define LINUX_MS_NOSUID 0x0002 -#define LINUX_MS_NODEV 0x0004 -#define LINUX_MS_NOEXEC 0x0008 -#define LINUX_MS_REMOUNT 0x0020 - +#define LINUX_MS_RDONLY 0x0001 +#define LINUX_MS_NOSUID 0x0002 +#define LINUX_MS_NODEV 0x0004 +#define LINUX_MS_NOEXEC 0x0008 +#define LINUX_MS_REMOUNT 0x0020 + /* * SystemV IPC defines */ @@ -679,7 +679,7 @@ #define LINUX_SO_RCVTIMEO 20 #define LINUX_SO_SNDTIMEO 21 #define LINUX_SO_TIMESTAMP 29 -#define LINUX_SO_ACCEPTCONN 30 +#define LINUX_SO_ACCEPTCONN 30 #define LINUX_IP_TOS 1 #define LINUX_IP_TTL 2 @@ -729,7 +729,7 @@ } ifr_ifru; } __packed; -#define ifr_name ifr_ifrn.ifrn_name /* interface name */ +#define ifr_name ifr_ifrn.ifrn_name /* Interface name */ #define ifr_hwaddr ifr_ifru.ifru_hwaddr /* MAC address */ struct l_ifconf { @@ -776,90 +776,90 @@ l_uint useable:1; }; -struct l_desc_struct { - unsigned int a,b; -}; +#define LINUX_LOWERWORD 0x0000ffff - -#define LINUX_LOWERWORD 0x0000ffff - -/* - * macros which does the same thing as those in linux include/asm-um/ldt-i386.h - * these convert linux user space descriptor to machine one +/* + * Macros which does the same thing as those in Linux include/asm-um/ldt-i386.h. + * These convert Linux user space descriptor to machine one. */ -#define LDT_entry_a(info) \ - ((((info)->base_addr & LINUX_LOWERWORD) << 16) | ((info)->limit & LINUX_LOWERWORD)) +#define LDT_entry_a(info) \ + ((((info)->base_addr & LINUX_LOWERWORD) << 16) | \ + ((info)->limit & LINUX_LOWERWORD)) -#define ENTRY_B_READ_EXEC_ONLY 9 -#define ENTRY_B_CONTENTS 10 -#define ENTRY_B_SEG_NOT_PRESENT 15 -#define ENTRY_B_BASE_ADDR 16 -#define ENTRY_B_USEABLE 20 -#define ENTRY_B_SEG32BIT 22 -#define ENTRY_B_LIMIT 23 +#define ENTRY_B_READ_EXEC_ONLY 9 +#define ENTRY_B_CONTENTS 10 +#define ENTRY_B_SEG_NOT_PRESENT 15 +#define ENTRY_B_BASE_ADDR 16 +#define ENTRY_B_USEABLE 20 +#define ENTRY_B_SEG32BIT 22 +#define ENTRY_B_LIMIT 23 -#define LDT_entry_b(info) \ - (((info)->base_addr & 0xff000000) | \ - ((info)->limit & 0xf0000) | \ - ((info)->contents << ENTRY_B_CONTENTS) | \ - (((info)->seg_not_present == 0) << ENTRY_B_SEG_NOT_PRESENT) | \ - (((info)->base_addr & 0x00ff0000) >> ENTRY_B_BASE_ADDR) | \ - (((info)->read_exec_only == 0) << ENTRY_B_READ_EXEC_ONLY) | \ - ((info)->seg_32bit << ENTRY_B_SEG32BIT) | \ - ((info)->useable << ENTRY_B_USEABLE) | \ - ((info)->limit_in_pages << ENTRY_B_LIMIT) | 0x7000) +#define LDT_entry_b(info) \ + (((info)->base_addr & 0xff000000) | \ + ((info)->limit & 0xf0000) | \ + ((info)->contents << ENTRY_B_CONTENTS) | \ + (((info)->seg_not_present == 0) << ENTRY_B_SEG_NOT_PRESENT) | \ + (((info)->base_addr & 0x00ff0000) >> ENTRY_B_BASE_ADDR) | \ + (((info)->read_exec_only == 0) << ENTRY_B_READ_EXEC_ONLY) | \ + ((info)->seg_32bit << ENTRY_B_SEG32BIT) | \ + ((info)->useable << ENTRY_B_USEABLE) | \ + ((info)->limit_in_pages << ENTRY_B_LIMIT) | 0x7000) -#define LDT_empty(info) (\ - (info)->base_addr == 0 && \ - (info)->limit == 0 && \ - (info)->contents == 0 && \ - (info)->seg_not_present == 1 && \ - (info)->read_exec_only == 1 && \ - (info)->seg_32bit == 0 && \ - (info)->limit_in_pages == 0 && \ - (info)->useable == 0 ) +#define LDT_empty(info) \ + ((info)->base_addr == 0 && \ + (info)->limit == 0 && \ + (info)->contents == 0 && \ + (info)->seg_not_present == 1 && \ + (info)->read_exec_only == 1 && \ + (info)->seg_32bit == 0 && \ + (info)->limit_in_pages == 0 && \ + (info)->useable == 0) -/* macros for converting segments, they do the same as those in arch/i386/kernel/process.c */ -#define GET_BASE(desc) ( \ - (((desc)->a >> 16) & LINUX_LOWERWORD) | \ - (((desc)->b << 16) & 0x00ff0000) | \ - ( (desc)->b & 0xff000000) ) +/* + * Macros for converting segments. + * They do the same as those in arch/i386/kernel/process.c in Linux. + */ +#define GET_BASE(desc) \ + ((((desc)->a >> 16) & LINUX_LOWERWORD) | \ + (((desc)->b << 16) & 0x00ff0000) | \ + ((desc)->b & 0xff000000)) -#define GET_LIMIT(desc) ( \ - ((desc)->a & LINUX_LOWERWORD) | \ - ((desc)->b & 0xf0000) ) +#define GET_LIMIT(desc) \ + (((desc)->a & LINUX_LOWERWORD) | \ + ((desc)->b & 0xf0000)) -#define GET_32BIT(desc) (((desc)->b >> ENTRY_B_SEG32BIT) & 1) -#define GET_CONTENTS(desc) (((desc)->b >> ENTRY_B_CONTENTS) & 3) -#define GET_WRITABLE(desc) (((desc)->b >> ENTRY_B_READ_EXEC_ONLY) & 1) -#define GET_LIMIT_PAGES(desc) (((desc)->b >> ENTRY_B_LIMIT) & 1) -#define GET_PRESENT(desc) (((desc)->b >> ENTRY_B_SEG_NOT_PRESENT) & 1) -#define GET_USEABLE(desc) (((desc)->b >> ENTRY_B_USEABLE) & 1) +#define GET_32BIT(desc) (((desc)->b >> ENTRY_B_SEG32BIT) & 1) +#define GET_CONTENTS(desc) (((desc)->b >> ENTRY_B_CONTENTS) & 3) +#define GET_WRITABLE(desc) (((desc)->b >> ENTRY_B_READ_EXEC_ONLY) & 1) +#define GET_LIMIT_PAGES(desc) (((desc)->b >> ENTRY_B_LIMIT) & 1) +#define GET_PRESENT(desc) (((desc)->b >> ENTRY_B_SEG_NOT_PRESENT) & 1) +#define GET_USEABLE(desc) (((desc)->b >> ENTRY_B_USEABLE) & 1) -#define LINUX_CLOCK_REALTIME 0 -#define LINUX_CLOCK_MONOTONIC 1 -#define LINUX_CLOCK_PROCESS_CPUTIME_ID 2 -#define LINUX_CLOCK_THREAD_CPUTIME_ID 3 -#define LINUX_CLOCK_REALTIME_HR 4 -#define LINUX_CLOCK_MONOTONIC_HR 5 +#define LINUX_CLOCK_REALTIME 0 +#define LINUX_CLOCK_MONOTONIC 1 +#define LINUX_CLOCK_PROCESS_CPUTIME_ID 2 +#define LINUX_CLOCK_THREAD_CPUTIME_ID 3 +#define LINUX_CLOCK_REALTIME_HR 4 +#define LINUX_CLOCK_MONOTONIC_HR 5 typedef int l_timer_t; typedef int l_mqd_t; -#define CLONE_VM 0x100 -#define CLONE_FS 0x200 -#define CLONE_FILES 0x400 -#define CLONE_SIGHAND 0x800 -#define CLONE_PID 0x1000 /* this flag does not exist in linux anymore */ -#define CLONE_VFORK 0x4000 -#define CLONE_PARENT 0x00008000 -#define CLONE_THREAD 0x10000 -#define CLONE_SETTLS 0x80000 -#define CLONE_CHILD_CLEARTID 0x00200000 -#define CLONE_CHILD_SETTID 0x01000000 -#define CLONE_PARENT_SETTID 0x00100000 +#define CLONE_VM 0x00000100 +#define CLONE_FS 0x00000200 +#define CLONE_FILES 0x00000400 +#define CLONE_SIGHAND 0x00000800 +#define CLONE_PID 0x00001000 /* No longer exist in Linux */ +#define CLONE_VFORK 0x00004000 +#define CLONE_PARENT 0x00008000 +#define CLONE_THREAD 0x00010000 +#define CLONE_SETTLS 0x00080000 +#define CLONE_PARENT_SETTID 0x00100000 +#define CLONE_CHILD_CLEARTID 0x00200000 +#define CLONE_CHILD_SETTID 0x01000000 -#define THREADING_FLAGS (CLONE_VM | CLONE_FS | CLONE_FILES | CLONE_SIGHAND | CLONE_THREAD) +#define THREADING_FLAGS \ + (CLONE_VM | CLONE_FS | CLONE_FILES | CLONE_SIGHAND | CLONE_THREAD) #include ==== //depot/projects/linuxolator/src/sys/i386/linux/linux.h#18 (text+ko) ==== @@ -6,7 +6,7 @@ * modification, are permitted provided that the following conditions * are met: * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer + * notice, this list of conditions and the following disclaimer * in this position and unchanged. * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the @@ -31,7 +31,7 @@ #ifndef _I386_LINUX_LINUX_H_ #define _I386_LINUX_LINUX_H_ -#include /* for sigval union */ +#include /* for sigval union */ #include @@ -39,9 +39,9 @@ * debugging support */ extern u_char linux_debug_map[]; -#define ldebug(name) isclr(linux_debug_map, LINUX_SYS_linux_ ## name) -#define ARGS(nm, fmt) "linux(%ld): "#nm"("fmt")\n", (long)td->td_proc->p_pid -#define LMSG(fmt) "linux(%ld): "fmt"\n", (long)td->td_proc->p_pid +#define ldebug(name) isclr(linux_debug_map, LINUX_SYS_linux_ ## name) +#define ARGS(nm, fmt) "linux(%ld): "#nm"("fmt")\n", (long)td->td_proc->p_pid +#define LMSG(fmt) "linux(%ld): "fmt"\n", (long)td->td_proc->p_pid #ifdef MALLOC_DECLARE MALLOC_DECLARE(M_LINUX); @@ -126,7 +126,7 @@ #define LINUX_RLIMIT_NPROC 6 #define LINUX_RLIMIT_NOFILE 7 #define LINUX_RLIMIT_MEMLOCK 8 -#define LINUX_RLIMIT_AS 9 /* address space limit */ +#define LINUX_RLIMIT_AS 9 /* Address space limit */ #define LINUX_RLIM_NLIMITS 10 @@ -180,21 +180,21 @@ }; struct l_stat { - l_ushort st_dev; - l_ulong st_ino; - l_ushort st_mode; - l_ushort st_nlink; - l_ushort st_uid; - l_ushort st_gid; - l_ushort st_rdev; - l_long st_size; - struct l_timespec st_atimespec; - struct l_timespec st_mtimespec; - struct l_timespec st_ctimespec; - l_long st_blksize; - l_long st_blocks; - l_ulong st_flags; - l_ulong st_gen; + l_ushort st_dev; + l_ulong st_ino; + l_ushort st_mode; + l_ushort st_nlink; + l_ushort st_uid; + l_ushort st_gid; + l_ushort st_rdev; + l_long st_size; + struct l_timespec st_atimespec; + struct l_timespec st_mtimespec; + struct l_timespec st_ctimespec; + l_long st_blksize; + l_long st_blocks; + l_ulong st_flags; + l_ulong st_gen; }; struct l_stat64 { @@ -290,9 +290,9 @@ #define LINUX_SIGADDSET(set, sig) SIGADDSET(set, sig) /* sigaltstack */ -#define LINUX_MINSIGSTKSZ 2048 -#define LINUX_SS_ONSTACK 1 -#define LINUX_SS_DISABLE 2 +#define LINUX_MINSIGSTKSZ 2048 +#define LINUX_SS_ONSTACK 1 +#define LINUX_SS_DISABLE 2 int linux_to_bsd_sigaltstack(int lsa); int bsd_to_linux_sigaltstack(int bsa); @@ -355,11 +355,11 @@ void *uc_link; l_stack_t uc_stack; struct l_sigcontext uc_mcontext; - l_sigset_t uc_sigmask; + l_sigset_t uc_sigmask; }; -#define LINUX_SI_MAX_SIZE 128 -#define LINUX_SI_PAD_SIZE ((LINUX_SI_MAX_SIZE/sizeof(l_int)) - 3) +#define LINUX_SI_MAX_SIZE 128 +#define LINUX_SI_PAD_SIZE ((LINUX_SI_MAX_SIZE/sizeof(l_int)) - 3) typedef struct l_siginfo { l_int lsi_signo; @@ -393,41 +393,41 @@ } _sigchld; struct { - void *_addr; /* faulting insn/memory ref. */ + void *_addr; /* Faulting insn/memory ref. */ } _sigfault; struct { - l_int _band; /* POLL_IN,POLL_OUT,POLL_MSG */ + l_int _band; /* POLL_IN,POLL_OUT,POLL_MSG */ l_int _fd; } _sigpoll; } _sifields; } l_siginfo_t; -#define lsi_pid _sifields._kill._pid -#define lsi_uid _sifields._kill._uid -#define lsi_status _sifields._sigchld._status -#define lsi_utime _sifields._sigchld._utime -#define lsi_stime _sifields._sigchld._stime -#define lsi_value _sifields._rt._sigval -#define lsi_int _sifields._rt._sigval.sival_int -#define lsi_ptr _sifields._rt._sigval.sival_ptr -#define lsi_addr _sifields._sigfault._addr -#define lsi_band _sifields._sigpoll._band -#define lsi_fd _sifields._sigpoll._fd +#define lsi_pid _sifields._kill._pid +#define lsi_uid _sifields._kill._uid +#define lsi_status _sifields._sigchld._status +#define lsi_utime _sifields._sigchld._utime +#define lsi_stime _sifields._sigchld._stime +#define lsi_value _sifields._rt._sigval +#define lsi_int _sifields._rt._sigval.sival_int +#define lsi_ptr _sifields._rt._sigval.sival_ptr +#define lsi_addr _sifields._sigfault._addr +#define lsi_band _sifields._sigpoll._band +#define lsi_fd _sifields._sigpoll._fd struct l_fpreg { - u_int16_t significand[4]; - u_int16_t exponent; + u_int16_t significand[4]; + u_int16_t exponent; }; struct l_fpxreg { - u_int16_t significand[4]; - u_int16_t exponent; - u_int16_t padding[3]; + u_int16_t significand[4]; + u_int16_t exponent; + u_int16_t padding[3]; }; struct l_xmmreg { - u_int32_t element[4]; + u_int32_t element[4]; }; struct l_fpstate { @@ -441,13 +441,13 @@ u_int32_t datasel; struct l_fpreg _st[8]; u_int16_t status; - u_int16_t magic; /* 0xffff = regular FPU data */ + u_int16_t magic; /* 0xffff = regular FPU data */ /* FXSR FPU environment */ - u_int32_t _fxsr_env[6]; /* env is ignored */ + u_int32_t _fxsr_env[6]; /* env is ignored. */ u_int32_t mxcsr; u_int32_t reserved; - struct l_fpxreg _fxsr_st[8]; /* reg data is ignored */ + struct l_fpxreg _fxsr_st[8]; /* reg data is ignored. */ struct l_xmmreg _xmm[8]; u_int32_t padding[56]; }; @@ -499,22 +499,22 @@ /* * open/fcntl flags */ -#define LINUX_O_RDONLY 00 -#define LINUX_O_WRONLY 01 -#define LINUX_O_RDWR 02 -#define LINUX_O_CREAT 0100 -#define LINUX_O_EXCL 0200 -#define LINUX_O_NOCTTY 0400 -#define LINUX_O_TRUNC 01000 -#define LINUX_O_APPEND 02000 -#define LINUX_O_NONBLOCK 04000 +#define LINUX_O_RDONLY 00000000 +#define LINUX_O_WRONLY 00000001 +#define LINUX_O_RDWR 00000002 +#define LINUX_O_CREAT 00000100 +#define LINUX_O_EXCL 00000200 +#define LINUX_O_NOCTTY 00000400 +#define LINUX_O_TRUNC 00001000 +#define LINUX_O_APPEND 00002000 +#define LINUX_O_NONBLOCK 00004000 #define LINUX_O_NDELAY LINUX_O_NONBLOCK -#define LINUX_O_SYNC 010000 -#define LINUX_FASYNC 020000 -#define LINUX_O_DIRECT 040000 /* direct disk access hint */ -#define LINUX_O_LARGEFILE 0100000 -#define LINUX_O_DIRECTORY 0200000 /* must be a directory */ -#define LINUX_O_NOFOLLOW 0400000 /* don't follow links */ +#define LINUX_O_SYNC 00010000 +#define LINUX_FASYNC 00020000 +#define LINUX_O_DIRECT 00040000 /* Direct disk access hint */ +#define LINUX_O_LARGEFILE 00100000 +#define LINUX_O_DIRECTORY 00200000 /* Must be a directory */ +#define LINUX_O_NOFOLLOW 00400000 /* Do not follow links */ #define LINUX_O_NOATIME 01000000 #define LINUX_F_DUPFD 0 @@ -536,17 +536,17 @@ #define LINUX_F_WRLCK 1 #define LINUX_F_UNLCK 2 -#define LINUX_AT_FDCWD -100 +#define LINUX_AT_FDCWD -100 /* * mount flags */ -#define LINUX_MS_RDONLY 0x0001 -#define LINUX_MS_NOSUID 0x0002 -#define LINUX_MS_NODEV 0x0004 -#define LINUX_MS_NOEXEC 0x0008 -#define LINUX_MS_REMOUNT 0x0020 - +#define LINUX_MS_RDONLY 0x0001 +#define LINUX_MS_NOSUID 0x0002 +#define LINUX_MS_NODEV 0x0004 +#define LINUX_MS_NOEXEC 0x0008 +#define LINUX_MS_REMOUNT 0x0020 + /* * SystemV IPC defines */ @@ -700,7 +700,7 @@ } ifr_ifru; }; -#define ifr_name ifr_ifrn.ifrn_name /* interface name */ +#define ifr_name ifr_ifrn.ifrn_name /* Interface name */ #define ifr_hwaddr ifr_ifru.ifru_hwaddr /* MAC address */ /* @@ -737,89 +737,94 @@ }; struct l_desc_struct { - unsigned long a,b; + unsigned long a,b; }; -#define LINUX_LOWERWORD 0x0000ffff +#define LINUX_LOWERWORD 0x0000ffff -/* - * macros which does the same thing as those in linux include/asm-um/ldt-i386.h - * these convert linux user space descriptor to machine one +/* + * Macros which does the same thing as those in Linux include/asm-um/ldt-i386.h. + * These convert Linux user space descriptor to machine one. */ -#define LDT_entry_a(info) \ - ((((info)->base_addr & LINUX_LOWERWORD) << 16) | ((info)->limit & LINUX_LOWERWORD)) +#define LDT_entry_a(info) \ + ((((info)->base_addr & LINUX_LOWERWORD) << 16) | \ + ((info)->limit & LINUX_LOWERWORD)) -#define ENTRY_B_READ_EXEC_ONLY 9 -#define ENTRY_B_CONTENTS 10 -#define ENTRY_B_SEG_NOT_PRESENT 15 -#define ENTRY_B_BASE_ADDR 16 -#define ENTRY_B_USEABLE 20 -#define ENTRY_B_SEG32BIT 22 -#define ENTRY_B_LIMIT 23 +#define ENTRY_B_READ_EXEC_ONLY 9 +#define ENTRY_B_CONTENTS 10 +#define ENTRY_B_SEG_NOT_PRESENT 15 +#define ENTRY_B_BASE_ADDR 16 +#define ENTRY_B_USEABLE 20 +#define ENTRY_B_SEG32BIT 22 +#define ENTRY_B_LIMIT 23 -#define LDT_entry_b(info) \ - (((info)->base_addr & 0xff000000) | \ - ((info)->limit & 0xf0000) | \ - ((info)->contents << ENTRY_B_CONTENTS) | \ - (((info)->seg_not_present == 0) << ENTRY_B_SEG_NOT_PRESENT) | \ - (((info)->base_addr & 0x00ff0000) >> ENTRY_B_BASE_ADDR) | \ - (((info)->read_exec_only == 0) << ENTRY_B_READ_EXEC_ONLY) | \ - ((info)->seg_32bit << ENTRY_B_SEG32BIT) | \ - ((info)->useable << ENTRY_B_USEABLE) | \ - ((info)->limit_in_pages << ENTRY_B_LIMIT) | 0x7000) +#define LDT_entry_b(info) \ + (((info)->base_addr & 0xff000000) | \ + ((info)->limit & 0xf0000) | \ + ((info)->contents << ENTRY_B_CONTENTS) | \ + (((info)->seg_not_present == 0) << ENTRY_B_SEG_NOT_PRESENT) | \ + (((info)->base_addr & 0x00ff0000) >> ENTRY_B_BASE_ADDR) | \ + (((info)->read_exec_only == 0) << ENTRY_B_READ_EXEC_ONLY) | \ + ((info)->seg_32bit << ENTRY_B_SEG32BIT) | \ + ((info)->useable << ENTRY_B_USEABLE) | \ + ((info)->limit_in_pages << ENTRY_B_LIMIT) | 0x7000) -#define LDT_empty(info) (\ - (info)->base_addr == 0 && \ - (info)->limit == 0 && \ - (info)->contents == 0 && \ - (info)->seg_not_present == 1 && \ - (info)->read_exec_only == 1 && \ - (info)->seg_32bit == 0 && \ - (info)->limit_in_pages == 0 && \ - (info)->useable == 0 ) +#define LDT_empty(info) \ + ((info)->base_addr == 0 && \ + (info)->limit == 0 && \ + (info)->contents == 0 && \ + (info)->seg_not_present == 1 && \ + (info)->read_exec_only == 1 && \ + (info)->seg_32bit == 0 && \ + (info)->limit_in_pages == 0 && \ + (info)->useable == 0) -/* macros for converting segments, they do the same as those in arch/i386/kernel/process.c */ -#define GET_BASE(desc) ( \ - (((desc)->a >> 16) & LINUX_LOWERWORD) | \ - (((desc)->b << 16) & 0x00ff0000) | \ - ( (desc)->b & 0xff000000) ) +/* + * Macros for converting segments. + * They do the same as those in arch/i386/kernel/process.c in Linux. + */ +#define GET_BASE(desc) \ + ((((desc)->a >> 16) & LINUX_LOWERWORD) | \ + (((desc)->b << 16) & 0x00ff0000) | \ + ((desc)->b & 0xff000000)) -#define GET_LIMIT(desc) ( \ - ((desc)->a & LINUX_LOWERWORD) | \ - ((desc)->b & 0xf0000) ) +#define GET_LIMIT(desc) \ + (((desc)->a & LINUX_LOWERWORD) | \ + ((desc)->b & 0xf0000)) -#define GET_32BIT(desc) (((desc)->b >> ENTRY_B_SEG32BIT) & 1) -#define GET_CONTENTS(desc) (((desc)->b >> ENTRY_B_CONTENTS) & 3) -#define GET_WRITABLE(desc) (((desc)->b >> ENTRY_B_READ_EXEC_ONLY) & 1) -#define GET_LIMIT_PAGES(desc) (((desc)->b >> ENTRY_B_LIMIT) & 1) -#define GET_PRESENT(desc) (((desc)->b >> ENTRY_B_SEG_NOT_PRESENT) & 1) -#define GET_USEABLE(desc) (((desc)->b >> ENTRY_B_USEABLE) & 1) +#define GET_32BIT(desc) (((desc)->b >> ENTRY_B_SEG32BIT) & 1) +#define GET_CONTENTS(desc) (((desc)->b >> ENTRY_B_CONTENTS) & 3) +#define GET_WRITABLE(desc) (((desc)->b >> ENTRY_B_READ_EXEC_ONLY) & 1) +#define GET_LIMIT_PAGES(desc) (((desc)->b >> ENTRY_B_LIMIT) & 1) +#define GET_PRESENT(desc) (((desc)->b >> ENTRY_B_SEG_NOT_PRESENT) & 1) +#define GET_USEABLE(desc) (((desc)->b >> ENTRY_B_USEABLE) & 1) -#define LINUX_CLOCK_REALTIME 0 -#define LINUX_CLOCK_MONOTONIC 1 -#define LINUX_CLOCK_PROCESS_CPUTIME_ID 2 -#define LINUX_CLOCK_THREAD_CPUTIME_ID 3 -#define LINUX_CLOCK_REALTIME_HR 4 -#define LINUX_CLOCK_MONOTONIC_HR 5 +#define LINUX_CLOCK_REALTIME 0 +#define LINUX_CLOCK_MONOTONIC 1 +#define LINUX_CLOCK_PROCESS_CPUTIME_ID 2 +#define LINUX_CLOCK_THREAD_CPUTIME_ID 3 +#define LINUX_CLOCK_REALTIME_HR 4 +#define LINUX_CLOCK_MONOTONIC_HR 5 typedef int l_timer_t; typedef int l_mqd_t; -#define CLONE_VM 0x100 -#define CLONE_FS 0x200 -#define CLONE_FILES 0x400 -#define CLONE_SIGHAND 0x800 -#define CLONE_PID 0x1000 /* this flag does not exist in linux anymore */ -#define CLONE_VFORK 0x4000 -#define CLONE_PARENT 0x00008000 -#define CLONE_THREAD 0x10000 -#define CLONE_SETTLS 0x80000 -#define CLONE_CHILD_CLEARTID 0x00200000 -#define CLONE_CHILD_SETTID 0x01000000 -#define CLONE_PARENT_SETTID 0x00100000 +#define CLONE_VM 0x00000100 +#define CLONE_FS 0x00000200 +#define CLONE_FILES 0x00000400 +#define CLONE_SIGHAND 0x00000800 +#define CLONE_PID 0x00001000 /* No longer exist in Linux */ +#define CLONE_VFORK 0x00004000 +#define CLONE_PARENT 0x00008000 +#define CLONE_THREAD 0x00010000 +#define CLONE_SETTLS 0x00080000 +#define CLONE_PARENT_SETTID 0x00100000 +#define CLONE_CHILD_CLEARTID 0x00200000 +#define CLONE_CHILD_SETTID 0x01000000 -#define THREADING_FLAGS (CLONE_VM | CLONE_FS | CLONE_FILES | CLONE_SIGHAND | CLONE_THREAD) +#define THREADING_FLAGS \ + (CLONE_VM | CLONE_FS | CLONE_FILES | CLONE_SIGHAND | CLONE_THREAD) #include From owner-p4-projects@FreeBSD.ORG Thu Mar 1 22:39: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 658BC16A407; Thu, 1 Mar 2007 22:39: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 30F1716A404 for ; Thu, 1 Mar 2007 22:39:07 +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 1C1EA13C441 for ; Thu, 1 Mar 2007 22:39:07 +0000 (UTC) (envelope-from jkim@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l21Md7Ak014497 for ; Thu, 1 Mar 2007 22:39:07 GMT (envelope-from jkim@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l21Md69H014494 for perforce@freebsd.org; Thu, 1 Mar 2007 22:39:06 GMT (envelope-from jkim@freebsd.org) Date: Thu, 1 Mar 2007 22:39:06 GMT Message-Id: <200703012239.l21Md69H014494@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 115222 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 01 Mar 2007 22:39:07 -0000 http://perforce.freebsd.org/chv.cgi?CH=115222 Change 115222 by jkim@jkim_hammer on 2007/03/01 22:38:25 Prefix Linuxulator macros with LINUX_ to prevent future collision. Affected files ... .. //depot/projects/linuxolator/src/sys/amd64/linux32/linux.h#23 edit .. //depot/projects/linuxolator/src/sys/amd64/linux32/linux32_machdep.c#45 edit .. //depot/projects/linuxolator/src/sys/compat/linux/linux_emul.c#40 edit .. //depot/projects/linuxolator/src/sys/i386/linux/linux.h#19 edit .. //depot/projects/linuxolator/src/sys/i386/linux/linux_machdep.c#36 edit Differences ... ==== //depot/projects/linuxolator/src/sys/amd64/linux32/linux.h#23 (text+ko) ==== @@ -30,8 +30,8 @@ * $FreeBSD: src/sys/amd64/linux32/linux.h,v 1.13 2007/02/24 16:49:24 netchild Exp $ */ -#ifndef _AMD64_LINUX_LINUX_H_ -#define _AMD64_LINUX_LINUX_H_ +#ifndef _AMD64_LINUX_H_ +#define _AMD64_LINUX_H_ #include @@ -782,30 +782,30 @@ * Macros which does the same thing as those in Linux include/asm-um/ldt-i386.h. * These convert Linux user space descriptor to machine one. */ -#define LDT_entry_a(info) \ +#define LINUX_LDT_entry_a(info) \ ((((info)->base_addr & LINUX_LOWERWORD) << 16) | \ ((info)->limit & LINUX_LOWERWORD)) -#define ENTRY_B_READ_EXEC_ONLY 9 -#define ENTRY_B_CONTENTS 10 -#define ENTRY_B_SEG_NOT_PRESENT 15 -#define ENTRY_B_BASE_ADDR 16 -#define ENTRY_B_USEABLE 20 -#define ENTRY_B_SEG32BIT 22 -#define ENTRY_B_LIMIT 23 +#define LINUX_ENTRY_B_READ_EXEC_ONLY 9 +#define LINUX_ENTRY_B_CONTENTS 10 +#define LINUX_ENTRY_B_SEG_NOT_PRESENT 15 +#define LINUX_ENTRY_B_BASE_ADDR 16 +#define LINUX_ENTRY_B_USEABLE 20 +#define LINUX_ENTRY_B_SEG32BIT 22 +#define LINUX_ENTRY_B_LIMIT 23 -#define LDT_entry_b(info) \ - (((info)->base_addr & 0xff000000) | \ - ((info)->limit & 0xf0000) | \ - ((info)->contents << ENTRY_B_CONTENTS) | \ - (((info)->seg_not_present == 0) << ENTRY_B_SEG_NOT_PRESENT) | \ - (((info)->base_addr & 0x00ff0000) >> ENTRY_B_BASE_ADDR) | \ - (((info)->read_exec_only == 0) << ENTRY_B_READ_EXEC_ONLY) | \ - ((info)->seg_32bit << ENTRY_B_SEG32BIT) | \ - ((info)->useable << ENTRY_B_USEABLE) | \ - ((info)->limit_in_pages << ENTRY_B_LIMIT) | 0x7000) +#define LINUX_LDT_entry_b(info) \ + (((info)->base_addr & 0xff000000) | \ + ((info)->limit & 0xf0000) | \ + ((info)->contents << LINUX_ENTRY_B_CONTENTS) | \ + (((info)->seg_not_present == 0) << LINUX_ENTRY_B_SEG_NOT_PRESENT) | \ + (((info)->base_addr & 0x00ff0000) >> LINUX_ENTRY_B_BASE_ADDR) | \ + (((info)->read_exec_only == 0) << LINUX_ENTRY_B_READ_EXEC_ONLY) | \ + ((info)->seg_32bit << LINUX_ENTRY_B_SEG32BIT) | \ + ((info)->useable << LINUX_ENTRY_B_USEABLE) | \ + ((info)->limit_in_pages << LINUX_ENTRY_B_LIMIT) | 0x7000) -#define LDT_empty(info) \ +#define LINUX_LDT_empty(info) \ ((info)->base_addr == 0 && \ (info)->limit == 0 && \ (info)->contents == 0 && \ @@ -819,21 +819,27 @@ * Macros for converting segments. * They do the same as those in arch/i386/kernel/process.c in Linux. */ -#define GET_BASE(desc) \ +#define LINUX_GET_BASE(desc) \ ((((desc)->a >> 16) & LINUX_LOWERWORD) | \ (((desc)->b << 16) & 0x00ff0000) | \ ((desc)->b & 0xff000000)) -#define GET_LIMIT(desc) \ +#define LINUX_GET_LIMIT(desc) \ (((desc)->a & LINUX_LOWERWORD) | \ ((desc)->b & 0xf0000)) -#define GET_32BIT(desc) (((desc)->b >> ENTRY_B_SEG32BIT) & 1) -#define GET_CONTENTS(desc) (((desc)->b >> ENTRY_B_CONTENTS) & 3) -#define GET_WRITABLE(desc) (((desc)->b >> ENTRY_B_READ_EXEC_ONLY) & 1) -#define GET_LIMIT_PAGES(desc) (((desc)->b >> ENTRY_B_LIMIT) & 1) -#define GET_PRESENT(desc) (((desc)->b >> ENTRY_B_SEG_NOT_PRESENT) & 1) -#define GET_USEABLE(desc) (((desc)->b >> ENTRY_B_USEABLE) & 1) +#define LINUX_GET_32BIT(desc) \ + (((desc)->b >> LINUX_ENTRY_B_SEG32BIT) & 1) +#define LINUX_GET_CONTENTS(desc) \ + (((desc)->b >> LINUX_ENTRY_B_CONTENTS) & 3) +#define LINUX_GET_WRITABLE(desc) \ + (((desc)->b >> LINUX_ENTRY_B_READ_EXEC_ONLY) & 1) +#define LINUX_GET_LIMIT_PAGES(desc) \ + (((desc)->b >> LINUX_ENTRY_B_LIMIT) & 1) +#define LINUX_GET_PRESENT(desc) \ + (((desc)->b >> LINUX_ENTRY_B_SEG_NOT_PRESENT) & 1) +#define LINUX_GET_USEABLE(desc) \ + (((desc)->b >> LINUX_ENTRY_B_USEABLE) & 1) #define LINUX_CLOCK_REALTIME 0 #define LINUX_CLOCK_MONOTONIC 1 @@ -845,22 +851,23 @@ typedef int l_timer_t; typedef int l_mqd_t; -#define CLONE_VM 0x00000100 -#define CLONE_FS 0x00000200 -#define CLONE_FILES 0x00000400 -#define CLONE_SIGHAND 0x00000800 -#define CLONE_PID 0x00001000 /* No longer exist in Linux */ -#define CLONE_VFORK 0x00004000 -#define CLONE_PARENT 0x00008000 -#define CLONE_THREAD 0x00010000 -#define CLONE_SETTLS 0x00080000 -#define CLONE_PARENT_SETTID 0x00100000 -#define CLONE_CHILD_CLEARTID 0x00200000 -#define CLONE_CHILD_SETTID 0x01000000 +#define LINUX_CLONE_VM 0x00000100 +#define LINUX_CLONE_FS 0x00000200 +#define LINUX_CLONE_FILES 0x00000400 +#define LINUX_CLONE_SIGHAND 0x00000800 +#define LINUX_CLONE_PID 0x00001000 /* No longer exist in Linux */ +#define LINUX_CLONE_VFORK 0x00004000 +#define LINUX_CLONE_PARENT 0x00008000 +#define LINUX_CLONE_THREAD 0x00010000 +#define LINUX_CLONE_SETTLS 0x00080000 +#define LINUX_CLONE_PARENT_SETTID 0x00100000 +#define LINUX_CLONE_CHILD_CLEARTID 0x00200000 +#define LINUX_CLONE_CHILD_SETTID 0x01000000 -#define THREADING_FLAGS \ - (CLONE_VM | CLONE_FS | CLONE_FILES | CLONE_SIGHAND | CLONE_THREAD) +#define LINUX_THREADING_FLAGS \ + (LINUX_CLONE_VM | LINUX_CLONE_FS | LINUX_CLONE_FILES | \ + LINUX_CLONE_SIGHAND | LINUX_CLONE_THREAD) #include -#endif /* !_AMD64_LINUX_LINUX_H_ */ +#endif /* !_AMD64_LINUX_H_ */ ==== //depot/projects/linuxolator/src/sys/amd64/linux32/linux32_machdep.c#45 (text+ko) ==== @@ -565,9 +565,9 @@ if (exit_signal <= LINUX_SIGTBLSZ) exit_signal = linux_to_bsd_signal[_SIG_IDX(exit_signal)]; - if (args->flags & CLONE_VM) + if (args->flags & LINUX_CLONE_VM) ff |= RFMEM; - if (args->flags & CLONE_SIGHAND) + if (args->flags & LINUX_CLONE_SIGHAND) ff |= RFSIGSHARE; /* * XXX: In Linux, sharing of fs info (chroot/cwd/umask) @@ -575,7 +575,7 @@ * structure but in reality it does not make any problems * because both of these flags are set at once usually. */ - if (!(args->flags & (CLONE_FILES | CLONE_FS))) + if (!(args->flags & (LINUX_CLONE_FILES | LINUX_CLONE_FS))) ff |= RFFDG; /* @@ -591,10 +591,10 @@ * that special treatment is necessary for signal delivery * between those processes and fd locking. */ - if ((args->flags & 0xffffff00) == THREADING_FLAGS) + if ((args->flags & 0xffffff00) == LINUX_THREADING_FLAGS) ff |= RFTHREAD; - if (args->flags & CLONE_PARENT_SETTID) + if (args->flags & LINUX_CLONE_PARENT_SETTID) if (args->parent_tidptr == NULL) return (EINVAL); @@ -602,7 +602,7 @@ if (error) return (error); - if (args->flags & (CLONE_PARENT|CLONE_THREAD)) { + if (args->flags & (LINUX_CLONE_PARENT|LINUX_CLONE_THREAD)) { sx_xlock(&proctree_lock); PROC_LOCK(p2); proc_reparent(p2, td->td_proc->p_pptr); @@ -617,7 +617,7 @@ KASSERT(em != NULL, ("clone: emuldata not found.\n")); /* and adjust it */ - if (args->flags & CLONE_THREAD) { + if (args->flags & LINUX_CLONE_THREAD) { #ifdef notyet PROC_LOCK(p2); p2->p_pgrp = td->td_proc->p_pgrp; @@ -626,19 +626,19 @@ exit_signal = 0; } - if (args->flags & CLONE_CHILD_SETTID) + if (args->flags & LINUX_CLONE_CHILD_SETTID) em->child_set_tid = args->child_tidptr; else em->child_set_tid = NULL; - if (args->flags & CLONE_CHILD_CLEARTID) + if (args->flags & LINUX_CLONE_CHILD_CLEARTID) em->child_clear_tid = args->child_tidptr; else em->child_clear_tid = NULL; EMUL_UNLOCK(&emul_lock); - if (args->flags & CLONE_PARENT_SETTID) { + if (args->flags & LINUX_CLONE_PARENT_SETTID) { error = copyout(&p2->p_pid, args->parent_tidptr, sizeof(p2->p_pid)); if (error) @@ -657,7 +657,7 @@ if (args->stack) td2->td_frame->tf_rsp = PTROUT(args->stack); - if (args->flags & CLONE_SETTLS) { + if (args->flags & LINUX_CLONE_SETTLS) { struct user_segment_descriptor sd; struct l_user_desc info; int a[2]; @@ -674,8 +674,8 @@ if (error) printf(LMSG("copyout failed!")); - a[0] = LDT_entry_a(&info); - a[1] = LDT_entry_b(&info); + a[0] = LINUX_LDT_entry_a(&info); + a[1] = LINUX_LDT_entry_b(&info); memcpy(&sd, &a, sizeof(a)); #ifdef DEBUG @@ -703,7 +703,7 @@ "stack %p sig = %d"), (int)p2->p_pid, args->stack, exit_signal); #endif - if (args->flags & CLONE_VFORK) { + if (args->flags & LINUX_CLONE_VFORK) { PROC_LOCK(p2); p2->p_flag |= P_PPWAIT; PROC_UNLOCK(p2); @@ -720,7 +720,7 @@ td->td_retval[0] = p2->p_pid; td->td_retval[1] = 0; - if (args->flags & CLONE_VFORK) { + if (args->flags & LINUX_CLONE_VFORK) { /* wait for the children to exit, ie. emulate vfork */ PROC_LOCK(p2); while (p2->p_flag & P_PPWAIT) @@ -1291,12 +1291,12 @@ if (error) return (error); - if (LDT_empty(&info)) { + if (LINUX_LDT_empty(&info)) { a[0] = 0; a[1] = 0; } else { - a[0] = LDT_entry_a(&info); - a[1] = LDT_entry_b(&info); + a[0] = LINUX_LDT_entry_a(&info); + a[1] = LINUX_LDT_entry_b(&info); } memcpy(&sd, &a, sizeof(a)); ==== //depot/projects/linuxolator/src/sys/compat/linux/linux_emul.c#40 (text+ko) ==== @@ -86,7 +86,7 @@ em = malloc(sizeof *em, M_LINUX, M_WAITOK | M_ZERO); em->pid = child; em->pdeath_signal = 0; - if (flags & CLONE_THREAD) { + if (flags & LINUX_CLONE_THREAD) { /* handled later in the code */ } else { struct linux_emuldata_shared *s; @@ -113,7 +113,7 @@ * proc */ if (child != 0) { - if (flags & CLONE_THREAD) { + if (flags & LINUX_CLONE_THREAD) { /* lookup the parent */ /* * we dont have to lock the p_em because ==== //depot/projects/linuxolator/src/sys/i386/linux/linux.h#19 (text+ko) ==== @@ -28,8 +28,8 @@ * $FreeBSD: src/sys/i386/linux/linux.h,v 1.75 2007/02/24 16:49:24 netchild Exp $ */ -#ifndef _I386_LINUX_LINUX_H_ -#define _I386_LINUX_LINUX_H_ +#ifndef _I386_LINUX_H_ +#define _I386_LINUX_H_ #include /* for sigval union */ @@ -747,30 +747,30 @@ * Macros which does the same thing as those in Linux include/asm-um/ldt-i386.h. * These convert Linux user space descriptor to machine one. */ -#define LDT_entry_a(info) \ +#define LINUX_LDT_entry_a(info) \ ((((info)->base_addr & LINUX_LOWERWORD) << 16) | \ ((info)->limit & LINUX_LOWERWORD)) -#define ENTRY_B_READ_EXEC_ONLY 9 -#define ENTRY_B_CONTENTS 10 -#define ENTRY_B_SEG_NOT_PRESENT 15 -#define ENTRY_B_BASE_ADDR 16 -#define ENTRY_B_USEABLE 20 -#define ENTRY_B_SEG32BIT 22 -#define ENTRY_B_LIMIT 23 +#define LINUX_ENTRY_B_READ_EXEC_ONLY 9 +#define LINUX_ENTRY_B_CONTENTS 10 +#define LINUX_ENTRY_B_SEG_NOT_PRESENT 15 +#define LINUX_ENTRY_B_BASE_ADDR 16 +#define LINUX_ENTRY_B_USEABLE 20 +#define LINUX_ENTRY_B_SEG32BIT 22 +#define LINUX_ENTRY_B_LIMIT 23 -#define LDT_entry_b(info) \ - (((info)->base_addr & 0xff000000) | \ - ((info)->limit & 0xf0000) | \ - ((info)->contents << ENTRY_B_CONTENTS) | \ - (((info)->seg_not_present == 0) << ENTRY_B_SEG_NOT_PRESENT) | \ - (((info)->base_addr & 0x00ff0000) >> ENTRY_B_BASE_ADDR) | \ - (((info)->read_exec_only == 0) << ENTRY_B_READ_EXEC_ONLY) | \ - ((info)->seg_32bit << ENTRY_B_SEG32BIT) | \ - ((info)->useable << ENTRY_B_USEABLE) | \ - ((info)->limit_in_pages << ENTRY_B_LIMIT) | 0x7000) +#define LINUX_LDT_entry_b(info) \ + (((info)->base_addr & 0xff000000) | \ + ((info)->limit & 0xf0000) | \ + ((info)->contents << LINUX_ENTRY_B_CONTENTS) | \ + (((info)->seg_not_present == 0) << LINUX_ENTRY_B_SEG_NOT_PRESENT) | \ + (((info)->base_addr & 0x00ff0000) >> LINUX_ENTRY_B_BASE_ADDR) | \ + (((info)->read_exec_only == 0) << LINUX_ENTRY_B_READ_EXEC_ONLY) | \ + ((info)->seg_32bit << LINUX_ENTRY_B_SEG32BIT) | \ + ((info)->useable << LINUX_ENTRY_B_USEABLE) | \ + ((info)->limit_in_pages << LINUX_ENTRY_B_LIMIT) | 0x7000) -#define LDT_empty(info) \ +#define LINUX_LDT_empty(info) \ ((info)->base_addr == 0 && \ (info)->limit == 0 && \ (info)->contents == 0 && \ @@ -784,21 +784,27 @@ * Macros for converting segments. * They do the same as those in arch/i386/kernel/process.c in Linux. */ -#define GET_BASE(desc) \ +#define LINUX_GET_BASE(desc) \ ((((desc)->a >> 16) & LINUX_LOWERWORD) | \ (((desc)->b << 16) & 0x00ff0000) | \ ((desc)->b & 0xff000000)) -#define GET_LIMIT(desc) \ +#define LINUX_GET_LIMIT(desc) \ (((desc)->a & LINUX_LOWERWORD) | \ ((desc)->b & 0xf0000)) -#define GET_32BIT(desc) (((desc)->b >> ENTRY_B_SEG32BIT) & 1) -#define GET_CONTENTS(desc) (((desc)->b >> ENTRY_B_CONTENTS) & 3) -#define GET_WRITABLE(desc) (((desc)->b >> ENTRY_B_READ_EXEC_ONLY) & 1) -#define GET_LIMIT_PAGES(desc) (((desc)->b >> ENTRY_B_LIMIT) & 1) -#define GET_PRESENT(desc) (((desc)->b >> ENTRY_B_SEG_NOT_PRESENT) & 1) -#define GET_USEABLE(desc) (((desc)->b >> ENTRY_B_USEABLE) & 1) +#define LINUX_GET_32BIT(desc) \ + (((desc)->b >> LINUX_ENTRY_B_SEG32BIT) & 1) +#define LINUX_GET_CONTENTS(desc) \ + (((desc)->b >> LINUX_ENTRY_B_CONTENTS) & 3) +#define LINUX_GET_WRITABLE(desc) \ + (((desc)->b >> LINUX_ENTRY_B_READ_EXEC_ONLY) & 1) +#define LINUX_GET_LIMIT_PAGES(desc) \ + (((desc)->b >> LINUX_ENTRY_B_LIMIT) & 1) +#define LINUX_GET_PRESENT(desc) \ + (((desc)->b >> LINUX_ENTRY_B_SEG_NOT_PRESENT) & 1) +#define LINUX_GET_USEABLE(desc) \ + (((desc)->b >> LINUX_ENTRY_B_USEABLE) & 1) #define LINUX_CLOCK_REALTIME 0 #define LINUX_CLOCK_MONOTONIC 1 @@ -810,22 +816,23 @@ typedef int l_timer_t; typedef int l_mqd_t; -#define CLONE_VM 0x00000100 -#define CLONE_FS 0x00000200 -#define CLONE_FILES 0x00000400 -#define CLONE_SIGHAND 0x00000800 -#define CLONE_PID 0x00001000 /* No longer exist in Linux */ -#define CLONE_VFORK 0x00004000 -#define CLONE_PARENT 0x00008000 -#define CLONE_THREAD 0x00010000 -#define CLONE_SETTLS 0x00080000 -#define CLONE_PARENT_SETTID 0x00100000 -#define CLONE_CHILD_CLEARTID 0x00200000 -#define CLONE_CHILD_SETTID 0x01000000 +#define LINUX_CLONE_VM 0x00000100 +#define LINUX_CLONE_FS 0x00000200 +#define LINUX_CLONE_FILES 0x00000400 +#define LINUX_CLONE_SIGHAND 0x00000800 +#define LINUX_CLONE_PID 0x00001000 /* No longer exist in Linux */ +#define LINUX_CLONE_VFORK 0x00004000 +#define LINUX_CLONE_PARENT 0x00008000 +#define LINUX_CLONE_THREAD 0x00010000 +#define LINUX_CLONE_SETTLS 0x00080000 +#define LINUX_CLONE_PARENT_SETTID 0x00100000 +#define LINUX_CLONE_CHILD_CLEARTID 0x00200000 +#define LINUX_CLONE_CHILD_SETTID 0x01000000 -#define THREADING_FLAGS \ - (CLONE_VM | CLONE_FS | CLONE_FILES | CLONE_SIGHAND | CLONE_THREAD) +#define LINUX_THREADING_FLAGS \ + (LINUX_CLONE_VM | LINUX_CLONE_FS | LINUX_CLONE_FILES | \ + LINUX_CLONE_SIGHAND | LINUX_CLONE_THREAD) #include -#endif /* !_I386_LINUX_LINUX_H_ */ +#endif /* !_I386_LINUX_H_ */ ==== //depot/projects/linuxolator/src/sys/i386/linux/linux_machdep.c#36 (text+ko) ==== @@ -394,9 +394,9 @@ if (exit_signal <= LINUX_SIGTBLSZ) exit_signal = linux_to_bsd_signal[_SIG_IDX(exit_signal)]; - if (args->flags & CLONE_VM) + if (args->flags & LINUX_CLONE_VM) ff |= RFMEM; - if (args->flags & CLONE_SIGHAND) + if (args->flags & LINUX_CLONE_SIGHAND) ff |= RFSIGSHARE; /* * XXX: in linux sharing of fs info (chroot/cwd/umask) @@ -404,7 +404,7 @@ * structure but in reality it doesn't cause any problems * because both of these flags are usually set together. */ - if (!(args->flags & (CLONE_FILES | CLONE_FS))) + if (!(args->flags & (LINUX_CLONE_FILES | LINUX_CLONE_FS))) ff |= RFFDG; /* @@ -420,10 +420,10 @@ * that special treatment is necessary for signal delivery * between those processes and fd locking. */ - if ((args->flags & 0xffffff00) == THREADING_FLAGS) + if ((args->flags & 0xffffff00) == LINUX_THREADING_FLAGS) ff |= RFTHREAD; - if (args->flags & CLONE_PARENT_SETTID) + if (args->flags & LINUX_CLONE_PARENT_SETTID) if (args->parent_tidptr == NULL) return (EINVAL); @@ -431,7 +431,7 @@ if (error) return (error); - if (args->flags & (CLONE_PARENT|CLONE_THREAD)) { + if (args->flags & (LINUX_CLONE_PARENT|LINUX_CLONE_THREAD)) { sx_xlock(&proctree_lock); PROC_LOCK(p2); proc_reparent(p2, td->td_proc->p_pptr); @@ -446,7 +446,7 @@ KASSERT(em != NULL, ("clone: emuldata not found.\n")); /* and adjust it */ - if (args->flags & CLONE_THREAD) { + if (args->flags & LINUX_CLONE_THREAD) { #ifdef notyet PROC_LOCK(p2); p2->p_pgrp = td->td_proc->p_pgrp; @@ -455,19 +455,19 @@ exit_signal = 0; } - if (args->flags & CLONE_CHILD_SETTID) + if (args->flags & LINUX_CLONE_CHILD_SETTID) em->child_set_tid = args->child_tidptr; else em->child_set_tid = NULL; - if (args->flags & CLONE_CHILD_CLEARTID) + if (args->flags & LINUX_CLONE_CHILD_CLEARTID) em->child_clear_tid = args->child_tidptr; else em->child_clear_tid = NULL; EMUL_UNLOCK(&emul_lock); - if (args->flags & CLONE_PARENT_SETTID) { + if (args->flags & LINUX_CLONE_PARENT_SETTID) { error = copyout(&p2->p_pid, args->parent_tidptr, sizeof(p2->p_pid)); if (error) printf(LMSG("copyout failed!")); @@ -484,7 +484,7 @@ if (args->stack) td2->td_frame->tf_esp = (unsigned int)args->stack; - if (args->flags & CLONE_SETTLS) { + if (args->flags & LINUX_CLONE_SETTLS) { struct l_user_desc info; int idx; int a[2]; @@ -515,8 +515,8 @@ printf(LMSG("copyout failed!")); } - a[0] = LDT_entry_a(&info); - a[1] = LDT_entry_b(&info); + a[0] = LINUX_LDT_entry_a(&info); + a[1] = LINUX_LDT_entry_b(&info); memcpy(&sd, &a, sizeof(a)); #ifdef DEBUG @@ -544,7 +544,7 @@ printf(LMSG("clone: successful rfork to %ld, stack %p sig = %d"), (long)p2->p_pid, args->stack, exit_signal); #endif - if (args->flags & CLONE_VFORK) { + if (args->flags & LINUX_CLONE_VFORK) { PROC_LOCK(p2); p2->p_flag |= P_PPWAIT; PROC_UNLOCK(p2); @@ -561,7 +561,7 @@ td->td_retval[0] = p2->p_pid; td->td_retval[1] = 0; - if (args->flags & CLONE_VFORK) { + if (args->flags & LINUX_CLONE_VFORK) { /* wait for the children to exit, ie. emulate vfork */ PROC_LOCK(p2); while (p2->p_flag & P_PPWAIT) @@ -1131,12 +1131,12 @@ if (error) return (error); - if (LDT_empty(&info)) { + if (LINUX_LDT_empty(&info)) { a[0] = 0; a[1] = 0; } else { - a[0] = LDT_entry_a(&info); - a[1] = LDT_entry_b(&info); + a[0] = LINUX_LDT_entry_a(&info); + a[1] = LINUX_LDT_entry_b(&info); } memcpy(&sd, &a, sizeof(a)); @@ -1198,14 +1198,14 @@ memcpy(&desc, &sd, sizeof(desc)); info.entry_number = idx; - info.base_addr = GET_BASE(&desc); - info.limit = GET_LIMIT(&desc); - info.seg_32bit = GET_32BIT(&desc); - info.contents = GET_CONTENTS(&desc); - info.read_exec_only = !GET_WRITABLE(&desc); - info.limit_in_pages = GET_LIMIT_PAGES(&desc); - info.seg_not_present = !GET_PRESENT(&desc); - info.useable = GET_USEABLE(&desc); + info.base_addr = LINUX_GET_BASE(&desc); + info.limit = LINUX_GET_LIMIT(&desc); + info.seg_32bit = LINUX_GET_32BIT(&desc); + info.contents = LINUX_GET_CONTENTS(&desc); + info.read_exec_only = !LINUX_GET_WRITABLE(&desc); + info.limit_in_pages = LINUX_GET_LIMIT_PAGES(&desc); + info.seg_not_present = !LINUX_GET_PRESENT(&desc); + info.useable = LINUX_GET_USEABLE(&desc); error = copyout(&info, args->desc, sizeof(struct l_user_desc)); if (error) From owner-p4-projects@FreeBSD.ORG Thu Mar 1 22:49: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 2E40716A403; Thu, 1 Mar 2007 22:49:21 +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 05CA116A400 for ; Thu, 1 Mar 2007 22:49:21 +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 E606713C428 for ; Thu, 1 Mar 2007 22:49:20 +0000 (UTC) (envelope-from jkim@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l21MnK5r016139 for ; Thu, 1 Mar 2007 22:49:20 GMT (envelope-from jkim@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l21MnKIN016136 for perforce@freebsd.org; Thu, 1 Mar 2007 22:49:20 GMT (envelope-from jkim@freebsd.org) Date: Thu, 1 Mar 2007 22:49:20 GMT Message-Id: <200703012249.l21MnKIN016136@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 115224 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 01 Mar 2007 22:49:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=115224 Change 115224 by jkim@jkim_hammer on 2007/03/01 22:49:17 IFC Affected files ... .. //depot/projects/linuxolator/src/sys/dev/ata/ata-chipset.c#10 integrate .. //depot/projects/linuxolator/src/sys/gnu/fs/ext2fs/ext2_vnops.c#4 integrate .. //depot/projects/linuxolator/src/sys/kern/kern_jail.c#7 integrate .. //depot/projects/linuxolator/src/sys/sys/priv.h#6 integrate .. //depot/projects/linuxolator/src/sys/ufs/ffs/ffs_vnops.c#7 integrate .. //depot/projects/linuxolator/src/sys/ufs/ufs/ufs_vnops.c#9 integrate Differences ... ==== //depot/projects/linuxolator/src/sys/dev/ata/ata-chipset.c#10 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/ata-chipset.c,v 1.185 2007/02/23 12:18:33 piso Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/ata-chipset.c,v 1.186 2007/03/01 21:18:27 sos Exp $"); #include "opt_ata.h" #include @@ -55,7 +55,7 @@ static int ata_generic_chipinit(device_t dev); static void ata_generic_intr(void *data); static void ata_generic_setmode(device_t dev, int mode); -static void ata_sata_phy_enable(struct ata_channel *ch); +static void ata_sata_phy_reset(device_t dev); static void ata_sata_phy_event(void *context, int dummy); static int ata_sata_connect(struct ata_channel *ch); static void ata_sata_setmode(device_t dev, int mode); @@ -97,7 +97,6 @@ static int ata_intel_31244_allocate(device_t dev); static int ata_intel_31244_status(device_t dev); static int ata_intel_31244_command(struct ata_request *request); -static void ata_intel_31244_reset(device_t dev); static int ata_ite_chipinit(device_t dev); static void ata_ite_setmode(device_t dev, int mode); static int ata_jmicron_chipinit(device_t dev); @@ -123,7 +122,6 @@ static int ata_nvidia_chipinit(device_t dev); static int ata_nvidia_allocate(device_t dev); static int ata_nvidia_status(device_t dev); -static void ata_nvidia_reset(device_t dev); static int ata_promise_chipinit(device_t dev); static int ata_promise_allocate(device_t dev); static int ata_promise_status(device_t dev); @@ -159,11 +157,11 @@ static void ata_sii_setmode(device_t dev, int mode); static int ata_sis_chipinit(device_t dev); static int ata_sis_allocate(device_t dev); -static void ata_sis_reset(device_t dev); static void ata_sis_setmode(device_t dev, int mode); static int ata_via_chipinit(device_t dev); static int ata_via_allocate(device_t dev); static void ata_via_reset(device_t dev); +static void ata_via_setmode(device_t dev, int mode); static void ata_via_southbridge_fixup(device_t dev); static void ata_via_family_setmode(device_t dev, int mode); static struct ata_chip_id *ata_match_chip(device_t dev, struct ata_chip_id *index); @@ -229,8 +227,9 @@ * SATA support functions */ static void -ata_sata_phy_enable(struct ata_channel *ch) +ata_sata_phy_reset(device_t dev) { + struct ata_channel *ch = device_get_softc(dev); int loop, retry; if ((ATA_IDX_INL(ch, ATA_SCONTROL) & ATA_SC_DET_MASK) == ATA_SC_DET_IDLE) { @@ -705,7 +704,7 @@ ATA_OUTL(ctlr->r_res2, ATA_AHCI_P_CMD + offset, ATA_AHCI_P_CMD_SUD); /* enable interface */ - ata_sata_phy_enable(ch); + ata_sata_phy_reset(dev); /* no ATAPI yet */ if (ch->devices & ATA_ATAPI_MASTER) { @@ -1752,7 +1751,7 @@ return ENXIO; ctlr->channels = 4; ctlr->allocate = ata_intel_31244_allocate; - ctlr->reset = ata_intel_31244_reset; + ctlr->reset = ata_sata_phy_reset; } ctlr->setmode = ata_sata_setmode; } @@ -2043,15 +2042,7 @@ return 0; } -static void -ata_intel_31244_reset(device_t dev) -{ - struct ata_channel *ch = device_get_softc(dev); - ata_sata_phy_enable(ch); -} - - /* * Integrated Technology Express Inc. (ITE) chipset support functions */ @@ -2763,7 +2754,7 @@ ATA_OUTL(ctlr->r_res1, 0x0200c + ATA_MV_EDMA_BASE(ch), ~0x0); /* enable channel and test for devices */ - ata_sata_phy_enable(ch); + ata_sata_phy_reset(dev); /* enable EDMA machinery */ ATA_OUTL(ctlr->r_res1, 0x02028 + ATA_MV_EDMA_BASE(ch), 0x00000001); @@ -2980,7 +2971,7 @@ int offset = ctlr->chip->cfg2 & NV4 ? 0x0440 : 0x0010; ctlr->allocate = ata_nvidia_allocate; - ctlr->reset = ata_nvidia_reset; + ctlr->reset = ata_sata_phy_reset; /* enable control access */ pci_write_config(dev, 0x50, pci_read_config(dev, 0x50, 1) | 0x04,1); @@ -3095,15 +3086,7 @@ return (status & (0x01 << shift)); } -static void -ata_nvidia_reset(device_t dev) -{ - struct ata_channel *ch = device_get_softc(dev); - ata_sata_phy_enable(ch); -} - - /* * Promise chipset support functions */ @@ -3772,7 +3755,7 @@ if ((ctlr->chip->cfg2 == PRSATA) || ((ctlr->chip->cfg2 == PRCMBO) && (ch->unit < 2))) { - ata_sata_phy_enable(ch); + ata_sata_phy_reset(dev); /* reset and enable plug/unplug intr */ ATA_OUTL(ctlr->r_res2, 0x06c, (0x00000011 << ch->unit)); @@ -3807,7 +3790,7 @@ (ATA_INL(ctlr->r_res2, 0x414 + (ch->unit << 8)) & ~0x00000003) | 0x00000001); - ata_sata_phy_enable(ch); + ata_sata_phy_reset(dev); /* reset and enable plug/unplug intr */ ATA_OUTL(ctlr->r_res2, 0x060, (0x00000011 << ch->unit)); @@ -4544,7 +4527,7 @@ ATA_OUTL(ctlr->r_res2, 0x48, ATA_INL(ctlr->r_res2, 0x48) & ~(0xc0 >> ch->unit)); - ata_sata_phy_enable(ch); + ata_sata_phy_reset(dev); /* enable PHY state change interrupt */ ATA_OUTL(ctlr->r_res2, 0x148 + offset, (1 << 16)); @@ -4730,7 +4713,7 @@ if ((ctlr->r_res2 = bus_alloc_resource_any(dev, ctlr->r_type2, &ctlr->r_rid2, RF_ACTIVE))) { ctlr->allocate = ata_sis_allocate; - ctlr->reset = ata_sis_reset; + ctlr->reset = ata_sata_phy_reset; /* enable PCI interrupt */ pci_write_config(dev, PCIR_COMMAND, @@ -4770,15 +4753,6 @@ } static void -ata_sis_reset(device_t dev) -{ - struct ata_channel *ch = device_get_softc(dev); - - ata_sata_phy_enable(ch); -} - - -static void ata_sis_setmode(device_t dev, int mode) { device_t gparent = GRANDPARENT(dev); @@ -4938,7 +4912,13 @@ pci_write_config(dev, PCIR_COMMAND, pci_read_config(dev, PCIR_COMMAND, 2) & ~0x0400,2); } - ctlr->setmode = ata_sata_setmode; + + if (ctlr->chip->cfg2 & VIABAR) { + ctlr->channels = 3; + ctlr->setmode = ata_via_setmode; + } + else + ctlr->setmode = ata_sata_setmode; return 0; } @@ -4999,6 +4979,8 @@ ch->r_io[i].offset = (i - ATA_BMCMD_PORT)+(ch->unit * ATA_BMIOSIZE); } ata_pci_hw(dev); + if (ch->unit > 1) + return 0; } else { /* setup the usual register normal pci style */ @@ -5022,9 +5004,46 @@ static void ata_via_reset(device_t dev) { + struct ata_pci_controller *ctlr = device_get_softc(device_get_parent(dev)); struct ata_channel *ch = device_get_softc(dev); - ata_sata_phy_enable(ch); + if ((ctlr->chip->cfg2 & VIABAR) && (ch->unit > 1)) + ata_generic_reset(dev); + else + ata_sata_phy_reset(dev); +} + +static void +ata_via_setmode(device_t dev, int mode) +{ + device_t gparent = GRANDPARENT(dev); + struct ata_pci_controller *ctlr = device_get_softc(gparent); + struct ata_channel *ch = device_get_softc(device_get_parent(dev)); + struct ata_device *atadev = device_get_softc(dev); + int error; + + if ((ctlr->chip->cfg2 & VIABAR) && (ch->unit > 1)) { + u_int8_t pio_timings[] = { 0xa8, 0x65, 0x65, 0x32, 0x20, + 0x65, 0x32, 0x20, + 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20 }; + u_int8_t dma_timings[] = { 0xee, 0xe8, 0xe6, 0xe4, 0xe2, 0xe1, 0xe0 }; + + mode = ata_check_80pin(dev, ata_limit_mode(dev, mode, ATA_UDMA6)); + error = ata_controlcmd(dev, ATA_SETFEATURES, ATA_SF_SETXFER, 0, mode); + if (bootverbose) + device_printf(dev, "%ssetting %s on %s chip\n", + (error) ? "FAILURE " : "", ata_mode2str(mode), + ctlr->chip->text); + if (!error) { + pci_write_config(gparent, 0xab, pio_timings[ata_mode2idx(mode)], 1); + if (mode >= ATA_UDMA0) + pci_write_config(gparent, 0xb3, + dma_timings[mode & ATA_MODE_MASK], 1); + atadev->mode = mode; + } + } + else + ata_sata_setmode(dev, mode); } static void @@ -5065,7 +5084,7 @@ struct ata_channel *ch = device_get_softc(device_get_parent(dev)); struct ata_device *atadev = device_get_softc(dev); u_int8_t timings[] = { 0xa8, 0x65, 0x42, 0x22, 0x20, 0x42, 0x22, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20 }; + 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20 }; int modes[][7] = { { 0xc2, 0xc1, 0xc0, 0x00, 0x00, 0x00, 0x00 }, /* VIA ATA33 */ { 0xee, 0xec, 0xea, 0xe9, 0xe8, 0x00, 0x00 }, /* VIA ATA66 */ ==== //depot/projects/linuxolator/src/sys/gnu/fs/ext2fs/ext2_vnops.c#4 (text+ko) ==== @@ -39,7 +39,7 @@ * * @(#)ufs_vnops.c 8.7 (Berkeley) 2/3/94 * @(#)ufs_vnops.c 8.27 (Berkeley) 5/27/95 - * $FreeBSD: src/sys/gnu/fs/ext2fs/ext2_vnops.c,v 1.107 2007/02/15 22:08:34 pjd Exp $ + * $FreeBSD: src/sys/gnu/fs/ext2fs/ext2_vnops.c,v 1.109 2007/03/01 20:47:41 pjd Exp $ */ #include "opt_suiddir.h" @@ -596,8 +596,8 @@ ip->i_gid = gid; ip->i_uid = uid; ip->i_flag |= IN_CHANGE; - if (ouid != uid || ogid != gid) { - if (priv_check_cred(cred, PRIV_VFS_CLEARSUGID, + if ((ip->i_mode & (ISUID | ISGID)) && (ouid != uid || ogid != gid)) { + if (priv_check_cred(cred, PRIV_VFS_RETAINSUGID, SUSER_ALLOWJAIL) != 0) ip->i_mode &= ~(ISUID | ISGID); } @@ -1648,7 +1648,7 @@ tvp->v_type = IFTOVT(mode); /* Rest init'd in getnewvnode(). */ ip->i_nlink = 1; if ((ip->i_mode & ISGID) && !groupmember(ip->i_gid, cnp->cn_cred)) { - if (priv_check_cred(cnp->cn_cred, PRIV_VFS_CLEARSUGID, + if (priv_check_cred(cnp->cn_cred, PRIV_VFS_RETAINSUGID, SUSER_ALLOWJAIL)) ip->i_mode &= ~ISGID; } ==== //depot/projects/linuxolator/src/sys/kern/kern_jail.c#7 (text+ko) ==== @@ -8,7 +8,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/kern_jail.c,v 1.58 2007/02/20 00:12:52 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_jail.c,v 1.59 2007/03/01 20:47:41 pjd Exp $"); #include "opt_mac.h" @@ -638,7 +638,7 @@ case PRIV_VFS_CHFLAGS_DEV: case PRIV_VFS_CHOWN: case PRIV_VFS_CHROOT: - case PRIV_VFS_CLEARSUGID: + case PRIV_VFS_RETAINSUGID: case PRIV_VFS_FCHROOT: case PRIV_VFS_LINK: case PRIV_VFS_SETGID: ==== //depot/projects/linuxolator/src/sys/sys/priv.h#6 (text+ko) ==== @@ -26,7 +26,7 @@ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/sys/priv.h,v 1.6 2007/02/27 23:38:58 pjd Exp $ + * $FreeBSD: src/sys/sys/priv.h,v 1.7 2007/03/01 20:47:42 pjd Exp $ */ /* @@ -238,7 +238,7 @@ #define PRIV_VFS_CHFLAGS_DEV 316 /* Can chflags() a device node. */ #define PRIV_VFS_CHOWN 317 /* Can set user; group to non-member. */ #define PRIV_VFS_CHROOT 318 /* chroot(). */ -#define PRIV_VFS_CLEARSUGID 319 /* Don't clear sugid on change. */ +#define PRIV_VFS_RETAINSUGID 319 /* Can retain sugid bits on change. */ #define PRIV_VFS_EXCEEDQUOTA 320 /* Exempt from quota restrictions. */ #define PRIV_VFS_EXTATTR_SYSTEM 321 /* Operate on system EA namespace. */ #define PRIV_VFS_FCHROOT 322 /* fchroot(). */ ==== //depot/projects/linuxolator/src/sys/ufs/ffs/ffs_vnops.c#7 (text+ko) ==== @@ -62,7 +62,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/ufs/ffs/ffs_vnops.c,v 1.165 2007/02/21 08:50:06 mckusick Exp $"); +__FBSDID("$FreeBSD: src/sys/ufs/ffs/ffs_vnops.c,v 1.167 2007/03/01 20:47:41 pjd Exp $"); #include #include @@ -788,11 +788,13 @@ * we clear the setuid and setgid bits as a precaution against * tampering. */ - if (resid > uio->uio_resid && ap->a_cred && - priv_check_cred(ap->a_cred, PRIV_VFS_CLEARSUGID, - SUSER_ALLOWJAIL)) { - ip->i_mode &= ~(ISUID | ISGID); - DIP_SET(ip, i_mode, ip->i_mode); + if ((ip->i_mode & (ISUID | ISGID)) && resid > uio->uio_resid && + ap->a_cred) { + if (priv_check_cred(ap->a_cred, PRIV_VFS_RETAINSUGID, + SUSER_ALLOWJAIL)) { + ip->i_mode &= ~(ISUID | ISGID); + DIP_SET(ip, i_mode, ip->i_mode); + } } if (error) { if (ioflag & IO_UNIT) { @@ -1115,10 +1117,12 @@ * we clear the setuid and setgid bits as a precaution against * tampering. */ - if (resid > uio->uio_resid && ucred && - priv_check_cred(ucred, PRIV_VFS_CLEARSUGID, SUSER_ALLOWJAIL)) { - ip->i_mode &= ~(ISUID | ISGID); - dp->di_mode = ip->i_mode; + if ((ip->i_mode & (ISUID | ISGID)) && resid > uio->uio_resid && ucred) { + if (priv_check_cred(ap->a_cred, PRIV_VFS_RETAINSUGID, + SUSER_ALLOWJAIL)) { + ip->i_mode &= ~(ISUID | ISGID); + dp->di_mode = ip->i_mode; + } } if (error) { if (ioflag & IO_UNIT) { ==== //depot/projects/linuxolator/src/sys/ufs/ufs/ufs_vnops.c#9 (text+ko) ==== @@ -35,7 +35,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/ufs/ufs/ufs_vnops.c,v 1.285 2007/02/08 09:47:19 kib Exp $"); +__FBSDID("$FreeBSD: src/sys/ufs/ufs/ufs_vnops.c,v 1.288 2007/03/01 21:44:08 pjd Exp $"); #include "opt_mac.h" #include "opt_quota.h" @@ -584,7 +584,7 @@ * the file or be the super-user. * * Possibly for historical reasons, try to use VADMIN in - * preference to VADMIN for a NULL timestamp. This means we + * preference to VWRITE for a NULL timestamp. This means we * will return EACCES in preference to EPERM if neither * check succeeds. */ @@ -786,10 +786,12 @@ panic("ufs_chown: lost quota"); #endif /* QUOTA */ ip->i_flag |= IN_CHANGE; - if (priv_check_cred(cred, PRIV_VFS_CLEARSUGID, SUSER_ALLOWJAIL) && - (ouid != uid || ogid != gid)) { - ip->i_mode &= ~(ISUID | ISGID); - DIP_SET(ip, i_mode, ip->i_mode); + if ((ip->i_mode & (ISUID | ISGID)) && (ouid != uid || ogid != gid)) { + if (priv_check_cred(cred, PRIV_VFS_RETAINSUGID, + SUSER_ALLOWJAIL)) { + ip->i_mode &= ~(ISUID | ISGID); + DIP_SET(ip, i_mode, ip->i_mode); + } } return (0); } From owner-p4-projects@FreeBSD.ORG Thu Mar 1 23:23:05 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 06CBE16A410; Thu, 1 Mar 2007 23:23:05 +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 BE25216A400 for ; Thu, 1 Mar 2007 23:23:04 +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 A033E13C4A8 for ; Thu, 1 Mar 2007 23:23:04 +0000 (UTC) (envelope-from jkim@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l21NN4VM027132 for ; Thu, 1 Mar 2007 23:23:04 GMT (envelope-from jkim@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l21NN4sT027129 for perforce@freebsd.org; Thu, 1 Mar 2007 23:23:04 GMT (envelope-from jkim@freebsd.org) Date: Thu, 1 Mar 2007 23:23:04 GMT Message-Id: <200703012323.l21NN4sT027129@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 115226 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 01 Mar 2007 23:23:05 -0000 http://perforce.freebsd.org/chv.cgi?CH=115226 Change 115226 by jkim@jkim_hammer on 2007/03/01 23:22:46 IFC (115225) Affected files ... .. //depot/projects/linuxolator/src/sys/netgraph/ng_source.c#2 integrate .. //depot/projects/linuxolator/src/sys/netgraph/ng_source.h#2 integrate .. //depot/projects/linuxolator/src/sys/ufs/ffs/ffs_vnops.c#8 integrate Differences ... ==== //depot/projects/linuxolator/src/sys/netgraph/ng_source.c#2 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/netgraph/ng_source.c,v 1.27 2006/01/23 10:28:04 glebius Exp $"); +__FBSDID("$FreeBSD: src/sys/netgraph/ng_source.c,v 1.28 2007/03/01 23:16:17 emaste Exp $"); /* * This node is used for high speed packet geneneration. It queues @@ -77,6 +77,8 @@ #define NG_SOURCE_INTR_TICKS 1 #define NG_SOURCE_DRIVER_IFQ_MAXLEN (4*1024) +#define mtod_off(m,off,t) ((t)(mtod((m),caddr_t)+(off))) + /* Per node info */ struct privdata { node_p node; @@ -88,6 +90,7 @@ struct callout intr_ch; uint64_t packets; /* packets to send */ uint32_t queueOctets; + struct ng_source_embed_info embed_timestamp; }; typedef struct privdata *sc_p; @@ -110,6 +113,10 @@ static void ng_source_stop (sc_p); static int ng_source_send (sc_p, int, int *); static int ng_source_store_output_ifp(sc_p, char *); +static void ng_source_packet_mod(sc_p, struct mbuf *, + int, int, caddr_t, int); +static int ng_source_dup_mod(sc_p, struct mbuf *, + struct mbuf **); /* Parse type for timeval */ static const struct ng_parse_struct_field ng_source_timeval_type_fields[] = { @@ -130,6 +137,14 @@ &ng_source_stats_type_fields }; +/* Parse type for struct ng_source_embed_info */ +static const struct ng_parse_struct_field ng_source_embed_type_fields[] = + NG_SOURCE_EMBED_TYPE_INFO; +static const struct ng_parse_type ng_source_embed_type = { + &ng_parse_struct_type, + &ng_source_embed_type_fields +}; + /* List of commands and how to convert arguments to/from ASCII */ static const struct ng_cmdlist ng_source_cmds[] = { { @@ -188,6 +203,20 @@ &ng_parse_uint32_type, NULL }, + { + NGM_SOURCE_COOKIE, + NGM_SOURCE_SET_TIMESTAMP, + "settimestamp", + &ng_source_embed_type, + NULL + }, + { + NGM_SOURCE_COOKIE, + NGM_SOURCE_GET_TIMESTAMP, + "gettimestamp", + NULL, + &ng_source_embed_type + }, { 0 } }; @@ -374,6 +403,29 @@ break; } + case NGM_SOURCE_SET_TIMESTAMP: + { + struct ng_source_embed_info *embed; + + embed = (struct ng_source_embed_info *)msg->data; + bcopy(embed, &sc->embed_timestamp, sizeof(*embed)); + + break; + } + case NGM_SOURCE_GET_TIMESTAMP: + { + struct ng_source_embed_info *embed; + + NG_MKRESPONSE(resp, msg, sizeof(*embed), M_DONTWAIT); + if (resp == NULL) { + error = ENOMEM; + goto done; + } + embed = (struct ng_source_embed_info *)resp->data; + bcopy(&sc->embed_timestamp, embed, sizeof(*embed)); + + break; + } default: error = EINVAL; break; @@ -662,11 +714,13 @@ if (m == NULL) break; - /* Duplicate the packet. */ - m2 = m_copypacket(m, M_DONTWAIT); - if (m2 == NULL) { - _IF_PREPEND(&sc->snd_queue, m); - error = ENOBUFS; + /* Duplicate and modify the packet. */ + error = ng_source_dup_mod(sc, m, &m2); + if (error) { + if (error == ENOBUFS) + _IF_PREPEND(&sc->snd_queue, m); + else + _IF_ENQUEUE(&sc->snd_queue, m); break; } @@ -685,3 +739,66 @@ *sent_p = sent; return (error); } + +/* + * Modify packet in 'm' by changing 'len' bytes starting at 'offset' + * to data in 'cp'. + * + * The packet data in 'm' must be in a contiguous buffer in a single mbuf. + */ +static void +ng_source_packet_mod(sc_p sc, struct mbuf *m, int offset, int len, caddr_t cp, + int flags) +{ + if (len == 0) + return; + + /* Can't modify beyond end of packet. */ + /* TODO: Pad packet for this case. */ + if (offset + len > m->m_len) + return; + + bcopy(cp, mtod_off(m, offset, caddr_t), len); +} + +static int +ng_source_dup_mod(sc_p sc, struct mbuf *m0, struct mbuf **m_ptr) +{ + struct mbuf *m; + struct ng_source_embed_info *ts; + int modify; + int error = 0; + + /* Are we going to modify packets? */ + modify = sc->embed_timestamp.flags & NGM_SOURCE_EMBED_ENABLE; + + /* Duplicate the packet. */ + if (modify) + m = m_dup(m0, M_DONTWAIT); + else + m = m_copypacket(m0, M_DONTWAIT); + if (m == NULL) { + error = ENOBUFS; + goto done; + } + *m_ptr = m; + + if (!modify) + goto done; + + /* Modify the copied packet for sending. */ + KASSERT(M_WRITABLE(m), ("%s: packet not writable", __func__)); + + ts = &sc->embed_timestamp; + if (ts->flags & NGM_SOURCE_EMBED_ENABLE) { + struct timeval now; + getmicrotime(&now); + now.tv_sec = htonl(now.tv_sec); + now.tv_usec = htonl(now.tv_usec); + ng_source_packet_mod(sc, m, ts->offset, sizeof (now), + (caddr_t)&now, ts->flags); + } + +done: + return(error); +} ==== //depot/projects/linuxolator/src/sys/netgraph/ng_source.h#2 (text+ko) ==== @@ -36,7 +36,7 @@ * * Author: Dave Chapeskie * - * $FreeBSD: src/sys/netgraph/ng_source.h,v 1.7 2005/12/23 19:14:38 glebius Exp $ + * $FreeBSD: src/sys/netgraph/ng_source.h,v 1.8 2007/03/01 23:16:17 emaste Exp $ */ #ifndef _NETGRAPH_NG_SOURCE_H_ @@ -78,6 +78,21 @@ { NULL } \ } +/* Packet embedding info for NGM_SOURCE_GET/SET_TIMESTAMP */ +struct ng_source_embed_info { + uint16_t offset; /* offset from ethernet header */ + uint8_t flags; + uint8_t spare; +}; +#define NGM_SOURCE_EMBED_ENABLE 0x01 /* enable embedding */ + +/* Keep this in sync with the above structure definition. */ +#define NG_SOURCE_EMBED_TYPE_INFO { \ + { "offset", &ng_parse_hint16_type }, \ + { "flags", &ng_parse_hint8_type }, \ + { NULL } \ +} + /* Netgraph commands */ enum { NGM_SOURCE_GET_STATS = 1, /* get stats */ @@ -88,6 +103,8 @@ NGM_SOURCE_CLR_DATA, /* clear the queued data */ NGM_SOURCE_SETIFACE, /* configure downstream iface */ NGM_SOURCE_SETPPS, /* rate-limiting packets per second */ + NGM_SOURCE_SET_TIMESTAMP, /* embed xmit timestamp */ + NGM_SOURCE_GET_TIMESTAMP, }; #endif /* _NETGRAPH_NG_SOURCE_H_ */ ==== //depot/projects/linuxolator/src/sys/ufs/ffs/ffs_vnops.c#8 (text+ko) ==== @@ -62,7 +62,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/ufs/ffs/ffs_vnops.c,v 1.167 2007/03/01 20:47:41 pjd Exp $"); +__FBSDID("$FreeBSD: src/sys/ufs/ffs/ffs_vnops.c,v 1.168 2007/03/01 23:14:46 pjd Exp $"); #include #include @@ -1118,7 +1118,7 @@ * tampering. */ if ((ip->i_mode & (ISUID | ISGID)) && resid > uio->uio_resid && ucred) { - if (priv_check_cred(ap->a_cred, PRIV_VFS_RETAINSUGID, + if (priv_check_cred(ucred, PRIV_VFS_RETAINSUGID, SUSER_ALLOWJAIL)) { ip->i_mode &= ~(ISUID | ISGID); dp->di_mode = ip->i_mode; From owner-p4-projects@FreeBSD.ORG Fri Mar 2 00:41: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 F096516A403; Fri, 2 Mar 2007 00:41: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 9486216A400 for ; Fri, 2 Mar 2007 00:41:48 +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 82C7313C47E for ; Fri, 2 Mar 2007 00:41:48 +0000 (UTC) (envelope-from jkim@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l220fml8044497 for ; Fri, 2 Mar 2007 00:41:48 GMT (envelope-from jkim@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l220fmim044494 for perforce@freebsd.org; Fri, 2 Mar 2007 00:41:48 GMT (envelope-from jkim@freebsd.org) Date: Fri, 2 Mar 2007 00:41:48 GMT Message-Id: <200703020041.l220fmim044494@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 115233 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 02 Mar 2007 00:41:49 -0000 http://perforce.freebsd.org/chv.cgi?CH=115233 Change 115233 by jkim@jkim_hammer on 2007/03/02 00:40:58 IFC Affected files ... .. //depot/projects/linuxolator/src/sys/amd64/linux32/linux.h#24 integrate .. //depot/projects/linuxolator/src/sys/amd64/linux32/linux32_machdep.c#46 edit .. //depot/projects/linuxolator/src/sys/compat/linux/linux_emul.c#41 integrate .. //depot/projects/linuxolator/src/sys/fs/fifofs/fifo_vnops.c#2 integrate .. //depot/projects/linuxolator/src/sys/i386/linux/linux.h#20 integrate .. //depot/projects/linuxolator/src/sys/i386/linux/linux_machdep.c#37 integrate Differences ... ==== //depot/projects/linuxolator/src/sys/amd64/linux32/linux.h#24 (text+ko) ==== @@ -27,7 +27,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/amd64/linux32/linux.h,v 1.13 2007/02/24 16:49:24 netchild Exp $ + * $FreeBSD: src/sys/amd64/linux32/linux.h,v 1.14 2007/03/02 00:08:47 jkim Exp $ */ #ifndef _AMD64_LINUX_H_ ==== //depot/projects/linuxolator/src/sys/amd64/linux32/linux32_machdep.c#46 (text+ko) ==== @@ -29,7 +29,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_machdep.c,v 1.35 2007/02/27 02:08:00 jkim Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_machdep.c,v 1.36 2007/03/02 00:08:47 jkim Exp $"); #include #include @@ -602,7 +602,7 @@ if (error) return (error); - if (args->flags & (LINUX_CLONE_PARENT|LINUX_CLONE_THREAD)) { + if (args->flags & (LINUX_CLONE_PARENT | LINUX_CLONE_THREAD)) { sx_xlock(&proctree_lock); PROC_LOCK(p2); proc_reparent(p2, td->td_proc->p_pptr); ==== //depot/projects/linuxolator/src/sys/compat/linux/linux_emul.c#41 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/linux/linux_emul.c,v 1.18 2007/02/24 16:49:24 netchild Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linux/linux_emul.c,v 1.19 2007/03/02 00:08:47 jkim Exp $"); #include "opt_compat.h" ==== //depot/projects/linuxolator/src/sys/fs/fifofs/fifo_vnops.c#2 (text+ko) ==== @@ -29,7 +29,7 @@ * SUCH DAMAGE. * * @(#)fifo_vnops.c 8.10 (Berkeley) 5/27/95 - * $FreeBSD: src/sys/fs/fifofs/fifo_vnops.c,v 1.134 2006/03/15 10:15:35 rwatson Exp $ + * $FreeBSD: src/sys/fs/fifofs/fifo_vnops.c,v 1.135 2007/03/02 00:10:11 mpp Exp $ */ #include @@ -447,6 +447,10 @@ { register struct fifoinfo *fip = vp->v_fifoinfo; + if (fip == NULL){ + printf(", NULL v_fifoinfo"); + return (0); + } printf(", fifo with %ld readers and %ld writers", fip->fi_readers, fip->fi_writers); return (0); ==== //depot/projects/linuxolator/src/sys/i386/linux/linux.h#20 (text+ko) ==== @@ -25,7 +25,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/i386/linux/linux.h,v 1.75 2007/02/24 16:49:24 netchild Exp $ + * $FreeBSD: src/sys/i386/linux/linux.h,v 1.76 2007/03/02 00:08:47 jkim Exp $ */ #ifndef _I386_LINUX_H_ @@ -737,7 +737,7 @@ }; struct l_desc_struct { - unsigned long a,b; + unsigned long a, b; }; ==== //depot/projects/linuxolator/src/sys/i386/linux/linux_machdep.c#37 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/i386/linux/linux_machdep.c,v 1.73 2007/02/27 02:08:01 jkim Exp $"); +__FBSDID("$FreeBSD: src/sys/i386/linux/linux_machdep.c,v 1.74 2007/03/02 00:08:47 jkim Exp $"); #include #include @@ -431,7 +431,7 @@ if (error) return (error); - if (args->flags & (LINUX_CLONE_PARENT|LINUX_CLONE_THREAD)) { + if (args->flags & (LINUX_CLONE_PARENT | LINUX_CLONE_THREAD)) { sx_xlock(&proctree_lock); PROC_LOCK(p2); proc_reparent(p2, td->td_proc->p_pptr); From owner-p4-projects@FreeBSD.ORG Fri Mar 2 07:43: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 259FE16A404; Fri, 2 Mar 2007 07:43: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 BC21416A400 for ; Fri, 2 Mar 2007 07:43:52 +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 A8CE613C467 for ; Fri, 2 Mar 2007 07:43:52 +0000 (UTC) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l227hqgN041706 for ; Fri, 2 Mar 2007 07:43:52 GMT (envelope-from mjacob@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l227hfTw041663 for perforce@freebsd.org; Fri, 2 Mar 2007 07:43:41 GMT (envelope-from mjacob@freebsd.org) Date: Fri, 2 Mar 2007 07:43:41 GMT Message-Id: <200703020743.l227hfTw041663@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 115237 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 02 Mar 2007 07:43:54 -0000 http://perforce.freebsd.org/chv.cgi?CH=115237 Change 115237 by mjacob@mjexp on 2007/03/02 07:42:40 IFC Affected files ... .. //depot/projects/mjexp/Makefile.inc1#5 integrate .. //depot/projects/mjexp/ObsoleteFiles.inc#9 integrate .. //depot/projects/mjexp/UPDATING#9 integrate .. //depot/projects/mjexp/bin/df/df.1#2 integrate .. //depot/projects/mjexp/bin/rcp/rcp.1#2 integrate .. //depot/projects/mjexp/bin/setfacl/setfacl.c#2 integrate .. //depot/projects/mjexp/contrib/libpcap/pcap-bpf.c#2 integrate .. //depot/projects/mjexp/etc/mtree/BSD.include.dist#5 integrate .. //depot/projects/mjexp/gnu/usr.bin/gdb/kgdb/kgdb.h#2 integrate .. //depot/projects/mjexp/gnu/usr.bin/gdb/kgdb/kthr.c#4 integrate .. //depot/projects/mjexp/gnu/usr.bin/gdb/kgdb/trgt_i386.c#2 integrate .. //depot/projects/mjexp/include/protocols/dumprestore.h#2 integrate .. //depot/projects/mjexp/lib/libarchive/archive_entry.c#4 integrate .. //depot/projects/mjexp/lib/libarchive/archive_entry.h#3 integrate .. //depot/projects/mjexp/lib/libarchive/archive_read_support_format_iso9660.c#5 integrate .. //depot/projects/mjexp/lib/libc/gen/tls.c#3 integrate .. //depot/projects/mjexp/lib/libc/net/Makefile.inc#5 integrate .. //depot/projects/mjexp/lib/libc/net/Symbol.map#2 integrate .. //depot/projects/mjexp/lib/libc/net/addr2ascii.3#2 delete .. //depot/projects/mjexp/lib/libc/net/addr2ascii.c#2 delete .. //depot/projects/mjexp/lib/libc/net/ascii2addr.c#2 delete .. //depot/projects/mjexp/lib/libc/net/getnameinfo.3#2 integrate .. //depot/projects/mjexp/lib/libc/net/getnameinfo.c#2 integrate .. //depot/projects/mjexp/lib/libc/net/inet.3#4 integrate .. //depot/projects/mjexp/lib/libc/net/linkaddr.3#3 integrate .. //depot/projects/mjexp/lib/libc/net/sctp_bindx.3#2 integrate .. //depot/projects/mjexp/lib/libc/net/sctp_connectx.3#2 integrate .. //depot/projects/mjexp/lib/libc/net/sctp_freepaddrs.3#2 integrate .. //depot/projects/mjexp/lib/libc/net/sctp_getaddrlen.3#2 integrate .. //depot/projects/mjexp/lib/libc/net/sctp_getassocid.3#2 integrate .. //depot/projects/mjexp/lib/libc/net/sctp_getpaddrs.3#2 integrate .. //depot/projects/mjexp/lib/libc/net/sctp_opt_info.3#2 integrate .. //depot/projects/mjexp/lib/libc/net/sctp_recvmsg.3#2 integrate .. //depot/projects/mjexp/lib/libc/net/sctp_send.3#2 integrate .. //depot/projects/mjexp/lib/libc/net/sctp_sendmsg.3#2 integrate .. //depot/projects/mjexp/lib/libc/posix1e/acl_from_text.c#2 integrate .. //depot/projects/mjexp/lib/libc/posix1e/acl_support.c#2 integrate .. //depot/projects/mjexp/lib/libc/posix1e/acl_support.h#2 integrate .. //depot/projects/mjexp/lib/libc/sys/sctp_generic_recvmsg.2#2 integrate .. //depot/projects/mjexp/lib/libc/sys/sctp_generic_sendmsg.2#2 integrate .. //depot/projects/mjexp/lib/libc/sys/sctp_peeloff.2#2 integrate .. //depot/projects/mjexp/lib/libncp/ipxsap.h#3 integrate .. //depot/projects/mjexp/lib/libwrap/Makefile#3 integrate .. //depot/projects/mjexp/sbin/dump/dump.h#2 integrate .. //depot/projects/mjexp/sbin/dump/traverse.c#2 integrate .. //depot/projects/mjexp/sbin/geom/class/Makefile#5 integrate .. //depot/projects/mjexp/sbin/geom/class/multipath/gmultipath.8#1 branch .. //depot/projects/mjexp/sbin/ifconfig/af_atalk.c#2 integrate .. //depot/projects/mjexp/sbin/ifconfig/af_inet.c#2 integrate .. //depot/projects/mjexp/sbin/ifconfig/af_inet6.c#3 integrate .. //depot/projects/mjexp/sbin/ifconfig/af_ipx.c#2 integrate .. //depot/projects/mjexp/sbin/ifconfig/af_link.c#2 integrate .. //depot/projects/mjexp/sbin/ifconfig/ifconfig.c#3 integrate .. //depot/projects/mjexp/sbin/ifconfig/ifconfig.h#2 integrate .. //depot/projects/mjexp/sbin/restore/dirs.c#2 integrate .. //depot/projects/mjexp/sbin/restore/extern.h#2 integrate .. //depot/projects/mjexp/sbin/restore/restore.h#3 integrate .. //depot/projects/mjexp/sbin/restore/tape.c#3 integrate .. //depot/projects/mjexp/share/man/man4/bpf.4#2 integrate .. //depot/projects/mjexp/share/man/man4/isp.4#2 integrate .. //depot/projects/mjexp/share/man/man4/multicast.4#2 integrate .. //depot/projects/mjexp/share/man/man4/sctp.4#2 integrate .. //depot/projects/mjexp/share/man/man4/tcp.4#3 integrate .. //depot/projects/mjexp/share/man/man9/BUS_SETUP_INTR.9#2 integrate .. //depot/projects/mjexp/share/man/man9/Makefile#10 integrate .. //depot/projects/mjexp/share/man/man9/extattr.9#2 integrate .. //depot/projects/mjexp/share/man/man9/mbuf.9#4 integrate .. //depot/projects/mjexp/share/man/man9/rwlock.9#2 integrate .. //depot/projects/mjexp/share/man/man9/sleep.9#3 integrate .. //depot/projects/mjexp/share/man/man9/vm_page_deactivate.9#2 integrate .. //depot/projects/mjexp/share/man/man9/vm_page_unmanage.9#2 delete .. //depot/projects/mjexp/share/monetdef/ru_RU.CP1251.src#2 integrate .. //depot/projects/mjexp/share/monetdef/ru_RU.CP866.src#2 integrate .. //depot/projects/mjexp/share/monetdef/ru_RU.ISO8859-5.src#2 integrate .. //depot/projects/mjexp/share/monetdef/ru_RU.KOI8-R.src#2 integrate .. //depot/projects/mjexp/share/monetdef/ru_RU.UTF-8.src#2 integrate .. //depot/projects/mjexp/sys/amd64/linux32/linux.h#9 integrate .. //depot/projects/mjexp/sys/amd64/linux32/linux32_machdep.c#10 integrate .. //depot/projects/mjexp/sys/arm/arm/db_interface.c#3 integrate .. //depot/projects/mjexp/sys/arm/arm/locore.S#3 integrate .. //depot/projects/mjexp/sys/arm/arm/support.S#2 integrate .. //depot/projects/mjexp/sys/arm/arm/trap.c#4 integrate .. //depot/projects/mjexp/sys/arm/at91/at91.c#4 integrate .. //depot/projects/mjexp/sys/arm/at91/at91_rtc.c#3 integrate .. //depot/projects/mjexp/sys/arm/at91/at91_spi.c#5 integrate .. //depot/projects/mjexp/sys/arm/at91/ohci_atmelarm.c#2 integrate .. //depot/projects/mjexp/sys/arm/conf/AVILA#2 integrate .. //depot/projects/mjexp/sys/arm/sa11x0/sa11x0_ost.c#4 integrate .. //depot/projects/mjexp/sys/arm/xscale/ixp425/avila_ata.c#2 integrate .. //depot/projects/mjexp/sys/arm/xscale/ixp425/ixp425_qmgr.c#2 integrate .. //depot/projects/mjexp/sys/cam/scsi/scsi_target.c#3 integrate .. //depot/projects/mjexp/sys/compat/linprocfs/linprocfs.c#6 integrate .. //depot/projects/mjexp/sys/compat/linux/linux_emul.c#10 integrate .. //depot/projects/mjexp/sys/compat/linux/linux_futex.c#2 integrate .. //depot/projects/mjexp/sys/compat/linux/linux_futex.h#2 integrate .. //depot/projects/mjexp/sys/conf/NOTES#13 integrate .. //depot/projects/mjexp/sys/conf/files#14 integrate .. //depot/projects/mjexp/sys/conf/options#12 integrate .. //depot/projects/mjexp/sys/dev/acpica/acpi_ec.c#2 integrate .. //depot/projects/mjexp/sys/dev/ata/ata-chipset.c#8 integrate .. //depot/projects/mjexp/sys/dev/ata/atapi-cam.c#4 integrate .. //depot/projects/mjexp/sys/dev/ath/if_ath.c#6 integrate .. //depot/projects/mjexp/sys/dev/ath/if_athvar.h#5 integrate .. //depot/projects/mjexp/sys/dev/em/if_em.c#5 integrate .. //depot/projects/mjexp/sys/dev/fdc/fdc.c#4 integrate .. //depot/projects/mjexp/sys/dev/firewire/fwohci.c#2 integrate .. //depot/projects/mjexp/sys/dev/firewire/sbp.c#4 integrate .. //depot/projects/mjexp/sys/dev/hptmv/entry.c#4 integrate .. //depot/projects/mjexp/sys/dev/hptmv/ioctl.c#2 integrate .. //depot/projects/mjexp/sys/dev/hwpmc/hwpmc_mod.c#3 integrate .. //depot/projects/mjexp/sys/dev/ipmi/ipmi_ssif.c#2 integrate .. //depot/projects/mjexp/sys/dev/mii/rlphy.c#7 integrate .. //depot/projects/mjexp/sys/dev/pccard/pccard_cis.c#2 integrate .. //depot/projects/mjexp/sys/dev/pccbb/pccbb.c#5 integrate .. //depot/projects/mjexp/sys/dev/random/randomdev_soft.c#2 integrate .. //depot/projects/mjexp/sys/dev/re/if_re.c#8 integrate .. //depot/projects/mjexp/sys/dev/scd/scd.c#2 integrate .. //depot/projects/mjexp/sys/dev/sound/midi/midi.c#3 integrate .. //depot/projects/mjexp/sys/dev/sound/midi/midi.h#3 integrate .. //depot/projects/mjexp/sys/dev/sound/midi/midiq.h#3 integrate .. //depot/projects/mjexp/sys/dev/sound/midi/mpu401.c#3 integrate .. //depot/projects/mjexp/sys/dev/sound/midi/mpu401.h#3 integrate .. //depot/projects/mjexp/sys/dev/sound/midi/mpu_if.m#3 integrate .. //depot/projects/mjexp/sys/dev/sound/midi/mpufoi_if.m#3 integrate .. //depot/projects/mjexp/sys/dev/sound/midi/sequencer.c#4 integrate .. //depot/projects/mjexp/sys/dev/sound/midi/sequencer.h#3 integrate .. //depot/projects/mjexp/sys/dev/sound/midi/synth_if.m#3 integrate .. //depot/projects/mjexp/sys/dev/sound/pci/hda/hdac.c#9 integrate .. //depot/projects/mjexp/sys/dev/usb/sl811hs.c#2 integrate .. //depot/projects/mjexp/sys/dev/usb/sl811hsvar.h#2 integrate .. //depot/projects/mjexp/sys/dev/usb/umass.c#6 integrate .. //depot/projects/mjexp/sys/dev/usb/usb_subr.c#4 integrate .. //depot/projects/mjexp/sys/dev/usb/usbdevs#7 integrate .. //depot/projects/mjexp/sys/dev/usb/uvscom.c#2 integrate .. //depot/projects/mjexp/sys/dev/zs/z8530var.h#2 integrate .. //depot/projects/mjexp/sys/dev/zs/zs.c#3 integrate .. //depot/projects/mjexp/sys/dev/zs/zs_macio.c#2 integrate .. //depot/projects/mjexp/sys/fs/fifofs/fifo_vnops.c#2 integrate .. //depot/projects/mjexp/sys/fs/smbfs/smbfs_smb.c#3 integrate .. //depot/projects/mjexp/sys/geom/geom_dev.c#3 integrate .. //depot/projects/mjexp/sys/geom/geom_io.c#5 integrate .. //depot/projects/mjexp/sys/gnu/fs/ext2fs/ext2_vnops.c#4 integrate .. //depot/projects/mjexp/sys/i386/ibcs2/ibcs2_xenix.c#3 integrate .. //depot/projects/mjexp/sys/i386/linux/linux.h#8 integrate .. //depot/projects/mjexp/sys/i386/linux/linux_machdep.c#10 integrate .. //depot/projects/mjexp/sys/isa/syscons_isa.c#2 integrate .. //depot/projects/mjexp/sys/kern/kern_fork.c#7 integrate .. //depot/projects/mjexp/sys/kern/kern_intr.c#8 integrate .. //depot/projects/mjexp/sys/kern/kern_jail.c#5 integrate .. //depot/projects/mjexp/sys/kern/kern_linker.c#5 integrate .. //depot/projects/mjexp/sys/kern/kern_lock.c#4 integrate .. //depot/projects/mjexp/sys/kern/kern_mutex.c#4 integrate .. //depot/projects/mjexp/sys/kern/kern_resource.c#7 integrate .. //depot/projects/mjexp/sys/kern/kern_rwlock.c#3 integrate .. //depot/projects/mjexp/sys/kern/kern_sx.c#3 integrate .. //depot/projects/mjexp/sys/kern/kern_synch.c#8 integrate .. //depot/projects/mjexp/sys/kern/link_elf.c#3 integrate .. //depot/projects/mjexp/sys/kern/sched_4bsd.c#9 integrate .. //depot/projects/mjexp/sys/kern/sched_ule.c#11 integrate .. //depot/projects/mjexp/sys/kern/subr_bus.c#3 integrate .. //depot/projects/mjexp/sys/kern/subr_lock.c#4 integrate .. //depot/projects/mjexp/sys/kern/sys_generic.c#3 integrate .. //depot/projects/mjexp/sys/kern/uipc_socket.c#9 integrate .. //depot/projects/mjexp/sys/kern/uipc_usrreq.c#8 integrate .. //depot/projects/mjexp/sys/modules/geom/Makefile#6 integrate .. //depot/projects/mjexp/sys/net/bpf.c#5 integrate .. //depot/projects/mjexp/sys/net/bpf.h#2 integrate .. //depot/projects/mjexp/sys/net/bpfdesc.h#3 integrate .. //depot/projects/mjexp/sys/net/if_vlan_var.h#2 integrate .. //depot/projects/mjexp/sys/netgraph/ng_source.c#2 integrate .. //depot/projects/mjexp/sys/netgraph/ng_source.h#2 integrate .. //depot/projects/mjexp/sys/netinet/in.h#4 integrate .. //depot/projects/mjexp/sys/netinet/ip_mroute.c#7 integrate .. //depot/projects/mjexp/sys/netinet/ip_output.c#5 integrate .. //depot/projects/mjexp/sys/netinet/tcp_input.c#6 integrate .. //depot/projects/mjexp/sys/netinet/tcp_output.c#4 integrate .. //depot/projects/mjexp/sys/netinet/tcp_subr.c#5 integrate .. //depot/projects/mjexp/sys/netinet/tcp_timer.c#2 integrate .. //depot/projects/mjexp/sys/netinet/tcp_timer.h#2 integrate .. //depot/projects/mjexp/sys/netinet/tcp_usrreq.c#5 integrate .. //depot/projects/mjexp/sys/netinet/tcp_var.h#3 integrate .. //depot/projects/mjexp/sys/netinet6/ip6_mroute.c#4 integrate .. //depot/projects/mjexp/sys/netinet6/ip6_mroute.h#3 integrate .. //depot/projects/mjexp/sys/netinet6/raw_ip6.c#3 integrate .. //depot/projects/mjexp/sys/netipx/ipx_ip.c#3 integrate .. //depot/projects/mjexp/sys/netipx/ipx_ip.h#3 integrate .. //depot/projects/mjexp/sys/netncp/ncp_sock.c#2 integrate .. //depot/projects/mjexp/sys/nfsclient/bootp_subr.c#4 integrate .. //depot/projects/mjexp/sys/pc98/cbus/clock.c#5 integrate .. //depot/projects/mjexp/sys/pc98/cbus/syscons_cbus.c#2 integrate .. //depot/projects/mjexp/sys/powerpc/powermac/pswitch.c#2 integrate .. //depot/projects/mjexp/sys/sparc64/sparc64/machdep.c#5 integrate .. //depot/projects/mjexp/sys/sys/extattr.h#2 integrate .. //depot/projects/mjexp/sys/sys/lock.h#4 integrate .. //depot/projects/mjexp/sys/sys/lock_profile.h#3 integrate .. //depot/projects/mjexp/sys/sys/mbuf.h#4 integrate .. //depot/projects/mjexp/sys/sys/mutex.h#4 integrate .. //depot/projects/mjexp/sys/sys/priv.h#3 integrate .. //depot/projects/mjexp/sys/sys/rwlock.h#3 integrate .. //depot/projects/mjexp/sys/sys/systm.h#8 integrate .. //depot/projects/mjexp/sys/sys/unpcb.h#3 integrate .. //depot/projects/mjexp/sys/tools/fw_stub.awk#3 integrate .. //depot/projects/mjexp/sys/ufs/ffs/ffs_vnops.c#6 integrate .. //depot/projects/mjexp/sys/ufs/ufs/ufs_vnops.c#7 integrate .. //depot/projects/mjexp/sys/vm/phys_pager.c#3 integrate .. //depot/projects/mjexp/sys/vm/swap_pager.c#6 integrate .. //depot/projects/mjexp/sys/vm/vm_kern.c#5 integrate .. //depot/projects/mjexp/sys/vm/vm_map.c#3 integrate .. //depot/projects/mjexp/sys/vm/vm_object.c#6 integrate .. //depot/projects/mjexp/sys/vm/vm_page.c#8 integrate .. //depot/projects/mjexp/sys/vm/vm_page.h#4 integrate .. //depot/projects/mjexp/tools/regression/ethernet/ethermulti/Makefile#1 branch .. //depot/projects/mjexp/tools/regression/ethernet/ethermulti/ethermulti.c#1 branch .. //depot/projects/mjexp/tools/regression/netinet/ipbroadcast/Makefile#1 branch .. //depot/projects/mjexp/tools/regression/netinet/ipbroadcast/ipbroadcast.c#1 branch .. //depot/projects/mjexp/usr.bin/cut/cut.1#2 integrate .. //depot/projects/mjexp/usr.bin/find/find.1#4 integrate .. //depot/projects/mjexp/usr.bin/netstat/bpf.c#3 integrate .. //depot/projects/mjexp/usr.bin/netstat/if.c#3 integrate .. //depot/projects/mjexp/usr.bin/netstat/inet.c#2 integrate .. //depot/projects/mjexp/usr.bin/netstat/inet6.c#2 integrate .. //depot/projects/mjexp/usr.bin/netstat/mcast.c#3 integrate .. //depot/projects/mjexp/usr.bin/netstat/mroute.c#3 integrate .. //depot/projects/mjexp/usr.bin/netstat/mroute6.c#3 integrate .. //depot/projects/mjexp/usr.bin/rup/rup.1#2 integrate .. //depot/projects/mjexp/usr.bin/setchannel/setchannel.1#2 integrate .. //depot/projects/mjexp/usr.bin/setchannel/setchannel.c#2 integrate .. //depot/projects/mjexp/usr.bin/ul/ul.1#2 integrate .. //depot/projects/mjexp/usr.sbin/fdformat/fdformat.1#2 integrate .. //depot/projects/mjexp/usr.sbin/ppp/radius.c#2 integrate .. //depot/projects/mjexp/usr.sbin/ypset/ypset.c#2 integrate Differences ... ==== //depot/projects/mjexp/Makefile.inc1#5 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.566 2007/01/20 07:48:09 rafan Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.569 2007/03/01 15:42:23 ru Exp $ # # Make command line options: # -DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir @@ -235,36 +235,30 @@ .else LIB32CPUTYPE= ${TARGET_CPUTYPE} .endif -LIB32PREFLAGS= -m32 -march=${LIB32CPUTYPE} -mfancy-math-387 -DCOMPAT_32BIT -LIB32POSTFLAGS= -I${LIB32TMP}/usr/include \ +LIB32FLAGS= -m32 -march=${LIB32CPUTYPE} -mfancy-math-387 -DCOMPAT_32BIT \ + -iprefix ${LIB32TMP}/usr/ \ -L${LIB32TMP}/usr/lib32 \ -B${LIB32TMP}/usr/lib32 -LIB32CC= ${LIB32PREFLAGS} \ - ${LIB32POSTFLAGS} -LIB32CXX= ${LIB32PREFLAGS} -I${LIB32TMP}/usr/include/c++/3.4 \ - ${LIB32POSTFLAGS} -LIB32OBJC= ${LIB32PREFLAGS} -I${LIB32TMP}/usr/include/objc \ - ${LIB32POSTFLAGS} # Yes, the flags are redundant. -LIB32MAKEENV= MAKEOBJDIRPREFIX=${OBJTREE}/lib32 \ +LIB32WMAKEENV= MAKEOBJDIRPREFIX=${OBJTREE}/lib32 \ _SHLIBDIRPREFIX=${LIB32TMP} \ MACHINE=i386 \ MACHINE_ARCH=i386 \ INSTALL="sh ${.CURDIR}/tools/install.sh" \ PATH=${TMPPATH} \ - CC="${CC} ${LIB32CC}" \ - CXX="${CXX} ${LIB32CXX}" \ - OBJC="${OBJC} ${LIB32OBJC}" \ + CC="${CC} ${LIB32FLAGS}" \ + CXX="${CXX} ${LIB32FLAGS}" \ + OBJC="${OBJC} ${LIB32FLAGS}" \ LD="${LD} -m elf_i386_fbsd -Y P,${LIB32TMP}/usr/lib32" \ AS="${AS} --32" \ LIBDIR=/usr/lib32 \ SHLIBDIR=/usr/lib32 -LIB32MAKE= ${LIB32MAKEENV} ${MAKE} -DNO_CPU_CFLAGS -DCOMPAT_32BIT \ +LIB32WMAKE= ${LIB32WMAKEENV} ${MAKE} -DNO_CPU_CFLAGS -DCOMPAT_32BIT \ -DWITHOUT_BIND -DWITHOUT_MAN -DWITHOUT_NLS -DWITHOUT_INFO \ - -DWITHOUT_HTML -LIB32IMAKE= ${LIB32MAKE:NINSTALL=*} -DNO_INCS + -DWITHOUT_HTML DESTDIR=${LIB32TMP} +LIB32IMAKE= ${LIB32WMAKE:NINSTALL=*:NDESTDIR=*} -DNO_INCS .endif # install stage @@ -364,7 +358,7 @@ @echo "--------------------------------------------------------------" ${_+_}cd ${.CURDIR}; ${WMAKE} ${CLEANDIR:S/^/par-/} .if ${TARGET_ARCH} == "amd64" - rm -rf ${OBJTREE}/lib32 + ${_+_}cd ${.CURDIR}; ${LIB32WMAKE} -f Makefile.inc1 ${CLEANDIR:S/^/par-/} .endif .endif _obj: @@ -434,34 +428,28 @@ .endfor .endif .for _t in obj includes - cd ${.CURDIR}/include; \ - ${LIB32MAKE} DESTDIR=${LIB32TMP} ${_t} - cd ${.CURDIR}/lib; \ - ${LIB32MAKE} DESTDIR=${LIB32TMP} ${_t} - cd ${.CURDIR}/gnu/lib; \ - ${LIB32MAKE} DESTDIR=${LIB32TMP} ${_t} + cd ${.CURDIR}/include; ${LIB32WMAKE} ${_t} + cd ${.CURDIR}/lib; ${LIB32WMAKE} ${_t} + cd ${.CURDIR}/gnu/lib; ${LIB32WMAKE} ${_t} .if ${MK_CRYPT} != "no" - cd ${.CURDIR}/secure/lib; \ - ${LIB32MAKE} DESTDIR=${LIB32TMP} ${_t} + cd ${.CURDIR}/secure/lib; ${LIB32WMAKE} ${_t} .endif .if ${MK_KERBEROS} != "no" - cd ${.CURDIR}/kerberos5/lib; \ - ${LIB32MAKE} DESTDIR=${LIB32TMP} ${_t} + cd ${.CURDIR}/kerberos5/lib; ${LIB32WMAKE} ${_t} .endif .endfor .for _dir in usr.bin/lex/lib - cd ${.CURDIR}/${_dir}; \ - ${LIB32MAKE} DESTDIR=${LIB32TMP} obj + cd ${.CURDIR}/${_dir}; ${LIB32WMAKE} obj .endfor .for _dir in lib/ncurses/ncurses lib/libmagic cd ${.CURDIR}/${_dir}; \ MAKEOBJDIRPREFIX=${OBJTREE}/lib32 ${MAKE} DESTDIR= build-tools .endfor cd ${.CURDIR}; \ - ${LIB32MAKE} -f Makefile.inc1 DESTDIR=${LIB32TMP} libraries + ${LIB32WMAKE} -f Makefile.inc1 libraries .for _t in obj depend all cd ${.CURDIR}/libexec/rtld-elf; \ - PROG=ld-elf32.so.1 ${LIB32MAKE} DESTDIR=${LIB32TMP} ${_t} + PROG=ld-elf32.so.1 ${LIB32WMAKE} ${_t} .endfor distribute32 install32: @@ -869,7 +857,7 @@ _mklocale= usr.bin/mklocale .endif -.if ${BOOTSTRAPPING} < 700015 +.if ${BOOTSTRAPPING} < 700018 _gensnmptree= usr.sbin/bsnmpd/gensnmptree .endif ==== //depot/projects/mjexp/ObsoleteFiles.inc#9 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/ObsoleteFiles.inc,v 1.73 2007/02/12 21:41:17 brueffer Exp $ +# $FreeBSD: src/ObsoleteFiles.inc,v 1.75 2007/03/01 10:53:55 bms Exp $ # # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and # directories (OLD_DIRS) which should get removed at an update. Recently @@ -14,6 +14,10 @@ # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last. # +# 20070301: remove addr2ascii and ascii2addr +OLD_FILES+=usr/share/man/man3/addr2ascii.3.gz +# 20070225: vm_page_unmanage() removed +OLD_FILES+=usr/share/man/man9/vm_page_unmanage.9.gz # 20070212: kame.4 removed OLD_FILES+=usr/share/man/man4/kame.4.gz # 20070201: remove libmytinfo link ==== //depot/projects/mjexp/UPDATING#9 (text+ko) ==== @@ -21,24 +21,26 @@ developers choose to disable these features on build machines to maximize performance. +20070228: + The name resolution/mapping functions addr2ascii(3) and ascii2addr(3) + were removed from FreeBSD's libc. These originally came from INRIA + IPv6. Nothing in FreeBSD ever used them. They may be regarded as + deprecated in previous releases. + The AF_LINK support for getnameinfo(3) was merged from NetBSD to + replace it as a more portable (and re-entrant) API. + +20070224: + To support interrupt filtering a modification to the newbus API + has occurred, ABI was broken and __FreeBSD_version was bumped + to 700031. Please make sure that your kernel and modules are in + sync. For more info: + http://docs.freebsd.org/cgi/mid.cgi?20070221233124.GA13941 + 20070224: The IPv6 multicast forwarding code may now be loaded into GENERIC - kernels by loading the ip_mroute.ko module. - The module build heeds the MK_INET6_SUPPORT make.conf option; it - may be set to "no" to omit building the IPv6 support. - -20070218: - The following build error may appear when upgrading from an old - -current (usr.sbin/bsnmpd/modules/snmp_bridge, depend stage): - line 31: '(' expected at begin of node - context: " TruthValue ENUM ( - *** Error code 1 - If so, run "make install" in usr.sbin/bsnmpd/gensnmptree. (It - should probably be a build tool). In the same module, you may - also get the error: - ...snmp_bridge/bridge_sys.c:39:27: - net/bridgestp.h: No such file or directory - If so, run "cp src/sys/net/bridgestp.h /usr/include/net". + kernels by loading the ip_mroute.ko module. This is built into the + module unless WITHOUT_INET6 or WITHOUT_INET6_SUPPORT options are + set; see src.conf(5) for more information. 20070214: The output of netstat -r has changed. Without -n, we now only @@ -749,4 +751,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.475 2007/02/24 11:41:05 bms Exp $ +$FreeBSD: src/UPDATING,v 1.481 2007/03/01 15:42:23 ru Exp $ ==== //depot/projects/mjexp/bin/df/df.1#2 (text+ko) ==== @@ -27,7 +27,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)df.1 8.3 (Berkeley) 5/8/95 -.\" $FreeBSD: src/bin/df/df.1,v 1.39 2005/01/16 16:41:56 ru Exp $ +.\" $FreeBSD: src/bin/df/df.1,v 1.40 2007/02/28 10:29:48 ru Exp $ .\" .Dd April 22, 2004 .Dt DF 1 @@ -58,9 +58,10 @@ option below). .Pp The following options are available: -.Bl -tag -width Ds +.Bl -tag -width indent .It Fl a -Show all mount points, including those that were mounted with the MNT_IGNORE +Show all mount points, including those that were mounted with the +.Dv MNT_IGNORE flag. .It Fl b Use 512-byte blocks rather than the default. ==== //depot/projects/mjexp/bin/rcp/rcp.1#2 (text+ko) ==== @@ -27,7 +27,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)rcp.1 8.1 (Berkeley) 5/31/93 -.\" $FreeBSD: src/bin/rcp/rcp.1,v 1.21 2005/02/13 22:25:09 ru Exp $ +.\" $FreeBSD: src/bin/rcp/rcp.1,v 1.22 2007/02/27 11:25:58 ru Exp $ .\" .Dd October 16, 2002 .Dt RCP 1 @@ -53,9 +53,15 @@ .Ar directory argument is either a remote file name of the form -.Dq rname@rhost:path , -or a local file name (containing no `:' characters, -or a `/' before any `:'s). +.Dq ruser@rhost:path , +or a local file name (containing no +.Ql :\& +characters, +or a +.Ql / +before any +.Ql :\& Ns +s). .Pp The following options are available: .Bl -tag -width indent @@ -68,7 +74,7 @@ .Nm to attempt to preserve (duplicate) in its copies the modification times and modes of the source files, ignoring the -.Ar umask . +.Xr umask 2 . By default, the mode and owner of .Ar file2 are preserved if it already existed; otherwise the mode of the source file @@ -92,7 +98,11 @@ or your current user name if no other remote user name is specified. A .Ar path -on a remote host may be quoted (using \e, ", or \(aa) +on a remote host may be quoted (using +.Ql \e , +.Ql \&" , +or +.Ql \(aa ) so that the metacharacters are interpreted remotely. .Pp The @@ -107,7 +117,7 @@ utility handles third party copies, where neither source nor target files are on the current machine. .Sh FILES -.Bl -tag -width /etc/auth.conf -compact +.Bl -tag -width ".Pa /etc/auth.conf" -compact .It Pa /etc/auth.conf configure authentication services .El @@ -133,14 +143,14 @@ be a file in cases where only a directory should be legal. .Pp Is confused by any output generated by commands in a -.Pa \&.login , -.Pa \&.profile , +.Pa .login , +.Pa .profile , or -.Pa \&.cshrc +.Pa .cshrc file on the remote host. .Pp The destination user and hostname may have to be specified as -.Dq rhost.rname +.Dq rhost.ruser when the destination machine is running the .Bx 4.2 version of ==== //depot/projects/mjexp/bin/setfacl/setfacl.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/bin/setfacl/setfacl.c,v 1.12 2006/06/09 16:09:26 kib Exp $"); +__FBSDID("$FreeBSD: src/bin/setfacl/setfacl.c,v 1.13 2007/02/26 00:42:17 mckusick Exp $"); #include #include @@ -253,10 +253,20 @@ if (need_mask && (set_acl_mask(&final_acl) == -1)) { warnx("failed to set ACL mask on %s", file->filename); carried_error++; - } else if (acl_set_file(file->filename, acl_type, - final_acl) == -1) { - carried_error++; - warn("acl_set_file() failed for %s", file->filename); + } else if (h_flag) { + if (acl_set_link_np(file->filename, acl_type, + final_acl) == -1) { + carried_error++; + warn("acl_set_link_np() failed for %s", + file->filename); + } + } else { + if (acl_set_file(file->filename, acl_type, + final_acl) == -1) { + carried_error++; + warn("acl_set_file() failed for %s", + file->filename); + } } acl_free(acl[ACCESS_ACL]); ==== //depot/projects/mjexp/contrib/libpcap/pcap-bpf.c#2 (text+ko) ==== @@ -18,7 +18,7 @@ * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. * - * $FreeBSD: src/contrib/libpcap/pcap-bpf.c,v 1.2 2006/09/04 20:12:45 sam Exp $ + * $FreeBSD: src/contrib/libpcap/pcap-bpf.c,v 1.3 2007/02/26 22:24:14 jkim Exp $ */ #ifndef lint static const char rcsid[] _U_ = @@ -1093,9 +1093,22 @@ static int pcap_setdirection_bpf(pcap_t *p, pcap_direction_t d) { -#ifdef BIOCSSEESENT +#if defined(BIOCSDIRECTION) + u_int direction; + + direction = (d == PCAP_D_IN) ? BPF_D_IN : + ((d == PCAP_D_OUT) ? BPF_D_OUT : BPF_D_INOUT); + if (ioctl(p->fd, BIOCSDIRECTION, &direction) == -1) { + (void) snprintf(p->errbuf, sizeof(p->errbuf), + "Cannot set direction to %s: %s", + (d == PCAP_D_IN) ? "PCAP_D_IN" : + ((d == PCAP_D_OUT) ? "PCAP_D_OUT" : "PCAP_D_INOUT"), + strerror(errno)); + return (-1); + } + return (0); +#elif defined(BIOCSSEESENT) u_int seesent; -#endif /* * We don't support PCAP_D_OUT. @@ -1105,7 +1118,7 @@ "Setting direction to PCAP_D_OUT is not supported on BPF"); return -1; } -#ifdef BIOCSSEESENT + seesent = (d == PCAP_D_INOUT); if (ioctl(p->fd, BIOCSSEESENT, &seesent) == -1) { (void) snprintf(p->errbuf, sizeof(p->errbuf), ==== //depot/projects/mjexp/etc/mtree/BSD.include.dist#5 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/mtree/BSD.include.dist,v 1.110 2006/10/31 22:22:29 pjd Exp $ +# $FreeBSD: src/etc/mtree/BSD.include.dist,v 1.111 2007/02/27 04:01:57 mjacob Exp $ # # Please see the file src/etc/mtree/README before making changes to this file. # ==== //depot/projects/mjexp/gnu/usr.bin/gdb/kgdb/kgdb.h#2 (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/gnu/usr.bin/gdb/kgdb/kgdb.h,v 1.3 2005/09/10 18:25:53 marcel Exp $ + * $FreeBSD: src/gnu/usr.bin/gdb/kgdb/kgdb.h,v 1.4 2007/03/01 13:55:15 kib Exp $ */ #ifndef _KGDB_H_ @@ -62,4 +62,6 @@ struct kthr *kgdb_thr_select(struct kthr *); char *kgdb_thr_extra_thread_info(int); +uintptr_t kgdb_lookup(const char *sym); + #endif /* _KGDB_H_ */ ==== //depot/projects/mjexp/gnu/usr.bin/gdb/kgdb/kthr.c#4 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/gnu/usr.bin/gdb/kgdb/kthr.c,v 1.6 2007/01/25 06:39:25 rodrigc Exp $"); +__FBSDID("$FreeBSD: src/gnu/usr.bin/gdb/kgdb/kthr.c,v 1.7 2007/03/01 13:55:15 kib Exp $"); #include #include @@ -52,8 +52,8 @@ static struct kthr *first; struct kthr *curkthr; -static uintptr_t -lookup(const char *sym) +uintptr_t +kgdb_lookup(const char *sym) { struct nlist nl[2]; @@ -80,28 +80,28 @@ struct kthr *kt; uintptr_t addr, paddr; - addr = lookup("_allproc"); + addr = kgdb_lookup("_allproc"); if (addr == 0) return (NULL); kvm_read(kvm, addr, &paddr, sizeof(paddr)); - dumppcb = lookup("_dumppcb"); + dumppcb = kgdb_lookup("_dumppcb"); if (dumppcb == 0) return (NULL); - addr = lookup("_dumptid"); + addr = kgdb_lookup("_dumptid"); if (addr != 0) kvm_read(kvm, addr, &dumptid, sizeof(dumptid)); else dumptid = -1; - addr = lookup("_stopped_cpus"); + addr = kgdb_lookup("_stopped_cpus"); if (addr != 0) kvm_read(kvm, addr, &stopped_cpus, sizeof(stopped_cpus)); else stopped_cpus = 0; - stoppcbs = lookup("_stoppcbs"); + stoppcbs = kgdb_lookup("_stoppcbs"); while (paddr != 0) { if (kvm_read(kvm, paddr, &p, sizeof(p)) != sizeof(p)) { ==== //depot/projects/mjexp/gnu/usr.bin/gdb/kgdb/trgt_i386.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/gnu/usr.bin/gdb/kgdb/trgt_i386.c,v 1.5 2005/09/11 05:36:30 marcel Exp $"); +__FBSDID("$FreeBSD: src/gnu/usr.bin/gdb/kgdb/trgt_i386.c,v 1.6 2007/03/01 13:56:08 kib Exp $"); #include #include @@ -134,6 +134,8 @@ char dummy_valuep[MAX_REGISTER_SIZE]; struct kgdb_frame_cache *cache; int ofs, regsz; + static int ofs_fix = 0; + static int ofs_fixed = 0; regsz = register_size(current_gdbarch, regnum); @@ -145,8 +147,27 @@ *lvalp = not_lval; *realnump = -1; + if (!ofs_fixed) { + uintptr_t calltrap_addr; + char calltrap[1]; + + calltrap_addr = kgdb_lookup("calltrap"); + if (calltrap_addr != 0) { + if (kvm_read(kvm, calltrap_addr, calltrap, + sizeof(calltrap)) != sizeof(calltrap)) { + warnx("kvm_read: %s", kvm_geterr(kvm)); + } else if (calltrap[0] == 0x54) /* push %esp */ { + /* + * To accomodate for rev. 1.117 of + * i386/i386/exception.s + */ + ofs_fix = 4; + } + } + ofs_fixed = 1; + } ofs = (regnum >= I386_EAX_REGNUM && regnum <= I386_FS_REGNUM) - ? kgdb_trgt_frame_offset[regnum] : -1; + ? kgdb_trgt_frame_offset[regnum] + ofs_fix : -1; if (ofs == -1) return; ==== //depot/projects/mjexp/include/protocols/dumprestore.h#2 (text+ko) ==== @@ -37,7 +37,7 @@ * * @(#)dumprestore.h 8.2 (Berkeley) 1/21/94 * - * $FreeBSD: src/include/protocols/dumprestore.h,v 1.10 2002/07/17 02:03:19 mckusick Exp $ + * $FreeBSD: src/include/protocols/dumprestore.h,v 1.11 2007/02/26 08:15:56 mckusick Exp $ */ #ifndef _PROTOCOLS_DUMPRESTORE_H_ @@ -97,7 +97,8 @@ int64_t c_birthtime; /* creation time, seconds */ int64_t c_atime; /* last access time, seconds */ int64_t c_mtime; /* last modified time, seconds */ - int32_t c_spare4[7]; /* old block pointers */ + int32_t c_extsize; /* external attribute size */ + int32_t c_spare4[6]; /* old block pointers */ u_int32_t c_file_flags; /* status flags (chflags) */ int32_t c_spare5[2]; /* old blocks, generation number */ u_int32_t c_uid; /* file owner */ ==== //depot/projects/mjexp/lib/libarchive/archive_entry.c#4 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_entry.c,v 1.37 2007/01/09 08:05:54 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_entry.c,v 1.38 2007/03/01 06:22:34 kientzle Exp $"); #ifdef HAVE_SYS_STAT_H #include @@ -760,6 +760,12 @@ } void +archive_entry_copy_symlink(struct archive_entry *entry, const char *linkname) +{ + aes_copy_mbs(&entry->ae_symlink, linkname); +} + +void archive_entry_copy_symlink_w(struct archive_entry *entry, const wchar_t *linkname) { aes_copy_wcs(&entry->ae_symlink, linkname); ==== //depot/projects/mjexp/lib/libarchive/archive_entry.h#3 (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_entry.h,v 1.20 2007/01/09 08:05:54 kientzle Exp $ + * $FreeBSD: src/lib/libarchive/archive_entry.h,v 1.21 2007/03/01 06:22:34 kientzle Exp $ */ #ifndef ARCHIVE_ENTRY_H_INCLUDED @@ -130,6 +130,7 @@ void archive_entry_set_rdevminor(struct archive_entry *, dev_t); void archive_entry_set_size(struct archive_entry *, int64_t); void archive_entry_set_symlink(struct archive_entry *, const char *); +void archive_entry_copy_symlink(struct archive_entry *, const char *); void archive_entry_copy_symlink_w(struct archive_entry *, const wchar_t *); void archive_entry_set_uid(struct archive_entry *, uid_t); void archive_entry_set_uname(struct archive_entry *, const char *); ==== //depot/projects/mjexp/lib/libarchive/archive_read_support_format_iso9660.c#5 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_support_format_iso9660.c,v 1.18 2007/01/09 08:05:55 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_support_format_iso9660.c,v 1.19 2007/03/01 06:22:34 kientzle Exp $"); #ifdef HAVE_SYS_STAT_H #include @@ -378,7 +378,7 @@ archive_entry_set_pathname(entry, build_pathname(&iso9660->pathname, file)); if (file->symlink.s != NULL) - archive_entry_set_symlink(entry, file->symlink.s); + archive_entry_copy_symlink(entry, file->symlink.s); /* If this entry points to the same data as the previous * entry, convert this into a hardlink to that entry. ==== //depot/projects/mjexp/lib/libc/gen/tls.c#3 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libc/gen/tls.c,v 1.13 2006/10/08 02:50:33 kmacy Exp $ + * $FreeBSD: src/lib/libc/gen/tls.c,v 1.14 2007/02/25 21:23:50 kientzle Exp $ */ /* @@ -36,7 +36,6 @@ #include #include #include -#include #include "libc_private.h" @@ -207,7 +206,8 @@ size = round(tls_static_space, tcbalign); - assert(tcbsize >= 2*sizeof(Elf_Addr)); + if (tcbsize < 2 * sizeof(Elf_Addr)) + tcbsize = 2 * sizeof(Elf_Addr); tls = calloc(1, size + tcbsize); dtv = malloc(3 * sizeof(Elf_Addr)); ==== //depot/projects/mjexp/lib/libc/net/Makefile.inc#5 (text+ko) ==== @@ -1,10 +1,10 @@ # from @(#)Makefile.inc 8.2 (Berkeley) 9/5/93 -# $FreeBSD: src/lib/libc/net/Makefile.inc,v 1.64 2007/02/22 14:32:38 rrs Exp $ +# $FreeBSD: src/lib/libc/net/Makefile.inc,v 1.65 2007/02/28 21:18:38 bms Exp $ # machine-independent net sources .PATH: ${.CURDIR}/net -SRCS+= addr2ascii.c ascii2addr.c base64.c ether_addr.c eui64.c \ +SRCS+= base64.c ether_addr.c eui64.c \ gai_strerror.c getaddrinfo.c \ gethostbydns.c gethostbyht.c gethostbynis.c gethostnamadr.c \ getifaddrs.c getifmaddrs.c getnameinfo.c \ @@ -43,7 +43,7 @@ ${LEX} ${LFLAGS} -o/dev/stdout ${.IMPSRC} | \ sed -e '/YY_BUF_SIZE/s/16384/1024/' >${.TARGET} -MAN+= addr2ascii.3 byteorder.3 ethers.3 eui64.3 \ +MAN+= byteorder.3 ethers.3 eui64.3 \ getaddrinfo.3 gai_strerror.3 gethostbyname.3 \ getifaddrs.3 getifmaddrs.3 getipnodebyname.3 \ getnameinfo.3 getnetent.3 getprotoent.3 getservent.3 \ @@ -56,7 +56,6 @@ sctp_getaddrlen.3 sctp_getassocid.3 sctp_getpaddrs.3 \ sctp_opt_info.3 sctp_recvmsg.3 sctp_send.3 sctp_sendmsg.3 \ -MLINKS+=addr2ascii.3 ascii2addr.3 MLINKS+=byteorder.3 htonl.3 byteorder.3 htons.3 byteorder.3 ntohl.3 \ byteorder.3 ntohs.3 MLINKS+=ethers.3 ether_aton.3 ethers.3 ether_hostton.3 ethers.3 ether_line.3 \ ==== //depot/projects/mjexp/lib/libc/net/Symbol.map#2 (text) ==== @@ -1,8 +1,6 @@ -# $FreeBSD: src/lib/libc/net/Symbol.map,v 1.6 2006/05/21 11:19:36 ume Exp $ +# $FreeBSD: src/lib/libc/net/Symbol.map,v 1.7 2007/02/28 21:18:38 bms Exp $ FBSD_1.0 { - addr2ascii; - ascii2addr; __b64_ntop; __b64_pton; ether_line; ==== //depot/projects/mjexp/lib/libc/net/getnameinfo.3#2 (text+ko) ==== @@ -16,9 +16,9 @@ .\" OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR .\" PERFORMANCE OF THIS SOFTWARE. .\" -.\" $FreeBSD: src/lib/libc/net/getnameinfo.3,v 1.24 2005/06/15 19:04:03 ru Exp $ +.\" $FreeBSD: src/lib/libc/net/getnameinfo.3,v 1.25 2007/02/28 21:28:33 bms Exp $ .\" -.Dd December 20, 2004 +.Dd February 28, 2007 .Dt GETNAMEINFO 3 .Os .Sh NAME @@ -47,15 +47,29 @@ .Xr getaddrinfo 3 function. .Pp +If a link-layer address is passed to +.Fn getnameinfo , +its ASCII representation will be stored in +.Fa host . +The string pointed to by +.Fa serv +will be set to the empty string if non-NULL; +.Fa flags +will always be ignored. +This is intended as a replacement for the legacy +.Xr link_ntoa 3 +function. +.Pp The .Li sockaddr structure .Fa sa should point to either a -.Li sockaddr_in +.Li sockaddr_in , +.Li sockaddr_in6 or -.Li sockaddr_in6 -structure (for IPv4 or IPv6 respectively) that is +.Li sockaddr_dl +structure (for IPv4, IPv6 or link-layer respectively) that is .Fa salen bytes long. .Pp @@ -166,6 +180,7 @@ .Xr gethostbyaddr 3 , .Xr getservbyport 3 , .Xr inet_ntop 3 , +.Xr link_ntoa 3 , .Xr resolver 3 , .Xr hosts 5 , .Xr resolv.conf 5 , ==== //depot/projects/mjexp/lib/libc/net/getnameinfo.c#2 (text+ko) ==== @@ -2,6 +2,7 @@ /* * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project. + * Copyright (c) 2000 Ben Harris. * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -44,11 +45,13 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/net/getnameinfo.c,v 1.19 2006/05/21 11:22:31 ume Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/net/getnameinfo.c,v 1.20 2007/02/28 21:18:38 bms Exp $"); #include #include #include +#include +#include #include #include #include @@ -58,6 +61,38 @@ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Mar 2 15:26: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 E1E5016A407; Fri, 2 Mar 2007 15:26: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 9FBAF16A401 for ; Fri, 2 Mar 2007 15:26:41 +0000 (UTC) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 8F60B13C4A8 for ; Fri, 2 Mar 2007 15:26:41 +0000 (UTC) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l22FQfZp044550 for ; Fri, 2 Mar 2007 15:26:41 GMT (envelope-from piso@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l22FQfIU044547 for perforce@freebsd.org; Fri, 2 Mar 2007 15:26:41 GMT (envelope-from piso@freebsd.org) Date: Fri, 2 Mar 2007 15:26:41 GMT Message-Id: <200703021526.l22FQfIU044547@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to piso@freebsd.org using -f From: Paolo Pisati To: Perforce Change Reviews Cc: Subject: PERFORCE change 115250 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 02 Mar 2007 15:26:42 -0000 http://perforce.freebsd.org/chv.cgi?CH=115250 Change 115250 by piso@piso_newluxor on 2007/03/02 15:26:22 Reduce diff against HEAD. Affected files ... .. //depot/projects/soc2006/intr_filter/amd64/isa/clock.c#9 edit .. //depot/projects/soc2006/intr_filter/arm/at91/at91.c#8 edit .. //depot/projects/soc2006/intr_filter/arm/at91/at91_st.c#10 edit .. //depot/projects/soc2006/intr_filter/arm/sa11x0/sa11x0.c#5 edit .. //depot/projects/soc2006/intr_filter/dev/ppc/ppc.c#6 edit .. //depot/projects/soc2006/intr_filter/dev/zs/z8530var.h#4 edit .. //depot/projects/soc2006/intr_filter/dev/zs/zs.c#5 edit .. //depot/projects/soc2006/intr_filter/i386/isa/clock.c#10 edit .. //depot/projects/soc2006/intr_filter/powerpc/powermac/hrowpic.c#4 edit .. //depot/projects/soc2006/intr_filter/sparc64/isa/isa.c#5 edit .. //depot/projects/soc2006/intr_filter/sparc64/sparc64/upa.c#5 edit .. //depot/projects/soc2006/intr_filter/sun4v/include/intr_machdep.h#5 edit .. //depot/projects/soc2006/intr_filter/sun4v/sun4v/hvcons.c#6 edit .. //depot/projects/soc2006/intr_filter/sun4v/sun4v/nexus.c#5 edit .. //depot/projects/soc2006/intr_filter/sun4v/sun4v/vnex.c#6 edit Differences ... ==== //depot/projects/soc2006/intr_filter/amd64/isa/clock.c#9 (text+ko) ==== @@ -227,7 +227,7 @@ if (pscnt == psdiv) statclock(TRAPF_USERMODE(frame)); } - return (flag ? FILTER_HANDLED : FILTER_STRAY); + return(flag ? FILTER_HANDLED : FILTER_STRAY); } #include "opt_ddb.h" ==== //depot/projects/soc2006/intr_filter/arm/at91/at91.c#8 (text) ==== @@ -550,8 +550,8 @@ if (rman_get_start(ires) == AT91RM92_IRQ_SYSTEM && filt == NULL) panic("All system interrupt ISRs must be type INTR_FAST"); - BUS_SETUP_INTR(device_get_parent(dev), child, ires, flags, filt, - intr, arg, cookiep); + BUS_SETUP_INTR(device_get_parent(dev), child, ires, flags, filt, intr, arg, + cookiep); bus_space_write_4(sc->sc_st, sc->sc_sys_sh, IC_IECR, 1 << rman_get_start(ires)); return (0); ==== //depot/projects/soc2006/intr_filter/arm/at91/at91_st.c#10 (text) ==== @@ -164,7 +164,7 @@ * it is likely to be used, and the extremely coarse nature time * interval, I think this is the best solution. */ -static int +static void at91st_watchdog(void *argp, u_int cmd, int *error) { uint32_t wdog; ==== //depot/projects/soc2006/intr_filter/arm/sa11x0/sa11x0.c#5 (text+ko) ==== @@ -113,8 +113,8 @@ saved_cpsr = SetCPSR(I32_bit, I32_bit); SetCPSR(I32_bit, saved_cpsr & I32_bit); - BUS_SETUP_INTR(device_get_parent(dev), child, ires, flags, filt, - intr, arg, cookiep); + BUS_SETUP_INTR(device_get_parent(dev), child, ires, flags, filt, intr, arg, + cookiep); return (0); } ==== //depot/projects/soc2006/intr_filter/dev/ppc/ppc.c#6 (text+ko) ==== @@ -1962,7 +1962,7 @@ */ int ppc_setup_intr(device_t bus, device_t child, struct resource *r, int flags, - driver_filter_t *filt, void (*ihand)(void *), void *arg, void **cookiep) + driver_filter_t *filt, void (*ihand)(void *), void *arg, void **cookiep) { int error; struct ppc_data *ppc = DEVTOSOFTC(bus); ==== //depot/projects/soc2006/intr_filter/dev/zs/z8530var.h#4 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/zs/z8530var.h,v 1.2 2004/06/16 09:47:02 phk Exp $ + * $FreeBSD: src/sys/dev/zs/z8530var.h,v 1.3 2007/02/27 15:31:11 piso Exp $ */ #ifndef _DEV_ZS_ZSVAR_H_ ==== //depot/projects/soc2006/intr_filter/dev/zs/zs.c#5 (text+ko) ==== @@ -40,7 +40,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/zs/zs.c,v 1.36 2006/11/06 13:41:56 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/zs/zs.c,v 1.37 2007/02/27 15:31:11 piso Exp $"); /*- * Copyright (c) 2003 Jake Burkholder. * All rights reserved. @@ -218,9 +218,9 @@ needsoft |= zstty_intr(sc->sc_child[1], rr3); if (needsoft) { swi_sched(sc->sc_softih, 0); - return(FILTER_HANDLED); + return (FILTER_HANDLED); } - return(FILTER_STRAY); + return (FILTER_STRAY); } static void ==== //depot/projects/soc2006/intr_filter/i386/isa/clock.c#10 (text+ko) ==== @@ -222,10 +222,8 @@ static int rtcintr(struct trapframe *frame) { - int flag = 0; while (rtcin(RTC_INTR) & RTCIR_PERIOD) { - flag = 1; if (profprocs != 0) { if (--pscnt == 0) pscnt = psdiv; @@ -234,7 +232,7 @@ if (pscnt == psdiv) statclock(TRAPF_USERMODE(frame)); } - return (flag ? FILTER_HANDLED : FILTER_STRAY); + return (FILTER_HANDLED); } #include "opt_ddb.h" ==== //depot/projects/soc2006/intr_filter/powerpc/powermac/hrowpic.c#4 (text+ko) ==== @@ -80,7 +80,7 @@ u_long, u_int); static int hrowpic_setup_intr(device_t, device_t, struct resource *, int, driver_filter_t, - driver_intr_t, void *, void **); + driver_intr_t, void *, void **); static int hrowpic_teardown_intr(device_t, device_t, struct resource *, void *); static int hrowpic_release_intr(device_t dev, device_t, int, @@ -241,8 +241,8 @@ if (error) return (error); - error = inthand_add(device_get_nameunit(child), start, filter, intr, - arg, flags, cookiep); + error = inthand_add(device_get_nameunit(child), start, filt, intr, arg, + flags, cookiep); if (!error) { /* ==== //depot/projects/soc2006/intr_filter/sparc64/isa/isa.c#5 (text+ko) ==== @@ -386,9 +386,9 @@ } int -isa_setup_intr(device_t dev, device_t child, struct resource *irq, int flags, - driver_filter_t *filter, driver_intr_t *intr, void *arg, - void **cookiep) +isa_setup_intr(device_t dev, device_t child, + struct resource *irq, int flags, driver_filter_t *filter, + driver_intr_t *intr, void *arg, void **cookiep) { /* ==== //depot/projects/soc2006/intr_filter/sparc64/sparc64/upa.c#5 (text+ko) ==== @@ -427,8 +427,8 @@ UPA_WRITE(sc, imr, 0x0, intrmap & ~INTMAP_V); (void)UPA_READ(sc, imr, 0x0); - error = bus_generic_setup_intr(dev, child, ires, flags, filt, func, - arg, cookiep); + error = bus_generic_setup_intr(dev, child, ires, flags, filt, func, arg, + cookiep); if (error != 0) return (error); UPA_WRITE(sc, imr, 0x0, INTMAP_ENABLE(intrmap, PCPU_GET(mid))); ==== //depot/projects/soc2006/intr_filter/sun4v/include/intr_machdep.h#5 (text+ko) ==== @@ -80,8 +80,8 @@ void intr_setup(int level, ih_func_t *ihf, int pri, iv_func_t *ivf, void *iva); -int inthand_add(const char *name, int vec, int (*filter)(void *), - void (*handler)(void *), void *arg, int flags, void **cookiep); +int inthand_add(const char *name, int vec, int (*filt)(void *), + void (*handler)(void *), void *arg, int flags, void **cookiep); int inthand_remove(int vec, void *cookie); void cpu_intrq_init(void); ==== //depot/projects/soc2006/intr_filter/sun4v/sun4v/hvcons.c#6 (text+ko) ==== @@ -390,8 +390,8 @@ goto fail; } - error = bus_setup_intr(dev, hvcn_irq, INTR_TYPE_TTY, NULL, hvcn_intr, - hvcn_tp, hvcn_intrhand); + error = bus_setup_intr(dev, hvcn_irq, INTR_TYPE_TTY, NULL, hvcn_intr, hvcn_tp, + hvcn_intrhand); if (error) device_printf(dev, "couldn't set up irq\n"); ==== //depot/projects/soc2006/intr_filter/sun4v/sun4v/nexus.c#5 (text+ko) ==== @@ -306,7 +306,7 @@ static int nexus_setup_intr(device_t dev, device_t child, struct resource *res, int flags, - driver_filter_t *filter, driver_intr_t *intr, void *arg, void **cookiep) + driver_filter_t *filt, driver_intr_t *intr, void *arg, void **cookiep) { struct nexus_devinfo *ndi; device_t ichild; @@ -345,8 +345,8 @@ if ((error = rman_activate_resource(res))) goto fail; - error = inthand_add(device_get_nameunit(child), ihdl, filter, - intr, arg, flags, cookiep); + error = inthand_add(device_get_nameunit(child), ihdl, + filt, intr, arg, flags, cookiep); cpuid = 0; if (hv_intr_settarget(ihdl, cpuid) != H_EOK) { ==== //depot/projects/soc2006/intr_filter/sun4v/sun4v/vnex.c#6 (text+ko) ==== @@ -249,7 +249,7 @@ static int vnex_setup_intr(device_t dev, device_t child, struct resource *res, int flags, - driver_filter_t *filter, driver_intr_t *intr, void *arg, void **cookiep) + driver_filter_t *filt,driver_intr_t *intr, void *arg, void **cookiep) { uint64_t reg, nreg; @@ -297,8 +297,8 @@ if ((error = rman_activate_resource(res))) goto fail; - error = inthand_add(device_get_nameunit(child), ihdl, filter, - intr, arg, flags, cookiep); + error = inthand_add(device_get_nameunit(child), ihdl, + filt, intr, arg, flags, cookiep); printf("inthandler added\n"); fail: From owner-p4-projects@FreeBSD.ORG Fri Mar 2 16:22: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 0EF8016A402; Fri, 2 Mar 2007 16:22: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 E05EC16A401 for ; Fri, 2 Mar 2007 16:22:53 +0000 (UTC) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id CE89A13C494 for ; Fri, 2 Mar 2007 16:22:53 +0000 (UTC) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l22GMrew056366 for ; Fri, 2 Mar 2007 16:22:53 GMT (envelope-from piso@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l22GMpre056354 for perforce@freebsd.org; Fri, 2 Mar 2007 16:22:51 GMT (envelope-from piso@freebsd.org) Date: Fri, 2 Mar 2007 16:22:51 GMT Message-Id: <200703021622.l22GMpre056354@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to piso@freebsd.org using -f From: Paolo Pisati To: Perforce Change Reviews Cc: Subject: PERFORCE change 115252 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 02 Mar 2007 16:22:54 -0000 http://perforce.freebsd.org/chv.cgi?CH=115252 Change 115252 by piso@piso_newluxor on 2007/03/02 16:22:25 IFC@115249 Affected files ... .. //depot/projects/soc2006/intr_filter/amd64/linux32/linux.h#7 integrate .. //depot/projects/soc2006/intr_filter/amd64/linux32/linux32_machdep.c#10 integrate .. //depot/projects/soc2006/intr_filter/arm/at91/at91_rtc.c#7 integrate .. //depot/projects/soc2006/intr_filter/arm/at91/at91_spi.c#6 integrate .. //depot/projects/soc2006/intr_filter/arm/at91/ohci_atmelarm.c#2 integrate .. //depot/projects/soc2006/intr_filter/cam/scsi/scsi_target.c#3 integrate .. //depot/projects/soc2006/intr_filter/compat/linprocfs/linprocfs.c#9 integrate .. //depot/projects/soc2006/intr_filter/compat/linux/linux_emul.c#9 integrate .. //depot/projects/soc2006/intr_filter/conf/NOTES#15 integrate .. //depot/projects/soc2006/intr_filter/conf/files#14 integrate .. //depot/projects/soc2006/intr_filter/conf/kmod.mk#6 integrate .. //depot/projects/soc2006/intr_filter/conf/options#14 integrate .. //depot/projects/soc2006/intr_filter/contrib/dev/ipw/LICENSE#1 branch .. //depot/projects/soc2006/intr_filter/contrib/dev/ipw/ipw2100-1.3-i.fw.uu#1 branch .. //depot/projects/soc2006/intr_filter/contrib/dev/ipw/ipw2100-1.3-p.fw.uu#1 branch .. //depot/projects/soc2006/intr_filter/contrib/dev/ipw/ipw2100-1.3.fw.uu#1 branch .. //depot/projects/soc2006/intr_filter/contrib/dev/iwi/LICENSE#1 branch .. //depot/projects/soc2006/intr_filter/contrib/dev/iwi/ipw2200-bss.fw.uu#1 branch .. //depot/projects/soc2006/intr_filter/contrib/dev/iwi/ipw2200-ibss.fw.uu#1 branch .. //depot/projects/soc2006/intr_filter/contrib/dev/iwi/ipw2200-sniffer.fw.uu#1 branch .. //depot/projects/soc2006/intr_filter/dev/acpica/acpi_ec.c#2 integrate .. //depot/projects/soc2006/intr_filter/dev/ata/ata-chipset.c#12 integrate .. //depot/projects/soc2006/intr_filter/dev/ata/atapi-cam.c#3 integrate .. //depot/projects/soc2006/intr_filter/dev/em/if_em.c#18 integrate .. //depot/projects/soc2006/intr_filter/dev/fdc/fdc.c#10 integrate .. //depot/projects/soc2006/intr_filter/dev/firewire/fwohci.c#2 integrate .. //depot/projects/soc2006/intr_filter/dev/firewire/sbp.c#3 integrate .. //depot/projects/soc2006/intr_filter/dev/hptmv/entry.c#5 integrate .. //depot/projects/soc2006/intr_filter/dev/hptmv/ioctl.c#2 integrate .. //depot/projects/soc2006/intr_filter/dev/hwpmc/hwpmc_mod.c#4 integrate .. //depot/projects/soc2006/intr_filter/dev/ipmi/ipmi_ssif.c#2 integrate .. //depot/projects/soc2006/intr_filter/dev/pccard/pccard_cis.c#3 integrate .. //depot/projects/soc2006/intr_filter/dev/pccbb/pccbb.c#10 integrate .. //depot/projects/soc2006/intr_filter/dev/random/randomdev_soft.c#2 integrate .. //depot/projects/soc2006/intr_filter/dev/re/if_re.c#17 integrate .. //depot/projects/soc2006/intr_filter/dev/scd/scd.c#2 integrate .. //depot/projects/soc2006/intr_filter/dev/usb/sl811hs.c#3 integrate .. //depot/projects/soc2006/intr_filter/dev/usb/sl811hsvar.h#3 integrate .. //depot/projects/soc2006/intr_filter/dev/usb/umass.c#5 integrate .. //depot/projects/soc2006/intr_filter/dev/usb/usb_subr.c#4 integrate .. //depot/projects/soc2006/intr_filter/dev/usb/usbdevs#10 integrate .. //depot/projects/soc2006/intr_filter/dev/usb/uvscom.c#3 integrate .. //depot/projects/soc2006/intr_filter/dev/zs/z8530var.h#5 integrate .. //depot/projects/soc2006/intr_filter/dev/zs/zs.c#6 integrate .. //depot/projects/soc2006/intr_filter/fs/fifofs/fifo_vnops.c#2 integrate .. //depot/projects/soc2006/intr_filter/fs/smbfs/smbfs_smb.c#3 integrate .. //depot/projects/soc2006/intr_filter/geom/eli/g_eli.c#7 integrate .. //depot/projects/soc2006/intr_filter/geom/geom_dev.c#4 integrate .. //depot/projects/soc2006/intr_filter/geom/geom_io.c#4 integrate .. //depot/projects/soc2006/intr_filter/geom/multipath/g_multipath.c#1 branch .. //depot/projects/soc2006/intr_filter/geom/multipath/g_multipath.h#1 branch .. //depot/projects/soc2006/intr_filter/gnu/fs/ext2fs/ext2_vnops.c#4 integrate .. //depot/projects/soc2006/intr_filter/i386/ibcs2/ibcs2_xenix.c#5 integrate .. //depot/projects/soc2006/intr_filter/i386/linux/linux.h#6 integrate .. //depot/projects/soc2006/intr_filter/i386/linux/linux_machdep.c#9 integrate .. //depot/projects/soc2006/intr_filter/isa/syscons_isa.c#2 integrate .. //depot/projects/soc2006/intr_filter/kern/kern_fork.c#8 integrate .. //depot/projects/soc2006/intr_filter/kern/kern_intr.c#33 integrate .. //depot/projects/soc2006/intr_filter/kern/kern_jail.c#5 integrate .. //depot/projects/soc2006/intr_filter/kern/kern_linker.c#9 integrate .. //depot/projects/soc2006/intr_filter/kern/kern_mutex.c#7 integrate .. //depot/projects/soc2006/intr_filter/kern/kern_rwlock.c#5 integrate .. //depot/projects/soc2006/intr_filter/kern/kern_sx.c#6 integrate .. //depot/projects/soc2006/intr_filter/kern/kern_synch.c#7 integrate .. //depot/projects/soc2006/intr_filter/kern/link_elf.c#6 integrate .. //depot/projects/soc2006/intr_filter/kern/sched_4bsd.c#10 integrate .. //depot/projects/soc2006/intr_filter/kern/subr_bus.c#11 integrate .. //depot/projects/soc2006/intr_filter/kern/sys_generic.c#5 integrate .. //depot/projects/soc2006/intr_filter/kern/uipc_usrreq.c#10 integrate .. //depot/projects/soc2006/intr_filter/modules/Makefile#12 integrate .. //depot/projects/soc2006/intr_filter/modules/geom/Makefile#5 integrate .. //depot/projects/soc2006/intr_filter/modules/geom/geom_multipath/Makefile#1 branch .. //depot/projects/soc2006/intr_filter/modules/ipwfw/Makefile#1 branch .. //depot/projects/soc2006/intr_filter/modules/ipwfw/ipw_bss/Makefile#1 branch .. //depot/projects/soc2006/intr_filter/modules/ipwfw/ipw_ibss/Makefile#1 branch .. //depot/projects/soc2006/intr_filter/modules/ipwfw/ipw_monitor/Makefile#1 branch .. //depot/projects/soc2006/intr_filter/modules/iwifw/Makefile#1 branch .. //depot/projects/soc2006/intr_filter/modules/iwifw/iwi_bss/Makefile#1 branch .. //depot/projects/soc2006/intr_filter/modules/iwifw/iwi_ibss/Makefile#1 branch .. //depot/projects/soc2006/intr_filter/modules/iwifw/iwi_monitor/Makefile#1 branch .. //depot/projects/soc2006/intr_filter/net/bpf.c#8 integrate .. //depot/projects/soc2006/intr_filter/net/bpf.h#4 integrate .. //depot/projects/soc2006/intr_filter/net/bpfdesc.h#3 integrate .. //depot/projects/soc2006/intr_filter/net/if_vlan_var.h#3 integrate .. //depot/projects/soc2006/intr_filter/netgraph/ng_source.c#2 integrate .. //depot/projects/soc2006/intr_filter/netgraph/ng_source.h#2 integrate .. //depot/projects/soc2006/intr_filter/netinet/in.h#4 integrate .. //depot/projects/soc2006/intr_filter/netinet/ip_mroute.c#5 integrate .. //depot/projects/soc2006/intr_filter/netinet/ip_output.c#7 integrate .. //depot/projects/soc2006/intr_filter/netinet/tcp_input.c#9 integrate .. //depot/projects/soc2006/intr_filter/netinet/tcp_output.c#5 integrate .. //depot/projects/soc2006/intr_filter/netinet/tcp_subr.c#7 integrate .. //depot/projects/soc2006/intr_filter/netinet/tcp_timer.c#4 integrate .. //depot/projects/soc2006/intr_filter/netinet/tcp_timer.h#4 integrate .. //depot/projects/soc2006/intr_filter/netinet/tcp_usrreq.c#7 integrate .. //depot/projects/soc2006/intr_filter/netinet/tcp_var.h#6 integrate .. //depot/projects/soc2006/intr_filter/netinet6/ip6_mroute.c#5 integrate .. //depot/projects/soc2006/intr_filter/netinet6/ip6_mroute.h#4 integrate .. //depot/projects/soc2006/intr_filter/netncp/ncp_sock.c#3 integrate .. //depot/projects/soc2006/intr_filter/nfsclient/bootp_subr.c#5 integrate .. //depot/projects/soc2006/intr_filter/pc98/cbus/syscons_cbus.c#2 integrate .. //depot/projects/soc2006/intr_filter/powerpc/powermac/pswitch.c#6 integrate .. //depot/projects/soc2006/intr_filter/sys/extattr.h#4 integrate .. //depot/projects/soc2006/intr_filter/sys/lock.h#4 integrate .. //depot/projects/soc2006/intr_filter/sys/lock_profile.h#4 integrate .. //depot/projects/soc2006/intr_filter/sys/mbuf.h#7 integrate .. //depot/projects/soc2006/intr_filter/sys/mutex.h#6 integrate .. //depot/projects/soc2006/intr_filter/sys/param.h#9 integrate .. //depot/projects/soc2006/intr_filter/sys/priv.h#3 integrate .. //depot/projects/soc2006/intr_filter/sys/rwlock.h#5 integrate .. //depot/projects/soc2006/intr_filter/sys/systm.h#9 integrate .. //depot/projects/soc2006/intr_filter/sys/unpcb.h#4 integrate .. //depot/projects/soc2006/intr_filter/tools/fw_stub.awk#4 integrate .. //depot/projects/soc2006/intr_filter/ufs/ffs/ffs_vnops.c#6 integrate .. //depot/projects/soc2006/intr_filter/ufs/ufs/ufs_vnops.c#7 integrate .. //depot/projects/soc2006/intr_filter/vm/swap_pager.c#7 integrate .. //depot/projects/soc2006/intr_filter/vm/vm_object.c#8 integrate Differences ... ==== //depot/projects/soc2006/intr_filter/amd64/linux32/linux.h#7 (text+ko) ==== @@ -8,7 +8,7 @@ * modification, are permitted provided that the following conditions * are met: * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer + * notice, this list of conditions and the following disclaimer * in this position and unchanged. * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the @@ -27,11 +27,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/amd64/linux32/linux.h,v 1.13 2007/02/24 16:49:24 netchild Exp $ + * $FreeBSD: src/sys/amd64/linux32/linux.h,v 1.14 2007/03/02 00:08:47 jkim Exp $ */ -#ifndef _AMD64_LINUX_LINUX_H_ -#define _AMD64_LINUX_LINUX_H_ +#ifndef _AMD64_LINUX_H_ +#define _AMD64_LINUX_H_ #include @@ -39,20 +39,20 @@ * debugging support */ extern u_char linux_debug_map[]; -#define ldebug(name) isclr(linux_debug_map, LINUX_SYS_linux_ ## name) -#define ARGS(nm, fmt) "linux(%ld): "#nm"("fmt")\n", (long)td->td_proc->p_pid -#define LMSG(fmt) "linux(%ld): "fmt"\n", (long)td->td_proc->p_pid +#define ldebug(name) isclr(linux_debug_map, LINUX_SYS_linux_ ## name) +#define ARGS(nm, fmt) "linux(%ld): "#nm"("fmt")\n", (long)td->td_proc->p_pid +#define LMSG(fmt) "linux(%ld): "fmt"\n", (long)td->td_proc->p_pid #ifdef MALLOC_DECLARE MALLOC_DECLARE(M_LINUX); #endif -#define LINUX32_USRSTACK ((1ul << 32) - PAGE_SIZE) +#define LINUX32_USRSTACK ((1ul << 32) - PAGE_SIZE) /* XXX 16 = sizeof(linux32_ps_strings) */ -#define LINUX32_PS_STRINGS (LINUX32_USRSTACK - 16) -#define LINUX32_MAXDSIZ (512*1024*1024) /* 512MB */ -#define LINUX32_MAXSSIZ (64*1024*1024) /* 64MB */ -#define LINUX32_MAXVMEM 0 /* Unlimited */ +#define LINUX32_PS_STRINGS (LINUX32_USRSTACK - 16) +#define LINUX32_MAXDSIZ (512 * 1024 * 1024) /* 512MB */ +#define LINUX32_MAXSSIZ (64 * 1024 * 1024) /* 64MB */ +#define LINUX32_MAXVMEM 0 /* Unlimited */ #define PTRIN(v) (void *)(uintptr_t)(v) #define PTROUT(v) (l_uintptr_t)(uintptr_t)(v) @@ -132,7 +132,7 @@ #define LINUX_RLIMIT_NPROC 6 #define LINUX_RLIMIT_NOFILE 7 #define LINUX_RLIMIT_MEMLOCK 8 -#define LINUX_RLIMIT_AS 9 /* address space limit */ +#define LINUX_RLIMIT_AS 9 /* Address space limit */ #define LINUX_RLIM_NLIMITS 10 @@ -205,21 +205,21 @@ } __packed; struct l_stat { - l_ushort st_dev; - l_ulong st_ino; - l_ushort st_mode; - l_ushort st_nlink; - l_ushort st_uid; - l_ushort st_gid; - l_ushort st_rdev; - l_long st_size; - struct l_timespec st_atimespec; - struct l_timespec st_mtimespec; - struct l_timespec st_ctimespec; - l_long st_blksize; - l_long st_blocks; - l_ulong st_flags; - l_ulong st_gen; + l_ushort st_dev; + l_ulong st_ino; + l_ushort st_mode; + l_ushort st_nlink; + l_ushort st_uid; + l_ushort st_gid; + l_ushort st_rdev; + l_long st_size; + struct l_timespec st_atimespec; + struct l_timespec st_mtimespec; + struct l_timespec st_ctimespec; + l_long st_blksize; + l_long st_blocks; + l_ulong st_flags; + l_ulong st_gen; }; struct l_stat64 { @@ -315,9 +315,9 @@ #define LINUX_SIGADDSET(set, sig) SIGADDSET(set, sig) /* sigaltstack */ -#define LINUX_MINSIGSTKSZ 2048 -#define LINUX_SS_ONSTACK 1 -#define LINUX_SS_DISABLE 2 +#define LINUX_MINSIGSTKSZ 2048 +#define LINUX_SS_ONSTACK 1 +#define LINUX_SS_DISABLE 2 int linux_to_bsd_sigaltstack(int lsa); int bsd_to_linux_sigaltstack(int bsa); @@ -380,11 +380,11 @@ l_uintptr_t uc_link; l_stack_t uc_stack; struct l_sigcontext uc_mcontext; - l_sigset_t uc_sigmask; + l_sigset_t uc_sigmask; } __packed; -#define LINUX_SI_MAX_SIZE 128 -#define LINUX_SI_PAD_SIZE ((LINUX_SI_MAX_SIZE/sizeof(l_int)) - 3) +#define LINUX_SI_MAX_SIZE 128 +#define LINUX_SI_PAD_SIZE ((LINUX_SI_MAX_SIZE/sizeof(l_int)) - 3) union l_sigval { l_int sival_int; @@ -423,41 +423,41 @@ } __packed _sigchld; struct { - l_uintptr_t _addr; /* faulting insn/memory ref. */ + l_uintptr_t _addr; /* Faulting insn/memory ref. */ } __packed _sigfault; struct { - l_int _band; /* POLL_IN,POLL_OUT,POLL_MSG */ + l_int _band; /* POLL_IN,POLL_OUT,POLL_MSG */ l_int _fd; } __packed _sigpoll; } _sifields; } __packed l_siginfo_t; -#define lsi_pid _sifields._kill._pid -#define lsi_uid _sifields._kill._uid -#define lsi_status _sifields._sigchld._status -#define lsi_utime _sifields._sigchld._utime -#define lsi_stime _sifields._sigchld._stime -#define lsi_value _sifields._rt._sigval -#define lsi_int _sifields._rt._sigval.sival_int -#define lsi_ptr _sifields._rt._sigval.sival_ptr -#define lsi_addr _sifields._sigfault._addr -#define lsi_band _sifields._sigpoll._band -#define lsi_fd _sifields._sigpoll._fd +#define lsi_pid _sifields._kill._pid +#define lsi_uid _sifields._kill._uid +#define lsi_status _sifields._sigchld._status +#define lsi_utime _sifields._sigchld._utime +#define lsi_stime _sifields._sigchld._stime +#define lsi_value _sifields._rt._sigval +#define lsi_int _sifields._rt._sigval.sival_int +#define lsi_ptr _sifields._rt._sigval.sival_ptr +#define lsi_addr _sifields._sigfault._addr +#define lsi_band _sifields._sigpoll._band +#define lsi_fd _sifields._sigpoll._fd struct l_fpreg { - u_int16_t significand[4]; - u_int16_t exponent; + u_int16_t significand[4]; + u_int16_t exponent; } __packed; struct l_fpxreg { - u_int16_t significand[4]; - u_int16_t exponent; - u_int16_t padding[3]; + u_int16_t significand[4]; + u_int16_t exponent; + u_int16_t padding[3]; } __packed; struct l_xmmreg { - u_int32_t element[4]; + u_int32_t element[4]; } __packed; struct l_fpstate { @@ -471,13 +471,13 @@ u_int32_t datasel; struct l_fpreg _st[8]; u_int16_t status; - u_int16_t magic; /* 0xffff = regular FPU data */ + u_int16_t magic; /* 0xffff = regular FPU data */ /* FXSR FPU environment */ - u_int32_t _fxsr_env[6]; /* env is ignored */ + u_int32_t _fxsr_env[6]; /* env is ignored. */ u_int32_t mxcsr; u_int32_t reserved; - struct l_fpxreg _fxsr_st[8]; /* reg data is ignored */ + struct l_fpxreg _fxsr_st[8]; /* reg data is ignored. */ struct l_xmmreg _xmm[8]; u_int32_t padding[56]; } __packed; @@ -528,22 +528,22 @@ /* * open/fcntl flags */ -#define LINUX_O_RDONLY 00 -#define LINUX_O_WRONLY 01 -#define LINUX_O_RDWR 02 -#define LINUX_O_CREAT 0100 -#define LINUX_O_EXCL 0200 -#define LINUX_O_NOCTTY 0400 -#define LINUX_O_TRUNC 01000 -#define LINUX_O_APPEND 02000 -#define LINUX_O_NONBLOCK 04000 +#define LINUX_O_RDONLY 00000000 +#define LINUX_O_WRONLY 00000001 +#define LINUX_O_RDWR 00000002 +#define LINUX_O_CREAT 00000100 +#define LINUX_O_EXCL 00000200 +#define LINUX_O_NOCTTY 00000400 +#define LINUX_O_TRUNC 00001000 +#define LINUX_O_APPEND 00002000 +#define LINUX_O_NONBLOCK 00004000 #define LINUX_O_NDELAY LINUX_O_NONBLOCK -#define LINUX_O_SYNC 010000 -#define LINUX_FASYNC 020000 -#define LINUX_O_DIRECT 040000 /* direct disk access hint */ -#define LINUX_O_LARGEFILE 0100000 -#define LINUX_O_DIRECTORY 0200000 /* must be a directory */ -#define LINUX_O_NOFOLLOW 0400000 /* don't follow links */ +#define LINUX_O_SYNC 00010000 +#define LINUX_FASYNC 00020000 +#define LINUX_O_DIRECT 00040000 /* Direct disk access hint */ +#define LINUX_O_LARGEFILE 00100000 +#define LINUX_O_DIRECTORY 00200000 /* Must be a directory */ +#define LINUX_O_NOFOLLOW 00400000 /* Do not follow links */ #define LINUX_O_NOATIME 01000000 #define LINUX_F_DUPFD 0 @@ -568,12 +568,12 @@ /* * mount flags */ -#define LINUX_MS_RDONLY 0x0001 -#define LINUX_MS_NOSUID 0x0002 -#define LINUX_MS_NODEV 0x0004 -#define LINUX_MS_NOEXEC 0x0008 -#define LINUX_MS_REMOUNT 0x0020 - +#define LINUX_MS_RDONLY 0x0001 +#define LINUX_MS_NOSUID 0x0002 +#define LINUX_MS_NODEV 0x0004 +#define LINUX_MS_NOEXEC 0x0008 +#define LINUX_MS_REMOUNT 0x0020 + /* * SystemV IPC defines */ @@ -671,13 +671,13 @@ #define LINUX_SO_NO_CHECK 11 #define LINUX_SO_PRIORITY 12 #define LINUX_SO_LINGER 13 -#define LINUX_SO_PEERCRED 17 -#define LINUX_SO_RCVLOWAT 18 -#define LINUX_SO_SNDLOWAT 19 -#define LINUX_SO_RCVTIMEO 20 -#define LINUX_SO_SNDTIMEO 21 -#define LINUX_SO_TIMESTAMP 29 -#define LINUX_SO_ACCEPTCONN 30 +#define LINUX_SO_PEERCRED 17 +#define LINUX_SO_RCVLOWAT 18 +#define LINUX_SO_SNDLOWAT 19 +#define LINUX_SO_RCVTIMEO 20 +#define LINUX_SO_SNDTIMEO 21 +#define LINUX_SO_TIMESTAMP 29 +#define LINUX_SO_ACCEPTCONN 30 #define LINUX_IP_TOS 1 #define LINUX_IP_TTL 2 @@ -727,7 +727,7 @@ } ifr_ifru; } __packed; -#define ifr_name ifr_ifrn.ifrn_name /* interface name */ +#define ifr_name ifr_ifrn.ifrn_name /* Interface name */ #define ifr_hwaddr ifr_ifru.ifru_hwaddr /* MAC address */ struct l_ifconf { @@ -774,89 +774,96 @@ l_uint useable:1; }; -struct l_desc_struct { - unsigned long a,b; -}; +#define LINUX_LOWERWORD 0x0000ffff - -#define LINUX_LOWERWORD 0x0000ffff - -/* - * macros which does the same thing as those in linux include/asm-um/ldt-i386.h - * these convert linux user space descriptor to machine one +/* + * Macros which does the same thing as those in Linux include/asm-um/ldt-i386.h. + * These convert Linux user space descriptor to machine one. */ -#define LDT_entry_a(info) \ - ((((info)->base_addr & LINUX_LOWERWORD) << 16) | ((info)->limit & LINUX_LOWERWORD)) +#define LINUX_LDT_entry_a(info) \ + ((((info)->base_addr & LINUX_LOWERWORD) << 16) | \ + ((info)->limit & LINUX_LOWERWORD)) -#define ENTRY_B_READ_EXEC_ONLY 9 -#define ENTRY_B_CONTENTS 10 -#define ENTRY_B_SEG_NOT_PRESENT 15 -#define ENTRY_B_BASE_ADDR 16 -#define ENTRY_B_USEABLE 20 -#define ENTRY_B_SEG32BIT 22 -#define ENTRY_B_LIMIT 23 +#define LINUX_ENTRY_B_READ_EXEC_ONLY 9 +#define LINUX_ENTRY_B_CONTENTS 10 +#define LINUX_ENTRY_B_SEG_NOT_PRESENT 15 +#define LINUX_ENTRY_B_BASE_ADDR 16 +#define LINUX_ENTRY_B_USEABLE 20 +#define LINUX_ENTRY_B_SEG32BIT 22 +#define LINUX_ENTRY_B_LIMIT 23 -#define LDT_entry_b(info) \ - (((info)->base_addr & 0xff000000) | \ - ((info)->limit & 0xf0000) | \ - ((info)->contents << ENTRY_B_CONTENTS) | \ - (((info)->seg_not_present == 0) << ENTRY_B_SEG_NOT_PRESENT) | \ - (((info)->base_addr & 0x00ff0000) >> ENTRY_B_BASE_ADDR) | \ - (((info)->read_exec_only == 0) << ENTRY_B_READ_EXEC_ONLY) | \ - ((info)->seg_32bit << ENTRY_B_SEG32BIT) | \ - ((info)->useable << ENTRY_B_USEABLE) | \ - ((info)->limit_in_pages << ENTRY_B_LIMIT) | 0x7000) +#define LINUX_LDT_entry_b(info) \ + (((info)->base_addr & 0xff000000) | \ + ((info)->limit & 0xf0000) | \ + ((info)->contents << LINUX_ENTRY_B_CONTENTS) | \ + (((info)->seg_not_present == 0) << LINUX_ENTRY_B_SEG_NOT_PRESENT) | \ + (((info)->base_addr & 0x00ff0000) >> LINUX_ENTRY_B_BASE_ADDR) | \ + (((info)->read_exec_only == 0) << LINUX_ENTRY_B_READ_EXEC_ONLY) | \ + ((info)->seg_32bit << LINUX_ENTRY_B_SEG32BIT) | \ + ((info)->useable << LINUX_ENTRY_B_USEABLE) | \ + ((info)->limit_in_pages << LINUX_ENTRY_B_LIMIT) | 0x7000) -#define LDT_empty(info) (\ - (info)->base_addr == 0 && \ - (info)->limit == 0 && \ - (info)->contents == 0 && \ - (info)->seg_not_present == 1 && \ - (info)->read_exec_only == 1 && \ - (info)->seg_32bit == 0 && \ - (info)->limit_in_pages == 0 && \ - (info)->useable == 0 ) +#define LINUX_LDT_empty(info) \ + ((info)->base_addr == 0 && \ + (info)->limit == 0 && \ + (info)->contents == 0 && \ + (info)->seg_not_present == 1 && \ + (info)->read_exec_only == 1 && \ + (info)->seg_32bit == 0 && \ + (info)->limit_in_pages == 0 && \ + (info)->useable == 0) -/* macros for converting segments, they do the same as those in arch/i386/kernel/process.c */ -#define GET_BASE(desc) ( \ - (((desc)->a >> 16) & LINUX_LOWERWORD) | \ - (((desc)->b << 16) & 0x00ff0000) | \ - ( (desc)->b & 0xff000000) ) +/* + * Macros for converting segments. + * They do the same as those in arch/i386/kernel/process.c in Linux. + */ +#define LINUX_GET_BASE(desc) \ + ((((desc)->a >> 16) & LINUX_LOWERWORD) | \ + (((desc)->b << 16) & 0x00ff0000) | \ + ((desc)->b & 0xff000000)) -#define GET_LIMIT(desc) ( \ - ((desc)->a & LINUX_LOWERWORD) | \ - ((desc)->b & 0xf0000) ) +#define LINUX_GET_LIMIT(desc) \ + (((desc)->a & LINUX_LOWERWORD) | \ + ((desc)->b & 0xf0000)) -#define GET_32BIT(desc) (((desc)->b >> ENTRY_B_SEG32BIT) & 1) -#define GET_CONTENTS(desc) (((desc)->b >> ENTRY_B_CONTENTS) & 3) -#define GET_WRITABLE(desc) (((desc)->b >> ENTRY_B_READ_EXEC_ONLY) & 1) -#define GET_LIMIT_PAGES(desc) (((desc)->b >> ENTRY_B_LIMIT) & 1) -#define GET_PRESENT(desc) (((desc)->b >> ENTRY_B_SEG_NOT_PRESENT) & 1) -#define GET_USEABLE(desc) (((desc)->b >> ENTRY_B_USEABLE) & 1) +#define LINUX_GET_32BIT(desc) \ + (((desc)->b >> LINUX_ENTRY_B_SEG32BIT) & 1) +#define LINUX_GET_CONTENTS(desc) \ + (((desc)->b >> LINUX_ENTRY_B_CONTENTS) & 3) +#define LINUX_GET_WRITABLE(desc) \ + (((desc)->b >> LINUX_ENTRY_B_READ_EXEC_ONLY) & 1) +#define LINUX_GET_LIMIT_PAGES(desc) \ + (((desc)->b >> LINUX_ENTRY_B_LIMIT) & 1) +#define LINUX_GET_PRESENT(desc) \ + (((desc)->b >> LINUX_ENTRY_B_SEG_NOT_PRESENT) & 1) +#define LINUX_GET_USEABLE(desc) \ + (((desc)->b >> LINUX_ENTRY_B_USEABLE) & 1) -#define LINUX_CLOCK_REALTIME 0 -#define LINUX_CLOCK_MONOTONIC 1 -#define LINUX_CLOCK_PROCESS_CPUTIME_ID 2 -#define LINUX_CLOCK_THREAD_CPUTIME_ID 3 -#define LINUX_CLOCK_REALTIME_HR 4 -#define LINUX_CLOCK_MONOTONIC_HR 5 +#define LINUX_CLOCK_REALTIME 0 +#define LINUX_CLOCK_MONOTONIC 1 +#define LINUX_CLOCK_PROCESS_CPUTIME_ID 2 +#define LINUX_CLOCK_THREAD_CPUTIME_ID 3 +#define LINUX_CLOCK_REALTIME_HR 4 +#define LINUX_CLOCK_MONOTONIC_HR 5 typedef int l_timer_t; typedef int l_mqd_t; -#define CLONE_VM 0x100 -#define CLONE_FS 0x200 -#define CLONE_FILES 0x400 -#define CLONE_SIGHAND 0x800 -#define CLONE_PID 0x1000 /* this flag does not exist in linux anymore */ -#define CLONE_VFORK 0x4000 -#define CLONE_PARENT 0x00008000 -#define CLONE_THREAD 0x10000 -#define CLONE_SETTLS 0x80000 -#define CLONE_CHILD_CLEARTID 0x00200000 -#define CLONE_CHILD_SETTID 0x01000000 -#define CLONE_PARENT_SETTID 0x00100000 +#define LINUX_CLONE_VM 0x00000100 +#define LINUX_CLONE_FS 0x00000200 +#define LINUX_CLONE_FILES 0x00000400 +#define LINUX_CLONE_SIGHAND 0x00000800 +#define LINUX_CLONE_PID 0x00001000 /* No longer exist in Linux */ +#define LINUX_CLONE_VFORK 0x00004000 +#define LINUX_CLONE_PARENT 0x00008000 +#define LINUX_CLONE_THREAD 0x00010000 +#define LINUX_CLONE_SETTLS 0x00080000 +#define LINUX_CLONE_PARENT_SETTID 0x00100000 +#define LINUX_CLONE_CHILD_CLEARTID 0x00200000 +#define LINUX_CLONE_CHILD_SETTID 0x01000000 -#define THREADING_FLAGS (CLONE_VM | CLONE_FS | CLONE_FILES | CLONE_SIGHAND) +#define LINUX_THREADING_FLAGS \ + (LINUX_CLONE_VM | LINUX_CLONE_FS | LINUX_CLONE_FILES | \ + LINUX_CLONE_SIGHAND | LINUX_CLONE_THREAD) -#endif /* !_AMD64_LINUX_LINUX_H_ */ +#endif /* !_AMD64_LINUX_H_ */ ==== //depot/projects/soc2006/intr_filter/amd64/linux32/linux32_machdep.c#10 (text+ko) ==== @@ -29,7 +29,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_machdep.c,v 1.34 2007/02/24 16:49:24 netchild Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_machdep.c,v 1.36 2007/03/02 00:08:47 jkim Exp $"); #include #include @@ -561,9 +561,9 @@ if (exit_signal <= LINUX_SIGTBLSZ) exit_signal = linux_to_bsd_signal[_SIG_IDX(exit_signal)]; - if (args->flags & CLONE_VM) + if (args->flags & LINUX_CLONE_VM) ff |= RFMEM; - if (args->flags & CLONE_SIGHAND) + if (args->flags & LINUX_CLONE_SIGHAND) ff |= RFSIGSHARE; /* * XXX: in linux sharing of fs info (chroot/cwd/umask) @@ -571,7 +571,7 @@ * structure but in reality it doesn't cause any problems * because both of these flags are usually set together. */ - if (!(args->flags & (CLONE_FILES | CLONE_FS))) + if (!(args->flags & (LINUX_CLONE_FILES | LINUX_CLONE_FS))) ff |= RFFDG; /* @@ -587,14 +587,14 @@ * that special treatment is necessary for signal delivery * between those processes and fd locking. */ - if ((args->flags & 0xffffff00) == THREADING_FLAGS) + if ((args->flags & 0xffffff00) == LINUX_THREADING_FLAGS) ff |= RFTHREAD; error = fork1(td, ff, 0, &p2); if (error) return (error); - if (args->flags & (CLONE_PARENT|CLONE_THREAD)) { + if (args->flags & (LINUX_CLONE_PARENT | LINUX_CLONE_THREAD)) { sx_xlock(&proctree_lock); PROC_LOCK(p2); proc_reparent(p2, td->td_proc->p_pptr); @@ -608,7 +608,7 @@ em = em_find(p2, EMUL_DOLOCK); KASSERT(em != NULL, ("clone: emuldata not found.\n")); /* and adjust it */ - if (args->flags & CLONE_PARENT_SETTID) { + if (args->flags & LINUX_CLONE_PARENT_SETTID) { if (args->parent_tidptr == NULL) { EMUL_UNLOCK(&emul_lock); return (EINVAL); @@ -620,7 +620,7 @@ } } - if (args->flags & CLONE_THREAD) { + if (args->flags & LINUX_CLONE_THREAD) { /* XXX: linux mangles pgrp and pptr somehow * I think it might be this but I am not sure. */ @@ -632,12 +632,12 @@ exit_signal = 0; } - if (args->flags & CLONE_CHILD_SETTID) + if (args->flags & LINUX_CLONE_CHILD_SETTID) em->child_set_tid = args->child_tidptr; else em->child_set_tid = NULL; - if (args->flags & CLONE_CHILD_CLEARTID) + if (args->flags & LINUX_CLONE_CHILD_CLEARTID) em->child_clear_tid = args->child_tidptr; else em->child_clear_tid = NULL; @@ -655,7 +655,7 @@ if (args->stack) td2->td_frame->tf_rsp = PTROUT(args->stack); - if (args->flags & CLONE_SETTLS) { + if (args->flags & LINUX_CLONE_SETTLS) { /* XXX: todo */ } @@ -664,7 +664,7 @@ printf(LMSG("clone: successful rfork to %ld, stack %p sig = %d"), (long)p2->p_pid, args->stack, exit_signal); #endif - if (args->flags & CLONE_VFORK) { + if (args->flags & LINUX_CLONE_VFORK) { PROC_LOCK(p2); p2->p_flag |= P_PPWAIT; PROC_UNLOCK(p2); @@ -681,7 +681,7 @@ td->td_retval[0] = p2->p_pid; td->td_retval[1] = 0; - if (args->flags & CLONE_VFORK) { + if (args->flags & LINUX_CLONE_VFORK) { /* wait for the children to exit, ie. emulate vfork */ PROC_LOCK(p2); while (p2->p_flag & P_PPWAIT) @@ -793,7 +793,9 @@ if (bsd_args.prot & (PROT_READ | PROT_WRITE | PROT_EXEC)) bsd_args.prot |= PROT_READ | PROT_EXEC; - if (linux_args->fd != -1) { + /* Linux does not check file descriptor when MAP_ANONYMOUS is set. */ + bsd_args.fd = (bsd_args.flags & MAP_ANON) ? -1 : linux_args->fd; + if (bsd_args.fd != -1) { /* * Linux follows Solaris mmap(2) description: * The file descriptor fildes is opened with @@ -801,7 +803,7 @@ * protection options specified. */ - if ((error = fget(td, linux_args->fd, &fp)) != 0) + if ((error = fget(td, bsd_args.fd, &fp)) != 0) return (error); if (fp->f_type != DTYPE_VNODE) { fdrop(fp, td); @@ -816,7 +818,6 @@ fdrop(fp, td); } - bsd_args.fd = linux_args->fd; if (linux_args->flags & LINUX_MAP_GROWSDOWN) { /* ==== //depot/projects/soc2006/intr_filter/arm/at91/at91_rtc.c#7 (text) ==== @@ -23,7 +23,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/at91/at91_rtc.c,v 1.3 2007/02/23 12:18:27 piso Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/at91/at91_rtc.c,v 1.4 2007/02/27 13:39:34 piso Exp $"); #include #include ==== //depot/projects/soc2006/intr_filter/arm/at91/at91_spi.c#6 (text) ==== @@ -23,7 +23,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/at91/at91_spi.c,v 1.5 2007/02/23 12:18:27 piso Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/at91/at91_spi.c,v 1.6 2007/02/27 17:15:39 jhb Exp $"); #include #include @@ -248,7 +248,7 @@ rxdone = sc->rxdone; do { - err = msleep(&sc->rxdone, NULL, PCATCH | PZERO, "spi", hz); + err = tsleep(&sc->rxdone, PCATCH | PZERO, "spi", hz); } while (rxdone == sc->rxdone && err != EINTR); WR4(sc, PDC_PTCR, PDC_PTCR_TXTDIS | PDC_PTCR_RXTDIS); if (err == 0) { ==== //depot/projects/soc2006/intr_filter/arm/at91/ohci_atmelarm.c#2 (text) ==== @@ -23,7 +23,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/at91/ohci_atmelarm.c,v 1.1 2006/03/18 01:45:29 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/at91/ohci_atmelarm.c,v 1.2 2007/03/01 09:10:55 piso Exp $"); #include #include @@ -99,8 +99,8 @@ } device_set_ivars(sc->sc_ohci.sc_bus.bdev, &sc->sc_ohci.sc_bus); - err = bus_setup_intr(dev, sc->sc_ohci.irq_res, INTR_TYPE_BIO, ohci_intr, sc, - &sc->sc_ohci.ih); + err = bus_setup_intr(dev, sc->sc_ohci.irq_res, INTR_TYPE_BIO, NULL, + ohci_intr, sc, &sc->sc_ohci.ih); if (err) { err = ENXIO; goto error; ==== //depot/projects/soc2006/intr_filter/cam/scsi/scsi_target.c#3 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_target.c,v 1.71 2006/12/05 07:45:28 mjacob Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_target.c,v 1.72 2007/02/27 17:15:39 jhb Exp $"); #include @@ -810,8 +810,8 @@ user_descr = TAILQ_FIRST(abort_queue); while (ccb_h == NULL && user_descr == NULL) { if ((ioflag & IO_NDELAY) == 0) { - error = msleep(user_queue, NULL, - PRIBIO | PCATCH, "targrd", 0); + error = tsleep(user_queue, + PRIBIO | PCATCH, "targrd", 0); ccb_h = TAILQ_FIRST(user_queue); user_descr = TAILQ_FIRST(abort_queue); if (error != 0) { @@ -1037,7 +1037,7 @@ /* If we aborted at least one pending CCB ok, wait for it. */ if (cab.ccb_h.status == CAM_REQ_CMP) { - msleep(&softc->pending_ccb_queue, NULL, + tsleep(&softc->pending_ccb_queue, PRIBIO | PCATCH, "tgabrt", 0); } ==== //depot/projects/soc2006/intr_filter/compat/linprocfs/linprocfs.c#9 (text+ko) ==== @@ -40,7 +40,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/linprocfs/linprocfs.c,v 1.105 2007/01/21 13:18:52 netchild Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linprocfs/linprocfs.c,v 1.106 2007/03/02 01:10:26 jkim Exp $"); #include #include @@ -416,6 +416,55 @@ } /* + * Get OS build date + */ +static void +linprocfs_osbuild(struct thread *td, struct sbuf *sb) +{ +#if 0 + char osbuild[256]; + char *cp1, *cp2; + + strncpy(osbuild, version, 256); + osbuild[255] = '\0'; + cp1 = strstr(osbuild, "\n"); + cp2 = strstr(osbuild, ":"); + if (cp1 && cp2) { + *cp1 = *cp2 = '\0'; + cp1 = strstr(osbuild, "#"); + } else + cp1 = NULL; + if (cp1) + sbuf_printf(sb, "%s%s", cp1, cp2 + 1); + else +#endif + sbuf_cat(sb, "#4 Sun Dec 18 04:30:00 CET 1977"); +} + +/* + * Get OS builder + */ +static void +linprocfs_osbuilder(struct thread *td, struct sbuf *sb) +{ + char builder[256]; + char *cp; + + cp = strstr(version, "\n "); + if (cp) { + strncpy(builder, cp + 5, 256); + builder[255] = '\0'; + cp = strstr(builder, ":"); + if (cp) + *cp = '\0'; + } + if (cp) + sbuf_cat(sb, builder); + else + sbuf_cat(sb, "des@freebsd.org"); +} + +/* * Filler function for proc/version */ static int @@ -426,10 +475,12 @@ linux_get_osname(td, osname); linux_get_osrelease(td, osrelease); + sbuf_printf(sb, "%s version %s (", osname, osrelease); + linprocfs_osbuilder(td, sb); + sbuf_cat(sb, ") (gcc version " __VERSION__ ") "); + linprocfs_osbuild(td, sb); + sbuf_cat(sb, "\n"); - sbuf_printf(sb, - "%s version %s (des@freebsd.org) (gcc version " __VERSION__ ")" - " #4 Sun Dec 18 04:30:00 CET 1977\n", osname, osrelease); return (0); } @@ -935,6 +986,46 @@ } /* + * Filler function for proc/sys/kernel/osrelease + */ +static int +linprocfs_doosrelease(PFS_FILL_ARGS) +{ + char osrelease[LINUX_MAX_UTSNAME]; + + linux_get_osrelease(td, osrelease); + sbuf_printf(sb, "%s\n", osrelease); + + return (0); +} + +/* + * Filler function for proc/sys/kernel/ostype + */ +static int +linprocfs_doostype(PFS_FILL_ARGS) +{ + char osname[LINUX_MAX_UTSNAME]; + + linux_get_osname(td, osname); + sbuf_printf(sb, "%s\n", osname); + + return (0); +} + +/* + * Filler function for proc/sys/kernel/version + */ +static int +linprocfs_doosbuild(PFS_FILL_ARGS) +{ + linprocfs_osbuild(td, sb); + sbuf_cat(sb, "\n"); + + return (0); +} + +/* * Filler function for proc/sys/kernel/msgmni */ static int @@ -1146,6 +1237,12 @@ dir = pfs_create_dir(root, "sys", NULL, NULL, 0); /* /proc/sys/kernel/... */ dir = pfs_create_dir(dir, "kernel", NULL, NULL, 0); + pfs_create_file(dir, "osrelease", &linprocfs_doosrelease, + NULL, NULL, PFS_RD); + pfs_create_file(dir, "ostype", &linprocfs_doostype, + NULL, NULL, PFS_RD); + pfs_create_file(dir, "version", &linprocfs_doosbuild, + NULL, NULL, PFS_RD); pfs_create_file(dir, "msgmni", &linprocfs_domsgmni, NULL, NULL, PFS_RD); pfs_create_file(dir, "pid_max", &linprocfs_dopid_max, ==== //depot/projects/soc2006/intr_filter/compat/linux/linux_emul.c#9 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/linux/linux_emul.c,v 1.18 2007/02/24 16:49:24 netchild Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linux/linux_emul.c,v 1.19 2007/03/02 00:08:47 jkim Exp $"); #include "opt_compat.h" @@ -86,7 +86,7 @@ em = malloc(sizeof *em, M_LINUX, M_WAITOK | M_ZERO); em->pid = child; em->pdeath_signal = 0; - if (flags & CLONE_THREAD) { + if (flags & LINUX_CLONE_THREAD) { /* handled later in the code */ } else { struct linux_emuldata_shared *s; @@ -113,7 +113,7 @@ * proc */ if (child != 0) { - if (flags & CLONE_THREAD) { + if (flags & LINUX_CLONE_THREAD) { /* lookup the parent */ /* * we dont have to lock the p_em because ==== //depot/projects/soc2006/intr_filter/conf/NOTES#15 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/NOTES,v 1.1410 2007/02/10 13:59:13 bms Exp $ +# $FreeBSD: src/sys/conf/NOTES,v 1.1411 2007/02/27 04:01:57 mjacob Exp $ # # NOTES -- Lines that can be cut/pasted into kernel and hints configs. # @@ -147,6 +147,7 @@ options GEOM_LABEL # Providers labelization. options GEOM_MBR # DOS/MBR partitioning >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Mar 2 17:32: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 3579D16A404; Fri, 2 Mar 2007 17:32: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 0BFBD16A400 for ; Fri, 2 Mar 2007 17:32:22 +0000 (UTC) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id F19FC13C481 for ; Fri, 2 Mar 2007 17:32:21 +0000 (UTC) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l22HWL5O080582 for ; Fri, 2 Mar 2007 17:32:21 GMT (envelope-from piso@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l22HWL9A080578 for perforce@freebsd.org; Fri, 2 Mar 2007 17:32:21 GMT (envelope-from piso@freebsd.org) Date: Fri, 2 Mar 2007 17:32:21 GMT Message-Id: <200703021732.l22HWL9A080578@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to piso@freebsd.org using -f From: Paolo Pisati To: Perforce Change Reviews Cc: Subject: PERFORCE change 115256 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 02 Mar 2007 17:32:22 -0000 http://perforce.freebsd.org/chv.cgi?CH=115256 Change 115256 by piso@piso_newluxor on 2007/03/02 17:31:21 Restablish a filtered version of aac. Affected files ... .. //depot/projects/soc2006/intr_filter/dev/aac/aac.c#10 edit .. //depot/projects/soc2006/intr_filter/dev/aac/aacvar.h#5 edit Differences ... ==== //depot/projects/soc2006/intr_filter/dev/aac/aac.c#10 (text+ko) ==== @@ -307,18 +307,11 @@ } } else { if (bus_setup_intr(sc->aac_dev, sc->aac_irq, - INTR_TYPE_BIO, aac_fast_intr, NULL, + INTR_TYPE_BIO, aac_fast_intr, aac_complete, sc, &sc->aac_intr)) { device_printf(sc->aac_dev, - "can't set up FAST interrupt\n"); - if (bus_setup_intr(sc->aac_dev, sc->aac_irq, - INTR_MPSAFE|INTR_TYPE_BIO, - NULL, (driver_intr_t *)aac_fast_intr, - sc, &sc->aac_intr)) { - device_printf(sc->aac_dev, - "can't set up MPSAFE interrupt\n"); + "can't set up FILTERed interrupt\n"); return (EINVAL); - } } } @@ -820,53 +813,9 @@ */ wakeup(sc->aifthread); } - return((ret)?ret:FILTER_STRAY); + return(ret ? ret : FILTER_STRAY); } -int -aac_intr(void *arg) -{ - struct aac_softc *sc; - u_int16_t reason; - - debug_called(2); - - sc = (struct aac_softc *)arg; - - /* - * Read the status register directly. This is faster than taking the - * driver lock and reading the queues directly. It also saves having - * to turn parts of the driver lock into a spin mutex, which would be - * ugly. - */ - reason = AAC_GET_ISTATUS(sc); - AAC_CLEAR_ISTATUS(sc, reason); - - /* handle completion processing */ - if (reason & AAC_DB_RESPONSE_READY) - taskqueue_enqueue_fast(taskqueue_fast, &sc->aac_task_complete); - - /* controller wants to talk to us */ - if (reason & (AAC_DB_PRINTF | AAC_DB_COMMAND_READY)) { - /* - * XXX Make sure that we don't get fooled by strange messages - * that start with a NULL. - */ - if ((reason & AAC_DB_PRINTF) && - (sc->aac_common->ac_printf[0] == 0)) - sc->aac_common->ac_printf[0] = 32; - - /* - * This might miss doing the actual wakeup. However, the - * msleep that this is waking up has a timeout, so it will - * wake up eventually. AIFs and printfs are low enough - * priority that they can handle hanging out for a few seconds - * if needed. - */ - wakeup(sc->aifthread); - } - return (FILTER_HANDLED); -} /* * Command Processing ==== //depot/projects/soc2006/intr_filter/dev/aac/aacvar.h#5 (text+ko) ==== @@ -426,7 +426,6 @@ extern int aac_resume(device_t dev); extern void aac_new_intr(void *arg); extern int aac_fast_intr(void *arg); -extern void aac_intr(void *arg); extern void aac_submit_bio(struct bio *bp); extern void aac_biodone(struct bio *bp); extern void aac_startio(struct aac_softc *sc); From owner-p4-projects@FreeBSD.ORG Sat Mar 3 15:38: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 02A0516A405; Sat, 3 Mar 2007 15:38: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 C2D6316A400 for ; Sat, 3 Mar 2007 15:38:15 +0000 (UTC) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id B72D413C46B for ; Sat, 3 Mar 2007 15:38:15 +0000 (UTC) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l23FcF4p005047 for ; Sat, 3 Mar 2007 15:38:15 GMT (envelope-from piso@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l23FcFa8005044 for perforce@freebsd.org; Sat, 3 Mar 2007 15:38:15 GMT (envelope-from piso@freebsd.org) Date: Sat, 3 Mar 2007 15:38:15 GMT Message-Id: <200703031538.l23FcFa8005044@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to piso@freebsd.org using -f From: Paolo Pisati To: Perforce Change Reviews Cc: Subject: PERFORCE change 115278 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 03 Mar 2007 15:38:16 -0000 http://perforce.freebsd.org/chv.cgi?CH=115278 Change 115278 by piso@piso_newluxor on 2007/03/03 15:38:00 Restore em filtered driver. Affected files ... .. //depot/projects/soc2006/intr_filter/dev/em/if_em.c#19 edit Differences ... ==== //depot/projects/soc2006/intr_filter/dev/em/if_em.c#19 (text+ko) ==== @@ -2184,7 +2184,7 @@ */ TASK_INIT(&adapter->link_task, 0, em_handle_link, adapter); if ((error = bus_setup_intr(dev, adapter->res_interrupt, - INTR_TYPE_NET, em_intr_fast, NULL, adapter, + INTR_TYPE_NET, em_intr_fast, em_handle_rxtx, adapter, &adapter->int_handler_tag)) != 0) { device_printf(dev, "Failed to register fast interrupt " "handler: %d\n", error); From owner-p4-projects@FreeBSD.ORG Sat Mar 3 16:14: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 A481816A405; Sat, 3 Mar 2007 16:14: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 5128116A400 for ; Sat, 3 Mar 2007 16:14:01 +0000 (UTC) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 4488C13C49D for ; Sat, 3 Mar 2007 16:14:01 +0000 (UTC) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l23GE1mX013968 for ; Sat, 3 Mar 2007 16:14:01 GMT (envelope-from piso@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l23GE0QR013965 for perforce@freebsd.org; Sat, 3 Mar 2007 16:14:00 GMT (envelope-from piso@freebsd.org) Date: Sat, 3 Mar 2007 16:14:00 GMT Message-Id: <200703031614.l23GE0QR013965@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to piso@freebsd.org using -f From: Paolo Pisati To: Perforce Change Reviews Cc: Subject: PERFORCE change 115279 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 03 Mar 2007 16:14:02 -0000 http://perforce.freebsd.org/chv.cgi?CH=115279 Change 115279 by piso@piso_newluxor on 2007/03/03 16:13:42 Restore pccard ability to support filtered drivers: o check for filter and ithread handlers o fix pccard_intr() return code Affected files ... .. //depot/projects/soc2006/intr_filter/dev/pccard/pccard.c#7 edit Differences ... ==== //depot/projects/soc2006/intr_filter/dev/pccard/pccard.c#7 (text+ko) ==== @@ -119,7 +119,7 @@ int rid, struct resource *r); static void pccard_child_detached(device_t parent, device_t dev); static int pccard_filter(void *arg); -static int pccard_intr(void *arg); +static void pccard_intr(void *arg); static int pccard_setup_intr(device_t dev, device_t child, struct resource *irq, int flags, driver_filter_t *filt, driver_intr_t *intr, void *arg, void **cookiep); @@ -1235,13 +1235,13 @@ struct pccard_function *pf = ivar->pf; int err; - if (pf->intr_handler != NULL) + if (pf->intr_filter != NULL || pf->intr_handler != NULL) panic("Only one interrupt handler per function allowed"); err = bus_generic_setup_intr(dev, child, irq, flags, pccard_filter, pccard_intr, pf, cookiep); if (err != 0) return (err); - pf->intr_filter = filter; + pf->intr_filter = filt; pf->intr_handler = intr; pf->intr_handler_arg = arg; pf->intr_handler_cookie = *cookiep; From owner-p4-projects@FreeBSD.ORG Sat Mar 3 16:59: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 B528516A405; Sat, 3 Mar 2007 16:59:59 +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 8981716A403 for ; Sat, 3 Mar 2007 16:59:59 +0000 (UTC) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 7E55813C49D for ; Sat, 3 Mar 2007 16:59:59 +0000 (UTC) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l23GxxJp032154 for ; Sat, 3 Mar 2007 16:59:59 GMT (envelope-from piso@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l23Gxwbr032151 for perforce@freebsd.org; Sat, 3 Mar 2007 16:59:58 GMT (envelope-from piso@freebsd.org) Date: Sat, 3 Mar 2007 16:59:58 GMT Message-Id: <200703031659.l23Gxwbr032151@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to piso@freebsd.org using -f From: Paolo Pisati To: Perforce Change Reviews Cc: Subject: PERFORCE change 115280 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 03 Mar 2007 17:00:00 -0000 http://perforce.freebsd.org/chv.cgi?CH=115280 Change 115280 by piso@piso_newluxor on 2007/03/03 16:59:42 Make pccbb able to handle filter+ithread handlers. Affected files ... .. //depot/projects/soc2006/intr_filter/dev/pccbb/pccbb.c#11 edit .. //depot/projects/soc2006/intr_filter/dev/pccbb/pccbbvar.h#8 edit Differences ... ==== //depot/projects/soc2006/intr_filter/dev/pccbb/pccbb.c#11 (text+ko) ==== @@ -177,7 +177,8 @@ device_t child); static void cbb_cardbus_power_disable_socket(device_t brdev, device_t child); -static int cbb_func_intr(void *arg); +static int cbb_func_filt(void *arg); +static void cbb_func_intr(void *arg); static void cbb_remove_res(struct cbb_softc *sc, struct resource *res) @@ -372,13 +373,12 @@ * least common denominator until the base system supports mixing * and matching better. */ - if (filt != NULL) - return (EINVAL); ih = malloc(sizeof(struct cbb_intrhand), M_DEVBUF, M_NOWAIT); if (ih == NULL) return (ENOMEM); *cookiep = ih; - ih->intr = filt; + ih->filt = filt; + ih->intr = intr; ih->arg = arg; ih->sc = sc; /* @@ -386,7 +386,7 @@ * XXX for now that's all we need to do. */ err = BUS_SETUP_INTR(device_get_parent(dev), child, irq, flags, - NULL, cbb_func_intr, ih, &ih->cookie); + cbb_func_filt, cbb_func_intr, ih, &ih->cookie); if (err != 0) { free(ih, M_DEVBUF); return (err); @@ -613,7 +613,7 @@ * CD changes were clear there, then we'd know the card was gone. */ static int -cbb_func_intr(void *arg) +cbb_func_filt(void *arg) { struct cbb_intrhand *ih = (struct cbb_intrhand *)arg; struct cbb_softc *sc = ih->sc; @@ -622,17 +622,31 @@ * Make sure that the card is really there. */ if ((sc->flags & CBB_CARD_OK) == 0) - return (FILTER_HANDLED); + return (FILTER_STRAY); if (!CBB_CARD_PRESENT(cbb_get(sc, CBB_SOCKET_STATE))) { sc->flags &= ~CBB_CARD_OK; - return (FILTER_HANDLED); + return (FILTER_STRAY); } /* * nb: don't have to check for giant or not, since that's done * in the ISR dispatch */ - return ((*ih->intr)(ih->arg)); + if (ih->filt != NULL) + return ((*ih->filt)(ih->arg)); + + if (ih->intr != NULL) + return (FILTER_HANDLED | FILTER_SCHEDULE_THREAD); + else + return (FILTER_STRAY); +} + +static void +cbb_func_intr(void *arg) +{ + struct cbb_intrhand *ih = (struct cbb_intrhand *)arg; + + ih->intr(ih->arg); } /************************************************************************/ ==== //depot/projects/soc2006/intr_filter/dev/pccbb/pccbbvar.h#8 (text+ko) ==== @@ -32,7 +32,8 @@ */ struct cbb_intrhand { - driver_filter_t *intr; + driver_filter_t *filt; + driver_intr_t *intr; void *arg; struct cbb_softc *sc; void *cookie; From owner-p4-projects@FreeBSD.ORG Sat Mar 3 17:06: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 1087A16A401; Sat, 3 Mar 2007 17:06: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 D7E8D16A409 for ; Sat, 3 Mar 2007 17:06:07 +0000 (UTC) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id B48AC13C442 for ; Sat, 3 Mar 2007 17:06:07 +0000 (UTC) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l23H67mf034695 for ; Sat, 3 Mar 2007 17:06:07 GMT (envelope-from piso@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l23H67nD034692 for perforce@freebsd.org; Sat, 3 Mar 2007 17:06:07 GMT (envelope-from piso@freebsd.org) Date: Sat, 3 Mar 2007 17:06:07 GMT Message-Id: <200703031706.l23H67nD034692@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to piso@freebsd.org using -f From: Paolo Pisati To: Perforce Change Reviews Cc: Subject: PERFORCE change 115281 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 03 Mar 2007 17:06:08 -0000 http://perforce.freebsd.org/chv.cgi?CH=115281 Change 115281 by piso@piso_newluxor on 2007/03/03 17:05:44 Check only for intr_filter in pccard_filter(). Affected files ... .. //depot/projects/soc2006/intr_filter/dev/pccard/pccard.c#8 edit Differences ... ==== //depot/projects/soc2006/intr_filter/dev/pccard/pccard.c#8 (text+ko) ==== @@ -1208,7 +1208,7 @@ else doisr = 0; } - if (pf->intr_handler != NULL && doisr) { + if (doisr) { if (pf->intr_filter != NULL) return (pf->intr_filter(pf->intr_handler_arg)); else From owner-p4-projects@FreeBSD.ORG Sat Mar 3 17:23: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 A711716A408; Sat, 3 Mar 2007 17:23: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 7AFD016A401 for ; Sat, 3 Mar 2007 17:23:29 +0000 (UTC) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 6FA8813C4A7 for ; Sat, 3 Mar 2007 17:23:29 +0000 (UTC) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l23HNTch037526 for ; Sat, 3 Mar 2007 17:23:29 GMT (envelope-from piso@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l23HNT8D037516 for perforce@freebsd.org; Sat, 3 Mar 2007 17:23:29 GMT (envelope-from piso@freebsd.org) Date: Sat, 3 Mar 2007 17:23:29 GMT Message-Id: <200703031723.l23HNT8D037516@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to piso@freebsd.org using -f From: Paolo Pisati To: Perforce Change Reviews Cc: Subject: PERFORCE change 115282 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 03 Mar 2007 17:23:30 -0000 http://perforce.freebsd.org/chv.cgi?CH=115282 Change 115282 by piso@piso_newluxor on 2007/03/03 17:22:44 Restore filtered handler for re. Affected files ... .. //depot/projects/soc2006/intr_filter/dev/re/if_re.c#18 edit Differences ... ==== //depot/projects/soc2006/intr_filter/dev/re/if_re.c#18 (text+ko) ==== @@ -241,10 +241,10 @@ static void re_poll (struct ifnet *, enum poll_cmd, int); static void re_poll_locked (struct ifnet *, enum poll_cmd, int); #endif -static int re_intr (void *); static void re_tick (void *); static void re_tx_task (void *, int); static void re_int_task (void *); +static int re_filter (void *); static void re_start (struct ifnet *); static int re_ioctl (struct ifnet *, u_long, caddr_t); static void re_init (void *); @@ -1364,7 +1364,6 @@ re_stop(sc); RL_UNLOCK(sc); callout_drain(&sc->rl_stat_callout); - taskqueue_drain(taskqueue_fast, &sc->rl_inttask); taskqueue_drain(taskqueue_fast, &sc->rl_txtask); /* * Force off the IFF_UP flag here, in case someone @@ -1938,7 +1937,7 @@ return (FILTER_STRAY); CSR_WRITE_2(sc, RL_IMR, 0); - return(FILTER_HANDLED | FILTER_SCHEDULE_THREAD); + return (FILTER_HANDLED | FILTER_SCHEDULE_THREAD); } static void From owner-p4-projects@FreeBSD.ORG Sat Mar 3 18:17: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 3A7E116A408; Sat, 3 Mar 2007 18:17: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 0CC8C16A407 for ; Sat, 3 Mar 2007 18:17:37 +0000 (UTC) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id DABD613C48E for ; Sat, 3 Mar 2007 18:17:36 +0000 (UTC) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l23IHaGQ047986 for ; Sat, 3 Mar 2007 18:17:36 GMT (envelope-from piso@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l23IHaaq047983 for perforce@freebsd.org; Sat, 3 Mar 2007 18:17:36 GMT (envelope-from piso@freebsd.org) Date: Sat, 3 Mar 2007 18:17:36 GMT Message-Id: <200703031817.l23IHaaq047983@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to piso@freebsd.org using -f From: Paolo Pisati To: Perforce Change Reviews Cc: Subject: PERFORCE change 115283 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 03 Mar 2007 18:17:37 -0000 http://perforce.freebsd.org/chv.cgi?CH=115283 Change 115283 by piso@piso_newluxor on 2007/03/03 18:17:12 Fix puc compilation. Affected files ... .. //depot/projects/soc2006/intr_filter/dev/puc/puc.c#11 edit Differences ... ==== //depot/projects/soc2006/intr_filter/dev/puc/puc.c#11 (text+ko) ==== @@ -59,6 +59,7 @@ int p_hasintr:1; + driver_filter_t *p_ih; serdev_intr_t *p_ihsrc[PUC_ISRCCNT]; void *p_iharg; From owner-p4-projects@FreeBSD.ORG Sat Mar 3 18:29: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 5046116A474; Sat, 3 Mar 2007 18:29: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 0D48B16A415 for ; Sat, 3 Mar 2007 18:29:53 +0000 (UTC) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id DA2BA13C46B for ; Sat, 3 Mar 2007 18:29:52 +0000 (UTC) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l23ITqJb054004 for ; Sat, 3 Mar 2007 18:29:52 GMT (envelope-from piso@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l23ITq0b054001 for perforce@freebsd.org; Sat, 3 Mar 2007 18:29:52 GMT (envelope-from piso@freebsd.org) Date: Sat, 3 Mar 2007 18:29:52 GMT Message-Id: <200703031829.l23ITq0b054001@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to piso@freebsd.org using -f From: Paolo Pisati To: Perforce Change Reviews Cc: Subject: PERFORCE change 115284 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 03 Mar 2007 18:29:53 -0000 http://perforce.freebsd.org/chv.cgi?CH=115284 Change 115284 by piso@piso_newluxor on 2007/03/03 18:28:51 Fix scc compilation. Affected files ... .. //depot/projects/soc2006/intr_filter/dev/scc/scc_core.c#14 edit Differences ... ==== //depot/projects/soc2006/intr_filter/dev/scc/scc_core.c#14 (text) ==== @@ -51,7 +51,7 @@ MALLOC_DEFINE(M_SCC, "SCC", "SCC driver"); -static int +static void scc_bfe_ihand(void *arg) { struct scc_softc *sc = arg; From owner-p4-projects@FreeBSD.ORG Sat Mar 3 20: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 4021B16A403; Sat, 3 Mar 2007 20:52: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 E1E7F16A400; Sat, 3 Mar 2007 20:52:49 +0000 (UTC) (envelope-from imp@bsdimp.com) Received: from harmony.bsdimp.com (vc4-2-0-87.dsl.netrack.net [199.45.160.85]) by mx1.freebsd.org (Postfix) with ESMTP id A1FB213C442; Sat, 3 Mar 2007 20:52:49 +0000 (UTC) (envelope-from imp@bsdimp.com) Received: from localhost (localhost [127.0.0.1]) by harmony.bsdimp.com (8.13.4/8.13.4) with ESMTP id l23KoW9C044476; Sat, 3 Mar 2007 13:50:33 -0700 (MST) (envelope-from imp@bsdimp.com) Date: Sat, 03 Mar 2007 13:50:40 -0700 (MST) Message-Id: <20070303.135040.179932401.imp@bsdimp.com> To: piso@freebsd.org From: "M. Warner Losh" In-Reply-To: <200703031614.l23GE0QR013965@repoman.freebsd.org> References: <200703031614.l23GE0QR013965@repoman.freebsd.org> X-Mailer: Mew version 4.2 on Emacs 21.3 / Mule 5.0 (SAKAKI) Mime-Version: 1.0 Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-2.0 (harmony.bsdimp.com [127.0.0.1]); Sat, 03 Mar 2007 13:50:33 -0700 (MST) Cc: perforce@freebsd.org Subject: Re: PERFORCE change 115279 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 03 Mar 2007 20:52:50 -0000 In message: <200703031614.l23GE0QR013965@repoman.freebsd.org> Paolo Pisati writes: : Restore pccard ability to support filtered drivers: : : o check for filter and ithread handlers : o fix pccard_intr() return code Good catch... I think we should re-evaluate how CSC interrupts are handled for CardBus and PC Card in general, which might simplify things in this area of the code. It was originally put into place to handle sudden, surprise removal of the cards in a (mostly) sane way. Now that the underlying reasons for having these checks are gone, it would make things better if this could be investigated... I'll have to add it to my list... Warner