From owner-p4-projects@FreeBSD.ORG Sun Jan 7 05:13:24 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 13E4A16A415; Sun, 7 Jan 2007 05:13:24 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id B437816A40F for ; Sun, 7 Jan 2007 05:13:23 +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 A606613C448 for ; Sun, 7 Jan 2007 05:13:23 +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 l075DNfc081066 for ; Sun, 7 Jan 2007 05:13:23 GMT (envelope-from mjacob@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l075DNbu081063 for perforce@freebsd.org; Sun, 7 Jan 2007 05:13:23 GMT (envelope-from mjacob@freebsd.org) Date: Sun, 7 Jan 2007 05:13:23 GMT Message-Id: <200701070513.l075DNbu081063@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 112630 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 07 Jan 2007 05:13:24 -0000 http://perforce.freebsd.org/chv.cgi?CH=112630 Change 112630 by mjacob@mjexp on 2007/01/07 05:12:26 Some more cleanups to catch a race between orphan and I/O failure decommissioning actions. Affected files ... .. //depot/projects/mjexp/sys/geom/multipath/g_multipath.c#11 edit Differences ... ==== //depot/projects/mjexp/sys/geom/multipath/g_multipath.c#11 (text+ko) ==== @@ -70,13 +70,36 @@ .destroy_geom = g_multipath_destroy_geom }; +#define MP_BAD 0x1 +#define MP_POSTED 0x2 + +static void +g_mpd(void *arg, int flags __unused) +{ + struct g_consumer *cp; + + g_topology_assert(); + cp = arg; + if (cp->acr > 0 || cp->acw > 0 || cp->ace > 0) { + g_access(cp, -cp->acr, -cp->acw, -cp->ace); + } + if (cp->provider) { + printf("GEOM_MULTIPATH: %s removed from %s\n", + cp->provider->name, cp->geom->name); + g_detach(cp); + } + g_destroy_consumer(cp); +} static void g_multipath_orphan(struct g_consumer *cp) { -printf("%s called on %s\n", __FUNCTION__, cp->provider? cp->provider->name : "none"); - g_topology_assert(); - g_multipath_destroy(cp->geom); + if ((cp->index & MP_POSTED) == 0) { + cp->index |= MP_POSTED; + printf("GEOM_MULTIPATH: %s orphaned in %s\n", + cp->provider->name, cp->geom->name); + g_mpd(cp, 0); + } } static void @@ -105,17 +128,6 @@ } static void -g_mpd(void *arg, int flags __unused) -{ - struct g_consumer *cp; - g_topology_assert(); - cp = arg; - g_access(cp, -cp->acr, -cp->acw, -cp->ace); - g_detach(cp); - g_destroy_consumer(cp); -} - -static void g_multipath_done(struct bio *bp) { struct bio *pbp = bp->bio_parent; @@ -127,16 +139,6 @@ if (bp->bio_error == ENXIO || bp->bio_error == EIO) { dofail = 1; -#if 0 - } else if (bp->bio_error == 0) { - static uint8_t inject = 0; - if (++inject == 0) { - bp->bio_error = ENXIO; - dofail = 1; - } else { - dofail = 0; - } -#endif } else { dofail = 0; } @@ -154,13 +156,17 @@ * to the next available consumer. */ g_topology_lock(); + cp->index |= MP_BAD; + if (cp->nend == cp->nstart && pp->nend == pp->nstart) { + cp->index |= MP_POSTED; + g_post_event(g_mpd, cp, M_NOWAIT, NULL); + } if (cp == sc->cp_active) { - printf("GEOM_MULTIPATH: I/O failure terminates use of " - "%s in %s\n", cp->provider->name, gp->name); - cp->index = 1; + printf("GEOM_MULTIPATH: %s failed in %s\n", + pp->name, sc->sc_name); sc->cp_active = NULL; LIST_FOREACH(lcp, &gp->consumer, consumer) { - if (lcp->index == 0) { + if ((lcp->index & MP_BAD) == 0) { sc->cp_active = lcp; break; } @@ -170,15 +176,10 @@ g_topology_unlock(); goto out; } - printf("GEOM_MULTIPATH: switching to provider %s\n", - sc->cp_active->provider->name); + printf("GEOM_MULTIPATH: %s now active path in %s\n", + sc->cp_active->provider->name, sc->sc_name); } g_topology_unlock(); - if (cp->nend == cp->nstart && pp->nend == pp->nstart) { - printf("GEOM_MULTIPATH: old provider %s is now quiet\n", - pp->name); - g_post_event(g_mpd, cp, M_NOWAIT, NULL); - } /* * If we can fruitfully restart the I/O, do so. @@ -318,12 +319,13 @@ return (error); } } + printf("GEOM_MULTIPATH: adding %s to %s/%s\n", + pp->name, sc->sc_name, sc->sc_uuid); if (sc->cp_active == NULL) { sc->cp_active = cp; - printf("GEOM_MULTIPATH: activating %s/%s\n", - sc->sc_name, sc->sc_uuid); + printf("GEOM_MULTIPATH: %s now active path in %s\n", + pp->name, sc->sc_name); } - printf("GEOM_MULTIPATH: adding %s to %s\n", pp->name, sc->sc_name); return (0); } From owner-p4-projects@FreeBSD.ORG Sun Jan 7 05:20: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 3452016A416; Sun, 7 Jan 2007 05:20: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 C4C6516A40F for ; Sun, 7 Jan 2007 05:20:33 +0000 (UTC) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id A9FD813C448 for ; Sun, 7 Jan 2007 05:20:33 +0000 (UTC) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l075KXbV081535 for ; Sun, 7 Jan 2007 05:20:33 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l075KW5V081532 for perforce@freebsd.org; Sun, 7 Jan 2007 05:20:32 GMT (envelope-from peter@freebsd.org) Date: Sun, 7 Jan 2007 05:20:32 GMT Message-Id: <200701070520.l075KW5V081532@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Cc: Subject: PERFORCE change 112631 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 07 Jan 2007 05:20:34 -0000 http://perforce.freebsd.org/chv.cgi?CH=112631 Change 112631 by peter@peter_overcee on 2007/01/07 05:19:40 catch up with some gratuitous SHLIB major bumps Affected files ... .. //depot/projects/hammer/gnu/lib/libdialog/Makefile#10 edit .. //depot/projects/hammer/gnu/lib/libg2c/Makefile#10 edit .. //depot/projects/hammer/gnu/lib/libobjc/Makefile#16 edit .. //depot/projects/hammer/gnu/lib/libreadline/Makefile.inc#10 edit .. //depot/projects/hammer/gnu/lib/libregex/Makefile#11 edit .. //depot/projects/hammer/gnu/lib/libstdc++/Makefile#26 edit .. //depot/projects/hammer/include/netdb.h#18 edit .. //depot/projects/hammer/kerberos5/lib/Makefile.inc#7 edit .. //depot/projects/hammer/lib/Makefile.inc#5 edit .. //depot/projects/hammer/lib/libalias/Makefile#14 edit .. //depot/projects/hammer/lib/libbegemot/Makefile#5 edit .. //depot/projects/hammer/lib/libbluetooth/Makefile#4 edit .. //depot/projects/hammer/lib/libc/net/getaddrinfo.c#30 edit .. //depot/projects/hammer/lib/libc/net/getnetnamadr.c#8 edit .. //depot/projects/hammer/lib/libc_r/Makefile#14 edit .. //depot/projects/hammer/lib/libcrypt/Makefile#10 edit .. //depot/projects/hammer/lib/libdevstat/Makefile#9 edit .. //depot/projects/hammer/lib/libdevstat/devstat.h#5 edit .. //depot/projects/hammer/lib/libedit/Makefile#7 edit .. //depot/projects/hammer/lib/libexpat/Makefile#6 edit .. //depot/projects/hammer/lib/libfetch/Makefile#14 edit .. //depot/projects/hammer/lib/libftpio/Makefile#5 edit .. //depot/projects/hammer/lib/libgpib/Makefile#6 edit .. //depot/projects/hammer/lib/libkiconv/Makefile#5 edit .. //depot/projects/hammer/lib/libmagic/Makefile#9 edit .. //depot/projects/hammer/lib/libmp/Makefile#7 edit .. //depot/projects/hammer/lib/libncp/Makefile#8 edit .. //depot/projects/hammer/lib/libncurses/Makefile#19 edit .. //depot/projects/hammer/lib/libnetgraph/Makefile#6 edit .. //depot/projects/hammer/lib/libngatm/Makefile#8 edit .. //depot/projects/hammer/lib/libopie/Makefile#9 edit .. //depot/projects/hammer/lib/libpam/Makefile.inc#11 edit .. //depot/projects/hammer/lib/libpcap/Makefile#11 edit .. //depot/projects/hammer/lib/libpthread/Makefile#23 edit .. //depot/projects/hammer/lib/libradius/Makefile#12 edit .. //depot/projects/hammer/lib/libsdp/Makefile#6 edit .. //depot/projects/hammer/lib/libsmb/Makefile#10 edit .. //depot/projects/hammer/lib/libtacplus/Makefile#7 edit .. //depot/projects/hammer/lib/libthr/Makefile#19 edit .. //depot/projects/hammer/lib/libthread_db/Makefile#8 edit .. //depot/projects/hammer/lib/libugidfw/Makefile#8 edit .. //depot/projects/hammer/lib/libusbhid/Makefile#7 edit .. //depot/projects/hammer/lib/libutil/Makefile#13 edit .. //depot/projects/hammer/lib/libvgl/Makefile#5 edit .. //depot/projects/hammer/lib/libwrap/Makefile#11 edit .. //depot/projects/hammer/lib/libypclnt/Makefile#7 edit .. //depot/projects/hammer/lib/msun/Makefile#32 edit .. //depot/projects/hammer/secure/lib/libcrypto/Makefile#21 edit .. //depot/projects/hammer/secure/lib/libssh/Makefile#18 edit .. //depot/projects/hammer/secure/lib/libssl/Makefile#12 edit Differences ... ==== //depot/projects/hammer/gnu/lib/libdialog/Makefile#10 (text+ko) ==== @@ -7,7 +7,7 @@ INCS= dialog.h MAN= dialog.3 -SHLIB_MAJOR= 4 +SHLIB_MAJOR= 5 SRCS= kernel.c rc.c checklist.c inputbox.c menubox.c msgbox.c \ lineedit.c radiolist.c textbox.c yesno.c prgbox.c raw_popen.c \ fselect.c ui_objects.c dir.c notify.c help.c gauge.c tree.c ==== //depot/projects/hammer/gnu/lib/libg2c/Makefile#10 (text+ko) ==== @@ -7,7 +7,7 @@ .PATH: ${SRCDIR} ${SRCDIR}/libU77 ${SRCDIR}/libF77 ${SRCDIR}/libI77 LIB= g2c -SHLIB_MAJOR= 1 +SHLIB_MAJOR= 2 # Traditional FORTRAN Library members defined in libF77 ==== //depot/projects/hammer/gnu/lib/libobjc/Makefile#16 (text+ko) ==== @@ -6,7 +6,7 @@ .PATH: ${OBJCDIR}/objc ${OBJCDIR} LIB= objc -SHLIB_MAJOR= 1 +SHLIB_MAJOR= 2 SRCS= archive.c class.c encoding.c gc.c hash.c init.c misc.c \ nil_method.c objects.c sarray.c selector.c sendmsg.c \ ==== //depot/projects/hammer/gnu/lib/libreadline/Makefile.inc#10 (text+ko) ==== @@ -1,6 +1,6 @@ # $FreeBSD: src/gnu/lib/libreadline/Makefile.inc,v 1.13 2006/03/27 23:35:05 ache Exp $ -SHLIB_MAJOR=5 +SHLIB_MAJOR=6 RL_LIBRARY_VERSION=5.1 SRCDIR= ${.CURDIR}/../../../../contrib/libreadline ==== //depot/projects/hammer/gnu/lib/libregex/Makefile#11 (text+ko) ==== @@ -3,7 +3,7 @@ SUBDIR= doc LIB= gnuregex -SHLIB_MAJOR= 2 +SHLIB_MAJOR= 3 SRCS= gnuregex.c INCSGROUPS= INCS WRINCS PXINCS ==== //depot/projects/hammer/gnu/lib/libstdc++/Makefile#26 (text+ko) ==== @@ -9,7 +9,7 @@ ${SUPDIR} ${GCCDIR} LIB= stdc++ -SHLIB_MAJOR= 4 +SHLIB_MAJOR= 5 CFLAGS+= -DIN_GLIBCPP_V3 -DHAVE_CONFIG_H CFLAGS+= -I${.CURDIR} -I${SUPDIR} -I${GCCDIR} -I${SRCDIR}/include ==== //depot/projects/hammer/include/netdb.h#18 (text+ko) ==== @@ -63,8 +63,6 @@ #include #include -#include -#include #ifndef _SIZE_T_DECLARED typedef __size_t size_t; @@ -105,28 +103,11 @@ #define h_addr h_addr_list[0] /* address, for backward compatibility */ }; -/* - * Note: n_net used to be an unsigned long integer. - * In XNS5, and subsequently in POSIX-2001 it was changed to an - * uint32_t. - * To accomodate for this while preserving binary compatibility with - * the old interface, we prepend or append 32 bits of padding, - * depending on the (LP64) architecture's endianness. - * - * This should be deleted the next time the libc major number is - * incremented. - */ struct netent { char *n_name; /* official name of net */ char **n_aliases; /* alias list */ int n_addrtype; /* net address type */ -#if __LONG_BIT == 64 && _BYTE_ORDER == _BIG_ENDIAN - uint32_t __n_pad0; /* ABI compatibility */ -#endif uint32_t n_net; /* network # */ -#if __LONG_BIT == 64 && _BYTE_ORDER == _LITTLE_ENDIAN - uint32_t __n_pad0; /* ABI compatibility */ -#endif }; struct servent { @@ -142,29 +123,12 @@ int p_proto; /* protocol # */ }; -/* - * Note: ai_addrlen used to be a size_t, per RFC 2553. - * In XNS5.2, and subsequently in POSIX-2001 and RFC 3493 it was - * changed to a socklen_t. - * To accomodate for this while preserving binary compatibility with the - * old interface, we prepend or append 32 bits of padding, depending on - * the (LP64) architecture's endianness. - * - * This should be deleted the next time the libc major number is - * incremented. - */ struct addrinfo { int ai_flags; /* AI_PASSIVE, AI_CANONNAME, AI_NUMERICHOST */ int ai_family; /* PF_xxx */ int ai_socktype; /* SOCK_xxx */ int ai_protocol; /* 0 or IPPROTO_xxx for IPv4 and IPv6 */ -#if __LONG_BIT == 64 && _BYTE_ORDER == _BIG_ENDIAN - uint32_t __ai_pad0; /* ABI compatibility */ -#endif socklen_t ai_addrlen; /* length of ai_addr */ -#if __LONG_BIT == 64 && _BYTE_ORDER == _LITTLE_ENDIAN - uint32_t __ai_pad0; /* ABI compatibility */ -#endif char *ai_canonname; /* canonical name for hostname */ struct sockaddr *ai_addr; /* binary address */ struct addrinfo *ai_next; /* next structure in linked list */ @@ -271,11 +235,7 @@ struct hostent **, int *); struct hostent *getipnodebyaddr(const void *, size_t, int, int *); struct hostent *getipnodebyname(const char *, int, int, int *); -#if __LONG_BIT == 64 -struct netent *getnetbyaddr(unsigned long, int); /* ABI compatibility */ -#else struct netent *getnetbyaddr(uint32_t, int); -#endif int getnetbyaddr_r(uint32_t, int, struct netent *, char *, size_t, struct netent**, int *); struct netent *getnetbyname(const char *); ==== //depot/projects/hammer/kerberos5/lib/Makefile.inc#7 (text+ko) ==== @@ -1,5 +1,5 @@ # $FreeBSD: src/kerberos5/lib/Makefile.inc,v 1.7 2005/07/22 17:18:58 kensmith Exp $ -SHLIB_MAJOR?= 7 +SHLIB_MAJOR?= 8 .include "../Makefile.inc" ==== //depot/projects/hammer/lib/Makefile.inc#5 (text+ko) ==== @@ -1,3 +1,3 @@ # $FreeBSD: src/lib/Makefile.inc,v 1.3 2005/07/22 17:18:58 kensmith Exp $ # Default version for system libs (override in /Makefile if necessary) -SHLIB_MAJOR?= 2 +SHLIB_MAJOR?= 3 ==== //depot/projects/hammer/lib/libalias/Makefile#14 (text+ko) ==== @@ -4,7 +4,7 @@ LIB= alias SHLIBDIR?= /lib -SHLIB_MAJOR= 4 +SHLIB_MAJOR= 5 MAN= libalias.3 SRCS= alias.c alias_cuseeme.c alias_db.c alias_ftp.c alias_irc.c \ alias_nbt.c alias_pptp.c alias_proxy.c alias_skinny.c alias_smedia.c \ ==== //depot/projects/hammer/lib/libbegemot/Makefile#5 (text+ko) ==== @@ -5,7 +5,7 @@ .PATH: ${LIBBEGEMOT_DIR} LIB= begemot -SHLIB_MAJOR= 1 +SHLIB_MAJOR= 2 SHLIBDIR?= /lib # WARNS?= 6 ==== //depot/projects/hammer/lib/libbluetooth/Makefile#4 (text+ko) ==== @@ -7,7 +7,7 @@ WARNS?= 2 CFLAGS+= -I${.CURDIR} -I${.CURDIR}/../../sys -SHLIB_MAJOR= 1 +SHLIB_MAJOR= 2 SRCS= bluetooth.c INCS= bluetooth.h ==== //depot/projects/hammer/lib/libc/net/getaddrinfo.c#30 (text+ko) ==== @@ -1331,9 +1331,6 @@ memset(ai->ai_addr, 0, (size_t)afd->a_socklen); ai->ai_addr->sa_len = afd->a_socklen; ai->ai_addrlen = afd->a_socklen; -#if __LONG_BIT == 64 - ai->__ai_pad0 = 0; /* ABI compatibility */ -#endif ai->ai_addr->sa_family = ai->ai_family = afd->a_af; p = (char *)(void *)(ai->ai_addr); #ifdef FAITH ==== //depot/projects/hammer/lib/libc/net/getnetnamadr.c#8 (text+ko) ==== @@ -413,11 +413,7 @@ } struct netent * -#if __LONG_BIT == 64 -getnetbyaddr(u_long addr, int af) /* ABI compatibility */ -#else getnetbyaddr(uint32_t addr, int af) -#endif { struct netdata *nd; struct netent *rval; ==== //depot/projects/hammer/lib/libc_r/Makefile#14 (text+ko) ==== @@ -8,7 +8,7 @@ # (for system call stubs) to CFLAGS below. -DSYSLIBC_SCCS affects just the # system call stubs. LIB=c_r -SHLIB_MAJOR= 5 +SHLIB_MAJOR= 6 CFLAGS+=-DPTHREAD_KERNEL CFLAGS+=-I${.CURDIR}/../libc/include -I${.CURDIR}/uthread \ -I${.CURDIR}/../../include ==== //depot/projects/hammer/lib/libcrypt/Makefile#10 (text+ko) ==== @@ -6,7 +6,7 @@ .include -SHLIB_MAJOR= 2 +SHLIB_MAJOR= 3 LIB= crypt .PATH: ${.CURDIR}/../libmd ==== //depot/projects/hammer/lib/libdevstat/Makefile#9 (text+ko) ==== @@ -3,7 +3,7 @@ LIB= devstat SHLIBDIR?= /lib # Bump DEVSTAT_USER_API_VER in devstat.h every time this is incremented. -SHLIB_MAJOR= 4 +SHLIB_MAJOR= 5 SRCS= devstat.c INCS= devstat.h ==== //depot/projects/hammer/lib/libdevstat/devstat.h#5 (text+ko) ==== @@ -43,7 +43,7 @@ * backwards-compatible API changes, so application writers have a way to * determine when a particular feature is available. */ -#define DEVSTAT_USER_API_VER 5 +#define DEVSTAT_USER_API_VER 6 #define DEVSTAT_ERRBUF_SIZE 2048 /* size of the devstat library error string */ ==== //depot/projects/hammer/lib/libedit/Makefile#7 (text+ko) ==== @@ -3,7 +3,7 @@ # $FreeBSD: src/lib/libedit/Makefile,v 1.30 2005/08/07 20:51:52 stefanf Exp $ LIB= edit -SHLIB_MAJOR= 4 +SHLIB_MAJOR= 5 SHLIBDIR?= /lib OSRCS= chared.c common.c el.c emacs.c fcns.c help.c hist.c key.c map.c \ ==== //depot/projects/hammer/lib/libexpat/Makefile#6 (text+ko) ==== @@ -4,7 +4,7 @@ LIB= bsdxml SHLIBDIR?= /lib -SHLIB_MAJOR= 1 +SHLIB_MAJOR= 2 SRCS= xmlparse.c xmlrole.c xmltok.c INCS= bsdxml.h MAN= libbsdxml.3 ==== //depot/projects/hammer/lib/libfetch/Makefile#14 (text+ko) ==== @@ -20,7 +20,7 @@ CSTD?= c99 WARNS?= 2 -SHLIB_MAJOR= 3 +SHLIB_MAJOR= 4 ftperr.h: ftp.errors @echo "static struct fetcherr _ftp_errlist[] = {" > ${.TARGET} ==== //depot/projects/hammer/lib/libftpio/Makefile#5 (text+ko) ==== @@ -1,7 +1,7 @@ # $FreeBSD: src/lib/libftpio/Makefile,v 1.14 2005/07/22 17:19:01 kensmith Exp $ LIB= ftpio -SHLIB_MAJOR= 5 +SHLIB_MAJOR= 6 SRCS= ftpio.c ftperr.c INCS= ftpio.h ==== //depot/projects/hammer/lib/libgpib/Makefile#6 (text+ko) ==== @@ -1,7 +1,7 @@ # $FreeBSD: src/lib/libgpib/Makefile,v 1.5 2006/04/13 08:12:31 ru Exp $ LIB= gpib -SHLIB_MAJOR= 0 +SHLIB_MAJOR= 1 INCS= gpib.h INCSDIR= ${INCLUDEDIR}/gpib SRCS= ibfoo.c ==== //depot/projects/hammer/lib/libkiconv/Makefile#5 (text+ko) ==== @@ -5,7 +5,7 @@ SRCS= xlat16_iconv.c xlat16_sysctl.c SRCS+= quirks.c -SHLIB_MAJOR= 1 +SHLIB_MAJOR= 2 MAN= kiconv.3 ==== //depot/projects/hammer/lib/libmagic/Makefile#9 (text+ko) ==== @@ -5,7 +5,7 @@ .PATH: ${CONTRDIR} LIB= magic -SHLIB_MAJOR= 1 +SHLIB_MAJOR= 2 DPADD= ${LIBZ} LDADD= -lz MAN= libmagic.3 magic.5 ==== //depot/projects/hammer/lib/libmp/Makefile#7 (text+ko) ==== @@ -1,7 +1,7 @@ # $FreeBSD: src/lib/libmp/Makefile,v 1.11 2005/11/10 18:07:06 ru Exp $ LIB= mp -SHLIB_MAJOR= 4 +SHLIB_MAJOR= 5 DPADD= ${LIBCRYPTO} LDADD= -lcrypto MAN= libmp.3 ==== //depot/projects/hammer/lib/libncp/Makefile#8 (text+ko) ==== @@ -2,7 +2,7 @@ LIB= ncp -SHLIB_MAJOR= 1 +SHLIB_MAJOR= 2 DPADD= ${LIBIPX} LDADD= -lipx ==== //depot/projects/hammer/lib/libncurses/Makefile#19 (text+ko) ==== @@ -7,7 +7,7 @@ NCURSES=${.CURDIR}/../../contrib/ncurses LIB= ncurses -SHLIB_MAJOR=5 +SHLIB_MAJOR=6 # Should be elsewhere AWK?= awk ==== //depot/projects/hammer/lib/libnetgraph/Makefile#6 (text+ko) ==== @@ -5,7 +5,7 @@ WARNS?= 3 MAN= netgraph.3 -SHLIB_MAJOR= 1 +SHLIB_MAJOR= 2 SRCS= sock.c msg.c debug.c INCS= netgraph.h ==== //depot/projects/hammer/lib/libngatm/Makefile#8 (text+ko) ==== @@ -3,7 +3,7 @@ # Author: Harti Brandt # LIB= ngatm -SHLIB_MAJOR= 1 +SHLIB_MAJOR= 2 MAN= libngatm.3 uniaddr.3 unifunc.3 unimsg.3 unisap.3 unistruct.3 WARNS?= 6 ==== //depot/projects/hammer/lib/libopie/Makefile#9 (text+ko) ==== @@ -4,7 +4,7 @@ # OPIE_DIST?= ${.CURDIR}/../../contrib/opie DIST_DIR= ${OPIE_DIST}/${.CURDIR:T} -SHLIB_MAJOR= 3 +SHLIB_MAJOR= 4 KEYFILE?= \"/etc/opiekeys\" ==== //depot/projects/hammer/lib/libpam/Makefile.inc#11 (text+ko) ==== @@ -28,5 +28,5 @@ DEBUG_FLAGS+= -DDEBUG .endif -SHLIB_MAJOR= 2 +SHLIB_MAJOR= 3 PAM_MOD_DIR= ${LIBDIR} ==== //depot/projects/hammer/lib/libpcap/Makefile#11 (text+ko) ==== @@ -23,7 +23,7 @@ CFLAGS+=-DINET6 .endif -SHLIB_MAJOR=3 +SHLIB_MAJOR=4 # # Magic to grab sources out of src/contrib ==== //depot/projects/hammer/lib/libpthread/Makefile#23 (text+ko) ==== @@ -13,7 +13,7 @@ LIB=pthread SHLIBDIR?= /lib .endif -SHLIB_MAJOR= 1 +SHLIB_MAJOR= 2 CFLAGS+=-DPTHREAD_KERNEL CFLAGS+=-I${.CURDIR}/../libc/include -I${.CURDIR}/thread \ -I${.CURDIR}/../../include ==== //depot/projects/hammer/lib/libradius/Makefile#12 (text+ko) ==== @@ -30,7 +30,7 @@ SRCS= radlib.c INCS= radlib.h radlib_vs.h CFLAGS+= -Wall -SHLIB_MAJOR= 1 +SHLIB_MAJOR= 2 MAN= libradius.3 radius.conf.5 .if ${MK_OPENSSL} == "no" ==== //depot/projects/hammer/lib/libsdp/Makefile#6 (text+ko) ==== @@ -7,7 +7,7 @@ WARNS?= 2 CFLAGS+= -I${.CURDIR} -SHLIB_MAJOR= 1 +SHLIB_MAJOR= 2 SRCS= search.c service.c session.c util.c INCS= sdp.h ==== //depot/projects/hammer/lib/libsmb/Makefile#10 (text+ko) ==== @@ -4,7 +4,7 @@ .PATH: ${CONTRIBDIR}/lib/smb LIB= smb -SHLIB_MAJOR= 1 +SHLIB_MAJOR= 2 DPADD= ${LIBKICONV} LDADD= -lkiconv ==== //depot/projects/hammer/lib/libtacplus/Makefile#7 (text+ko) ==== @@ -30,7 +30,7 @@ CFLAGS+= -Wall DPADD= ${LIBMD} LDADD= -lmd -SHLIB_MAJOR= 1 +SHLIB_MAJOR= 2 MAN= libtacplus.3 tacplus.conf.5 .include ==== //depot/projects/hammer/lib/libthr/Makefile#19 (text+ko) ==== @@ -15,7 +15,7 @@ .include LIB=thr -SHLIB_MAJOR= 1 +SHLIB_MAJOR= 2 CFLAGS+=-DPTHREAD_KERNEL CFLAGS+=-I${.CURDIR}/../libc/include -I${.CURDIR}/thread \ -I${.CURDIR}/../../include ==== //depot/projects/hammer/lib/libthread_db/Makefile#8 (text+ko) ==== @@ -3,7 +3,7 @@ .PATH: ${.CURDIR}/arch/${MACHINE_ARCH} LIB= thread_db -SHLIB_MAJOR= 1 +SHLIB_MAJOR= 2 SRCS= thread_db.c SRCS+= libpthread_db.c libpthread_md.c SRCS+= libc_r_db.c libc_r_md.c ==== //depot/projects/hammer/lib/libugidfw/Makefile#8 (text+ko) ==== @@ -1,7 +1,7 @@ # $FreeBSD: src/lib/libugidfw/Makefile,v 1.7 2005/07/22 17:19:04 kensmith Exp $ LIB= ugidfw -SHLIB_MAJOR= 1 +SHLIB_MAJOR= 2 SRCS= ugidfw.c INCS= ugidfw.h ==== //depot/projects/hammer/lib/libusbhid/Makefile#7 (text+ko) ==== @@ -4,7 +4,7 @@ LIB= usbhid MAN= usbhid.3 -SHLIB_MAJOR= 1 +SHLIB_MAJOR= 2 MLINKS= usbhid.3 libusbhid.3 usbhid.3 hid_get_report_desc.3 \ usbhid.3 hid_dispose_report_desc.3 \ ==== //depot/projects/hammer/lib/libutil/Makefile#13 (text+ko) ==== @@ -6,7 +6,7 @@ .include LIB= util -SHLIB_MAJOR= 4 +SHLIB_MAJOR= 6 CFLAGS+=-DLIBC_SCCS -I${.CURDIR} -I${.CURDIR}/../libc/gen/ .if ${MK_INET6_SUPPORT} != "no" ==== //depot/projects/hammer/lib/libvgl/Makefile#5 (text+ko) ==== @@ -1,6 +1,6 @@ # $FreeBSD: src/lib/libvgl/Makefile,v 1.11 2005/07/22 17:19:04 kensmith Exp $ LIB= vgl -SHLIB_MAJOR= 3 +SHLIB_MAJOR= 4 CFLAGS+=-Wall -I${.CURDIR} SRCS= main.c simple.c bitmap.c text.c mouse.c keyboard.c INCS= vgl.h ==== //depot/projects/hammer/lib/libwrap/Makefile#11 (text+ko) ==== @@ -5,7 +5,7 @@ .include LIB= wrap -SHLIB_MAJOR= 3 +SHLIB_MAJOR= 4 INCS= tcpd.h MAN= hosts_access.3 MAN+= hosts_access.5 hosts_options.5 ==== //depot/projects/hammer/lib/libypclnt/Makefile#7 (text+ko) ==== @@ -1,7 +1,7 @@ # $FreeBSD: src/lib/libypclnt/Makefile,v 1.13 2005/07/22 17:19:04 kensmith Exp $ LIB= ypclnt -SHLIB_MAJOR= 1 +SHLIB_MAJOR= 2 SRCS= ypclnt_connect.c \ ypclnt_error.c \ ypclnt_free.c \ ==== //depot/projects/hammer/lib/msun/Makefile#32 (text+ko) ==== @@ -26,7 +26,7 @@ LIB= m SHLIBDIR?= /lib -SHLIB_MAJOR= 3 +SHLIB_MAJOR= 4 COMMON_SRCS= b_exp.c b_log.c b_tgamma.c \ e_acos.c e_acosf.c e_acosh.c e_acoshf.c e_asin.c e_asinf.c \ e_atan2.c e_atan2f.c e_atanh.c e_atanhf.c e_cosh.c e_coshf.c e_exp.c \ ==== //depot/projects/hammer/secure/lib/libcrypto/Makefile#21 (text+ko) ==== @@ -5,7 +5,7 @@ .include LIB= crypto -SHLIB_MAJOR= 3 +SHLIB_MAJOR= 4 NO_LINT= ==== //depot/projects/hammer/secure/lib/libssh/Makefile#18 (text+ko) ==== @@ -3,7 +3,7 @@ .include LIB= ssh -SHLIB_MAJOR= 2 +SHLIB_MAJOR= 3 SRCS= acss.c authfd.c authfile.c bufaux.c buffer.c \ canohost.c channels.c cipher.c cipher-acss.c cipher-aes.c \ cipher-bf1.c cipher-ctr.c cipher-3des1.c cleanup.c \ ==== //depot/projects/hammer/secure/lib/libssl/Makefile#12 (text+ko) ==== @@ -1,7 +1,7 @@ # $FreeBSD: src/secure/lib/libssl/Makefile,v 1.24 2005/11/19 07:04:17 ru Exp $ LIB= ssl -SHLIB_MAJOR= 3 +SHLIB_MAJOR= 4 NO_LINT= From owner-p4-projects@FreeBSD.ORG Sun Jan 7 05:22: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 05B0516A416; Sun, 7 Jan 2007 05:22: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 CB41316A412 for ; Sun, 7 Jan 2007 05:22:36 +0000 (UTC) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id BCE4E13C428 for ; Sun, 7 Jan 2007 05:22:36 +0000 (UTC) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l075MaoY082481 for ; Sun, 7 Jan 2007 05:22:36 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l075MaMV082477 for perforce@freebsd.org; Sun, 7 Jan 2007 05:22:36 GMT (envelope-from peter@freebsd.org) Date: Sun, 7 Jan 2007 05:22:36 GMT Message-Id: <200701070522.l075MaMV082477@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Cc: Subject: PERFORCE change 112632 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 07 Jan 2007 05:22:37 -0000 http://perforce.freebsd.org/chv.cgi?CH=112632 Change 112632 by peter@peter_overcee on 2007/01/07 05:21:59 catch up with some gratuitous shlib major bumps Affected files ... .. //depot/projects/hammer/lib/libbsnmp/Makefile.inc#8 edit .. //depot/projects/hammer/lib/libbz2/Makefile#6 edit .. //depot/projects/hammer/lib/libipsec/Makefile#9 edit .. //depot/projects/hammer/usr.sbin/bsnmpd/modules/Makefile.inc#7 edit Differences ... ==== //depot/projects/hammer/lib/libbsnmp/Makefile.inc#8 (text+ko) ==== @@ -1,6 +1,6 @@ # $FreeBSD: src/lib/libbsnmp/Makefile.inc,v 1.6 2005/07/22 17:18:59 kensmith Exp $ -SHLIB_MAJOR= 2 +SHLIB_MAJOR= 3 WARNS?= 6 NO_WERROR= INCSDIR= ${INCLUDEDIR}/bsnmp ==== //depot/projects/hammer/lib/libbz2/Makefile#6 (text+ko) ==== @@ -4,7 +4,7 @@ .PATH: ${BZ2DIR} LIB= bz2 -SHLIB_MAJOR= 1 +SHLIB_MAJOR= 2 SRCS= bzlib.c blocksort.c compress.c crctable.c decompress.c \ huffman.c randtable.c INCS= bzlib.h ==== //depot/projects/hammer/lib/libipsec/Makefile#9 (text+ko) ==== @@ -32,7 +32,7 @@ .include LIB= ipsec -SHLIB_MAJOR= 1 +SHLIB_MAJOR= 2 CFLAGS+=-I. -I${.CURDIR} CFLAGS+=-DIPSEC_DEBUG -DIPSEC .if ${MK_INET6_SUPPORT} != "no" ==== //depot/projects/hammer/usr.sbin/bsnmpd/modules/Makefile.inc#7 (text+ko) ==== @@ -1,6 +1,6 @@ # $FreeBSD: src/usr.sbin/bsnmpd/modules/Makefile.inc,v 1.12 2005/11/10 10:14:56 harti Exp $ -SHLIB_MAJOR= 3 +SHLIB_MAJOR= 4 WARNS?= 6 MANFILTER= sed -e 's%@MODPATH@%${LIBDIR}/%g' \ From owner-p4-projects@FreeBSD.ORG Sun Jan 7 05:34: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 E6AAD16A40F; Sun, 7 Jan 2007 05:34: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 A3F1E16A403 for ; Sun, 7 Jan 2007 05:34: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 957A013C455 for ; Sun, 7 Jan 2007 05:34: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 l075Yq2K084468 for ; Sun, 7 Jan 2007 05:34:52 GMT (envelope-from mjacob@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l075YqDb084465 for perforce@freebsd.org; Sun, 7 Jan 2007 05:34:52 GMT (envelope-from mjacob@freebsd.org) Date: Sun, 7 Jan 2007 05:34:52 GMT Message-Id: <200701070534.l075YqDb084465@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 112633 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 07 Jan 2007 05:34:53 -0000 http://perforce.freebsd.org/chv.cgi?CH=112633 Change 112633 by mjacob@mjexp on 2007/01/07 05:34:22 Make sure we don't add the same disk twice. Note when we destroy a multipath geom. Affected files ... .. //depot/projects/mjexp/sys/geom/multipath/g_multipath.c#12 edit Differences ... ==== //depot/projects/mjexp/sys/geom/multipath/g_multipath.c#12 (text+ko) ==== @@ -291,6 +291,19 @@ sc = gp->softc; KASSERT(sc, ("no softc")); + /* + * Make sure that the passed provider isn't already attached + */ + LIST_FOREACH(cp, &gp->consumer, consumer) { + if (cp->provider == pp) { + break; + } + } + if (cp) { + printf("GEOM_MULTIPATH: provider %s already attached to %s\n", + pp->name, gp->name); + return (EEXIST); + } nxtcp = LIST_FIRST(&gp->consumer); cp = g_new_consumer(gp); if (cp == NULL) { @@ -342,6 +355,7 @@ if (pp != NULL && (pp->acr != 0 || pp->acw != 0 || pp->ace != 0)) { return (EBUSY); } + printf("GEOM_MULTIPATH: destroying %s\n", gp->name); g_free(gp->softc); gp->softc = NULL; g_wither_geom(gp, ENXIO); From owner-p4-projects@FreeBSD.ORG Sun Jan 7 05:35: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 BC79316A40F; Sun, 7 Jan 2007 05:35: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 82D8C16A407 for ; Sun, 7 Jan 2007 05:35: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 7424413C448 for ; Sun, 7 Jan 2007 05:35: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 l075Zs3d084546 for ; Sun, 7 Jan 2007 05:35:54 GMT (envelope-from mjacob@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l075Zs1i084543 for perforce@freebsd.org; Sun, 7 Jan 2007 05:35:54 GMT (envelope-from mjacob@freebsd.org) Date: Sun, 7 Jan 2007 05:35:54 GMT Message-Id: <200701070535.l075Zs1i084543@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 112634 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 07 Jan 2007 05:35:55 -0000 http://perforce.freebsd.org/chv.cgi?CH=112634 Change 112634 by mjacob@mjexp_6 on 2007/01/07 05:35:25 Some more cleanups to catch a race between orphan and I/O failure decommissioning actions. Make sure we don't add the same disk twice. Note when we destroy a multipath geom. Affected files ... .. //depot/projects/mjexp_6/sys/geom/multipath/g_multipath.c#6 edit Differences ... ==== //depot/projects/mjexp_6/sys/geom/multipath/g_multipath.c#6 (text+ko) ==== @@ -70,13 +70,36 @@ .destroy_geom = g_multipath_destroy_geom }; +#define MP_BAD 0x1 +#define MP_POSTED 0x2 static void +g_mpd(void *arg, int flags __unused) +{ + struct g_consumer *cp; + + g_topology_assert(); + cp = arg; + if (cp->acr > 0 || cp->acw > 0 || cp->ace > 0) { + g_access(cp, -cp->acr, -cp->acw, -cp->ace); + } + if (cp->provider) { + printf("GEOM_MULTIPATH: %s removed from %s\n", + cp->provider->name, cp->geom->name); + g_detach(cp); + } + g_destroy_consumer(cp); +} + +static void g_multipath_orphan(struct g_consumer *cp) { -printf("%s called on %s\n", __FUNCTION__, cp->provider? cp->provider->name : "none"); - g_topology_assert(); - g_multipath_destroy(cp->geom); + if ((cp->index & MP_POSTED) == 0) { + cp->index |= MP_POSTED; + printf("GEOM_MULTIPATH: %s orphaned in %s\n", + cp->provider->name, cp->geom->name); + g_mpd(cp, 0); + } } static void @@ -105,17 +128,6 @@ } static void -g_mpd(void *arg, int flags __unused) -{ - struct g_consumer *cp; - g_topology_assert(); - cp = arg; - g_access(cp, -cp->acr, -cp->acw, -cp->ace); - g_detach(cp); - g_destroy_consumer(cp); -} - -static void g_multipath_done(struct bio *bp) { struct bio *pbp = bp->bio_parent; @@ -127,16 +139,6 @@ if (bp->bio_error == ENXIO || bp->bio_error == EIO) { dofail = 1; -#if 0 - } else if (bp->bio_error == 0) { - static uint8_t inject = 0; - if (++inject == 0) { - bp->bio_error = ENXIO; - dofail = 1; - } else { - dofail = 0; - } -#endif } else { dofail = 0; } @@ -154,13 +156,17 @@ * to the next available consumer. */ g_topology_lock(); + cp->index |= MP_BAD; + if (cp->nend == cp->nstart && pp->nend == pp->nstart) { + cp->index |= MP_POSTED; + g_post_event(g_mpd, cp, M_NOWAIT, NULL); + } if (cp == sc->cp_active) { - printf("GEOM_MULTIPATH: I/O failure terminates use of " - "%s in %s\n", cp->provider->name, gp->name); - cp->index = 1; + printf("GEOM_MULTIPATH: %s failed in %s\n", + pp->name, sc->sc_name); sc->cp_active = NULL; LIST_FOREACH(lcp, &gp->consumer, consumer) { - if (lcp->index == 0) { + if ((lcp->index & MP_BAD) == 0) { sc->cp_active = lcp; break; } @@ -170,15 +176,10 @@ g_topology_unlock(); goto out; } - printf("GEOM_MULTIPATH: switching to provider %s\n", - sc->cp_active->provider->name); + printf("GEOM_MULTIPATH: %s now active path in %s\n", + sc->cp_active->provider->name, sc->sc_name); } g_topology_unlock(); - if (cp->nend == cp->nstart && pp->nend == pp->nstart) { - printf("GEOM_MULTIPATH: old provider %s is now quiet\n", - pp->name); - g_post_event(g_mpd, cp, M_NOWAIT, NULL); - } /* * If we can fruitfully restart the I/O, do so. @@ -290,6 +291,19 @@ sc = gp->softc; KASSERT(sc, ("no softc")); + /* + * Make sure that the passed provider isn't already attached + */ + LIST_FOREACH(cp, &gp->consumer, consumer) { + if (cp->provider == pp) { + break; + } + } + if (cp) { + printf("GEOM_MULTIPATH: provider %s already attached to %s\n", + pp->name, gp->name); + return (EEXIST); + } nxtcp = LIST_FIRST(&gp->consumer); cp = g_new_consumer(gp); if (cp == NULL) { @@ -318,12 +332,13 @@ return (error); } } + printf("GEOM_MULTIPATH: adding %s to %s/%s\n", + pp->name, sc->sc_name, sc->sc_uuid); if (sc->cp_active == NULL) { sc->cp_active = cp; - printf("GEOM_MULTIPATH: activating %s/%s\n", - sc->sc_name, sc->sc_uuid); + printf("GEOM_MULTIPATH: %s now active path in %s\n", + pp->name, sc->sc_name); } - printf("GEOM_MULTIPATH: adding %s to %s\n", pp->name, sc->sc_name); return (0); } @@ -340,6 +355,7 @@ if (pp != NULL && (pp->acr != 0 || pp->acw != 0 || pp->ace != 0)) { return (EBUSY); } + printf("GEOM_MULTIPATH: destroying %s\n", gp->name); g_free(gp->softc); gp->softc = NULL; g_wither_geom(gp, ENXIO); From owner-p4-projects@FreeBSD.ORG Sun Jan 7 06: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 8AB3F16A412; Sun, 7 Jan 2007 06: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 3B02316A403 for ; Sun, 7 Jan 2007 06:16:56 +0000 (UTC) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 29A3F13C43E for ; Sun, 7 Jan 2007 06:16:56 +0000 (UTC) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l076GugF091523 for ; Sun, 7 Jan 2007 06:16:56 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l076DINh090501 for perforce@freebsd.org; Sun, 7 Jan 2007 06:13:18 GMT (envelope-from peter@freebsd.org) Date: Sun, 7 Jan 2007 06:13:18 GMT Message-Id: <200701070613.l076DINh090501@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Cc: Subject: PERFORCE change 112635 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 07 Jan 2007 06:16:56 -0000 http://perforce.freebsd.org/chv.cgi?CH=112635 Change 112635 by peter@peter_overcee on 2007/01/07 06:10:19 IFC @112629 Affected files ... .. //depot/projects/hammer/COPYRIGHT#5 integrate .. //depot/projects/hammer/MAINTAINERS#42 integrate .. //depot/projects/hammer/Makefile#40 integrate .. //depot/projects/hammer/Makefile.inc1#117 integrate .. //depot/projects/hammer/ObsoleteFiles.inc#20 integrate .. //depot/projects/hammer/UPDATING#96 integrate .. //depot/projects/hammer/bin/cat/cat.1#7 integrate .. //depot/projects/hammer/bin/chmod/chmod.1#9 integrate .. //depot/projects/hammer/bin/cp/cp.1#10 integrate .. //depot/projects/hammer/bin/cp/cp.c#13 integrate .. //depot/projects/hammer/bin/cp/extern.h#6 integrate .. //depot/projects/hammer/bin/cp/utils.c#10 integrate .. //depot/projects/hammer/bin/date/netdate.c#4 integrate .. //depot/projects/hammer/bin/dd/Makefile#8 integrate .. //depot/projects/hammer/bin/df/df.c#20 integrate .. //depot/projects/hammer/bin/domainname/domainname.1#5 integrate .. //depot/projects/hammer/bin/ed/main.c#6 integrate .. //depot/projects/hammer/bin/getfacl/getfacl.1#7 integrate .. //depot/projects/hammer/bin/hostname/hostname.1#6 integrate .. //depot/projects/hammer/bin/hostname/hostname.c#5 integrate .. //depot/projects/hammer/bin/ls/ls.1#26 integrate .. //depot/projects/hammer/bin/ls/print.c#17 integrate .. //depot/projects/hammer/bin/mkdir/mkdir.1#6 integrate .. //depot/projects/hammer/bin/mkdir/mkdir.c#8 integrate .. //depot/projects/hammer/bin/pax/cpio.c#7 integrate .. //depot/projects/hammer/bin/pax/pax.1#10 integrate .. //depot/projects/hammer/bin/pax/tar.c#6 integrate .. //depot/projects/hammer/bin/ps/ps.1#24 integrate .. //depot/projects/hammer/bin/rm/rm.1#14 integrate .. //depot/projects/hammer/bin/rm/rm.c#13 integrate .. //depot/projects/hammer/bin/rmdir/rmdir.1#6 integrate .. //depot/projects/hammer/bin/setfacl/setfacl.1#10 integrate .. //depot/projects/hammer/bin/sh/expand.c#13 integrate .. //depot/projects/hammer/bin/sh/histedit.c#6 integrate .. //depot/projects/hammer/bin/sh/jobs.c#15 integrate .. //depot/projects/hammer/bin/sh/jobs.h#3 integrate .. //depot/projects/hammer/bin/sh/main.c#6 integrate .. //depot/projects/hammer/bin/sh/parser.c#11 integrate .. //depot/projects/hammer/bin/sh/parser.h#3 integrate .. //depot/projects/hammer/bin/sh/sh.1#27 integrate .. //depot/projects/hammer/bin/test/test.1#6 integrate .. //depot/projects/hammer/contrib/bind9/CHANGES#5 integrate .. //depot/projects/hammer/contrib/bind9/COPYRIGHT#3 integrate .. //depot/projects/hammer/contrib/bind9/FAQ#4 integrate .. //depot/projects/hammer/contrib/bind9/FAQ.xml#2 integrate .. //depot/projects/hammer/contrib/bind9/Makefile.in#2 integrate .. //depot/projects/hammer/contrib/bind9/README#4 integrate .. //depot/projects/hammer/contrib/bind9/bin/check/named-checkconf.8#3 integrate .. //depot/projects/hammer/contrib/bind9/bin/check/named-checkconf.c#3 integrate .. //depot/projects/hammer/contrib/bind9/bin/check/named-checkconf.html#3 integrate .. //depot/projects/hammer/contrib/bind9/bin/check/named-checkzone.8#3 integrate .. //depot/projects/hammer/contrib/bind9/bin/check/named-checkzone.docbook#3 integrate .. //depot/projects/hammer/contrib/bind9/bin/check/named-checkzone.html#3 integrate .. //depot/projects/hammer/contrib/bind9/bin/dig/dig.1#3 integrate .. //depot/projects/hammer/contrib/bind9/bin/dig/dig.c#4 integrate .. //depot/projects/hammer/contrib/bind9/bin/dig/dig.html#3 integrate .. //depot/projects/hammer/contrib/bind9/bin/dig/dighost.c#4 integrate .. //depot/projects/hammer/contrib/bind9/bin/dig/host.1#3 integrate .. //depot/projects/hammer/contrib/bind9/bin/dig/host.c#4 integrate .. //depot/projects/hammer/contrib/bind9/bin/dig/host.html#3 integrate .. //depot/projects/hammer/contrib/bind9/bin/dig/include/dig/dig.h#4 integrate .. //depot/projects/hammer/contrib/bind9/bin/dig/nslookup.1#3 integrate .. //depot/projects/hammer/contrib/bind9/bin/dig/nslookup.c#4 integrate .. //depot/projects/hammer/contrib/bind9/bin/dig/nslookup.docbook#3 integrate .. //depot/projects/hammer/contrib/bind9/bin/dig/nslookup.html#3 integrate .. //depot/projects/hammer/contrib/bind9/bin/dnssec/dnssec-keygen.8#3 integrate .. //depot/projects/hammer/contrib/bind9/bin/dnssec/dnssec-keygen.html#3 integrate .. //depot/projects/hammer/contrib/bind9/bin/dnssec/dnssec-signzone.8#3 integrate .. //depot/projects/hammer/contrib/bind9/bin/dnssec/dnssec-signzone.c#4 integrate .. //depot/projects/hammer/contrib/bind9/bin/dnssec/dnssec-signzone.html#3 integrate .. //depot/projects/hammer/contrib/bind9/bin/named/aclconf.c#3 integrate .. //depot/projects/hammer/contrib/bind9/bin/named/client.c#4 integrate .. //depot/projects/hammer/contrib/bind9/bin/named/config.c#3 integrate .. //depot/projects/hammer/contrib/bind9/bin/named/controlconf.c#2 integrate .. //depot/projects/hammer/contrib/bind9/bin/named/include/named/aclconf.h#2 integrate .. //depot/projects/hammer/contrib/bind9/bin/named/include/named/client.h#3 integrate .. //depot/projects/hammer/contrib/bind9/bin/named/include/named/config.h#2 integrate .. //depot/projects/hammer/contrib/bind9/bin/named/include/named/control.h#4 integrate .. //depot/projects/hammer/contrib/bind9/bin/named/include/named/globals.h#2 integrate .. //depot/projects/hammer/contrib/bind9/bin/named/include/named/logconf.h#2 integrate .. //depot/projects/hammer/contrib/bind9/bin/named/include/named/lwresd.h#2 integrate .. //depot/projects/hammer/contrib/bind9/bin/named/include/named/server.h#2 integrate .. //depot/projects/hammer/contrib/bind9/bin/named/include/named/sortlist.h#2 integrate .. //depot/projects/hammer/contrib/bind9/bin/named/include/named/tkeyconf.h#2 integrate .. //depot/projects/hammer/contrib/bind9/bin/named/include/named/tsigconf.h#2 integrate .. //depot/projects/hammer/contrib/bind9/bin/named/include/named/zoneconf.h#2 integrate .. //depot/projects/hammer/contrib/bind9/bin/named/interfacemgr.c#2 integrate .. //depot/projects/hammer/contrib/bind9/bin/named/logconf.c#2 integrate .. //depot/projects/hammer/contrib/bind9/bin/named/lwdgabn.c#2 integrate .. //depot/projects/hammer/contrib/bind9/bin/named/lwdgrbn.c#2 integrate .. //depot/projects/hammer/contrib/bind9/bin/named/lwresd.8#3 integrate .. //depot/projects/hammer/contrib/bind9/bin/named/lwresd.c#2 integrate .. //depot/projects/hammer/contrib/bind9/bin/named/lwresd.html#3 integrate .. //depot/projects/hammer/contrib/bind9/bin/named/main.c#4 integrate .. //depot/projects/hammer/contrib/bind9/bin/named/named.8#3 integrate .. //depot/projects/hammer/contrib/bind9/bin/named/named.conf.5#4 integrate .. //depot/projects/hammer/contrib/bind9/bin/named/named.conf.docbook#4 integrate .. //depot/projects/hammer/contrib/bind9/bin/named/named.conf.html#4 integrate .. //depot/projects/hammer/contrib/bind9/bin/named/named.docbook#3 integrate .. //depot/projects/hammer/contrib/bind9/bin/named/named.html#3 integrate .. //depot/projects/hammer/contrib/bind9/bin/named/query.c#3 integrate .. //depot/projects/hammer/contrib/bind9/bin/named/server.c#4 integrate .. //depot/projects/hammer/contrib/bind9/bin/named/sortlist.c#2 integrate .. //depot/projects/hammer/contrib/bind9/bin/named/tkeyconf.c#2 integrate .. //depot/projects/hammer/contrib/bind9/bin/named/tsigconf.c#2 integrate .. //depot/projects/hammer/contrib/bind9/bin/named/unix/os.c#4 integrate .. //depot/projects/hammer/contrib/bind9/bin/named/update.c#4 integrate .. //depot/projects/hammer/contrib/bind9/bin/named/zoneconf.c#3 integrate .. //depot/projects/hammer/contrib/bind9/bin/nsupdate/nsupdate.8#3 integrate .. //depot/projects/hammer/contrib/bind9/bin/nsupdate/nsupdate.c#4 integrate .. //depot/projects/hammer/contrib/bind9/bin/nsupdate/nsupdate.html#3 integrate .. //depot/projects/hammer/contrib/bind9/bin/rndc/rndc-confgen.8#3 integrate .. //depot/projects/hammer/contrib/bind9/bin/rndc/rndc-confgen.html#3 integrate .. //depot/projects/hammer/contrib/bind9/bin/rndc/rndc.8#3 integrate .. //depot/projects/hammer/contrib/bind9/bin/rndc/rndc.c#5 integrate .. //depot/projects/hammer/contrib/bind9/bin/rndc/rndc.conf.5#3 integrate .. //depot/projects/hammer/contrib/bind9/bin/rndc/rndc.conf.html#3 integrate .. //depot/projects/hammer/contrib/bind9/bin/rndc/rndc.html#3 integrate .. //depot/projects/hammer/contrib/bind9/config.threads.in#2 integrate .. //depot/projects/hammer/contrib/bind9/configure.in#4 integrate .. //depot/projects/hammer/contrib/bind9/doc/arm/Bv9ARM-book.xml#4 integrate .. //depot/projects/hammer/contrib/bind9/doc/arm/Bv9ARM.ch01.html#3 integrate .. //depot/projects/hammer/contrib/bind9/doc/arm/Bv9ARM.ch02.html#3 integrate .. //depot/projects/hammer/contrib/bind9/doc/arm/Bv9ARM.ch03.html#4 integrate .. //depot/projects/hammer/contrib/bind9/doc/arm/Bv9ARM.ch04.html#4 integrate .. //depot/projects/hammer/contrib/bind9/doc/arm/Bv9ARM.ch05.html#4 integrate .. //depot/projects/hammer/contrib/bind9/doc/arm/Bv9ARM.ch06.html#4 integrate .. //depot/projects/hammer/contrib/bind9/doc/arm/Bv9ARM.ch07.html#4 integrate .. //depot/projects/hammer/contrib/bind9/doc/arm/Bv9ARM.ch08.html#4 integrate .. //depot/projects/hammer/contrib/bind9/doc/arm/Bv9ARM.ch09.html#4 integrate .. //depot/projects/hammer/contrib/bind9/doc/arm/Bv9ARM.html#4 integrate .. //depot/projects/hammer/contrib/bind9/doc/arm/Bv9ARM.pdf#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/Makefile.in#4 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/api#4 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/config.h.in#4 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/configure#4 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/configure.in#4 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/dst/dst_api.c#4 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/dst/hmac_link.c#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/include/arpa/nameser_compat.h#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/include/isc/list.h#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/include/netdb.h#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/inet/inet_cidr_ntop.c#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/inet/inet_net_ntop.c#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/irs/dns.c#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/irs/dns_ho.c#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/irs/gai_strerror.c#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/irs/gen_ho.c#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/irs/getaddrinfo.c#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/irs/gethostent.c#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/irs/getnameinfo.c#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/irs/getprotoent_r.c#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/irs/getservent_r.c#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/irs/irp.c#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/irs/irp_nw.c#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/irs/irpmarshall.c#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/irs/irs_data.c#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/irs/lcl_ho.c#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/irs/lcl_pr.c#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/isc/ev_connects.c#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/isc/eventlib.c#4 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/isc/eventlib_p.h#4 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/isc/heap.c#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/isc/hex.c#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/isc/memcluster.c#4 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/nameser/ns_sign.c#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/nameser/ns_verify.c#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/port_after.h.in#4 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/port_before.h.in#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/resolv/mtctxres.c#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/resolv/res_init.c#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/resolv/res_send.c#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/resolv/res_sendsigned.c#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind9/api#4 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind9/check.c#4 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind9/include/bind9/check.h#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/Makefile.in#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/acl.c#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/adb.c#4 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/api#4 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/cache.c#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/compress.c#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/dispatch.c#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/dnssec.c#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/dst_api.c#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/gen.c#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/include/dns/acl.h#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/include/dns/cache.h#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/include/dns/compress.h#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/include/dns/keytable.h#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/include/dns/message.h#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/include/dns/name.h#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/include/dns/peer.h#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/include/dns/rdataset.h#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/include/dns/resolver.h#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/include/dns/types.h#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/include/dns/validator.h#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/include/dns/xfrin.h#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/include/dns/zone.h#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/keytable.c#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/lookup.c#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/masterdump.c#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/message.c#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/name.c#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/openssl_link.c#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/openssldh_link.c#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/openssldsa_link.c#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/opensslrsa_link.c#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/peer.c#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/portlist.c#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/rbtdb.c#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/rdata.c#4 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/generic/dlv_32769.c#1 branch .. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/generic/dlv_32769.h#1 branch .. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/generic/dlv_65323.c#2 delete .. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/generic/dlv_65323.h#2 delete .. //depot/projects/hammer/contrib/bind9/lib/dns/rdataset.c#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/request.c#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/resolver.c#5 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/tcpmsg.c#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/tkey.c#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/tsig.c#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/validator.c#4 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/xfrin.c#4 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/zone.c#4 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/api#4 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/hash.c#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/heap.c#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/hmacmd5.c#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/include/isc/heap.h#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/include/isc/list.h#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/include/isc/sockaddr.h#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/include/isc/symtab.h#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/lex.c#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/log.c#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/netscope.c#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/nothreads/condition.c#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/nothreads/mutex.c#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/print.c#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/sockaddr.c#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/taskpool.c#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/timer.c#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/unix/entropy.c#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/unix/fsaccess.c#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/unix/ifiter_ioctl.c#4 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/unix/ipv6.c#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/unix/socket.c#4 integrate .. //depot/projects/hammer/contrib/bind9/lib/isccc/api#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/isccfg/include/isccfg/cfg.h#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/isccfg/include/isccfg/grammar.h#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/isccfg/namedconf.c#4 integrate .. //depot/projects/hammer/contrib/bind9/lib/isccfg/parser.c#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/lwres/api#4 integrate .. //depot/projects/hammer/contrib/bind9/lib/lwres/gai_strerror.c#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/lwres/getaddrinfo.c#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/lwres/lwconfig.c#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/lwres/man/lwres.3#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/lwres/man/lwres.html#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/lwres/man/lwres_buffer.3#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/lwres/man/lwres_buffer.html#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/lwres/man/lwres_config.3#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/lwres/man/lwres_config.html#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/lwres/man/lwres_context.3#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/lwres/man/lwres_context.html#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/lwres/man/lwres_gabn.3#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/lwres/man/lwres_gabn.html#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/lwres/man/lwres_gai_strerror.3#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/lwres/man/lwres_gai_strerror.html#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/lwres/man/lwres_getaddrinfo.3#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/lwres/man/lwres_getaddrinfo.html#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/lwres/man/lwres_gethostent.3#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/lwres/man/lwres_gethostent.html#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/lwres/man/lwres_getipnode.3#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/lwres/man/lwres_getipnode.html#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/lwres/man/lwres_getnameinfo.3#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/lwres/man/lwres_getnameinfo.html#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/lwres/man/lwres_getrrsetbyname.3#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/lwres/man/lwres_getrrsetbyname.html#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/lwres/man/lwres_gnba.3#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/lwres/man/lwres_gnba.html#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/lwres/man/lwres_hstrerror.3#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/lwres/man/lwres_hstrerror.html#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/lwres/man/lwres_inetntop.3#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/lwres/man/lwres_inetntop.html#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/lwres/man/lwres_noop.3#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/lwres/man/lwres_noop.html#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/lwres/man/lwres_packet.3#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/lwres/man/lwres_packet.html#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/lwres/man/lwres_resutil.3#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/lwres/man/lwres_resutil.html#3 integrate .. //depot/projects/hammer/contrib/bind9/libtool.m4#3 integrate .. //depot/projects/hammer/contrib/bind9/ltmain.sh#3 integrate .. //depot/projects/hammer/contrib/bind9/make/rules.in#3 integrate .. //depot/projects/hammer/contrib/bind9/version#5 integrate .. //depot/projects/hammer/contrib/bsnmp/snmp_mibII/mibII.c#11 integrate .. //depot/projects/hammer/contrib/bsnmp/snmpd/action.c#5 integrate .. //depot/projects/hammer/contrib/bsnmp/snmpd/tree.def#4 integrate .. //depot/projects/hammer/contrib/com_err/compile_et.1#3 integrate .. //depot/projects/hammer/contrib/cvs/src/log.c#7 integrate .. //depot/projects/hammer/contrib/gcc/ChangeLog#11 integrate .. //depot/projects/hammer/contrib/gcc/ansidecl.h#4 integrate .. //depot/projects/hammer/contrib/gcc/builtins.c#8 integrate .. //depot/projects/hammer/contrib/gcc/c-common.c#7 integrate .. //depot/projects/hammer/contrib/gcc/c-common.h#6 integrate .. //depot/projects/hammer/contrib/gcc/c-decl.c#11 integrate .. //depot/projects/hammer/contrib/gcc/c-objc-common.c#7 integrate .. //depot/projects/hammer/contrib/gcc/c-pch.c#2 integrate .. //depot/projects/hammer/contrib/gcc/c-typeck.c#9 integrate .. //depot/projects/hammer/contrib/gcc/cccp.1#2 delete .. //depot/projects/hammer/contrib/gcc/cfgcleanup.c#7 integrate .. //depot/projects/hammer/contrib/gcc/combine.c#8 integrate .. //depot/projects/hammer/contrib/gcc/config.gcc#8 integrate .. //depot/projects/hammer/contrib/gcc/config.host#2 integrate .. //depot/projects/hammer/contrib/gcc/config.in#7 integrate .. //depot/projects/hammer/contrib/gcc/config/alpha/alpha.c#8 integrate .. //depot/projects/hammer/contrib/gcc/config/alpha/alpha.md#7 integrate .. //depot/projects/hammer/contrib/gcc/config/arm/arm-protos.h#5 integrate .. //depot/projects/hammer/contrib/gcc/config/arm/arm.c#7 integrate .. //depot/projects/hammer/contrib/gcc/config/arm/arm.md#7 integrate .. //depot/projects/hammer/contrib/gcc/config/host-linux.c#1 branch .. //depot/projects/hammer/contrib/gcc/config/host-solaris.c#1 branch .. //depot/projects/hammer/contrib/gcc/config/i386/i386.c#14 integrate .. //depot/projects/hammer/contrib/gcc/config/i386/i386.md#8 integrate .. //depot/projects/hammer/contrib/gcc/config/ia64/hpux.h#5 integrate .. //depot/projects/hammer/contrib/gcc/config/rs6000/aix51.h#5 integrate .. //depot/projects/hammer/contrib/gcc/config/rs6000/host-darwin.c#2 integrate .. //depot/projects/hammer/contrib/gcc/config/rs6000/linux64.h#8 integrate .. //depot/projects/hammer/contrib/gcc/config/rs6000/rs6000-protos.h#6 integrate .. //depot/projects/hammer/contrib/gcc/config/rs6000/rs6000.c#10 integrate .. //depot/projects/hammer/contrib/gcc/config/rs6000/rs6000.h#6 integrate .. //depot/projects/hammer/contrib/gcc/config/rs6000/rs6000.md#10 integrate .. //depot/projects/hammer/contrib/gcc/config/rs6000/sysv4.h#10 integrate .. //depot/projects/hammer/contrib/gcc/config/sparc/gmon-sol2.c#4 integrate .. //depot/projects/hammer/contrib/gcc/config/sparc/sol2-gas-bi.h#3 integrate .. //depot/projects/hammer/contrib/gcc/config/sparc/sol2.h#5 integrate .. //depot/projects/hammer/contrib/gcc/config/sparc/sparc.c#9 integrate .. //depot/projects/hammer/contrib/gcc/config/sparc/sparc.h#5 integrate .. //depot/projects/hammer/contrib/gcc/config/x-linux#1 branch .. //depot/projects/hammer/contrib/gcc/config/x-solaris#1 branch .. //depot/projects/hammer/contrib/gcc/configure#9 integrate .. //depot/projects/hammer/contrib/gcc/configure.ac#3 integrate .. //depot/projects/hammer/contrib/gcc/coverage.c#2 integrate .. //depot/projects/hammer/contrib/gcc/cp/ChangeLog#11 integrate .. //depot/projects/hammer/contrib/gcc/cp/call.c#8 integrate .. //depot/projects/hammer/contrib/gcc/cp/class.c#9 integrate .. //depot/projects/hammer/contrib/gcc/cp/cp-tree.def#4 integrate .. //depot/projects/hammer/contrib/gcc/cp/cp-tree.h#10 integrate .. //depot/projects/hammer/contrib/gcc/cp/cvt.c#7 integrate .. //depot/projects/hammer/contrib/gcc/cp/decl.c#11 integrate .. //depot/projects/hammer/contrib/gcc/cp/decl2.c#10 integrate .. //depot/projects/hammer/contrib/gcc/cp/error.c#7 integrate .. //depot/projects/hammer/contrib/gcc/cp/init.c#10 integrate .. //depot/projects/hammer/contrib/gcc/cp/lex.c#6 integrate .. //depot/projects/hammer/contrib/gcc/cp/method.c#7 integrate .. //depot/projects/hammer/contrib/gcc/cp/name-lookup.c#3 integrate .. //depot/projects/hammer/contrib/gcc/cp/name-lookup.h#2 integrate .. //depot/projects/hammer/contrib/gcc/cp/parser.c#3 integrate .. //depot/projects/hammer/contrib/gcc/cp/pt.c#10 integrate .. //depot/projects/hammer/contrib/gcc/cp/search.c#9 integrate .. //depot/projects/hammer/contrib/gcc/cp/semantics.c#6 integrate .. //depot/projects/hammer/contrib/gcc/cp/typeck.c#8 integrate .. //depot/projects/hammer/contrib/gcc/cpp.1#2 delete .. //depot/projects/hammer/contrib/gcc/cppfiles.c#6 integrate .. //depot/projects/hammer/contrib/gcc/cpphash.h#4 integrate .. //depot/projects/hammer/contrib/gcc/cppinit.c#8 integrate .. //depot/projects/hammer/contrib/gcc/cse.c#7 integrate .. //depot/projects/hammer/contrib/gcc/doc/contrib.texi#7 integrate .. //depot/projects/hammer/contrib/gcc/doc/cpp.1#2 integrate .. //depot/projects/hammer/contrib/gcc/doc/gcc.1#2 integrate .. //depot/projects/hammer/contrib/gcc/doc/gcov.1#2 integrate .. //depot/projects/hammer/contrib/gcc/doc/hostconfig.texi#3 integrate .. //depot/projects/hammer/contrib/gcc/doc/include/gcc-common.texi#8 integrate .. //depot/projects/hammer/contrib/gcc/doc/invoke.texi#11 integrate .. //depot/projects/hammer/contrib/gcc/expmed.c#7 integrate .. //depot/projects/hammer/contrib/gcc/f/ChangeLog#10 integrate .. //depot/projects/hammer/contrib/gcc/f/g77.texi#4 integrate .. //depot/projects/hammer/contrib/gcc/f/g77spec.c#4 integrate .. //depot/projects/hammer/contrib/gcc/flow.c#8 integrate .. //depot/projects/hammer/contrib/gcc/fold-const.c#7 integrate .. //depot/projects/hammer/contrib/gcc/function.c#9 integrate .. //depot/projects/hammer/contrib/gcc/gcc.1#5 delete .. //depot/projects/hammer/contrib/gcc/gcc.c#10 integrate .. //depot/projects/hammer/contrib/gcc/gcov-dump.c#2 integrate .. //depot/projects/hammer/contrib/gcc/gcov.c#4 integrate .. //depot/projects/hammer/contrib/gcc/gcse.c#6 integrate .. //depot/projects/hammer/contrib/gcc/ggc-common.c#4 integrate .. //depot/projects/hammer/contrib/gcc/global.c#5 integrate .. //depot/projects/hammer/contrib/gcc/hooks.c#7 integrate .. //depot/projects/hammer/contrib/gcc/hooks.h#7 integrate .. //depot/projects/hammer/contrib/gcc/hosthooks-def.h#2 integrate .. //depot/projects/hammer/contrib/gcc/hosthooks.h#2 integrate .. //depot/projects/hammer/contrib/gcc/local-alloc.c#5 integrate .. //depot/projects/hammer/contrib/gcc/longlong.h#4 integrate .. //depot/projects/hammer/contrib/gcc/loop.c#11 integrate .. //depot/projects/hammer/contrib/gcc/md5.c#3 integrate .. //depot/projects/hammer/contrib/gcc/md5.h#2 integrate .. //depot/projects/hammer/contrib/gcc/mips-tdump.c#3 integrate .. //depot/projects/hammer/contrib/gcc/mips-tfile.c#3 integrate .. //depot/projects/hammer/contrib/gcc/mklibgcc.in#8 integrate .. //depot/projects/hammer/contrib/gcc/optabs.c#8 integrate .. //depot/projects/hammer/contrib/gcc/pretty-print.c#2 integrate .. //depot/projects/hammer/contrib/gcc/reg-stack.c#7 integrate .. //depot/projects/hammer/contrib/gcc/regrename.c#5 integrate .. //depot/projects/hammer/contrib/gcc/regs.h#5 integrate .. //depot/projects/hammer/contrib/gcc/rtl.h#8 integrate .. //depot/projects/hammer/contrib/gcc/sched-rgn.c#5 integrate .. //depot/projects/hammer/contrib/gcc/simplify-rtx.c#5 integrate .. //depot/projects/hammer/contrib/gcc/stmt.c#6 integrate .. //depot/projects/hammer/contrib/gcc/toplev.c#11 integrate .. //depot/projects/hammer/contrib/gcc/tree.c#7 integrate .. //depot/projects/hammer/contrib/gcc/unroll.c#9 integrate .. //depot/projects/hammer/contrib/gcc/version.c#11 integrate .. //depot/projects/hammer/contrib/gdb/FREEBSD-Xlist#4 integrate .. //depot/projects/hammer/contrib/gdb/gdb/config/powerpc/fbsd.mh#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/config/powerpc/fbsd.mt#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/config/powerpc/nm-fbsd.h#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/config/rs6000/nm-rs6000.h#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/config/rs6000/nm-rs6000ly.h#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/config/rs6000/rs6000.mh#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/config/rs6000/rs6000.mt#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/config/rs6000/rs6000lynx.mh#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/config/rs6000/rs6000lynx.mt#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/config/rs6000/tm-rs6000.h#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/config/rs6000/tm-rs6000ly.h#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/config/rs6000/xm-rs6000.h#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/ppcfbsd-nat.c#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/ppcfbsd-tdep.c#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/ppcfbsd-tdep.h#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/rs6000-nat.c#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/rs6000-tdep.c#1 branch .. //depot/projects/hammer/contrib/gdtoa/README#3 integrate .. //depot/projects/hammer/contrib/gdtoa/arithchk.c#2 integrate .. //depot/projects/hammer/contrib/gdtoa/dmisc.c#2 integrate .. //depot/projects/hammer/contrib/gdtoa/dtoa.c#2 integrate .. //depot/projects/hammer/contrib/gdtoa/g_Qfmt.c#2 integrate .. //depot/projects/hammer/contrib/gdtoa/g__fmt.c#3 integrate .. //depot/projects/hammer/contrib/gdtoa/g_ddfmt.c#2 integrate .. //depot/projects/hammer/contrib/gdtoa/g_dfmt.c#2 integrate .. //depot/projects/hammer/contrib/gdtoa/g_ffmt.c#2 integrate .. //depot/projects/hammer/contrib/gdtoa/g_xLfmt.c#2 integrate .. //depot/projects/hammer/contrib/gdtoa/g_xfmt.c#2 integrate .. //depot/projects/hammer/contrib/gdtoa/gdtoa.c#2 integrate .. //depot/projects/hammer/contrib/gdtoa/gdtoa.h#2 integrate .. //depot/projects/hammer/contrib/gdtoa/gdtoaimp.h#7 integrate .. //depot/projects/hammer/contrib/gdtoa/gethex.c#4 integrate .. //depot/projects/hammer/contrib/gdtoa/gmisc.c#2 integrate .. //depot/projects/hammer/contrib/gdtoa/hd_init.c#2 integrate .. //depot/projects/hammer/contrib/gdtoa/hexnan.c#2 integrate .. //depot/projects/hammer/contrib/gdtoa/makefile#2 integrate .. //depot/projects/hammer/contrib/gdtoa/misc.c#2 integrate .. //depot/projects/hammer/contrib/gdtoa/qnan.c#1 branch .. //depot/projects/hammer/contrib/gdtoa/smisc.c#2 integrate .. //depot/projects/hammer/contrib/gdtoa/strtoIQ.c#2 integrate .. //depot/projects/hammer/contrib/gdtoa/strtoId.c#2 integrate .. //depot/projects/hammer/contrib/gdtoa/strtoIdd.c#2 integrate .. //depot/projects/hammer/contrib/gdtoa/strtoIf.c#2 integrate .. //depot/projects/hammer/contrib/gdtoa/strtoIg.c#2 integrate .. //depot/projects/hammer/contrib/gdtoa/strtoIx.c#2 integrate .. //depot/projects/hammer/contrib/gdtoa/strtoIxL.c#2 integrate .. //depot/projects/hammer/contrib/gdtoa/strtod.c#4 integrate .. //depot/projects/hammer/contrib/gdtoa/strtodI.c#2 integrate .. //depot/projects/hammer/contrib/gdtoa/strtodg.c#3 integrate .. //depot/projects/hammer/contrib/gdtoa/strtodnrp.c#1 branch .. //depot/projects/hammer/contrib/gdtoa/strtof.c#2 integrate .. //depot/projects/hammer/contrib/gdtoa/strtopQ.c#2 integrate .. //depot/projects/hammer/contrib/gdtoa/strtopd.c#2 integrate .. //depot/projects/hammer/contrib/gdtoa/strtopdd.c#2 integrate .. //depot/projects/hammer/contrib/gdtoa/strtopf.c#2 integrate .. //depot/projects/hammer/contrib/gdtoa/strtopx.c#2 integrate .. //depot/projects/hammer/contrib/gdtoa/strtopxL.c#2 integrate .. //depot/projects/hammer/contrib/gdtoa/strtorQ.c#2 integrate .. //depot/projects/hammer/contrib/gdtoa/strtord.c#2 integrate .. //depot/projects/hammer/contrib/gdtoa/strtordd.c#2 integrate .. //depot/projects/hammer/contrib/gdtoa/strtorf.c#2 integrate .. //depot/projects/hammer/contrib/gdtoa/strtorx.c#2 integrate .. //depot/projects/hammer/contrib/gdtoa/strtorxL.c#2 integrate .. //depot/projects/hammer/contrib/gdtoa/sum.c#2 integrate .. //depot/projects/hammer/contrib/gdtoa/test/Qtest.c#2 integrate .. //depot/projects/hammer/contrib/gdtoa/test/dItest.c#2 integrate .. //depot/projects/hammer/contrib/gdtoa/test/ddtest.c#2 integrate .. //depot/projects/hammer/contrib/gdtoa/test/dt.c#2 integrate .. //depot/projects/hammer/contrib/gdtoa/test/dtest.c#2 integrate .. //depot/projects/hammer/contrib/gdtoa/test/dtst.out#2 integrate .. //depot/projects/hammer/contrib/gdtoa/test/ftest.c#2 integrate .. //depot/projects/hammer/contrib/gdtoa/test/getround.c#2 integrate .. //depot/projects/hammer/contrib/gdtoa/test/makefile#2 integrate .. //depot/projects/hammer/contrib/gdtoa/test/strtodt.c#2 integrate .. //depot/projects/hammer/contrib/gdtoa/test/x.ou0#2 integrate .. //depot/projects/hammer/contrib/gdtoa/test/x.ou1#2 integrate .. //depot/projects/hammer/contrib/gdtoa/test/xL.ou1#2 integrate .. //depot/projects/hammer/contrib/gdtoa/test/xLtest.c#2 integrate .. //depot/projects/hammer/contrib/gdtoa/test/xsum0.out#2 integrate .. //depot/projects/hammer/contrib/gdtoa/test/xtest.c#2 integrate .. //depot/projects/hammer/contrib/gdtoa/ulp.c#2 integrate .. //depot/projects/hammer/contrib/gdtoa/xsum0.out#4 integrate .. //depot/projects/hammer/contrib/groff/tmac/doc-common#14 integrate .. //depot/projects/hammer/contrib/groff/tmac/doc-syms#8 integrate .. //depot/projects/hammer/contrib/groff/tmac/groff_mdoc.man#12 integrate .. //depot/projects/hammer/contrib/ipfilter/BSD/Makefile#6 integrate .. //depot/projects/hammer/contrib/ipfilter/HISTORY#7 integrate .. //depot/projects/hammer/contrib/ipfilter/Makefile#7 integrate .. //depot/projects/hammer/contrib/ipfilter/bpf_filter.c#3 integrate .. //depot/projects/hammer/contrib/ipfilter/ip_fil.c#2 integrate .. //depot/projects/hammer/contrib/ipfilter/ipf.h#5 integrate .. //depot/projects/hammer/contrib/ipfilter/iplang/iplang_y.y#5 integrate .. //depot/projects/hammer/contrib/ipfilter/ipmon.h#3 integrate .. //depot/projects/hammer/contrib/ipfilter/ipsd/sbpf.c#3 integrate .. //depot/projects/hammer/contrib/ipfilter/ipsend/ipsend.c#6 integrate .. //depot/projects/hammer/contrib/ipfilter/ipsend/iptests.c#5 integrate .. //depot/projects/hammer/contrib/ipfilter/ipsend/lsock.c#5 integrate .. //depot/projects/hammer/contrib/ipfilter/ipsend/resend.c#5 integrate .. //depot/projects/hammer/contrib/ipfilter/ipsend/sbpf.c#4 integrate .. //depot/projects/hammer/contrib/ipfilter/ipsend/sock.c#5 integrate .. //depot/projects/hammer/contrib/ipfilter/ipt.h#4 integrate .. //depot/projects/hammer/contrib/ipfilter/lib/Makefile#3 integrate .. //depot/projects/hammer/contrib/ipfilter/lib/addicmp.c#3 integrate .. //depot/projects/hammer/contrib/ipfilter/lib/addkeep.c#3 delete .. //depot/projects/hammer/contrib/ipfilter/lib/facpri.c#3 integrate .. //depot/projects/hammer/contrib/ipfilter/lib/getport.c#2 integrate .. //depot/projects/hammer/contrib/ipfilter/lib/icmpcode.c#3 integrate .. //depot/projects/hammer/contrib/ipfilter/lib/ipft_tx.c#3 integrate .. //depot/projects/hammer/contrib/ipfilter/lib/make_range.c#3 delete .. //depot/projects/hammer/contrib/ipfilter/lib/optprint.c#3 integrate .. //depot/projects/hammer/contrib/ipfilter/lib/printfr.c#3 integrate .. //depot/projects/hammer/contrib/ipfilter/lib/printlog.c#3 integrate .. //depot/projects/hammer/contrib/ipfilter/man/ipmon.8#8 integrate .. //depot/projects/hammer/contrib/ipfilter/radix.c#3 integrate .. //depot/projects/hammer/contrib/ipfilter/samples/proxy.c#4 integrate .. //depot/projects/hammer/contrib/ipfilter/test/Makefile#6 integrate .. //depot/projects/hammer/contrib/ipfilter/test/expected/f20#1 branch .. //depot/projects/hammer/contrib/ipfilter/test/expected/i1#4 integrate .. //depot/projects/hammer/contrib/ipfilter/test/expected/i10#2 integrate .. //depot/projects/hammer/contrib/ipfilter/test/expected/i11#5 integrate .. //depot/projects/hammer/contrib/ipfilter/test/expected/i18#2 integrate .. //depot/projects/hammer/contrib/ipfilter/test/expected/i5#3 integrate .. //depot/projects/hammer/contrib/ipfilter/test/expected/i8#3 integrate .. //depot/projects/hammer/contrib/ipfilter/test/expected/i9#4 integrate .. //depot/projects/hammer/contrib/ipfilter/test/expected/in2#4 integrate .. //depot/projects/hammer/contrib/ipfilter/test/expected/in5#3 integrate .. //depot/projects/hammer/contrib/ipfilter/test/expected/ni19#1 branch .. //depot/projects/hammer/contrib/ipfilter/test/expected/ni20#1 branch .. //depot/projects/hammer/contrib/ipfilter/test/expected/ni21#1 branch .. //depot/projects/hammer/contrib/ipfilter/test/input/f2#2 integrate .. //depot/projects/hammer/contrib/ipfilter/test/input/f20#1 branch .. //depot/projects/hammer/contrib/ipfilter/test/input/ni19#1 branch .. //depot/projects/hammer/contrib/ipfilter/test/input/ni20#1 branch .. //depot/projects/hammer/contrib/ipfilter/test/input/ni21#1 branch .. //depot/projects/hammer/contrib/ipfilter/test/regress/f20#1 branch .. //depot/projects/hammer/contrib/ipfilter/test/regress/i1#4 integrate .. //depot/projects/hammer/contrib/ipfilter/test/regress/i10#2 integrate .. //depot/projects/hammer/contrib/ipfilter/test/regress/i11#5 integrate .. //depot/projects/hammer/contrib/ipfilter/test/regress/i15#2 integrate .. //depot/projects/hammer/contrib/ipfilter/test/regress/i17#2 integrate .. //depot/projects/hammer/contrib/ipfilter/test/regress/i18#2 integrate .. //depot/projects/hammer/contrib/ipfilter/test/regress/i5#2 integrate .. //depot/projects/hammer/contrib/ipfilter/test/regress/i8#3 integrate .. //depot/projects/hammer/contrib/ipfilter/test/regress/i9#4 integrate .. //depot/projects/hammer/contrib/ipfilter/test/regress/in2#4 integrate .. //depot/projects/hammer/contrib/ipfilter/test/regress/in5#3 integrate .. //depot/projects/hammer/contrib/ipfilter/test/regress/ni19.ipf#1 branch .. //depot/projects/hammer/contrib/ipfilter/test/regress/ni19.nat#1 branch .. //depot/projects/hammer/contrib/ipfilter/test/regress/ni20.ipf#1 branch .. //depot/projects/hammer/contrib/ipfilter/test/regress/ni20.nat#1 branch .. //depot/projects/hammer/contrib/ipfilter/test/regress/ni21.ipf#1 branch .. //depot/projects/hammer/contrib/ipfilter/test/regress/ni21.nat#1 branch .. //depot/projects/hammer/contrib/ipfilter/test/test.format#3 integrate .. //depot/projects/hammer/contrib/ipfilter/tools/ipf.c#4 integrate .. //depot/projects/hammer/contrib/ipfilter/tools/ipf_y.y#4 integrate .. //depot/projects/hammer/contrib/ipfilter/tools/ipfcomp.c#3 integrate .. //depot/projects/hammer/contrib/ipfilter/tools/ipfs.c#2 integrate .. //depot/projects/hammer/contrib/ipfilter/tools/ipfstat.c#3 integrate .. //depot/projects/hammer/contrib/ipfilter/tools/ipftest.c#3 integrate .. //depot/projects/hammer/contrib/ipfilter/tools/ipmon.c#5 integrate .. //depot/projects/hammer/contrib/ipfilter/tools/ipnat_y.y#3 integrate .. //depot/projects/hammer/contrib/ipfilter/tools/ipsyncm.c#3 integrate .. //depot/projects/hammer/contrib/ipfilter/tools/ipsyncs.c#3 integrate .. //depot/projects/hammer/contrib/ipfilter/tools/lexer.c#2 integrate .. //depot/projects/hammer/contrib/less/LICENSE#3 integrate .. //depot/projects/hammer/contrib/less/Makefile.aut#3 integrate .. //depot/projects/hammer/contrib/less/Makefile.in#3 integrate .. //depot/projects/hammer/contrib/less/Makefile.wnb#2 integrate .. //depot/projects/hammer/contrib/less/NEWS#3 integrate .. //depot/projects/hammer/contrib/less/README#3 integrate .. //depot/projects/hammer/contrib/less/brac.c#3 integrate .. //depot/projects/hammer/contrib/less/ch.c#3 integrate .. //depot/projects/hammer/contrib/less/charset.c#3 integrate .. //depot/projects/hammer/contrib/less/charset.h#1 branch .. //depot/projects/hammer/contrib/less/cmd.h#3 integrate .. //depot/projects/hammer/contrib/less/cmdbuf.c#3 integrate .. //depot/projects/hammer/contrib/less/command.c#3 integrate .. //depot/projects/hammer/contrib/less/configure#3 integrate .. //depot/projects/hammer/contrib/less/configure.ac#2 integrate .. //depot/projects/hammer/contrib/less/decode.c#3 integrate .. //depot/projects/hammer/contrib/less/defines.ds#3 integrate .. //depot/projects/hammer/contrib/less/defines.h.in#3 integrate .. //depot/projects/hammer/contrib/less/defines.o2#3 integrate .. //depot/projects/hammer/contrib/less/defines.o9#2 integrate .. //depot/projects/hammer/contrib/less/defines.wn#3 integrate .. //depot/projects/hammer/contrib/less/edit.c#3 integrate .. //depot/projects/hammer/contrib/less/filename.c#3 integrate .. //depot/projects/hammer/contrib/less/forwback.c#3 integrate .. //depot/projects/hammer/contrib/less/funcs.h#3 integrate .. //depot/projects/hammer/contrib/less/ifile.c#3 integrate .. //depot/projects/hammer/contrib/less/input.c#3 integrate .. //depot/projects/hammer/contrib/less/jump.c#3 integrate .. //depot/projects/hammer/contrib/less/less.h#3 integrate .. //depot/projects/hammer/contrib/less/less.man#3 integrate .. //depot/projects/hammer/contrib/less/less.nro#3 integrate .. //depot/projects/hammer/contrib/less/lessecho.c#3 integrate .. //depot/projects/hammer/contrib/less/lessecho.man#1 branch .. //depot/projects/hammer/contrib/less/lessecho.nro#1 branch .. //depot/projects/hammer/contrib/less/lesskey.c#3 integrate .. //depot/projects/hammer/contrib/less/lesskey.h#3 integrate .. //depot/projects/hammer/contrib/less/lesskey.man#3 integrate .. //depot/projects/hammer/contrib/less/lesskey.nro#3 integrate .. //depot/projects/hammer/contrib/less/lglob.h#3 integrate .. //depot/projects/hammer/contrib/less/line.c#4 integrate .. //depot/projects/hammer/contrib/less/linenum.c#3 integrate .. //depot/projects/hammer/contrib/less/lsystem.c#3 integrate .. //depot/projects/hammer/contrib/less/main.c#3 integrate .. //depot/projects/hammer/contrib/less/mark.c#3 integrate .. //depot/projects/hammer/contrib/less/mkhelp.c#3 integrate .. //depot/projects/hammer/contrib/less/optfunc.c#3 integrate .. //depot/projects/hammer/contrib/less/option.c#3 integrate .. //depot/projects/hammer/contrib/less/option.h#3 integrate .. //depot/projects/hammer/contrib/less/opttbl.c#3 integrate .. //depot/projects/hammer/contrib/less/os.c#3 integrate .. //depot/projects/hammer/contrib/less/output.c#3 integrate .. //depot/projects/hammer/contrib/less/pckeys.h#3 integrate .. //depot/projects/hammer/contrib/less/position.c#3 integrate .. //depot/projects/hammer/contrib/less/position.h#3 integrate .. //depot/projects/hammer/contrib/less/prompt.c#3 integrate .. //depot/projects/hammer/contrib/less/screen.c#3 integrate .. //depot/projects/hammer/contrib/less/scrsize.c#3 integrate .. //depot/projects/hammer/contrib/less/search.c#3 integrate .. //depot/projects/hammer/contrib/less/signal.c#3 integrate .. //depot/projects/hammer/contrib/less/tags.c#3 integrate .. //depot/projects/hammer/contrib/less/ttyin.c#3 integrate .. //depot/projects/hammer/contrib/less/version.c#3 integrate .. //depot/projects/hammer/contrib/libbegemot/rpoll.c#3 integrate .. //depot/projects/hammer/contrib/libbegemot/rpoll.h#2 integrate .. //depot/projects/hammer/contrib/libbegemot/rpoll.man#3 integrate .. //depot/projects/hammer/contrib/libf2c/ChangeLog#10 integrate .. //depot/projects/hammer/contrib/libobjc/ChangeLog#10 integrate .. //depot/projects/hammer/contrib/libobjc/README#2 integrate .. //depot/projects/hammer/contrib/libpcap/CHANGES#5 integrate .. //depot/projects/hammer/contrib/libpcap/CREDITS#5 integrate .. //depot/projects/hammer/contrib/libpcap/FREEBSD-upgrade#2 integrate .. //depot/projects/hammer/contrib/libpcap/README.dag#2 integrate .. //depot/projects/hammer/contrib/libpcap/VERSION#6 integrate .. //depot/projects/hammer/contrib/libpcap/config.h.in#5 integrate .. //depot/projects/hammer/contrib/libpcap/configure#5 integrate .. //depot/projects/hammer/contrib/libpcap/configure.in#5 integrate .. //depot/projects/hammer/contrib/libpcap/doc/pcap.html#1 branch .. //depot/projects/hammer/contrib/libpcap/doc/pcap.txt#1 branch .. //depot/projects/hammer/contrib/libpcap/doc/pcap.xml#1 branch .. //depot/projects/hammer/contrib/libpcap/ethertype.h#3 integrate .. //depot/projects/hammer/contrib/libpcap/fad-win32.c#3 integrate .. //depot/projects/hammer/contrib/libpcap/gencode.c#7 integrate .. //depot/projects/hammer/contrib/libpcap/gencode.h#5 integrate .. //depot/projects/hammer/contrib/libpcap/grammar.y#5 integrate .. //depot/projects/hammer/contrib/libpcap/pcap-bpf.c#9 integrate .. //depot/projects/hammer/contrib/libpcap/pcap-bpf.h#4 integrate .. //depot/projects/hammer/contrib/libpcap/pcap-dag.c#4 integrate .. //depot/projects/hammer/contrib/libpcap/pcap-dag.h#2 integrate .. //depot/projects/hammer/contrib/libpcap/pcap-dlpi.c#5 integrate .. //depot/projects/hammer/contrib/libpcap/pcap-int.h#6 integrate .. //depot/projects/hammer/contrib/libpcap/pcap-linux.c#5 integrate .. //depot/projects/hammer/contrib/libpcap/pcap-stdinc.h#2 integrate .. //depot/projects/hammer/contrib/libpcap/pcap-win32.c#4 integrate .. //depot/projects/hammer/contrib/libpcap/pcap.3#7 integrate .. //depot/projects/hammer/contrib/libpcap/pcap.c#6 integrate .. //depot/projects/hammer/contrib/libpcap/pcap.h#6 integrate .. //depot/projects/hammer/contrib/libpcap/savefile.c#5 integrate .. //depot/projects/hammer/contrib/libpcap/scanner.l#6 integrate .. //depot/projects/hammer/contrib/libreadline/CHANGELOG#5 integrate .. //depot/projects/hammer/contrib/libreadline/CHANGES#5 integrate .. //depot/projects/hammer/contrib/libreadline/FREEBSD-upgrade#6 integrate .. //depot/projects/hammer/contrib/libreadline/INSTALL#5 integrate .. //depot/projects/hammer/contrib/libreadline/NEWS#3 integrate .. //depot/projects/hammer/contrib/libreadline/README#5 integrate .. //depot/projects/hammer/contrib/libreadline/aclocal.m4#5 integrate .. //depot/projects/hammer/contrib/libreadline/bind.c#6 integrate .. //depot/projects/hammer/contrib/libreadline/callback.c#5 integrate .. //depot/projects/hammer/contrib/libreadline/complete.c#7 integrate .. //depot/projects/hammer/contrib/libreadline/config.h.in#5 integrate .. //depot/projects/hammer/contrib/libreadline/configure#5 integrate .. //depot/projects/hammer/contrib/libreadline/configure.in#5 integrate .. //depot/projects/hammer/contrib/libreadline/display.c#7 integrate .. //depot/projects/hammer/contrib/libreadline/doc/history.texi#2 integrate .. //depot/projects/hammer/contrib/libreadline/doc/hstech.texi#2 integrate .. //depot/projects/hammer/contrib/libreadline/doc/hsuser.texi#2 integrate .. //depot/projects/hammer/contrib/libreadline/doc/readline.3#7 integrate .. //depot/projects/hammer/contrib/libreadline/doc/rlman.texi#2 integrate .. //depot/projects/hammer/contrib/libreadline/doc/rltech.texi#3 integrate .. //depot/projects/hammer/contrib/libreadline/doc/rluser.texi#3 integrate .. //depot/projects/hammer/contrib/libreadline/doc/rluserman.texi#3 integrate .. //depot/projects/hammer/contrib/libreadline/doc/version.texi#3 integrate .. //depot/projects/hammer/contrib/libreadline/examples/excallback.c#2 integrate .. //depot/projects/hammer/contrib/libreadline/examples/rlfe/Makefile.in#2 integrate .. //depot/projects/hammer/contrib/libreadline/histexpand.c#5 integrate .. //depot/projects/hammer/contrib/libreadline/histfile.c#4 integrate .. //depot/projects/hammer/contrib/libreadline/history.c#5 integrate .. //depot/projects/hammer/contrib/libreadline/input.c#5 integrate .. //depot/projects/hammer/contrib/libreadline/isearch.c#4 integrate .. //depot/projects/hammer/contrib/libreadline/kill.c#4 integrate .. //depot/projects/hammer/contrib/libreadline/macro.c#4 integrate .. //depot/projects/hammer/contrib/libreadline/misc.c#4 integrate .. //depot/projects/hammer/contrib/libreadline/readline.c#6 integrate .. //depot/projects/hammer/contrib/libreadline/readline.h#7 integrate .. //depot/projects/hammer/contrib/libreadline/rlconf.h#5 integrate .. //depot/projects/hammer/contrib/libreadline/rlmbutil.h#4 integrate .. //depot/projects/hammer/contrib/libreadline/rlprivate.h#5 integrate .. //depot/projects/hammer/contrib/libreadline/rltty.c#5 integrate .. //depot/projects/hammer/contrib/libreadline/search.c#5 integrate .. //depot/projects/hammer/contrib/libreadline/signals.c#5 integrate .. //depot/projects/hammer/contrib/libreadline/support/shlib-install#5 integrate .. //depot/projects/hammer/contrib/libreadline/support/shobj-conf#5 integrate .. //depot/projects/hammer/contrib/libreadline/terminal.c#7 integrate .. //depot/projects/hammer/contrib/libreadline/text.c#4 integrate .. //depot/projects/hammer/contrib/libreadline/tilde.c#4 integrate .. //depot/projects/hammer/contrib/libreadline/undo.c#4 integrate .. //depot/projects/hammer/contrib/libreadline/vi_mode.c#7 integrate .. //depot/projects/hammer/contrib/libstdc++/ChangeLog#11 integrate .. //depot/projects/hammer/contrib/libstdc++/include/bits/c++config#11 integrate .. //depot/projects/hammer/contrib/libstdc++/include/bits/fstream.tcc#7 integrate .. //depot/projects/hammer/contrib/libstdc++/include/c_std/std_cmath.h#5 integrate .. //depot/projects/hammer/contrib/libstdc++/include/ext/demangle.h#2 delete .. //depot/projects/hammer/contrib/libstdc++/include/ext/hashtable.h#2 integrate .. //depot/projects/hammer/contrib/lukemftpd/src/Makefile#3 integrate .. //depot/projects/hammer/contrib/lukemftpd/src/cmds.c#4 integrate .. //depot/projects/hammer/contrib/lukemftpd/src/conf.c#4 integrate .. //depot/projects/hammer/contrib/lukemftpd/src/extern.h#4 integrate .. //depot/projects/hammer/contrib/lukemftpd/src/ftpcmd.y#4 integrate .. //depot/projects/hammer/contrib/lukemftpd/src/ftpd.8#4 integrate .. //depot/projects/hammer/contrib/lukemftpd/src/ftpd.c#4 integrate .. //depot/projects/hammer/contrib/lukemftpd/src/ftpd.conf.5#4 integrate .. //depot/projects/hammer/contrib/lukemftpd/src/logutmp.c#4 integrate .. //depot/projects/hammer/contrib/lukemftpd/src/logwtmp.c#4 integrate .. //depot/projects/hammer/contrib/lukemftpd/src/pathnames.h#4 integrate .. //depot/projects/hammer/contrib/lukemftpd/src/popen.c#4 integrate .. //depot/projects/hammer/contrib/lukemftpd/src/version.h#4 integrate .. //depot/projects/hammer/contrib/ncurses/man/MKterminfo.sh#2 integrate .. //depot/projects/hammer/contrib/ntp/include/ntp_stdlib.h#3 integrate .. //depot/projects/hammer/contrib/ntp/include/ntpd.h#4 integrate .. //depot/projects/hammer/contrib/openbsm/FREEBSD-upgrade#4 integrate .. //depot/projects/hammer/contrib/openbsm/HISTORY#3 integrate .. //depot/projects/hammer/contrib/openbsm/README#3 integrate .. //depot/projects/hammer/contrib/openbsm/TODO#3 integrate .. //depot/projects/hammer/contrib/openbsm/VERSION#3 integrate .. //depot/projects/hammer/contrib/openbsm/bin/audit/audit.c#2 integrate .. //depot/projects/hammer/contrib/openbsm/bin/auditd/audit_warn.c#2 integrate .. //depot/projects/hammer/contrib/openbsm/bin/auditd/auditd.8#2 integrate .. //depot/projects/hammer/contrib/openbsm/bin/auditd/auditd.c#3 integrate .. //depot/projects/hammer/contrib/openbsm/bin/auditd/auditd.h#2 integrate .. //depot/projects/hammer/contrib/openbsm/bin/auditfilterd/auditfilterd.c#2 integrate .. //depot/projects/hammer/contrib/openbsm/bin/auditfilterd/auditfilterd.h#2 integrate .. //depot/projects/hammer/contrib/openbsm/bin/auditfilterd/auditfilterd_conf.c#2 integrate .. //depot/projects/hammer/contrib/openbsm/bin/auditreduce/auditreduce.1#2 integrate .. //depot/projects/hammer/contrib/openbsm/bin/auditreduce/auditreduce.c#3 integrate .. //depot/projects/hammer/contrib/openbsm/bin/auditreduce/auditreduce.h#2 integrate .. //depot/projects/hammer/contrib/openbsm/bsm/audit.h#3 delete .. //depot/projects/hammer/contrib/openbsm/bsm/audit_filter.h#2 integrate .. //depot/projects/hammer/contrib/openbsm/bsm/audit_internal.h#2 delete .. //depot/projects/hammer/contrib/openbsm/bsm/audit_kevents.h#3 delete .. //depot/projects/hammer/contrib/openbsm/bsm/audit_record.h#3 delete .. //depot/projects/hammer/contrib/openbsm/bsm/libbsm.h#3 integrate .. //depot/projects/hammer/contrib/openbsm/compat/strlcat.h#1 branch .. //depot/projects/hammer/contrib/openbsm/config/config.h#3 integrate .. //depot/projects/hammer/contrib/openbsm/config/config.h.in#3 integrate .. //depot/projects/hammer/contrib/openbsm/configure#3 integrate .. //depot/projects/hammer/contrib/openbsm/configure.ac#3 integrate .. //depot/projects/hammer/contrib/openbsm/etc/audit_control#3 integrate .. //depot/projects/hammer/contrib/openbsm/etc/audit_event#4 integrate .. //depot/projects/hammer/contrib/openbsm/libbsm/au_control.3#2 integrate .. //depot/projects/hammer/contrib/openbsm/libbsm/au_open.3#2 integrate .. //depot/projects/hammer/contrib/openbsm/libbsm/au_token.3#3 integrate .. //depot/projects/hammer/contrib/openbsm/libbsm/bsm_audit.c#3 integrate .. //depot/projects/hammer/contrib/openbsm/libbsm/bsm_control.c#2 integrate .. //depot/projects/hammer/contrib/openbsm/libbsm/bsm_event.c#2 integrate .. //depot/projects/hammer/contrib/openbsm/libbsm/bsm_io.c#3 integrate .. //depot/projects/hammer/contrib/openbsm/libbsm/bsm_token.c#3 integrate .. //depot/projects/hammer/contrib/openbsm/libbsm/libbsm.3#3 integrate .. //depot/projects/hammer/contrib/openbsm/man/audit.log.5#3 integrate .. //depot/projects/hammer/contrib/openbsm/man/audit_control.5#2 integrate .. //depot/projects/hammer/contrib/openbsm/man/auditon.2#2 integrate .. //depot/projects/hammer/contrib/openbsm/modules/auditfilter_noop/auditfilter_noop.c#2 integrate .. //depot/projects/hammer/contrib/openbsm/test/bsm/generate.c#2 integrate .. //depot/projects/hammer/contrib/openbsm/test/reference/arg32_record#1 branch .. //depot/projects/hammer/contrib/openbsm/test/reference/arg32_token#1 branch .. //depot/projects/hammer/contrib/openbsm/test/reference/data_record#1 branch .. //depot/projects/hammer/contrib/openbsm/test/reference/data_token#1 branch .. //depot/projects/hammer/contrib/openbsm/test/reference/file_record#1 branch .. //depot/projects/hammer/contrib/openbsm/test/reference/file_token#1 branch .. //depot/projects/hammer/contrib/openbsm/test/reference/header32_token#1 branch .. //depot/projects/hammer/contrib/openbsm/test/reference/in_addr_record#1 branch .. //depot/projects/hammer/contrib/openbsm/test/reference/in_addr_token#1 branch .. //depot/projects/hammer/contrib/openbsm/test/reference/ip_record#1 branch .. //depot/projects/hammer/contrib/openbsm/test/reference/ip_token#1 branch .. //depot/projects/hammer/contrib/openbsm/test/reference/ipc_record#1 branch .. //depot/projects/hammer/contrib/openbsm/test/reference/ipc_token#1 branch .. //depot/projects/hammer/contrib/openbsm/test/reference/iport_record#1 branch .. //depot/projects/hammer/contrib/openbsm/test/reference/iport_token#1 branch .. //depot/projects/hammer/contrib/openbsm/test/reference/opaque_record#1 branch .. //depot/projects/hammer/contrib/openbsm/test/reference/opaque_token#1 branch .. //depot/projects/hammer/contrib/openbsm/test/reference/path_record#1 branch .. //depot/projects/hammer/contrib/openbsm/test/reference/path_token#1 branch .. //depot/projects/hammer/contrib/openbsm/test/reference/process32_record#1 branch .. //depot/projects/hammer/contrib/openbsm/test/reference/process32_token#1 branch .. //depot/projects/hammer/contrib/openbsm/test/reference/process32ex_record#1 branch .. //depot/projects/hammer/contrib/openbsm/test/reference/process32ex_token#1 branch .. //depot/projects/hammer/contrib/openbsm/test/reference/return32_record#1 branch .. //depot/projects/hammer/contrib/openbsm/test/reference/return32_token#1 branch .. //depot/projects/hammer/contrib/openbsm/test/reference/seq_record#1 branch .. //depot/projects/hammer/contrib/openbsm/test/reference/seq_token#1 branch .. //depot/projects/hammer/contrib/openbsm/test/reference/subject32_record#1 branch .. //depot/projects/hammer/contrib/openbsm/test/reference/subject32_token#1 branch .. //depot/projects/hammer/contrib/openbsm/test/reference/subject32ex_record#1 branch .. //depot/projects/hammer/contrib/openbsm/test/reference/subject32ex_token-IPv4#1 branch .. //depot/projects/hammer/contrib/openbsm/test/reference/subject32ex_token-IPv6#1 branch .. //depot/projects/hammer/contrib/openbsm/test/reference/text_record#1 branch .. //depot/projects/hammer/contrib/openbsm/test/reference/text_token#1 branch .. //depot/projects/hammer/contrib/openbsm/test/reference/trailer_token#1 branch .. //depot/projects/hammer/contrib/openbsm/test/samples/execve-long-args.trail#1 branch .. //depot/projects/hammer/contrib/openbsm/tools/Makefile.am#2 integrate .. //depot/projects/hammer/contrib/openbsm/tools/Makefile.in#2 integrate .. //depot/projects/hammer/contrib/openbsm/tools/audump.c#2 integrate .. //depot/projects/hammer/contrib/pf/man/pf.conf.5#10 integrate .. //depot/projects/hammer/contrib/pf/pfctl/pfctl_altq.c#6 integrate .. //depot/projects/hammer/contrib/pnpinfo/pnpinfo.8#3 integrate .. //depot/projects/hammer/contrib/pnpinfo/pnpinfo.c#3 integrate .. //depot/projects/hammer/contrib/sendmail/FREEBSD-upgrade#15 integrate .. //depot/projects/hammer/contrib/sendmail/RELEASE_NOTES#12 integrate .. //depot/projects/hammer/contrib/sendmail/cf/cf/submit.cf#12 integrate .. //depot/projects/hammer/contrib/sendmail/cf/m4/version.m4#12 integrate .. //depot/projects/hammer/contrib/sendmail/contrib/cidrexpand#4 integrate .. //depot/projects/hammer/contrib/sendmail/src/main.c#10 integrate .. //depot/projects/hammer/contrib/sendmail/src/queue.c#12 integrate .. //depot/projects/hammer/contrib/sendmail/src/srvrsmtp.c#12 integrate .. //depot/projects/hammer/contrib/sendmail/src/version.c#12 integrate .. //depot/projects/hammer/contrib/smbfs/smbutil/print.c#2 integrate .. //depot/projects/hammer/contrib/smbfs/smbutil/view.c#3 integrate .. //depot/projects/hammer/contrib/tar/ABOUT-NLS#2 delete .. //depot/projects/hammer/contrib/tar/AUTHORS#2 delete .. //depot/projects/hammer/contrib/tar/COPYING#2 delete .. //depot/projects/hammer/contrib/tar/ChangeLog#2 delete .. //depot/projects/hammer/contrib/tar/ChangeLog.1#2 delete .. //depot/projects/hammer/contrib/tar/FREEBSD-Xlist#3 delete .. //depot/projects/hammer/contrib/tar/FREEBSD-upgrade#2 delete .. //depot/projects/hammer/contrib/tar/INSTALL#2 delete .. //depot/projects/hammer/contrib/tar/NEWS#2 delete .. //depot/projects/hammer/contrib/tar/PORTS#2 delete .. //depot/projects/hammer/contrib/tar/README#2 delete .. //depot/projects/hammer/contrib/tar/README-alpha#2 delete .. //depot/projects/hammer/contrib/tar/THANKS#2 delete .. //depot/projects/hammer/contrib/tar/TODO#2 delete .. //depot/projects/hammer/contrib/tar/doc/fdl.texi#2 delete .. //depot/projects/hammer/contrib/tar/doc/freemanuals.texi#2 delete .. //depot/projects/hammer/contrib/tar/doc/getdate.texi#2 delete .. //depot/projects/hammer/contrib/tar/doc/header.texi#2 delete .. //depot/projects/hammer/contrib/tar/doc/tar.texi#2 delete .. //depot/projects/hammer/contrib/tar/doc/version.texi#2 delete .. //depot/projects/hammer/contrib/tar/lib/addext.c#2 delete .. //depot/projects/hammer/contrib/tar/lib/alloca.c#2 delete .. //depot/projects/hammer/contrib/tar/lib/argmatch.c#2 delete .. //depot/projects/hammer/contrib/tar/lib/argmatch.h#2 delete .. //depot/projects/hammer/contrib/tar/lib/backupfile.c#2 delete .. //depot/projects/hammer/contrib/tar/lib/backupfile.h#2 delete .. //depot/projects/hammer/contrib/tar/lib/basename.c#2 delete .. //depot/projects/hammer/contrib/tar/lib/dirname.c#2 delete .. //depot/projects/hammer/contrib/tar/lib/dirname.h#2 delete .. //depot/projects/hammer/contrib/tar/lib/error.c#2 delete .. //depot/projects/hammer/contrib/tar/lib/error.h#2 delete .. //depot/projects/hammer/contrib/tar/lib/exclude.c#2 delete .. //depot/projects/hammer/contrib/tar/lib/exclude.h#2 delete .. //depot/projects/hammer/contrib/tar/lib/fileblocks.c#2 delete .. //depot/projects/hammer/contrib/tar/lib/fnmatch.c#2 delete .. //depot/projects/hammer/contrib/tar/lib/fnmatch.hin#2 delete .. //depot/projects/hammer/contrib/tar/lib/ftruncate.c#2 delete .. //depot/projects/hammer/contrib/tar/lib/full-write.c#2 delete .. //depot/projects/hammer/contrib/tar/lib/full-write.h#2 delete .. //depot/projects/hammer/contrib/tar/lib/getdate.c#2 delete .. //depot/projects/hammer/contrib/tar/lib/getdate.h#2 delete .. //depot/projects/hammer/contrib/tar/lib/getline.c#2 delete .. //depot/projects/hammer/contrib/tar/lib/getline.h#2 delete .. //depot/projects/hammer/contrib/tar/lib/getstr.c#2 delete .. //depot/projects/hammer/contrib/tar/lib/getstr.h#2 delete .. //depot/projects/hammer/contrib/tar/lib/hash.c#2 delete .. //depot/projects/hammer/contrib/tar/lib/hash.h#2 delete .. //depot/projects/hammer/contrib/tar/lib/human.c#2 delete .. //depot/projects/hammer/contrib/tar/lib/human.h#2 delete .. //depot/projects/hammer/contrib/tar/lib/lchown.c#2 delete .. //depot/projects/hammer/contrib/tar/lib/lchown.h#2 delete .. //depot/projects/hammer/contrib/tar/lib/malloc.c#2 delete .. //depot/projects/hammer/contrib/tar/lib/memset.c#2 delete .. //depot/projects/hammer/contrib/tar/lib/mktime.c#2 delete .. //depot/projects/hammer/contrib/tar/lib/modechange.c#2 delete .. //depot/projects/hammer/contrib/tar/lib/modechange.h#2 delete .. //depot/projects/hammer/contrib/tar/lib/msleep.c#2 delete .. //depot/projects/hammer/contrib/tar/lib/prepargs.c#2 delete .. //depot/projects/hammer/contrib/tar/lib/prepargs.h#2 delete .. //depot/projects/hammer/contrib/tar/lib/print-copyr.c#2 delete .. //depot/projects/hammer/contrib/tar/lib/print-copyr.h#2 delete .. //depot/projects/hammer/contrib/tar/lib/quote.c#2 delete .. //depot/projects/hammer/contrib/tar/lib/quote.h#2 delete .. //depot/projects/hammer/contrib/tar/lib/quotearg.c#2 delete .. //depot/projects/hammer/contrib/tar/lib/quotearg.h#2 delete .. //depot/projects/hammer/contrib/tar/lib/readutmp.c#2 delete .. //depot/projects/hammer/contrib/tar/lib/realloc.c#2 delete .. //depot/projects/hammer/contrib/tar/lib/rename.c#2 delete .. //depot/projects/hammer/contrib/tar/lib/rmdir.c#2 delete .. //depot/projects/hammer/contrib/tar/lib/safe-read.c#2 delete .. //depot/projects/hammer/contrib/tar/lib/safe-read.h#2 delete .. //depot/projects/hammer/contrib/tar/lib/save-cwd.c#2 delete .. //depot/projects/hammer/contrib/tar/lib/save-cwd.h#2 delete .. //depot/projects/hammer/contrib/tar/lib/savedir.c#2 delete .. //depot/projects/hammer/contrib/tar/lib/savedir.h#2 delete .. //depot/projects/hammer/contrib/tar/lib/stpcpy.c#2 delete .. //depot/projects/hammer/contrib/tar/lib/strcasecmp.c#2 delete .. //depot/projects/hammer/contrib/tar/lib/strncasecmp.c#2 delete .. //depot/projects/hammer/contrib/tar/lib/strstr.c#2 delete .. //depot/projects/hammer/contrib/tar/lib/strtoimax.c#2 delete .. //depot/projects/hammer/contrib/tar/lib/strtol.c#2 delete .. //depot/projects/hammer/contrib/tar/lib/strtoll.c#2 delete .. //depot/projects/hammer/contrib/tar/lib/strtoul.c#2 delete .. //depot/projects/hammer/contrib/tar/lib/strtoull.c#2 delete .. //depot/projects/hammer/contrib/tar/lib/strtoumax.c#2 delete .. //depot/projects/hammer/contrib/tar/lib/unicodeio.c#2 delete .. //depot/projects/hammer/contrib/tar/lib/unicodeio.h#2 delete .. //depot/projects/hammer/contrib/tar/lib/utime.c#2 delete .. //depot/projects/hammer/contrib/tar/lib/waitpid.c#2 delete .. //depot/projects/hammer/contrib/tar/lib/xalloc.h#2 delete .. //depot/projects/hammer/contrib/tar/lib/xgetcwd.c#2 delete .. //depot/projects/hammer/contrib/tar/lib/xmalloc.c#2 delete .. //depot/projects/hammer/contrib/tar/lib/xstrdup.c#2 delete .. //depot/projects/hammer/contrib/tar/lib/xstrtoimax.c#2 delete .. //depot/projects/hammer/contrib/tar/lib/xstrtol.c#2 delete .. //depot/projects/hammer/contrib/tar/lib/xstrtol.h#2 delete .. //depot/projects/hammer/contrib/tar/lib/xstrtoul.c#2 delete .. //depot/projects/hammer/contrib/tar/lib/xstrtoumax.c#2 delete .. //depot/projects/hammer/contrib/tar/src/arith.h#2 delete .. //depot/projects/hammer/contrib/tar/src/buffer.c#6 delete .. //depot/projects/hammer/contrib/tar/src/common.h#2 delete .. //depot/projects/hammer/contrib/tar/src/compare.c#2 delete .. //depot/projects/hammer/contrib/tar/src/create.c#2 delete .. //depot/projects/hammer/contrib/tar/src/delete.c#2 delete .. //depot/projects/hammer/contrib/tar/src/extract.c#3 delete .. //depot/projects/hammer/contrib/tar/src/incremen.c#2 delete .. //depot/projects/hammer/contrib/tar/src/list.c#2 delete .. //depot/projects/hammer/contrib/tar/src/mangle.c#2 delete .. //depot/projects/hammer/contrib/tar/src/misc.c#3 delete .. //depot/projects/hammer/contrib/tar/src/names.c#2 delete .. //depot/projects/hammer/contrib/tar/src/rmt.c#2 delete .. //depot/projects/hammer/contrib/tar/src/rmt.h#2 delete .. //depot/projects/hammer/contrib/tar/src/rtapelib.c#2 delete .. //depot/projects/hammer/contrib/tar/src/system.h#2 delete .. //depot/projects/hammer/contrib/tar/src/tar.c#3 delete .. //depot/projects/hammer/contrib/tar/src/tar.h#2 delete .. //depot/projects/hammer/contrib/tar/src/update.c#2 delete .. //depot/projects/hammer/contrib/tcpdump/CHANGES#6 integrate .. //depot/projects/hammer/contrib/tcpdump/CREDITS#6 integrate .. //depot/projects/hammer/contrib/tcpdump/FILES#6 integrate .. //depot/projects/hammer/contrib/tcpdump/INSTALL#6 integrate .. //depot/projects/hammer/contrib/tcpdump/Makefile.in#5 integrate .. //depot/projects/hammer/contrib/tcpdump/VERSION#6 integrate .. //depot/projects/hammer/contrib/tcpdump/addrtoname.c#6 integrate .. //depot/projects/hammer/contrib/tcpdump/configure#6 integrate .. //depot/projects/hammer/contrib/tcpdump/configure.in#6 integrate .. //depot/projects/hammer/contrib/tcpdump/dccp.h#1 branch .. //depot/projects/hammer/contrib/tcpdump/ethertype.h#4 integrate .. //depot/projects/hammer/contrib/tcpdump/icmp6.h#4 integrate .. //depot/projects/hammer/contrib/tcpdump/interface.h#6 integrate .. //depot/projects/hammer/contrib/tcpdump/ipproto.c#3 integrate .. //depot/projects/hammer/contrib/tcpdump/ipproto.h#4 integrate .. //depot/projects/hammer/contrib/tcpdump/llc.h#5 integrate .. //depot/projects/hammer/contrib/tcpdump/netdissect.h#2 integrate .. //depot/projects/hammer/contrib/tcpdump/ospf.h#4 integrate .. //depot/projects/hammer/contrib/tcpdump/ppp.h#4 integrate .. //depot/projects/hammer/contrib/tcpdump/print-802_11.c#6 integrate .. //depot/projects/hammer/contrib/tcpdump/print-ap1394.c#3 integrate .. //depot/projects/hammer/contrib/tcpdump/print-ascii.c#4 integrate .. //depot/projects/hammer/contrib/tcpdump/print-atm.c#5 integrate .. //depot/projects/hammer/contrib/tcpdump/print-chdlc.c#5 integrate .. //depot/projects/hammer/contrib/tcpdump/print-cip.c#4 integrate .. //depot/projects/hammer/contrib/tcpdump/print-dccp.c#1 branch .. //depot/projects/hammer/contrib/tcpdump/print-ether.c#6 integrate .. //depot/projects/hammer/contrib/tcpdump/print-fddi.c#5 integrate .. //depot/projects/hammer/contrib/tcpdump/print-fr.c#5 integrate .. //depot/projects/hammer/contrib/tcpdump/print-icmp6.c#6 integrate .. //depot/projects/hammer/contrib/tcpdump/print-ip.c#6 integrate .. //depot/projects/hammer/contrib/tcpdump/print-ip6.c#5 integrate .. //depot/projects/hammer/contrib/tcpdump/print-ipfc.c#3 integrate .. //depot/projects/hammer/contrib/tcpdump/print-ipx.c#5 integrate .. //depot/projects/hammer/contrib/tcpdump/print-isoclns.c#7 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Jan 7 06:27: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 CC05516A416; Sun, 7 Jan 2007 06:27: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 A56E716A40F for ; Sun, 7 Jan 2007 06:27:09 +0000 (UTC) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 7E8CF13C44B for ; Sun, 7 Jan 2007 06:27:09 +0000 (UTC) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l076R903093377 for ; Sun, 7 Jan 2007 06:27:09 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l076R99Y093374 for perforce@freebsd.org; Sun, 7 Jan 2007 06:27:09 GMT (envelope-from peter@freebsd.org) Date: Sun, 7 Jan 2007 06:27:09 GMT Message-Id: <200701070627.l076R99Y093374@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Cc: Subject: PERFORCE change 112636 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 07 Jan 2007 06:27:10 -0000 http://perforce.freebsd.org/chv.cgi?CH=112636 Change 112636 by peter@peter_overcee on 2007/01/07 06:26:18 These are gone in HEAD (the last integrate didn't kill these because of the unique way they arrived in the tree to start with (via i386)). Affected files ... .. //depot/projects/hammer/lib/libc/amd64/net/Makefile.inc#5 delete .. //depot/projects/hammer/lib/libc/amd64/net/htonl.S#5 delete .. //depot/projects/hammer/lib/libc/amd64/net/htons.S#5 delete .. //depot/projects/hammer/lib/libc/amd64/net/ntohl.S#5 delete .. //depot/projects/hammer/lib/libc/amd64/net/ntohs.S#5 delete Differences ... From owner-p4-projects@FreeBSD.ORG Sun Jan 7 06:55: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 1103716A407; Sun, 7 Jan 2007 06:55: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 DB4E116A412 for ; Sun, 7 Jan 2007 06:55:45 +0000 (UTC) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id CD63413C442 for ; Sun, 7 Jan 2007 06:55:45 +0000 (UTC) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l076tjnI098050 for ; Sun, 7 Jan 2007 06:55:45 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l076tjC6098047 for perforce@freebsd.org; Sun, 7 Jan 2007 06:55:45 GMT (envelope-from peter@freebsd.org) Date: Sun, 7 Jan 2007 06:55:45 GMT Message-Id: <200701070655.l076tjC6098047@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Cc: Subject: PERFORCE change 112639 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 07 Jan 2007 06:55:46 -0000 http://perforce.freebsd.org/chv.cgi?CH=112639 Change 112639 by peter@peter_overcee on 2007/01/07 06:55:45 grr. change filetype to text Affected files ... .. //depot/projects/hammer/sys/amd64/amd64/trap.c#93 edit .. //depot/projects/hammer/sys/bsm/audit.h#5 edit .. //depot/projects/hammer/sys/bsm/audit_kevents.h#6 edit Differences ... ==== //depot/projects/hammer/sys/amd64/amd64/trap.c#93 (text+ko) ==== @@ -420,7 +420,7 @@ * Handle invalid userland selectors causing a trap * by turning it onto a SIGBUS. */ - if (frame.tf_rip == (long)load_gs_load) { + if (frame->tf_rip == (long)load_gs_load) { ucode = code + BUS_SEGM_FAULT; i = SIGBUS; goto out; ==== //depot/projects/hammer/sys/bsm/audit.h#5 (text/text+ko) ==== @@ -30,6 +30,7 @@ * * @APPLE_BSD_LICENSE_HEADER_END@ * + * $P4: //depot/projects/trustedbsd/audit3/sys/bsm/audit.h#34 $ * $FreeBSD: src/sys/bsm/audit.h,v 1.6 2006/09/21 07:27:02 rwatson Exp $ */ ==== //depot/projects/hammer/sys/bsm/audit_kevents.h#6 (text/text+ko) ==== @@ -30,6 +30,7 @@ * * @APPLE_BSD_LICENSE_HEADER_END@ * + * $P4: //depot/projects/trustedbsd/audit3/sys/bsm/audit_kevents.h#29 $ * $FreeBSD: src/sys/bsm/audit_kevents.h,v 1.9 2006/09/25 12:22:07 rwatson Exp $ */ From owner-p4-projects@FreeBSD.ORG Sun Jan 7 10:52: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 EE56216A47B; Sun, 7 Jan 2007 10:52:45 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 8E1C716A407 for ; Sun, 7 Jan 2007 10:52:45 +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 6792B13C45A for ; Sun, 7 Jan 2007 10:52:45 +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 l07AqjmY062508 for ; Sun, 7 Jan 2007 10:52:45 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l07Aqj0I062505 for perforce@freebsd.org; Sun, 7 Jan 2007 10:52:45 GMT (envelope-from rdivacky@FreeBSD.org) Date: Sun, 7 Jan 2007 10:52:45 GMT Message-Id: <200701071052.l07Aqj0I062505@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 112646 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 07 Jan 2007 10:52:46 -0000 http://perforce.freebsd.org/chv.cgi?CH=112646 Change 112646 by rdivacky@rdivacky_witten on 2007/01/07 10:52:26 Implement RLIMIT_AS for getrlimit. Affected files ... .. //depot/projects/linuxolator/src/sys/compat/linux/linux_misc.c#51 edit Differences ... ==== //depot/projects/linuxolator/src/sys/compat/linux/linux_misc.c#51 (text+ko) ==== @@ -100,7 +100,7 @@ static unsigned int linux_to_bsd_resource[LINUX_RLIM_NLIMITS] = { RLIMIT_CPU, RLIMIT_FSIZE, RLIMIT_DATA, RLIMIT_STACK, RLIMIT_CORE, RLIMIT_RSS, RLIMIT_NPROC, RLIMIT_NOFILE, - RLIMIT_MEMLOCK, -1 + RLIMIT_MEMLOCK, RLIMIT_AS }; struct l_sysinfo { From owner-p4-projects@FreeBSD.ORG Sun Jan 7 15:05: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 BE5DF16A415; Sun, 7 Jan 2007 15:05: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 8078E16A40F for ; Sun, 7 Jan 2007 15:05:08 +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 6B86413C45E for ; Sun, 7 Jan 2007 15:05:08 +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 l07F58QC025754 for ; Sun, 7 Jan 2007 15:05:08 GMT (envelope-from piso@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l07F58TH025751 for perforce@freebsd.org; Sun, 7 Jan 2007 15:05:08 GMT (envelope-from piso@freebsd.org) Date: Sun, 7 Jan 2007 15:05:08 GMT Message-Id: <200701071505.l07F58TH025751@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 112652 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 07 Jan 2007 15:05:09 -0000 http://perforce.freebsd.org/chv.cgi?CH=112652 Change 112652 by piso@piso_newluxor on 2007/01/07 15:04:26 Do not pass down the interrupt source, use intr_event->ie_source instead. Affected files ... .. //depot/projects/soc2006/intr_filter/amd64/amd64/intr_machdep.c#17 edit .. //depot/projects/soc2006/intr_filter/arm/arm/intr.c#16 edit .. //depot/projects/soc2006/intr_filter/i386/i386/intr_machdep.c#24 edit .. //depot/projects/soc2006/intr_filter/ia64/ia64/interrupt.c#16 edit .. //depot/projects/soc2006/intr_filter/kern/kern_intr.c#28 edit .. //depot/projects/soc2006/intr_filter/powerpc/powerpc/intr_machdep.c#22 edit .. //depot/projects/soc2006/intr_filter/sparc64/sparc64/intr_machdep.c#16 edit .. //depot/projects/soc2006/intr_filter/sys/interrupt.h#13 edit Differences ... ==== //depot/projects/soc2006/intr_filter/amd64/amd64/intr_machdep.c#17 (text+ko) ==== @@ -274,7 +274,7 @@ if (vector == 0) clkintr_pending = 1; - res = intr_event_handle(ie, frame, intr_eoi_src, intr_disab_eoi_src, isrc); + res = intr_event_handle(ie, frame, intr_eoi_src, intr_disab_eoi_src); switch(res) { case 0: break; ==== //depot/projects/soc2006/intr_filter/arm/arm/intr.c#16 (text+ko) ==== @@ -142,7 +142,7 @@ intrcnt[intrcnt_tab[i]]++; event = intr_events[i]; intr_event_handle(event, frame, intr_eoi_src_stub, - intr_disab_eoi_src, (void *)i); + intr_disab_eoi_src); } } ==== //depot/projects/soc2006/intr_filter/i386/i386/intr_machdep.c#24 (text+ko) ==== @@ -262,7 +262,7 @@ if (vector == 0) clkintr_pending = 1; - res = intr_event_handle(ie, frame, intr_eoi_src, intr_disab_eoi_src, isrc); + res = intr_event_handle(ie, frame, intr_eoi_src, intr_disab_eoi_src); switch(res) { case 0: break; ==== //depot/projects/soc2006/intr_filter/ia64/ia64/interrupt.c#16 (text+ko) ==== @@ -406,7 +406,7 @@ atomic_add_long(i->cntp, 1); res = intr_event_handle(i->event, frame, intr_eoi_src, - intr_disab_eoi_src_stub, (void *)vector); + intr_disab_eoi_src_stub); switch (res) { case 0: break; ==== //depot/projects/soc2006/intr_filter/kern/kern_intr.c#28 (text+ko) ==== @@ -985,8 +985,6 @@ * handlers as their main argument. * o intr_eoi_src(): turn off an irq. * o intr_disab_eoi_src(): mask and turn off an irq. - * o arg: struct intsrc passed to the 2 previous - * intr_*_src() functions or NULL. * * NOTA BENE: i386 and amd64 handle their * interrupt controllers through the @@ -1007,8 +1005,7 @@ */ int intr_event_handle(struct intr_event *ie, struct trapframe *frame, - void (*intr_eoi_src)(void *), void (*intr_disab_eoi_src)(void *), - void *arg) + void (*intr_eoi_src)(void *), void (*intr_disab_eoi_src)(void *)) { struct intr_thread *ithd; struct thread *td; @@ -1031,9 +1028,9 @@ * it an EOI. */ if (thread & FILTER_HANDLED) - intr_eoi_src(arg); + intr_eoi_src(ie->ie_source); else - intr_disab_eoi_src(arg); + intr_disab_eoi_src(ie->ie_source); critical_exit(); /* Interrupt storm logic */ ==== //depot/projects/soc2006/intr_filter/powerpc/powerpc/intr_machdep.c#22 (text+ko) ==== @@ -290,7 +290,7 @@ KASSERT(ie != NULL, ("%s: interrupt without an event", __func__)); res = intr_event_handle(ie, NULL, intr_eoi_src, - intr_disab_eoi_src_stub, (void *)irq); + intr_disab_eoi_src_stub); switch(res) { case 0: break; ==== //depot/projects/soc2006/intr_filter/sparc64/sparc64/intr_machdep.c#16 (text+ko) ==== @@ -273,7 +273,7 @@ iv = cookie; ie = iv->iv_event; res = intr_event_handle(ie, NULL, intr_eoi_src_stub, - intr_disab_eoi_src_stub, NULL); + intr_disab_eoi_src_stub); switch (res) { case 0: break; ==== //depot/projects/soc2006/intr_filter/sys/interrupt.h#13 (text+ko) ==== @@ -120,8 +120,7 @@ void intr_eoi_src_stub(void *arg __unused); void intr_disab_eoi_src_stub(void *arg __unused); int intr_event_handle(struct intr_event *ie, struct trapframe *frame, - void (*intr_eoi_src)(void *), void (*intr_disab_eoi_src)(void *), - void *arg); + void (*intr_eoi_src)(void *), void (*intr_disab_eoi_src)(void *)); u_char intr_priority(enum intr_type flags); int intr_event_add_handler(struct intr_event *ie, const char *name, driver_filter_t filter, driver_intr_t handler, void *arg, u_char pri, enum intr_type flags, From owner-p4-projects@FreeBSD.ORG Sun Jan 7 16:06: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 6A88516A47B; Sun, 7 Jan 2007 16:06: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 0915816A403 for ; Sun, 7 Jan 2007 16:06: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 EBD6713C4B4 for ; Sun, 7 Jan 2007 16:06:28 +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 l07G6SJE037999 for ; Sun, 7 Jan 2007 16:06:28 GMT (envelope-from piso@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l07G6SPi037992 for perforce@freebsd.org; Sun, 7 Jan 2007 16:06:28 GMT (envelope-from piso@freebsd.org) Date: Sun, 7 Jan 2007 16:06:28 GMT Message-Id: <200701071606.l07G6SPi037992@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 112655 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 07 Jan 2007 16:06:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=112655 Change 112655 by piso@piso_newluxor on 2007/01/07 16:05:58 Move intr_eoi_src() and intr_disab_src() into struct intr_event. Affected files ... .. //depot/projects/soc2006/intr_filter/amd64/amd64/intr_machdep.c#18 edit .. //depot/projects/soc2006/intr_filter/arm/arm/intr.c#17 edit .. //depot/projects/soc2006/intr_filter/i386/i386/intr_machdep.c#25 edit .. //depot/projects/soc2006/intr_filter/ia64/ia64/interrupt.c#17 edit .. //depot/projects/soc2006/intr_filter/kern/kern_intr.c#29 edit .. //depot/projects/soc2006/intr_filter/powerpc/powerpc/intr_machdep.c#23 edit .. //depot/projects/soc2006/intr_filter/sparc64/sparc64/intr_machdep.c#17 edit .. //depot/projects/soc2006/intr_filter/sys/interrupt.h#14 edit Differences ... ==== //depot/projects/soc2006/intr_filter/amd64/amd64/intr_machdep.c#18 (text+ko) ==== @@ -143,7 +143,7 @@ error = intr_event_create(&isrc->is_event, isrc, 0, (mask_fn)isrc->is_pic->pic_enable_source, (int (*)(void *))isrc->is_pic->pic_source_pending, - "irq%d:", vector); + intr_eoi_src, intr_disab_eoi_src, "irq%d:", vector); if (error) return (error); mtx_lock_spin(&intr_table_lock); @@ -274,7 +274,7 @@ if (vector == 0) clkintr_pending = 1; - res = intr_event_handle(ie, frame, intr_eoi_src, intr_disab_eoi_src); + res = intr_event_handle(ie, frame); switch(res) { case 0: break; ==== //depot/projects/soc2006/intr_filter/arm/arm/intr.c#17 (text+ko) ==== @@ -62,6 +62,7 @@ void arm_handler_execute(struct trapframe *, int); void intr_callout_reset(void); +static void intr_disab_eoi_src(void *arg); extern struct bus_space i80321_bs_tag; @@ -77,7 +78,8 @@ event = intr_events[irq]; if (event == NULL) { error = intr_event_create(&event, (void *)irq, 0, - (void (*)(void *))arm_unmask_irq, NULL, "intr%d:", irq); + (void (*)(void *))arm_unmask_irq, NULL, intr_eoi_src_stub, + intr_disab_eoi_src, "intr%d:", irq); if (error) return; intr_events[irq] = event; @@ -141,8 +143,7 @@ while ((i = arm_get_next_irq()) != -1) { intrcnt[intrcnt_tab[i]]++; event = intr_events[i]; - intr_event_handle(event, frame, intr_eoi_src_stub, - intr_disab_eoi_src); + intr_event_handle(event, frame); } } ==== //depot/projects/soc2006/intr_filter/i386/i386/intr_machdep.c#25 (text+ko) ==== @@ -141,7 +141,7 @@ error = intr_event_create(&isrc->is_event, isrc, 0, (mask_fn)isrc->is_pic->pic_enable_source, (int (*)(void *))isrc->is_pic->pic_source_pending, - "irq%d:", vector); + intr_eoi_src, intr_disab_eoi_src, "irq%d:", vector); if (error) return (error); mtx_lock_spin(&intr_table_lock); @@ -262,7 +262,7 @@ if (vector == 0) clkintr_pending = 1; - res = intr_event_handle(ie, frame, intr_eoi_src, intr_disab_eoi_src); + res = intr_event_handle(ie, frame); switch(res) { case 0: break; ==== //depot/projects/soc2006/intr_filter/ia64/ia64/interrupt.c#17 (text+ko) ==== @@ -78,6 +78,7 @@ #endif volatile int mc_expected, mc_received; +static void intr_eoi_src(void *arg); static void dummy_perf(unsigned long vector, struct trapframe *tf) @@ -327,7 +328,8 @@ bcopy(name, intrname, strlen(name)); } errcode = intr_event_create(&i->event, (void *)vector, 0, - (void (*)(void *))ia64_send_eoi, NULL, "intr:"); + (void (*)(void *))ia64_send_eoi, NULL, intr_eoi_src, + intr_disab_eoi_src_stub, "intr:"); if (errcode) { free(i, M_DEVBUF); return errcode; @@ -405,8 +407,7 @@ if (i->cntp) atomic_add_long(i->cntp, 1); - res = intr_event_handle(i->event, frame, intr_eoi_src, - intr_disab_eoi_src_stub); + res = intr_event_handle(i->event, frame); switch (res) { case 0: break; ==== //depot/projects/soc2006/intr_filter/kern/kern_intr.c#29 (text+ko) ==== @@ -239,7 +239,8 @@ int intr_event_create(struct intr_event **event, void *source, int flags, - void (*enable)(void *), int (*pending)(void *), const char *fmt, ...) + void (*enable)(void *), int (*pending)(void *), void (*eoi)(void *), + void (*disab)(void *), const char *fmt, ...) { struct intr_event *ie; va_list ap; @@ -250,7 +251,9 @@ ie = malloc(sizeof(struct intr_event), M_ITHREAD, M_WAITOK | M_ZERO); ie->ie_source = source; ie->ie_enable = enable; - ie->ie_pending = pending; + ie->ie_pending = pending; + ie->ie_eoi = eoi; + ie->ie_disab = disab; ie->ie_flags = flags; TAILQ_INIT(&ie->ie_handlers); mtx_init(&ie->ie_lock, "intr event", NULL, MTX_DEF); @@ -983,29 +986,12 @@ * o ie: the event connected to this interrupt. * o frame: some archs (i.e. i386) pass a frame to some. * handlers as their main argument. - * o intr_eoi_src(): turn off an irq. - * o intr_disab_eoi_src(): mask and turn off an irq. - * - * NOTA BENE: i386 and amd64 handle their - * interrupt controllers through the - * intr_*_src() functions, so they are - * defined in the MD code for these archs. - * All the other archs (arm, ia64, - * powerpc, sparc64, etcetc) that don't - * use these facilities, will pass a NULL - * pointer for arg, and use the stub - * functions intr_eoi_src_stub() for - * intr_eoi_src() and - * intr_disab_eoi_src_stub() for - * intr_disab_eoi_src(). - * * Return value: * o 0: everything ok. * o EINVAL: stray interrupt. */ int -intr_event_handle(struct intr_event *ie, struct trapframe *frame, - void (*intr_eoi_src)(void *), void (*intr_disab_eoi_src)(void *)) +intr_event_handle(struct intr_event *ie, struct trapframe *frame) { struct intr_thread *ithd; struct thread *td; @@ -1028,9 +1014,9 @@ * it an EOI. */ if (thread & FILTER_HANDLED) - intr_eoi_src(ie->ie_source); + ie->ie_eoi(ie->ie_source); else - intr_disab_eoi_src(ie->ie_source); + ie->ie_disab(ie->ie_source); critical_exit(); /* Interrupt storm logic */ ==== //depot/projects/soc2006/intr_filter/powerpc/powerpc/intr_machdep.c#23 (text+ko) ==== @@ -96,6 +96,7 @@ static int intrcnt_index; static void (*irq_enable)(uintptr_t); +static void intr_eoi_src(void *arg); static void intrcnt_setname(const char *name, int index) @@ -153,7 +154,8 @@ if (i == NULL) return (ENOMEM); error = intr_event_create(&i->event, (void *)irq, 0, - (void (*)(void *))irq_enable, "irq%d:", irq); + (void (*)(void *))irq_enable, NULL, intr_eoi_src, + intr_disab_eoi_src, "irq%d:", irq); if (error) { free(i, M_INTR); return (error); @@ -289,8 +291,7 @@ ie = i->event; KASSERT(ie != NULL, ("%s: interrupt without an event", __func__)); - res = intr_event_handle(ie, NULL, intr_eoi_src, - intr_disab_eoi_src_stub); + res = intr_event_handle(ie, NULL); switch(res) { case 0: break; ==== //depot/projects/soc2006/intr_filter/sparc64/sparc64/intr_machdep.c#17 (text+ko) ==== @@ -272,8 +272,7 @@ iv = cookie; ie = iv->iv_event; - res = intr_event_handle(ie, NULL, intr_eoi_src_stub, - intr_disab_eoi_src_stub); + res = intr_event_handle(ie, NULL); switch (res) { case 0: break; @@ -305,7 +304,8 @@ mtx_unlock_spin(&intr_table_lock); if (ie == NULL) { errcode = intr_event_create(&ie, (void *)(intptr_t)vec, 0, NULL, - NULL, "vec%d:", vec); + NULL, intr_eoi_src_stub, intr_disab_eoi_src_stub, "vec%d:", + vec); if (errcode) return (errcode); mtx_lock_spin(&intr_table_lock); ==== //depot/projects/soc2006/intr_filter/sys/interrupt.h#14 (text+ko) ==== @@ -74,6 +74,8 @@ struct intr_thread *ie_thread; /* Thread we are connected to. */ void (*ie_enable)(void *); int (*ie_pending)(void *); + void (*ie_eoi)(void *); + void (*ie_disab)(void *); int ie_flags; int ie_count; /* Loop counter. */ int ie_warned; /* Warned about interrupt storm. */ From owner-p4-projects@FreeBSD.ORG Sun Jan 7 18:33: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 29FD316A407; Sun, 7 Jan 2007 18:33: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 E074416A415 for ; Sun, 7 Jan 2007 18:33: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 C4A6013C458 for ; Sun, 7 Jan 2007 18:33: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 l07IXZhh091081 for ; Sun, 7 Jan 2007 18:33:35 GMT (envelope-from piso@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l07IXZs6091078 for perforce@freebsd.org; Sun, 7 Jan 2007 18:33:35 GMT (envelope-from piso@freebsd.org) Date: Sun, 7 Jan 2007 18:33:35 GMT Message-Id: <200701071833.l07IXZs6091078@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 112658 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 07 Jan 2007 18:33:36 -0000 http://perforce.freebsd.org/chv.cgi?CH=112658 Change 112658 by piso@piso_newluxor on 2007/01/07 18:33:13 Do not use empty stub functions: kill intr_eoi_src_stub() and intr_eoi_disab_src_stub(), check for NULL in kerne_intr.c::intr_event_handle() instead. Affected files ... .. //depot/projects/soc2006/intr_filter/arm/arm/intr.c#18 edit .. //depot/projects/soc2006/intr_filter/ia64/ia64/interrupt.c#18 edit .. //depot/projects/soc2006/intr_filter/kern/kern_intr.c#30 edit .. //depot/projects/soc2006/intr_filter/sparc64/sparc64/intr_machdep.c#18 edit .. //depot/projects/soc2006/intr_filter/sys/interrupt.h#15 edit Differences ... ==== //depot/projects/soc2006/intr_filter/arm/arm/intr.c#18 (text+ko) ==== @@ -78,7 +78,7 @@ event = intr_events[irq]; if (event == NULL) { error = intr_event_create(&event, (void *)irq, 0, - (void (*)(void *))arm_unmask_irq, NULL, intr_eoi_src_stub, + (void (*)(void *))arm_unmask_irq, NULL, NULL, intr_disab_eoi_src, "intr%d:", irq); if (error) return; ==== //depot/projects/soc2006/intr_filter/ia64/ia64/interrupt.c#18 (text+ko) ==== @@ -329,7 +329,7 @@ } errcode = intr_event_create(&i->event, (void *)vector, 0, (void (*)(void *))ia64_send_eoi, NULL, intr_eoi_src, - intr_disab_eoi_src_stub, "intr:"); + NULL, "intr:"); if (errcode) { free(i, M_DEVBUF); return errcode; ==== //depot/projects/soc2006/intr_filter/kern/kern_intr.c#30 (text+ko) ==== @@ -962,23 +962,6 @@ } } -/* - * To avoid code duplication across different archs, use these functions - * for interrupt eoiing and disabling when you don't actually need to do - * any real action on the interrupt controller. - */ -void -intr_eoi_src_stub(void *arg __unused) -{ - ; -} - -void -intr_disab_eoi_src_stub(void *arg __unused) -{ - ; -} - /* * Main interrupt handling body. * @@ -1013,10 +996,13 @@ * it unmasked. Otherwise, mask the source as well as sending * it an EOI. */ - if (thread & FILTER_HANDLED) - ie->ie_eoi(ie->ie_source); - else - ie->ie_disab(ie->ie_source); + if (thread & FILTER_HANDLED) { + if (ie->ie_eoi != NULL) + ie->ie_eoi(ie->ie_source); + } else { + if (ie->ie_disab != NULL) + ie->ie_disab(ie->ie_source); + } critical_exit(); /* Interrupt storm logic */ ==== //depot/projects/soc2006/intr_filter/sparc64/sparc64/intr_machdep.c#18 (text+ko) ==== @@ -304,7 +304,7 @@ mtx_unlock_spin(&intr_table_lock); if (ie == NULL) { errcode = intr_event_create(&ie, (void *)(intptr_t)vec, 0, NULL, - NULL, intr_eoi_src_stub, intr_disab_eoi_src_stub, "vec%d:", + NULL, NULL, NULL, "vec%d:", vec); if (errcode) return (errcode); ==== //depot/projects/soc2006/intr_filter/sys/interrupt.h#15 (text+ko) ==== @@ -119,8 +119,6 @@ int intr_filter_loop(struct intr_event *ie, struct trapframe *frame, struct intr_thread **ithd); void stray_detection(void *_arg); -void intr_eoi_src_stub(void *arg __unused); -void intr_disab_eoi_src_stub(void *arg __unused); int intr_event_handle(struct intr_event *ie, struct trapframe *frame, void (*intr_eoi_src)(void *), void (*intr_disab_eoi_src)(void *)); u_char intr_priority(enum intr_type flags); From owner-p4-projects@FreeBSD.ORG Sun Jan 7 21:06: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 00F6A16A492; Sun, 7 Jan 2007 21:06: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 CF48E16A47B for ; Sun, 7 Jan 2007 21:06:47 +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 BD8D113C46A for ; Sun, 7 Jan 2007 21:06:47 +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 l07L6l2U040734 for ; Sun, 7 Jan 2007 21:06:47 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l07L6kWa040731 for perforce@freebsd.org; Sun, 7 Jan 2007 21:06:46 GMT (envelope-from rdivacky@FreeBSD.org) Date: Sun, 7 Jan 2007 21:06:46 GMT Message-Id: <200701072106.l07L6kWa040731@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 112664 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 07 Jan 2007 21:06:48 -0000 http://perforce.freebsd.org/chv.cgi?CH=112664 Change 112664 by rdivacky@rdivacky_witten on 2007/01/07 21:06:04 IFC Affected files ... .. //depot/projects/linuxolator/src/sys/amd64/linux32/linux32_machdep.c#18 integrate .. //depot/projects/linuxolator/src/sys/arm/at91/at91_mci.c#2 integrate .. //depot/projects/linuxolator/src/sys/arm/at91/at91_pioreg.h#2 integrate .. //depot/projects/linuxolator/src/sys/arm/at91/at91_pmc.c#2 integrate .. //depot/projects/linuxolator/src/sys/arm/at91/at91_spireg.h#2 integrate .. //depot/projects/linuxolator/src/sys/arm/at91/at91_st.c#3 integrate .. //depot/projects/linuxolator/src/sys/arm/at91/files.at91#2 integrate .. //depot/projects/linuxolator/src/sys/arm/at91/if_ate.c#4 integrate .. //depot/projects/linuxolator/src/sys/arm/conf/BWCT#1 branch .. //depot/projects/linuxolator/src/sys/arm/conf/BWCT.hints#1 branch .. //depot/projects/linuxolator/src/sys/arm/include/atomic.h#3 integrate .. //depot/projects/linuxolator/src/sys/bsm/audit.h#3 integrate .. //depot/projects/linuxolator/src/sys/bsm/audit_internal.h#3 integrate .. //depot/projects/linuxolator/src/sys/bsm/audit_kevents.h#4 integrate .. //depot/projects/linuxolator/src/sys/bsm/audit_record.h#3 integrate .. //depot/projects/linuxolator/src/sys/compat/linux/linux_signal.c#10 integrate .. //depot/projects/linuxolator/src/sys/conf/NOTES#14 integrate .. //depot/projects/linuxolator/src/sys/conf/files#15 integrate .. //depot/projects/linuxolator/src/sys/conf/options#12 integrate .. //depot/projects/linuxolator/src/sys/conf/options.arm#3 integrate .. //depot/projects/linuxolator/src/sys/contrib/pf/net/pf_ioctl.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/ata/ata-chipset.c#5 integrate .. //depot/projects/linuxolator/src/sys/dev/ata/ata-pci.h#3 integrate .. //depot/projects/linuxolator/src/sys/dev/bktr/bktr_i2c.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/hptmv/entry.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/isp/isp.c#8 integrate .. //depot/projects/linuxolator/src/sys/dev/isp/isp_freebsd.h#5 integrate .. //depot/projects/linuxolator/src/sys/dev/isp/isp_pci.c#8 integrate .. //depot/projects/linuxolator/src/sys/dev/mfi/mfi.c#9 integrate .. //depot/projects/linuxolator/src/sys/dev/mii/miidevs#4 integrate .. //depot/projects/linuxolator/src/sys/dev/mii/rlswitch.c#1 branch .. //depot/projects/linuxolator/src/sys/dev/mpt/mpt.c#5 integrate .. //depot/projects/linuxolator/src/sys/dev/mpt/mpt.h#5 integrate .. //depot/projects/linuxolator/src/sys/dev/mpt/mpt_cam.c#10 integrate .. //depot/projects/linuxolator/src/sys/dev/mpt/mpt_pci.c#5 integrate .. //depot/projects/linuxolator/src/sys/dev/sound/pci/emu10kx-pcm.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/sound/pci/emu10kx.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/sound/pci/emu10kx.h#2 integrate .. //depot/projects/linuxolator/src/sys/dev/sound/pci/hda/hdac.c#10 integrate .. //depot/projects/linuxolator/src/sys/dev/sound/pcm/feeder.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/sound/usb/uaudio.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/usb/usbdi_util.h#2 integrate .. //depot/projects/linuxolator/src/sys/fs/msdosfs/bpb.h#4 integrate .. //depot/projects/linuxolator/src/sys/fs/msdosfs/msdosfs_vfsops.c#5 integrate .. //depot/projects/linuxolator/src/sys/fs/pseudofs/pseudofs_vncache.c#2 integrate .. //depot/projects/linuxolator/src/sys/fs/unionfs/union_subr.c#4 integrate .. //depot/projects/linuxolator/src/sys/fs/unionfs/union_vnops.c#4 integrate .. //depot/projects/linuxolator/src/sys/kern/kern_descrip.c#4 integrate .. //depot/projects/linuxolator/src/sys/kern/kern_switch.c#4 integrate .. //depot/projects/linuxolator/src/sys/kern/kern_synch.c#6 integrate .. //depot/projects/linuxolator/src/sys/kern/kern_thread.c#5 integrate .. //depot/projects/linuxolator/src/sys/kern/sched_4bsd.c#8 integrate .. //depot/projects/linuxolator/src/sys/kern/sched_core.c#2 integrate .. //depot/projects/linuxolator/src/sys/kern/sched_ule.c#6 integrate .. //depot/projects/linuxolator/src/sys/kern/uipc_usrreq.c#3 integrate .. //depot/projects/linuxolator/src/sys/modules/sound/driver/emu10kx/Makefile#2 integrate .. //depot/projects/linuxolator/src/sys/net/ethernet.h#4 integrate .. //depot/projects/linuxolator/src/sys/net80211/ieee80211.c#4 integrate .. //depot/projects/linuxolator/src/sys/net80211/ieee80211_var.h#4 integrate .. //depot/projects/linuxolator/src/sys/netinet/ip_fw2.c#10 integrate .. //depot/projects/linuxolator/src/sys/netinet/udp_usrreq.c#5 integrate .. //depot/projects/linuxolator/src/sys/nfsserver/nfs_srvsubs.c#3 integrate .. //depot/projects/linuxolator/src/sys/nfsserver/nfsm_subs.h#2 integrate .. //depot/projects/linuxolator/src/sys/pc98/pc98/machdep.c#7 integrate .. //depot/projects/linuxolator/src/sys/pci/agp_intel.c#2 integrate .. //depot/projects/linuxolator/src/sys/pci/agpreg.h#2 integrate .. //depot/projects/linuxolator/src/sys/security/audit/audit_arg.c#4 integrate .. //depot/projects/linuxolator/src/sys/security/mac/mac_framework.c#2 integrate .. //depot/projects/linuxolator/src/sys/security/mac_stub/mac_stub.c#5 integrate .. //depot/projects/linuxolator/src/sys/sys/copyright.h#3 integrate .. //depot/projects/linuxolator/src/sys/sys/file.h#2 integrate .. //depot/projects/linuxolator/src/sys/sys/proc.h#10 integrate .. //depot/projects/linuxolator/src/sys/sys/runq.h#3 integrate .. //depot/projects/linuxolator/src/sys/sys/unpcb.h#2 integrate .. //depot/projects/linuxolator/src/sys/vm/swap_pager.c#5 integrate .. //depot/projects/linuxolator/src/sys/vm/uma.h#2 integrate .. //depot/projects/linuxolator/src/sys/vm/uma_core.c#3 integrate .. //depot/projects/linuxolator/src/sys/vm/vm_kern.c#4 integrate Differences ... ==== //depot/projects/linuxolator/src/sys/amd64/linux32/linux32_machdep.c#18 (text+ko) ==== @@ -29,11 +29,13 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_machdep.c,v 1.23 2006/12/20 20:17:34 jkim Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_machdep.c,v 1.24 2007/01/06 15:58:34 netchild Exp $"); #include #include #include +#include +#include #include #include #include @@ -776,9 +778,20 @@ off_t pos; } */ bsd_args; int error; + struct file *fp; error = 0; bsd_args.flags = 0; + fp = NULL; + + /* + * Linux mmap(2): + * You must specify exactly one of MAP_SHARED and MAP_PRIVATE + */ + if (! ((linux_args->flags & LINUX_MAP_SHARED) ^ + (linux_args->flags & LINUX_MAP_PRIVATE))) + return (EINVAL); + if (linux_args->flags & LINUX_MAP_SHARED) bsd_args.flags |= MAP_SHARED; if (linux_args->flags & LINUX_MAP_PRIVATE) @@ -861,17 +874,44 @@ bsd_args.addr = (caddr_t)PTRIN(linux_args->addr); bsd_args.len = linux_args->len; } + /* - * XXX i386 Linux always emulator forces PROT_READ on (why?) - * so we do the same. We add PROT_EXEC to work around buggy - * applications (e.g. Java) that take advantage of the fact - * that execute permissions are not enforced by x86 CPUs. + * We add PROT_EXEC to work around buggy applications (e.g. Java) + * that take advantage of the fact that execute permissions are not + * enforced by x86 CPUs. */ - bsd_args.prot = linux_args->prot | PROT_EXEC | PROT_READ; + bsd_args.prot = linux_args->prot | PROT_EXEC; if (linux_args->flags & LINUX_MAP_ANON) bsd_args.fd = -1; - else + else { + /* + * Linux follows Solaris mmap(2) description: + * The file descriptor fildes is opened with + * read permission, regardless of the + * protection options specified. + * If PROT_WRITE is specified, the application + * must have opened the file descriptor + * fildes with write permission unless + * MAP_PRIVATE is specified in the flag + * argument as described below. + */ + + if ((error = fget(td, linux_args->fd, &fp)) != 0) + return (error); + if (fp->f_type != DTYPE_VNODE) { + fdrop(fp, td); + return (EINVAL); + } + + /* Linux mmap() just fails for O_WRONLY files */ + if (! (fp->f_flag & FREAD)) { + fdrop(fp, td); + return (EACCES); + } + bsd_args.fd = linux_args->fd; + fdrop(fp, td); + } bsd_args.pos = (off_t)linux_args->pgoff * PAGE_SIZE; bsd_args.pad = 0; ==== //depot/projects/linuxolator/src/sys/arm/at91/at91_mci.c#2 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/at91/at91_mci.c,v 1.1 2006/10/20 06:44:04 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/at91/at91_mci.c,v 1.2 2007/01/05 01:18:32 ticso Exp $"); #include #include @@ -403,12 +403,14 @@ } // printf("CMDR %x ARGR %x with data\n", cmdr, cmd->arg); WR4(sc, MCI_ARGR, cmd->arg); - WR4(sc, MCI_CMDR, cmdr); if (cmdr & MCI_CMDR_TRCMD_START) { - if (cmdr & MCI_CMDR_TRDIR) + if (cmdr & MCI_CMDR_TRDIR) { WR4(sc, PDC_PTCR, PDC_PTCR_RXTEN); - else + WR4(sc, MCI_CMDR, cmdr); + } else { + WR4(sc, MCI_CMDR, cmdr); WR4(sc, PDC_PTCR, PDC_PTCR_TXTEN); + } } WR4(sc, MCI_IER, MCI_SR_ERROR | ier); } ==== //depot/projects/linuxolator/src/sys/arm/at91/at91_pioreg.h#2 (text) ==== @@ -22,7 +22,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -/* $FreeBSD: src/sys/arm/at91/at91_pioreg.h,v 1.1 2006/03/24 07:39:29 imp Exp $ */ +/* $FreeBSD: src/sys/arm/at91/at91_pioreg.h,v 1.2 2007/01/01 00:46:54 imp Exp $ */ #ifndef ARM_AT91_AT91_PIOREG_H #define ARM_AT91_AT91_PIOREG_H @@ -52,8 +52,8 @@ #define PIO_MDDR 0x54 /* PIO Multi-Driver Disable Register */ #define PIO_MDSR 0x58 /* PIO Multi-Driver Status Register */ /* 0x5c reserved */ -#define PIO_PUER 0x60 /* PIO Pull-up Enable Register */ -#define PIO_PUDR 0x64 /* PIO Pull-up Disable Register */ +#define PIO_PUDR 0x60 /* PIO Pull-up Disable Register */ +#define PIO_PUER 0x64 /* PIO Pull-up Enable Register */ #define PIO_PUSR 0x68 /* PIO Pull-up Status Register */ /* 0x6c reserved */ #define PIO_ASR 0x70 /* PIO Peripheral A Select Register */ ==== //depot/projects/linuxolator/src/sys/arm/at91/at91_pmc.c#2 (text) ==== @@ -25,7 +25,7 @@ #include "opt_at91.h" #include -__FBSDID("$FreeBSD: src/sys/arm/at91/at91_pmc.c,v 1.3 2006/07/14 22:01:51 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/at91/at91_pmc.c,v 1.4 2007/01/05 01:14:14 ticso Exp $"); #include #include @@ -399,7 +399,7 @@ pmc_softc->dev = dev; if ((err = at91_pmc_activate(dev)) != 0) return err; -#ifdef AT91_TSC +#if defined(AT91_TSC) | defined (AT91_BWCT) at91_pmc_init_clock(pmc_softc, 16000000); #else at91_pmc_init_clock(pmc_softc, 10000000); ==== //depot/projects/linuxolator/src/sys/arm/at91/at91_spireg.h#2 (text) ==== @@ -22,7 +22,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -/* $FreeBSD: src/sys/arm/at91/at91_spireg.h,v 1.2 2006/07/14 21:35:59 imp Exp $ */ +/* $FreeBSD: src/sys/arm/at91/at91_spireg.h,v 1.3 2007/01/01 00:50:25 imp Exp $ */ #ifndef ARM_AT91_AT91_SPIREG_H #define ARM_AT91_AT91_SPIREG_H @@ -51,7 +51,7 @@ #define SPI_SR_OVRES 0x00008 #define SPI_SR_ENDRX 0x00010 #define SPI_SR_ENDTX 0x00020 -#define SPI_SR_RXBUFE 0x00040 +#define SPI_SR_RXBUFF 0x00040 #define SPI_SR_TXBUFE 0x00080 #define SPI_SR_SPIENS 0x10000 #define SPI_IER 0x14 /* IER: Interrupt Enable Regsiter */ ==== //depot/projects/linuxolator/src/sys/arm/at91/at91_st.c#3 (text) ==== @@ -23,7 +23,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/at91/at91_st.c,v 1.6 2006/12/15 21:44:48 n_hibma Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/at91/at91_st.c,v 1.7 2007/01/05 02:52:06 ticso Exp $"); #include #include @@ -206,11 +206,14 @@ void *ih; device_t dev = timer_softc->sc_dev; + rel_value = 32768 / hz; + if (rel_value < 1) + rel_value = 1; if (32768 % hz) { - printf("Cannot get %d Hz clock; using 128Hz\n", hz); - hz = 128; + printf("Cannot get %d Hz clock; using %dHz\n", hz, 32768 / rel_value); + hz = 32768 / rel_value; + tick = 1000000 / hz; } - rel_value = 32768 / hz; /* Disable all interrupts. */ WR4(ST_IDR, 0xffffffff); /* The system timer shares the system irq (1) */ ==== //depot/projects/linuxolator/src/sys/arm/at91/files.at91#2 (text) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/arm/at91/files.at91,v 1.6 2006/07/14 22:41:54 imp Exp $ +# $FreeBSD: src/sys/arm/at91/files.at91,v 1.7 2007/01/05 02:06:53 ticso Exp $ arm/arm/cpufunc_asm_arm9.S standard arm/arm/irq_dispatch.S standard arm/at91/at91.c standard @@ -6,7 +6,7 @@ arm/at91/at91_mci.c optional at91_mci arm/at91/at91_pio.c standard arm/at91/at91_pmc.c standard -arm/at91/at91_rtc.c standard +arm/at91/at91_rtc.c optional at91_rtc arm/at91/at91_ssc.c optional at91_ssc arm/at91/at91_spi.c optional at91_spi \ dependency "spibus_if.h" ==== //depot/projects/linuxolator/src/sys/arm/at91/if_ate.c#4 (text) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/at91/if_ate.c,v 1.12 2006/11/03 07:39:37 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/at91/if_ate.c,v 1.15 2007/01/05 01:07:59 ticso Exp $"); #include #include @@ -72,7 +72,7 @@ #include "miibus_if.h" -#define ATE_MAX_TX_BUFFERS 64 /* We have ping-pong tx buffers */ +#define ATE_MAX_TX_BUFFERS 2 /* We have ping-pong tx buffers */ #define ATE_MAX_RX_BUFFERS 64 struct ate_softc @@ -132,7 +132,6 @@ static void ateinit(void *); static void atestart(struct ifnet *); static void atestop(struct ate_softc *); -static void atewatchdog(struct ifnet *); static int ateioctl(struct ifnet * ifp, u_long, caddr_t); /* bus entry points */ @@ -206,9 +205,10 @@ if_initname(ifp, device_get_name(dev), device_get_unit(dev)); ifp->if_mtu = ETHERMTU; ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST; + ifp->if_capabilities |= IFCAP_VLAN_MTU; + ifp->if_capenable |= IFCAP_VLAN_MTU; /* the hw bits already set */ ifp->if_start = atestart; ifp->if_ioctl = ateioctl; - ifp->if_watchdog = atewatchdog; ifp->if_init = ateinit; ifp->if_baudrate = 10000000; IFQ_SET_MAXLEN(&ifp->if_snd, IFQ_MAXLEN); @@ -754,6 +754,9 @@ */ ate_setmcast(sc); + /* enable big packets */ + WR4(sc, ETH_CFG, RD4(sc, ETH_CFG) | ETH_CFG_BIG); + /* * Set 'running' flag, and clear output active flag * and attempt to start the output @@ -910,25 +913,13 @@ */ } -static void -atewatchdog(struct ifnet *ifp) -{ - struct ate_softc *sc = ifp->if_softc; - - ATE_LOCK(sc); - device_printf(sc->dev, "Device timeout\n"); - ifp->if_oerrors++; - ateinit_locked(sc); - ATE_UNLOCK(sc); -} - static int ateioctl(struct ifnet *ifp, u_long cmd, caddr_t data) { struct ate_softc *sc = ifp->if_softc; struct mii_data *mii; struct ifreq *ifr = (struct ifreq *)data; - int error = 0; + int mask, error = 0; switch (cmd) { case SIOCSIFFLAGS: @@ -958,6 +949,19 @@ mii = device_get_softc(sc->miibus); error = ifmedia_ioctl(ifp, ifr, &mii->mii_media, cmd); break; + case SIOCSIFCAP: + mask = ifp->if_capenable ^ ifr->ifr_reqcap; + if (mask & IFCAP_VLAN_MTU) { + ATE_LOCK(sc); + if (ifr->ifr_reqcap & IFCAP_VLAN_MTU) { + WR4(sc, ETH_CFG, RD4(sc, ETH_CFG) | ETH_CFG_BIG); + ifp->if_capenable |= IFCAP_VLAN_MTU; + } else { + WR4(sc, ETH_CFG, RD4(sc, ETH_CFG) & ~ETH_CFG_BIG); + ifp->if_capenable &= ~IFCAP_VLAN_MTU; + } + ATE_UNLOCK(sc); + } default: error = ether_ioctl(ifp, cmd, data); break; ==== //depot/projects/linuxolator/src/sys/arm/include/atomic.h#3 (text+ko) ==== @@ -33,7 +33,7 @@ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/arm/include/atomic.h,v 1.20 2006/11/07 11:53:44 cognet Exp $ + * $FreeBSD: src/sys/arm/include/atomic.h,v 1.21 2007/01/05 02:50:27 ticso Exp $ */ #ifndef _MACHINE_ATOMIC_H_ @@ -308,46 +308,76 @@ #endif /* _LOCORE */ +#define atomic_add_long(p, v) \ + atomic_add_32((volatile u_int *)(p), (u_int)(v)) +#define atomic_add_acq_long atomic_add_long +#define atomic_add_rel_long atomic_add_long +#define atomic_subtract_long(p, v) \ + atomic_subtract_32((volatile u_int *)(p), (u_int)(v)) +#define atomic_subtract_acq_long atomic_subtract_long +#define atomic_subtract_rel_long atomic_subtract_long +#define atomic_clear_long(p, v) \ + atomic_clear_32((volatile u_int *)(p), (u_int)(v)) +#define atomic_clear_acq_long atomic_clear_long +#define atomic_clear_rel_long atomic_clear_long +#define atomic_set_long(p, v) \ + atomic_set_32((volatile u_int *)(p), (u_int)(v)) +#define atomic_set_acq_long atomic_set_long +#define atomic_set_rel_long atomic_set_long +#define atomic_cmpset_long(dst, old, new) \ + atomic_cmpset_32((volatile u_int *)(dst), (u_int)(old), (u_int)(new)) +#define atomic_cmpset_acq_long atomic_cmpset_long +#define atomic_cmpset_rel_long atomic_cmpset_long +#define atomic_fetchadd_long(p, v) \ + atomic_fetchadd_32((volatile u_int *)(p), (u_int)(v)) +#define atomic_readandclear_long(p) \ + atomic_readandclear_long((volatile u_int *)(p)) +#define atomic_load_long(p) \ + atomic_load_32((volatile u_int *)(p)) +#define atomic_load_acq_long atomic_load_long +#define atomic_store_rel_long(p, v) \ + atomic_store_rel_32((volatile u_int *)(p), (u_int)(v)) -static __inline int -atomic_cmpset_long(volatile u_long *dst, u_long exp, u_long src) -{ - return (atomic_cmpset_32((volatile u_int *)dst, (u_int)exp, - (u_int)src)); -} + +#define atomic_clear_ptr atomic_clear_32 +#define atomic_set_ptr atomic_set_32 +#define atomic_cmpset_ptr atomic_cmpset_32 +#define atomic_cmpset_rel_ptr atomic_cmpset_ptr +#define atomic_cmpset_acq_ptr atomic_cmpset_ptr +#define atomic_store_ptr atomic_store_32 +#define atomic_store_rel_ptr atomic_store_ptr -#define atomic_set_rel_int atomic_set_32 -#define atomic_set_acq_long atomic_set_32 +#define atomic_add_int atomic_add_32 +#define atomic_add_acq_int atomic_add_int +#define atomic_add_rel_int atomic_add_int +#define atomic_subtract_int atomic_subtract_32 +#define atomic_subtract_acq_int atomic_subtract_int +#define atomic_subtract_rel_int atomic_subtract_int +#define atomic_clear_int atomic_clear_32 +#define atomic_clear_acq_int atomic_clear_int +#define atomic_clear_rel_int atomic_clear_int #define atomic_set_int atomic_set_32 +#define atomic_set_acq_int atomic_set_int +#define atomic_set_rel_int atomic_set_int +#define atomic_cmpset_int atomic_cmpset_32 +#define atomic_cmpset_acq_int atomic_cmpset_int +#define atomic_cmpset_rel_int atomic_cmpset_int +#define atomic_fetchadd_int atomic_fetchadd_32 #define atomic_readandclear_int atomic_readandclear_32 -#define atomic_clear_int atomic_clear_32 -#define atomic_clear_acq_long atomic_clear_32 -#define atomic_subtract_int atomic_subtract_32 -#define atomic_subtract_rel_int atomic_subtract_32 +#define atomic_load_acq_int atomic_load_32 +#define atomic_store_rel_int atomic_store_32 + +#define atomic_add_acq_32 atomic_add_32 +#define atomic_add_rel_32 atomic_add_32 +#define atomic_subtract_acq_32 atomic_subtract_32 #define atomic_subtract_rel_32 atomic_subtract_32 -#define atomic_subtract_acq_int atomic_subtract_32 -#define atomic_add_int atomic_add_32 -#define atomic_add_acq_long atomic_add_32 -#define atomic_add_rel_int atomic_add_32 -#define atomic_add_rel_32 atomic_add_32 -#define atomic_add_acq_int atomic_add_32 -#define atomic_cmpset_int atomic_cmpset_32 -#define atomic_cmpset_rel_int atomic_cmpset_32 -#define atomic_cmpset_rel_ptr atomic_cmpset_ptr -#define atomic_cmpset_acq_int atomic_cmpset_32 -#define atomic_cmpset_acq_ptr atomic_cmpset_ptr -#define atomic_cmpset_acq_long atomic_cmpset_long +#define atomic_clear_acq_32 atomic_clear_32 +#define atomic_clear_rel_32 atomic_clear_32 +#define atomic_set_acq_32 atomic_set_32 +#define atomic_set_rel_32 atomic_set_32 #define atomic_cmpset_acq_32 atomic_cmpset_32 -#define atomic_store_rel_ptr atomic_store_ptr -#define atomic_store_rel_int atomic_store_32 #define atomic_cmpset_rel_32 atomic_cmpset_32 -#define atomic_cmpset_rel_ptr atomic_cmpset_ptr -#define atomic_load_acq_int atomic_load_32 #define atomic_load_acq_32 atomic_load_32 -#define atomic_clear_ptr atomic_clear_32 -#define atomic_store_ptr atomic_store_32 -#define atomic_cmpset_ptr atomic_cmpset_32 -#define atomic_set_ptr atomic_set_32 -#define atomic_fetchadd_int atomic_fetchadd_32 +#define atomic_store_rel_32 atomic_store_32 #endif /* _MACHINE_ATOMIC_H_ */ ==== //depot/projects/linuxolator/src/sys/bsm/audit.h#3 (text) ==== ==== //depot/projects/linuxolator/src/sys/bsm/audit_internal.h#3 (text) ==== ==== //depot/projects/linuxolator/src/sys/bsm/audit_kevents.h#4 (text) ==== ==== //depot/projects/linuxolator/src/sys/bsm/audit_record.h#3 (text) ==== ==== //depot/projects/linuxolator/src/sys/compat/linux/linux_signal.c#10 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/linux/linux_signal.c,v 1.62 2006/12/31 13:16:00 netchild Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linux/linux_signal.c,v 1.63 2007/01/01 14:47:45 delphij Exp $"); #include #include @@ -475,8 +475,8 @@ timevalclear(&tv); #ifdef DEBUG if (ldebug(rt_sigtimedwait)) - printf(LMSG("linux_rt_sigtimedwait: converted timeout (%d/%ld)\n"), - tv.tv_sec, tv.tv_usec); + printf(LMSG("linux_rt_sigtimedwait: converted timeout (%jd/%ld)\n"), + (intmax_t)tv.tv_sec, tv.tv_usec); #endif } TIMEVAL_TO_TIMESPEC(&tv, &ts); ==== //depot/projects/linuxolator/src/sys/conf/NOTES#14 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/NOTES,v 1.1404 2006/12/29 13:59:02 mlaier Exp $ +# $FreeBSD: src/sys/conf/NOTES,v 1.1405 2007/01/03 11:12:54 piso Exp $ # # NOTES -- Lines that can be cut/pasted into kernel and hints configs. # @@ -841,6 +841,10 @@ # packets too. Because of this great care is required when # crafting the ruleset. # +# IPFIREWALL_NAT adds support for in kernel nat in ipfw, and it requires +# LIBALIAS. To build an ipfw kld with nat support enabled, add +# "CFLAGS+= -DIPFIREWALL_NAT" to your make.conf. +# # IPSTEALTH enables code to support stealth forwarding (i.e., forwarding # packets without touching the TTL). This can be useful to hide firewalls # from traceroute and similar tools. @@ -856,6 +860,7 @@ options IPFIREWALL_VERBOSE_LIMIT=100 #limit verbosity options IPFIREWALL_DEFAULT_TO_ACCEPT #allow everything by default options IPFIREWALL_FORWARD #packet destination changes +options IPFIREWALL_NAT #ipfw kernel nat support options IPDIVERT #divert sockets options IPFILTER #ipfilter support options IPFILTER_LOG #ipfilter logging ==== //depot/projects/linuxolator/src/sys/conf/files#15 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.1170 2006/12/29 13:16:42 glebius Exp $ +# $FreeBSD: src/sys/conf/files,v 1.1171 2007/01/05 01:46:26 ticso Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -740,6 +740,7 @@ dev/mii/qsphy.c optional miibus | qsphy dev/mii/rgephy.c optional miibus | rgephy dev/mii/rlphy.c optional miibus | rlphy +dev/mii/rlswitch.c optional rlswitch # XXX rue only? dev/mii/ruephy.c optional miibus | ruephy dev/mii/tdkphy.c optional miibus | tdkphy ==== //depot/projects/linuxolator/src/sys/conf/options#12 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options,v 1.570 2006/12/29 13:59:02 mlaier Exp $ +# $FreeBSD: src/sys/conf/options,v 1.571 2007/01/03 11:12:54 piso Exp $ # # On the handling of kernel options # @@ -374,6 +374,7 @@ IPFIREWALL_VERBOSE_LIMIT opt_ipfw.h IPFIREWALL_DEFAULT_TO_ACCEPT opt_ipfw.h IPFIREWALL_FORWARD opt_ipfw.h +IPFIREWALL_NAT opt_ipfw.h IPSTEALTH IPX IPXIP opt_ipx.h ==== //depot/projects/linuxolator/src/sys/conf/options.arm#3 (text+ko) ==== @@ -1,4 +1,4 @@ -#$FreeBSD: src/sys/conf/options.arm,v 1.14 2006/11/19 23:56:44 sam Exp $ +#$FreeBSD: src/sys/conf/options.arm,v 1.15 2007/01/05 02:08:35 ticso Exp $ ARM9_CACHE_WRITE_THROUGH opt_global.h ARM_CACHE_LOCK_ENABLE opt_global.h ARMFPE opt_global.h @@ -19,5 +19,6 @@ XSCALE_CACHE_READ_WRITE_ALLOCATE opt_global.h XSACLE_DISABLE_CCNT opt_timer.h VERBOSE_INIT_ARM opt_global.h +AT91_BWCT opt_at91.h AT91_TSC opt_at91.h AT91_KWIKBYTE opt_at91.h ==== //depot/projects/linuxolator/src/sys/contrib/pf/net/pf_ioctl.c#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/contrib/pf/net/pf_ioctl.c,v 1.26 2006/09/06 17:19:45 mlaier Exp $ */ +/* $FreeBSD: src/sys/contrib/pf/net/pf_ioctl.c,v 1.27 2007/01/01 16:51:11 mlaier Exp $ */ /* $OpenBSD: pf_ioctl.c,v 1.139 2005/03/03 07:13:39 dhartmei Exp $ */ /* add: $OpenBSD: pf_ioctl.c,v 1.168 2006/07/21 01:21:17 dhartmei Exp $ */ @@ -272,6 +272,7 @@ UMA_DESTROY(pf_cache_pl); UMA_DESTROY(pf_cent_pl); UMA_DESTROY(pfr_ktable_pl); + UMA_DESTROY(pfr_kentry_pl2); UMA_DESTROY(pfr_kentry_pl); UMA_DESTROY(pf_state_scrub_pl); UMA_DESTROY(pfi_addr_pl); ==== //depot/projects/linuxolator/src/sys/dev/ata/ata-chipset.c#5 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 1998 - 2006 Søren Schmidt + * Copyright (c) 1998 - 2007 Søren Schmidt * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/ata-chipset.c,v 1.177 2006/10/08 09:58:00 sos Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/ata-chipset.c,v 1.179 2007/01/04 16:09:11 sos Exp $"); #include "opt_ata.h" #include @@ -105,14 +105,17 @@ static void ata_jmicron_reset(device_t dev); static void ata_jmicron_dmainit(device_t dev); static void ata_jmicron_setmode(device_t dev, int mode); -static int ata_marvell_chipinit(device_t dev); -static int ata_marvell_allocate(device_t dev); -static int ata_marvell_status(device_t dev); -static int ata_marvell_begin_transaction(struct ata_request *request); -static int ata_marvell_end_transaction(struct ata_request *request); -static void ata_marvell_reset(device_t dev); -static void ata_marvell_dmasetprd(void *xsc, bus_dma_segment_t *segs, int nsegs, int error); -static void ata_marvell_dmainit(device_t dev); +static int ata_marvell_pata_chipinit(device_t dev); +static int ata_marvell_pata_allocate(device_t dev); +static void ata_marvell_pata_setmode(device_t dev, int mode); +static int ata_marvell_edma_chipinit(device_t dev); +static int ata_marvell_edma_allocate(device_t dev); +static int ata_marvell_edma_status(device_t dev); +static int ata_marvell_edma_begin_transaction(struct ata_request *request); +static int ata_marvell_edma_end_transaction(struct ata_request *request); +static void ata_marvell_edma_reset(device_t dev); +static void ata_marvell_edma_dmasetprd(void *xsc, bus_dma_segment_t *segs, int nsegs, int error); +static void ata_marvell_edma_dmainit(device_t dev); static int ata_national_chipinit(device_t dev); static void ata_national_setmode(device_t dev, int mode); static int ata_nvidia_chipinit(device_t dev); @@ -2149,6 +2152,7 @@ { ATA_JMB363, 0, 2, 1, ATA_SA300, "JMB363" }, { ATA_JMB365, 0, 1, 2, ATA_SA300, "JMB365" }, { ATA_JMB366, 0, 2, 2, ATA_SA300, "JMB366" }, + { ATA_JMB368, 0, 0, 1, ATA_UDMA6, "JMB368" }, { 0, 0, 0, 0, 0, 0}}; char buffer[64]; @@ -2309,12 +2313,14 @@ struct ata_pci_controller *ctlr = device_get_softc(dev); struct ata_chip_id *idx; static struct ata_chip_id ids[] = - {{ ATA_M88SX5040, 0, 4, MV5XXX, ATA_SA150, "88SX5040" }, - { ATA_M88SX5041, 0, 4, MV5XXX, ATA_SA150, "88SX5041" }, - { ATA_M88SX5080, 0, 8, MV5XXX, ATA_SA150, "88SX5080" }, - { ATA_M88SX5081, 0, 8, MV5XXX, ATA_SA150, "88SX5081" }, - { ATA_M88SX6041, 0, 4, MV6XXX, ATA_SA300, "88SX6041" }, - { ATA_M88SX6081, 0, 8, MV6XXX, ATA_SA300, "88SX6081" }, + {{ ATA_M88SX5040, 0, 4, MV50XX, ATA_SA150, "88SX5040" }, + { ATA_M88SX5041, 0, 4, MV50XX, ATA_SA150, "88SX5041" }, + { ATA_M88SX5080, 0, 8, MV50XX, ATA_SA150, "88SX5080" }, + { ATA_M88SX5081, 0, 8, MV50XX, ATA_SA150, "88SX5081" }, + { ATA_M88SX6041, 0, 4, MV60XX, ATA_SA300, "88SX6041" }, + { ATA_M88SX6081, 0, 8, MV60XX, ATA_SA300, "88SX6081" }, + { ATA_M88SX6101, 0, 1, MV61XX, ATA_UDMA6, "88SX6101" }, + { ATA_M88SX6145, 0, 2, MV61XX, ATA_UDMA6, "88SX6145" }, { 0, 0, 0, 0, 0, 0}}; char buffer[64]; @@ -2325,12 +2331,62 @@ idx->text, ata_mode2str(idx->max_dma)); device_set_desc_copy(dev, buffer); ctlr->chip = idx; - ctlr->chipinit = ata_marvell_chipinit; + switch (ctlr->chip->cfg2) { + case MV50XX: + case MV60XX: + ctlr->chipinit = ata_marvell_edma_chipinit; + break; + case MV61XX: + ctlr->chipinit = ata_marvell_pata_chipinit; + break; + } + return 0; +} + +static int +ata_marvell_pata_chipinit(device_t dev) +{ + struct ata_pci_controller *ctlr = device_get_softc(dev); + + if (ata_setup_interrupt(dev)) + return ENXIO; + + ctlr->allocate = ata_marvell_pata_allocate; + ctlr->setmode = ata_marvell_pata_setmode; + ctlr->channels = ctlr->chip->cfg1; + return 0; +} + +static int +ata_marvell_pata_allocate(device_t dev) +{ + struct ata_channel *ch = device_get_softc(dev); + + /* setup the usual register normal pci style */ + if (ata_pci_allocate(dev)) + return ENXIO; + + /* dont use 32 bit PIO transfers */ + ch->flags |= ATA_USE_16BIT; + return 0; } +static void +ata_marvell_pata_setmode(device_t dev, int mode) +{ + device_t gparent = GRANDPARENT(dev); + struct ata_pci_controller *ctlr = device_get_softc(gparent); + struct ata_device *atadev = device_get_softc(dev); + + mode = ata_limit_mode(dev, mode, ctlr->chip->max_dma); + mode = ata_check_80pin(dev, mode); + if (!ata_controlcmd(dev, ATA_SETFEATURES, ATA_SF_SETXFER, 0, mode)) + atadev->mode = mode; +} + static int -ata_marvell_chipinit(device_t dev) +ata_marvell_edma_chipinit(device_t dev) { struct ata_pci_controller *ctlr = device_get_softc(dev); @@ -2349,9 +2405,9 @@ /* mask all PCI interrupts */ ATA_OUTL(ctlr->r_res1, 0x01d5c, 0x00000000); - ctlr->allocate = ata_marvell_allocate; - ctlr->reset = ata_marvell_reset; - ctlr->dmainit = ata_marvell_dmainit; + ctlr->allocate = ata_marvell_edma_allocate; + ctlr->reset = ata_marvell_edma_reset; + ctlr->dmainit = ata_marvell_edma_dmainit; ctlr->setmode = ata_sata_setmode; ctlr->channels = ctlr->chip->cfg1; @@ -2377,7 +2433,7 @@ } static int -ata_marvell_allocate(device_t dev) +ata_marvell_edma_allocate(device_t dev) { struct ata_pci_controller *ctlr = device_get_softc(device_get_parent(dev)); struct ata_channel *ch = device_get_softc(dev); @@ -2399,7 +2455,7 @@ /* set SATA resources */ switch (ctlr->chip->cfg2) { - case MV5XXX: + case MV50XX: ch->r_io[ATA_SSTATUS].res = ctlr->r_res1; ch->r_io[ATA_SSTATUS].offset = 0x00100 + ATA_MV_HOST_BASE(ch); ch->r_io[ATA_SERROR].res = ctlr->r_res1; @@ -2407,7 +2463,7 @@ ch->r_io[ATA_SCONTROL].res = ctlr->r_res1; ch->r_io[ATA_SCONTROL].offset = 0x00108 + ATA_MV_HOST_BASE(ch); break; - case MV6XXX: + case MV60XX: ch->r_io[ATA_SSTATUS].res = ctlr->r_res1; ch->r_io[ATA_SSTATUS].offset = 0x02300 + ATA_MV_EDMA_BASE(ch); ch->r_io[ATA_SERROR].res = ctlr->r_res1; @@ -2422,9 +2478,9 @@ ch->flags |= ATA_NO_SLAVE; ch->flags |= ATA_USE_16BIT; /* XXX SOS needed ? */ ata_generic_hw(dev); - ch->hw.begin_transaction = ata_marvell_begin_transaction; - ch->hw.end_transaction = ata_marvell_end_transaction; - ch->hw.status = ata_marvell_status; + ch->hw.begin_transaction = ata_marvell_edma_begin_transaction; + ch->hw.end_transaction = ata_marvell_edma_end_transaction; + ch->hw.status = ata_marvell_edma_status; /* disable the EDMA machinery */ ATA_OUTL(ctlr->r_res1, 0x02028 + ATA_MV_EDMA_BASE(ch), 0x00000002); @@ -2467,7 +2523,7 @@ } static int -ata_marvell_status(device_t dev) +ata_marvell_edma_status(device_t dev) { struct ata_pci_controller *ctlr = device_get_softc(device_get_parent(dev)); struct ata_channel *ch = device_get_softc(dev); @@ -2521,7 +2577,7 @@ /* must be called with ATA channel locked and state_mtx held */ static int -ata_marvell_begin_transaction(struct ata_request *request) +ata_marvell_edma_begin_transaction(struct ata_request *request) { struct ata_pci_controller *ctlr=device_get_softc(GRANDPARENT(request->dev)); struct ata_channel *ch = device_get_softc(device_get_parent(request->dev)); @@ -2613,7 +2669,7 @@ /* must be called with ATA channel locked and state_mtx held */ static int -ata_marvell_end_transaction(struct ata_request *request) +ata_marvell_edma_end_transaction(struct ata_request *request) { struct ata_pci_controller *ctlr=device_get_softc(GRANDPARENT(request->dev)); struct ata_channel *ch = device_get_softc(device_get_parent(request->dev)); @@ -2667,7 +2723,7 @@ } static void -ata_marvell_reset(device_t dev) +ata_marvell_edma_reset(device_t dev) { struct ata_pci_controller *ctlr = device_get_softc(device_get_parent(dev)); struct ata_channel *ch = device_get_softc(dev); @@ -2694,7 +2750,8 @@ } static void -ata_marvell_dmasetprd(void *xsc, bus_dma_segment_t *segs, int nsegs, int error) +ata_marvell_edma_dmasetprd(void *xsc, bus_dma_segment_t *segs, int nsegs, + int error) { struct ata_dmasetprd_args *args = xsc; struct ata_marvell_dma_prdentry *prd = args->dmatab; @@ -2712,14 +2769,14 @@ } static void -ata_marvell_dmainit(device_t dev) +ata_marvell_edma_dmainit(device_t dev) { struct ata_channel *ch = device_get_softc(dev); ata_dmainit(dev); if (ch->dma) { /* note start and stop are not used here */ - ch->dma->setprd = ata_marvell_dmasetprd; + ch->dma->setprd = ata_marvell_edma_dmasetprd; } } ==== //depot/projects/linuxolator/src/sys/dev/ata/ata-pci.h#3 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2003 - 2006 Søren Schmidt + * Copyright (c) 2003 - 2007 Søren Schmidt * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -23,7 +23,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/ata/ata-pci.h,v 1.71 2006/09/11 19:48:30 sos Exp $ + * $FreeBSD: src/sys/dev/ata/ata-pci.h,v 1.73 2007/01/04 16:09:11 sos Exp $ */ /* structure holding chipset config info */ @@ -179,6 +179,7 @@ #define ATA_JMB363 0x2363197b #define ATA_JMB365 0x2365197b #define ATA_JMB366 0x2366197b +#define ATA_JMB368 0x2368197b #define ATA_MARVELL_ID 0x11ab #define ATA_M88SX5040 0x504011ab @@ -187,6 +188,8 @@ #define ATA_M88SX5081 0x508111ab #define ATA_M88SX6041 0x604111ab #define ATA_M88SX6081 0x608111ab +#define ATA_M88SX6101 0x610111ab +#define ATA_M88SX6145 0x614511ab #define ATA_MICRON_ID 0x1042 #define ATA_MICRON_RZ1000 0x10001042 @@ -364,8 +367,9 @@ #define HPT374 3 #define HPTOLD 0x01 -#define MV5XXX 5 -#define MV6XXX 6 +#define MV50XX 50 +#define MV60XX 60 +#define MV61XX 61 #define PROLD 0 #define PRNEW 1 ==== //depot/projects/linuxolator/src/sys/dev/bktr/bktr_i2c.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/bktr/bktr_i2c.c,v 1.28 2006/09/11 20:52:40 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/bktr/bktr_i2c.c,v 1.29 2006/12/31 19:42:47 jmg Exp $"); /* * I2C support for the bti2c chipset. @@ -50,7 +50,6 @@ #endif #if (__FreeBSD_version < 500000) -#include /* for DELAY */ #include #include #else @@ -69,8 +68,6 @@ #include #include -#define I2C_DELAY 40 - /* Compilation is void if BKTR_USE_FREEBSD_SMBUS is not * defined. This allows bktr owners to have smbus active for there >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Jan 7 22:41:44 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 9A1BB16A416; Sun, 7 Jan 2007 22:41:44 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 5B89816A40F for ; Sun, 7 Jan 2007 22:41:44 +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 31EC913C43E for ; Sun, 7 Jan 2007 22:41:44 +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 l07MfiWb055855 for ; Sun, 7 Jan 2007 22:41:44 GMT (envelope-from piso@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l07MfhPU055852 for perforce@freebsd.org; Sun, 7 Jan 2007 22:41:43 GMT (envelope-from piso@freebsd.org) Date: Sun, 7 Jan 2007 22:41:43 GMT Message-Id: <200701072241.l07MfhPU055852@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 112665 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 07 Jan 2007 22:41:44 -0000 http://perforce.freebsd.org/chv.cgi?CH=112665 Change 112665 by piso@piso_newluxor on 2007/01/07 22:41:08 Axe stale stuff. Affected files ... .. //depot/projects/soc2006/intr_filter/i386/i386/intr_machdep.c#26 edit Differences ... ==== //depot/projects/soc2006/intr_filter/i386/i386/intr_machdep.c#26 (text+ko) ==== @@ -117,13 +117,6 @@ return (error); } -#if 0 -struct stray_stuff ss = { - .check_pending = isrc->is_pic->pic_source_pending(), - .enable_src = isrc->is_pic->pic_enable_source() -}; -#endif - /* * Register a new interrupt source with the global interrupt system. * The global interrupts need to be disabled when this function is From owner-p4-projects@FreeBSD.ORG Sun Jan 7 23:54:13 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 69CDD16A417; Sun, 7 Jan 2007 23:54:13 +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 465F516A403 for ; Sun, 7 Jan 2007 23:54:13 +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 369D813C448 for ; Sun, 7 Jan 2007 23:54:13 +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 l07NsDOS073365 for ; Sun, 7 Jan 2007 23:54:13 GMT (envelope-from piso@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l07NsC0x073362 for perforce@freebsd.org; Sun, 7 Jan 2007 23:54:12 GMT (envelope-from piso@freebsd.org) Date: Sun, 7 Jan 2007 23:54:12 GMT Message-Id: <200701072354.l07NsC0x073362@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 112667 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 07 Jan 2007 23:54:13 -0000 http://perforce.freebsd.org/chv.cgi?CH=112667 Change 112667 by piso@piso_newluxor on 2007/01/07 23:53:54 o get rid of the switch statement. o for i386 and amd64: move the stray code into intr_stray_event() Still, different archs behave in different ways for the stray case: if (ie == NULL) o powerpc and ia64: panic (the former with a KASSERT, the latter with an explicit panic()) o i386, amd64 and sparc64: log the condition o arm: do nothing else if (ie->ie_handlers == NULL) o ia64: panic() o i386, amd64, powerpc and sparc64: log the condition o arm: do nothing IMHO we should consolidate all the archs around the same MI behaviour: if (ie == NULL) panic() else if (ie->ie_handlers == NULL) let the new stray mechanism takes care of it: o disab the line and schedule a callout in the callout handler: o if the event is still pending, call intr_filter_loop() o if someone claimed the event, ok o else, disab again the line and reschedule the the callout with a longer timeout The problem with the new stray mechanism is that we rely on the interrupt controller to let us check if an event is still pending and, while i386 and amd64 have this feature, i don't know about all the other archs/controllers. XXX - what if i simply call intr_filter_loop() without checking the status of the line?!?!? Affected files ... .. //depot/projects/soc2006/intr_filter/amd64/amd64/intr_machdep.c#19 edit .. //depot/projects/soc2006/intr_filter/i386/i386/intr_machdep.c#27 edit .. //depot/projects/soc2006/intr_filter/ia64/ia64/interrupt.c#19 edit .. //depot/projects/soc2006/intr_filter/powerpc/powerpc/intr_machdep.c#24 edit .. //depot/projects/soc2006/intr_filter/sparc64/sparc64/intr_machdep.c#19 edit Differences ... ==== //depot/projects/soc2006/intr_filter/amd64/amd64/intr_machdep.c#19 (text+ko) ==== @@ -251,7 +251,7 @@ { struct thread *td; struct intr_event *ie; - int res, vector; + int vector; td = curthread; @@ -274,28 +274,28 @@ if (vector == 0) clkintr_pending = 1; - res = intr_event_handle(ie, frame); - switch(res) { - case 0: - break; - case EINVAL: - /* - * For stray interrupts, mask and EOI the source, bump the - * stray count, and log the condition. - */ - isrc->is_pic->pic_disable_source(isrc, PIC_EOI); - (*isrc->is_straycount)++; - if (*isrc->is_straycount < MAX_STRAY_LOG) - log(LOG_ERR, "stray irq%d\n", vector); - else if (*isrc->is_straycount == MAX_STRAY_LOG) - log(LOG_CRIT, - "too many stray irq %d's: not logging anymore\n", - vector); - break; - default: - printf("Ouch! Return code from mi_handle_intr()" - "not expected.\n"); - } + if (intr_event_handle(ie, frame) != 0) + intr_event_stray(isrc); +} + +static void +intr_event_stray(void *cookie) +{ + struct intsrc *isrc; + + isrc = cookie; + /* + * For stray interrupts, mask and EOI the source, bump the + * stray count, and log the condition. + */ + isrc->is_pic->pic_disable_source(isrc, PIC_EOI); + (*isrc->is_straycount)++; + if (*isrc->is_straycount < MAX_STRAY_LOG) + log(LOG_ERR, "stray irq%d\n", isrc->is_pic->pic_vector(isrc)); + else if (*isrc->is_straycount == MAX_STRAY_LOG) + log(LOG_CRIT, + "too many stray irq %d's: not logging anymore\n", + isrc->is_pic->pic_vector(isrc)); } static void ==== //depot/projects/soc2006/intr_filter/i386/i386/intr_machdep.c#27 (text+ko) ==== @@ -70,6 +70,7 @@ static void intr_eoi_src(void *arg); static void intr_disab_eoi_src(void *arg); void intr_callout_reset(void); +static void intr_event_stray(void *cookie); #ifdef SMP static int assign_cpu; @@ -232,7 +233,7 @@ { struct thread *td; struct intr_event *ie; - int res, vector; + int vector; td = curthread; @@ -255,28 +256,28 @@ if (vector == 0) clkintr_pending = 1; - res = intr_event_handle(ie, frame); - switch(res) { - case 0: - break; - case EINVAL: - /* - * For stray interrupts, mask and EOI the source, bump the - * stray count, and log the condition. - */ - isrc->is_pic->pic_disable_source(isrc, PIC_EOI); - (*isrc->is_straycount)++; - if (*isrc->is_straycount < MAX_STRAY_LOG) - log(LOG_ERR, "stray irq%d\n", vector); - else if (*isrc->is_straycount == MAX_STRAY_LOG) - log(LOG_CRIT, - "too many stray irq %d's: not logging anymore\n", - vector); - break; - default: - printf("Ouch! Return code from mi_handle_intr()" - "not expected.\n"); - } + if (intr_event_handle(ie, frame) != 0) + intr_event_stray(isrc); +} + +static void +intr_event_stray(void *cookie) +{ + struct intsrc *isrc; + + isrc = cookie; + /* + * For stray interrupts, mask and EOI the source, bump the + * stray count, and log the condition. + */ + isrc->is_pic->pic_disable_source(isrc, PIC_EOI); + (*isrc->is_straycount)++; + if (*isrc->is_straycount < MAX_STRAY_LOG) + log(LOG_ERR, "stray irq%d\n", isrc->is_pic->pic_vector(isrc)); + else if (*isrc->is_straycount == MAX_STRAY_LOG) + log(LOG_CRIT, + "too many stray irq %d's: not logging anymore\n", + isrc->is_pic->pic_vector(isrc)); } void ==== //depot/projects/soc2006/intr_filter/ia64/ia64/interrupt.c#19 (text+ko) ==== @@ -395,8 +395,6 @@ ia64_dispatch_intr(void *frame, unsigned long vector) { struct ia64_intr *i; - int res; - /* * Find the interrupt thread for this vector. */ @@ -407,17 +405,8 @@ if (i->cntp) atomic_add_long(i->cntp, 1); - res = intr_event_handle(i->event, frame); - switch (res) { - case 0: - break; - case EINVAL: + if (intr_event_handle(i->event, frame) != 0) panic("Interrupt vector without an event\n"); - break; - default: - printf("Ouch! Return code from mi_handle_intr()" - "not expected.\n"); - } } #ifdef DDB ==== //depot/projects/soc2006/intr_filter/powerpc/powerpc/intr_machdep.c#24 (text+ko) ==== @@ -278,7 +278,6 @@ { struct ppc_intr *i; struct intr_event *ie; - int error; i = ppc_intrs[irq]; if (i == NULL) { @@ -291,15 +290,6 @@ ie = i->event; KASSERT(ie != NULL, ("%s: interrupt without an event", __func__)); - res = intr_event_handle(ie, NULL); - switch(res) { - case 0: - break; - case EINVAL: + if (intr_event_handle(ie, NULL) != 0) stray_int(irq); - break; - default: - printf("Ouch! Return code from mi_handle_intr()" - "not expected.\n"); - } } ==== //depot/projects/soc2006/intr_filter/sparc64/sparc64/intr_machdep.c#19 (text+ko) ==== @@ -268,21 +268,11 @@ { struct intr_vector *iv; struct intr_event *ie; - int res; iv = cookie; ie = iv->iv_event; - res = intr_event_handle(ie, NULL); - switch (res) { - case 0: - break; - case EINVAL: + if (intr_event_handle(ie, NULL) != 0) intr_stray_vector(iv); - break; - default: - printf("Ouch! Return code from mi_handle_intr()" - "not expected.\n"); - } } int From owner-p4-projects@FreeBSD.ORG Mon Jan 8 02:14:58 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 16FC016A415; Mon, 8 Jan 2007 02:14:58 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id DC53C16A403 for ; Mon, 8 Jan 2007 02:14:57 +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 C929813C428 for ; Mon, 8 Jan 2007 02:14:57 +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 l082EvNI009500 for ; Mon, 8 Jan 2007 02:14:57 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 l082DbCY009478 for perforce@freebsd.org; Mon, 8 Jan 2007 02:13:37 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 8 Jan 2007 02:13:37 GMT Message-Id: <200701080213.l082DbCY009478@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 112670 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 08 Jan 2007 02:14:58 -0000 http://perforce.freebsd.org/chv.cgi?CH=112670 Change 112670 by rwatson@rwatson_zoo on 2007/01/08 02:13:04 Integrate TrustedBSD base branch. Affected files ... .. //depot/projects/trustedbsd/base/COPYRIGHT#5 integrate .. //depot/projects/trustedbsd/base/MAINTAINERS#44 integrate .. //depot/projects/trustedbsd/base/Makefile#49 integrate .. //depot/projects/trustedbsd/base/Makefile.inc1#81 integrate .. //depot/projects/trustedbsd/base/ObsoleteFiles.inc#17 integrate .. //depot/projects/trustedbsd/base/UPDATING#74 integrate .. //depot/projects/trustedbsd/base/bin/cat/cat.1#6 integrate .. //depot/projects/trustedbsd/base/bin/chmod/chmod.1#13 integrate .. //depot/projects/trustedbsd/base/bin/domainname/domainname.1#7 integrate .. //depot/projects/trustedbsd/base/bin/hostname/hostname.1#8 integrate .. //depot/projects/trustedbsd/base/bin/hostname/hostname.c#9 integrate .. //depot/projects/trustedbsd/base/bin/mkdir/mkdir.1#8 integrate .. //depot/projects/trustedbsd/base/bin/pax/cpio.c#10 integrate .. //depot/projects/trustedbsd/base/bin/pax/tar.c#10 integrate .. //depot/projects/trustedbsd/base/bin/rm/rm.1#16 integrate .. //depot/projects/trustedbsd/base/bin/rmdir/rmdir.1#8 integrate .. //depot/projects/trustedbsd/base/bin/sh/expand.c#18 integrate .. //depot/projects/trustedbsd/base/bin/sh/parser.c#17 integrate .. //depot/projects/trustedbsd/base/bin/sh/parser.h#5 integrate .. //depot/projects/trustedbsd/base/bin/test/test.1#8 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/CHANGES#6 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/COPYRIGHT#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/FAQ#4 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/FAQ.xml#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/Makefile.in#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/README#4 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/check/named-checkconf.8#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/check/named-checkconf.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/check/named-checkconf.html#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/check/named-checkzone.8#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/check/named-checkzone.docbook#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/check/named-checkzone.html#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/dig/dig.1#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/dig/dig.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/dig/dig.html#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/dig/dighost.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/dig/host.1#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/dig/host.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/dig/host.html#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/dig/include/dig/dig.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/dig/nslookup.1#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/dig/nslookup.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/dig/nslookup.docbook#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/dig/nslookup.html#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/dnssec/dnssec-keygen.8#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/dnssec/dnssec-keygen.html#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/dnssec/dnssec-signzone.8#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/dnssec/dnssec-signzone.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/dnssec/dnssec-signzone.html#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/named/aclconf.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/named/client.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/named/config.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/named/controlconf.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/named/include/named/aclconf.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/named/include/named/client.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/named/include/named/config.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/named/include/named/control.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/named/include/named/globals.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/named/include/named/logconf.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/named/include/named/lwresd.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/named/include/named/server.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/named/include/named/sortlist.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/named/include/named/tkeyconf.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/named/include/named/tsigconf.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/named/include/named/zoneconf.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/named/interfacemgr.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/named/logconf.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/named/lwdgabn.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/named/lwdgrbn.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/named/lwresd.8#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/named/lwresd.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/named/lwresd.html#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/named/main.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/named/named.8#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/named/named.conf.5#4 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/named/named.conf.docbook#4 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/named/named.conf.html#4 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/named/named.docbook#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/named/named.html#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/named/query.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/named/server.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/named/sortlist.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/named/tkeyconf.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/named/tsigconf.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/named/unix/os.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/named/update.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/named/zoneconf.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/nsupdate/nsupdate.8#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/nsupdate/nsupdate.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/nsupdate/nsupdate.html#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/rndc/rndc-confgen.8#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/rndc/rndc-confgen.html#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/rndc/rndc.8#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/rndc/rndc.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/rndc/rndc.conf.5#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/rndc/rndc.conf.html#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/rndc/rndc.html#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/config.threads.in#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/configure.in#5 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/doc/arm/Bv9ARM-book.xml#4 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/doc/arm/Bv9ARM.ch01.html#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/doc/arm/Bv9ARM.ch02.html#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/doc/arm/Bv9ARM.ch03.html#4 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/doc/arm/Bv9ARM.ch04.html#4 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/doc/arm/Bv9ARM.ch05.html#4 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/doc/arm/Bv9ARM.ch06.html#4 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/doc/arm/Bv9ARM.ch07.html#4 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/doc/arm/Bv9ARM.ch08.html#4 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/doc/arm/Bv9ARM.ch09.html#4 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/doc/arm/Bv9ARM.html#4 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/doc/arm/Bv9ARM.pdf#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/Makefile.in#4 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/api#4 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/config.h.in#4 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/configure#4 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/configure.in#4 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/dst/dst_api.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/dst/hmac_link.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/include/arpa/nameser_compat.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/include/isc/list.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/include/netdb.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/inet/inet_cidr_ntop.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/inet/inet_net_ntop.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/irs/dns.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/irs/dns_ho.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/irs/gai_strerror.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/irs/gen_ho.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/irs/getaddrinfo.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/irs/gethostent.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/irs/getnameinfo.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/irs/getprotoent_r.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/irs/getservent_r.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/irs/irp.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/irs/irp_nw.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/irs/irpmarshall.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/irs/irs_data.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/irs/lcl_ho.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/irs/lcl_pr.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/isc/ev_connects.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/isc/eventlib.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/isc/eventlib_p.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/isc/heap.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/isc/hex.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/isc/memcluster.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/nameser/ns_sign.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/nameser/ns_verify.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/port_after.h.in#4 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/port_before.h.in#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/resolv/mtctxres.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/resolv/res_init.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/resolv/res_send.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/resolv/res_sendsigned.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind9/api#4 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind9/check.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind9/include/bind9/check.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/Makefile.in#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/acl.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/adb.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/api#4 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/cache.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/compress.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/dispatch.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/dnssec.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/dst_api.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/gen.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/include/dns/acl.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/include/dns/cache.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/include/dns/compress.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/include/dns/keytable.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/include/dns/message.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/include/dns/name.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/include/dns/peer.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/include/dns/rdataset.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/include/dns/resolver.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/include/dns/types.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/include/dns/validator.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/include/dns/xfrin.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/include/dns/zone.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/keytable.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/lookup.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/masterdump.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/message.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/name.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/openssl_link.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/openssldh_link.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/openssldsa_link.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/opensslrsa_link.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/peer.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/portlist.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/rbtdb.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/rdata.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/rdata/generic/dlv_32769.c#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/rdata/generic/dlv_32769.h#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/rdata/generic/dlv_65323.c#2 delete .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/rdata/generic/dlv_65323.h#2 delete .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/rdataset.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/request.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/resolver.c#7 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/tcpmsg.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/tkey.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/tsig.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/validator.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/xfrin.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/zone.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isc/api#4 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isc/hash.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isc/heap.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isc/hmacmd5.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isc/include/isc/heap.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isc/include/isc/list.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isc/include/isc/sockaddr.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isc/include/isc/symtab.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isc/lex.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isc/log.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isc/netscope.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isc/nothreads/condition.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isc/nothreads/mutex.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isc/print.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isc/sockaddr.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isc/taskpool.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isc/timer.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isc/unix/entropy.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isc/unix/fsaccess.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isc/unix/ifiter_ioctl.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isc/unix/ipv6.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isc/unix/socket.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isccc/api#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isccfg/include/isccfg/cfg.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isccfg/include/isccfg/grammar.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isccfg/namedconf.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isccfg/parser.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/lwres/api#4 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/lwres/gai_strerror.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/lwres/getaddrinfo.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/lwres/lwconfig.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/lwres/man/lwres.3#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/lwres/man/lwres.html#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/lwres/man/lwres_buffer.3#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/lwres/man/lwres_buffer.html#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/lwres/man/lwres_config.3#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/lwres/man/lwres_config.html#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/lwres/man/lwres_context.3#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/lwres/man/lwres_context.html#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/lwres/man/lwres_gabn.3#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/lwres/man/lwres_gabn.html#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/lwres/man/lwres_gai_strerror.3#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/lwres/man/lwres_gai_strerror.html#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/lwres/man/lwres_getaddrinfo.3#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/lwres/man/lwres_getaddrinfo.html#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/lwres/man/lwres_gethostent.3#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/lwres/man/lwres_gethostent.html#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/lwres/man/lwres_getipnode.3#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/lwres/man/lwres_getipnode.html#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/lwres/man/lwres_getnameinfo.3#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/lwres/man/lwres_getnameinfo.html#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/lwres/man/lwres_getrrsetbyname.3#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/lwres/man/lwres_getrrsetbyname.html#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/lwres/man/lwres_gnba.3#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/lwres/man/lwres_gnba.html#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/lwres/man/lwres_hstrerror.3#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/lwres/man/lwres_hstrerror.html#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/lwres/man/lwres_inetntop.3#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/lwres/man/lwres_inetntop.html#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/lwres/man/lwres_noop.3#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/lwres/man/lwres_noop.html#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/lwres/man/lwres_packet.3#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/lwres/man/lwres_packet.html#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/lwres/man/lwres_resutil.3#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/lwres/man/lwres_resutil.html#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/libtool.m4#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/ltmain.sh#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/make/rules.in#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/version#6 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/src/log.c#8 integrate .. //depot/projects/trustedbsd/base/contrib/gdtoa/README#3 integrate .. //depot/projects/trustedbsd/base/contrib/gdtoa/arithchk.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/gdtoa/dmisc.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/gdtoa/dtoa.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/gdtoa/g_Qfmt.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/gdtoa/g__fmt.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/gdtoa/g_ddfmt.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/gdtoa/g_dfmt.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/gdtoa/g_ffmt.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/gdtoa/g_xLfmt.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/gdtoa/g_xfmt.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/gdtoa/gdtoa.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/gdtoa/gdtoa.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/gdtoa/gdtoaimp.h#5 integrate .. //depot/projects/trustedbsd/base/contrib/gdtoa/gethex.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/gdtoa/gmisc.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/gdtoa/hd_init.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/gdtoa/hexnan.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/gdtoa/makefile#2 integrate .. //depot/projects/trustedbsd/base/contrib/gdtoa/misc.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/gdtoa/qnan.c#1 branch .. //depot/projects/trustedbsd/base/contrib/gdtoa/smisc.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/gdtoa/strtoIQ.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/gdtoa/strtoId.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/gdtoa/strtoIdd.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/gdtoa/strtoIf.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/gdtoa/strtoIg.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/gdtoa/strtoIx.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/gdtoa/strtoIxL.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/gdtoa/strtod.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/gdtoa/strtodI.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/gdtoa/strtodg.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/gdtoa/strtodnrp.c#1 branch .. //depot/projects/trustedbsd/base/contrib/gdtoa/strtof.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/gdtoa/strtopQ.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/gdtoa/strtopd.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/gdtoa/strtopdd.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/gdtoa/strtopf.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/gdtoa/strtopx.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/gdtoa/strtopxL.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/gdtoa/strtorQ.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/gdtoa/strtord.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/gdtoa/strtordd.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/gdtoa/strtorf.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/gdtoa/strtorx.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/gdtoa/strtorxL.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/gdtoa/sum.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/gdtoa/test/Qtest.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/gdtoa/test/dItest.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/gdtoa/test/ddtest.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/gdtoa/test/dt.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/gdtoa/test/dtest.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/gdtoa/test/dtst.out#2 integrate .. //depot/projects/trustedbsd/base/contrib/gdtoa/test/ftest.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/gdtoa/test/getround.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/gdtoa/test/makefile#2 integrate .. //depot/projects/trustedbsd/base/contrib/gdtoa/test/strtodt.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/gdtoa/test/x.ou0#2 integrate .. //depot/projects/trustedbsd/base/contrib/gdtoa/test/x.ou1#2 integrate .. //depot/projects/trustedbsd/base/contrib/gdtoa/test/xL.ou1#2 integrate .. //depot/projects/trustedbsd/base/contrib/gdtoa/test/xLtest.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/gdtoa/test/xsum0.out#2 integrate .. //depot/projects/trustedbsd/base/contrib/gdtoa/test/xtest.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/gdtoa/ulp.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/gdtoa/xsum0.out#4 integrate .. //depot/projects/trustedbsd/base/contrib/groff/tmac/doc-common#19 integrate .. //depot/projects/trustedbsd/base/contrib/groff/tmac/doc-syms#11 integrate .. //depot/projects/trustedbsd/base/contrib/groff/tmac/groff_mdoc.man#16 integrate .. //depot/projects/trustedbsd/base/contrib/libbegemot/rpoll.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/libbegemot/rpoll.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/libbegemot/rpoll.man#3 integrate .. //depot/projects/trustedbsd/base/contrib/libreadline/CHANGELOG#5 integrate .. //depot/projects/trustedbsd/base/contrib/libreadline/CHANGES#5 integrate .. //depot/projects/trustedbsd/base/contrib/libreadline/FREEBSD-upgrade#6 integrate .. //depot/projects/trustedbsd/base/contrib/libreadline/INSTALL#5 integrate .. //depot/projects/trustedbsd/base/contrib/libreadline/NEWS#3 integrate .. //depot/projects/trustedbsd/base/contrib/libreadline/README#5 integrate .. //depot/projects/trustedbsd/base/contrib/libreadline/aclocal.m4#5 integrate .. //depot/projects/trustedbsd/base/contrib/libreadline/bind.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/libreadline/callback.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/libreadline/complete.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/libreadline/config.h.in#5 integrate .. //depot/projects/trustedbsd/base/contrib/libreadline/configure#5 integrate .. //depot/projects/trustedbsd/base/contrib/libreadline/configure.in#5 integrate .. //depot/projects/trustedbsd/base/contrib/libreadline/display.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/libreadline/doc/history.texi#2 integrate .. //depot/projects/trustedbsd/base/contrib/libreadline/doc/hstech.texi#2 integrate .. //depot/projects/trustedbsd/base/contrib/libreadline/doc/hsuser.texi#2 integrate .. //depot/projects/trustedbsd/base/contrib/libreadline/doc/readline.3#6 integrate .. //depot/projects/trustedbsd/base/contrib/libreadline/doc/rlman.texi#2 integrate .. //depot/projects/trustedbsd/base/contrib/libreadline/doc/rltech.texi#3 integrate .. //depot/projects/trustedbsd/base/contrib/libreadline/doc/rluser.texi#3 integrate .. //depot/projects/trustedbsd/base/contrib/libreadline/doc/rluserman.texi#3 integrate .. //depot/projects/trustedbsd/base/contrib/libreadline/doc/version.texi#3 integrate .. //depot/projects/trustedbsd/base/contrib/libreadline/examples/excallback.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/libreadline/examples/rlfe/Makefile.in#2 integrate .. //depot/projects/trustedbsd/base/contrib/libreadline/histexpand.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/libreadline/histfile.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/libreadline/history.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/libreadline/input.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/libreadline/isearch.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/libreadline/kill.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/libreadline/macro.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/libreadline/misc.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/libreadline/readline.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/libreadline/readline.h#7 integrate .. //depot/projects/trustedbsd/base/contrib/libreadline/rlconf.h#5 integrate .. //depot/projects/trustedbsd/base/contrib/libreadline/rlmbutil.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/libreadline/rlprivate.h#5 integrate .. //depot/projects/trustedbsd/base/contrib/libreadline/rltty.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/libreadline/search.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/libreadline/signals.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/libreadline/support/shlib-install#5 integrate .. //depot/projects/trustedbsd/base/contrib/libreadline/support/shobj-conf#5 integrate .. //depot/projects/trustedbsd/base/contrib/libreadline/terminal.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/libreadline/text.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/libreadline/tilde.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/libreadline/undo.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/libreadline/vi_mode.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/pf/pfctl/pfctl_altq.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/top/sigconv.awk#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/ChangeLog#14 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/Makefile.in#12 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/README#13 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/audit-bsm.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/auth-rsa.c#10 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/auth.c#13 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/bufaux.h#8 delete .. //depot/projects/trustedbsd/base/crypto/openssh/bufbn.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/buildpkg.sh.in#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/clientloop.c#14 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/configure.ac#14 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/dh.c#11 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/entropy.c#7 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/kexdhc.c#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/kexdhs.c#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/kexgexc.c#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/kexgexs.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/key.c#13 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/moduli.c#7 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/monitor.c#17 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/monitor_fdpass.c#6 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/openbsd-compat/port-solaris.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/rsa.c#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/scard.c#7 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/scard/Makefile.in#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/serverloop.c#13 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/session.c#26 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/sftp-client.c#16 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/sftp.c#16 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/ssh-agent.c#18 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/ssh-dss.c#8 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/ssh-keygen.c#14 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/ssh-keyscan.1#8 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/ssh-keyscan.c#15 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/ssh.1#16 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/ssh.c#17 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/ssh_config#21 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/ssh_config.5#17 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/sshconnect.c#14 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/sshconnect1.c#11 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/sshd.c#20 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/sshd_config#22 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/sshd_config.5#19 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/version.h#21 integrate .. //depot/projects/trustedbsd/base/etc/amd.map#4 integrate .. //depot/projects/trustedbsd/base/etc/defaults/rc.conf#63 integrate .. //depot/projects/trustedbsd/base/etc/mtree/BSD.local.dist#34 integrate .. //depot/projects/trustedbsd/base/etc/mtree/BSD.usr.dist#45 integrate .. //depot/projects/trustedbsd/base/etc/pccard_ether#17 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/abi#8 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/accounting#7 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/archdep#11 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/atm1#8 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/auto_linklocal#4 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/bluetooth#2 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/bootconf.sh#5 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/bridge#2 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/geli#3 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/hcsecd#3 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/ip6fw#7 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/ipfilter#17 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/ipfw#14 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/ipnat#11 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/jail#16 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/ldconfig#14 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/lpd#7 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/mdconfig#3 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/mdconfig2#3 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/mountcritremote#12 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/moused#9 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/natd#6 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/netif#15 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/nfsclient#6 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/nfsserver#5 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/nsswitch#6 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/pf#12 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/pflog#8 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/pfsync#2 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/pppoed#4 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/sdpd#3 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/syscons#13 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/syslogd#8 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/ugidfw#5 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/var#5 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/ypbind#9 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/yppasswdd#9 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/ypserv#10 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/ypset#7 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/ypupdated#6 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/ypxfrd#8 integrate .. //depot/projects/trustedbsd/base/etc/rc.firewall#9 integrate .. //depot/projects/trustedbsd/base/etc/rc.initdiskless#8 integrate .. //depot/projects/trustedbsd/base/etc/rc.subr#31 integrate .. //depot/projects/trustedbsd/base/etc/snmpd.config#6 integrate .. //depot/projects/trustedbsd/base/games/fortune/datfiles/fortunes#58 integrate .. //depot/projects/trustedbsd/base/games/fortune/datfiles/fortunes-o.real#9 integrate .. //depot/projects/trustedbsd/base/games/fortune/datfiles/fortunes.sp.ok#6 integrate .. //depot/projects/trustedbsd/base/games/fortune/datfiles/fortunes2-o#14 integrate .. //depot/projects/trustedbsd/base/games/fortune/datfiles/freebsd-tips#21 integrate .. //depot/projects/trustedbsd/base/games/fortune/datfiles/zippy#4 integrate .. //depot/projects/trustedbsd/base/gnu/lib/libreadline/Makefile.inc#9 integrate .. //depot/projects/trustedbsd/base/gnu/lib/libreadline/config.h#5 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/binutils/libiberty/config.h#6 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/cc/cc_tools/arm.md.diff#2 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/groff/tmac/mdoc.local#30 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/man/apropos/apropos.man#9 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/man/man/man.man#8 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/man/manpath/manpath.man#3 integrate .. //depot/projects/trustedbsd/base/include/Makefile#57 integrate .. //depot/projects/trustedbsd/base/include/ar.h#2 integrate .. //depot/projects/trustedbsd/base/include/arpa/nameser_compat.h#4 integrate .. //depot/projects/trustedbsd/base/include/mqueue.h#2 integrate .. //depot/projects/trustedbsd/base/include/unistd.h#25 integrate .. //depot/projects/trustedbsd/base/lib/Makefile#46 integrate .. //depot/projects/trustedbsd/base/lib/bind/bind/config.h#4 integrate .. //depot/projects/trustedbsd/base/lib/bind/bind/port_after.h#3 integrate .. //depot/projects/trustedbsd/base/lib/bind/bind/port_before.h#3 integrate .. //depot/projects/trustedbsd/base/lib/bind/config.h#5 integrate .. //depot/projects/trustedbsd/base/lib/bind/dns/code.h#3 integrate .. //depot/projects/trustedbsd/base/lib/bind/dns/dns/enumclass.h#3 integrate .. //depot/projects/trustedbsd/base/lib/bind/dns/dns/enumtype.h#3 integrate .. //depot/projects/trustedbsd/base/lib/bind/dns/dns/rdatastruct.h#3 integrate .. //depot/projects/trustedbsd/base/lib/bind/lwres/lwres/platform.h#3 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/Makefile#22 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive.h.in#13 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_check_magic.c#5 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_entry.c#17 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_platform.h#14 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_private.h#15 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_read.3#12 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_read.c#14 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_read_data_into_buffer.c#5 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_read_data_into_fd.c#8 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_read_extract.c#16 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_read_open_fd.c#7 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_read_open_file.c#10 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_read_open_filename.c#1 branch .. //depot/projects/trustedbsd/base/lib/libarchive/archive_read_open_memory.c#1 branch .. //depot/projects/trustedbsd/base/lib/libarchive/archive_read_support_compression_bzip2.c#8 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_read_support_compression_compress.c#6 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_read_support_compression_gzip.c#8 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_read_support_compression_none.c#7 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_read_support_format_cpio.c#13 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_read_support_format_iso9660.c#7 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_read_support_format_tar.c#18 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_read_support_format_zip.c#5 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_string.c#6 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_string.h#5 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_util.c#8 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_write.3#10 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_write.c#12 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_write_open_fd.c#5 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_write_open_file.c#8 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_write_open_filename.c#1 branch .. //depot/projects/trustedbsd/base/lib/libarchive/archive_write_open_memory.c#1 branch .. //depot/projects/trustedbsd/base/lib/libarchive/archive_write_set_compression_bzip2.c#7 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_write_set_compression_gzip.c#8 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_write_set_compression_none.c#7 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_write_set_format.c#2 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_write_set_format_by_name.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_write_set_format_cpio.c#6 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_write_set_format_pax.c#18 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_write_set_format_shar.c#6 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_write_set_format_ustar.c#9 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/config_freebsd.h#1 branch .. //depot/projects/trustedbsd/base/lib/libarchive/libarchive.3#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/amd64/gd_qnan.h#1 branch .. //depot/projects/trustedbsd/base/lib/libc/amd64/net/Makefile.inc#2 delete .. //depot/projects/trustedbsd/base/lib/libc/amd64/net/htonl.S#2 delete .. //depot/projects/trustedbsd/base/lib/libc/amd64/net/htons.S#2 delete .. //depot/projects/trustedbsd/base/lib/libc/amd64/net/ntohl.S#2 delete .. //depot/projects/trustedbsd/base/lib/libc/amd64/net/ntohs.S#2 delete .. //depot/projects/trustedbsd/base/lib/libc/arm/arith.h#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/arm/gd_qnan.h#1 branch .. //depot/projects/trustedbsd/base/lib/libc/arm/net/Makefile.inc#2 delete .. //depot/projects/trustedbsd/base/lib/libc/arm/net/htonl.S#3 delete .. //depot/projects/trustedbsd/base/lib/libc/arm/net/htons.S#3 delete .. //depot/projects/trustedbsd/base/lib/libc/arm/net/ntohl.S#3 delete .. //depot/projects/trustedbsd/base/lib/libc/arm/net/ntohs.S#3 delete .. //depot/projects/trustedbsd/base/lib/libc/arm/sys/cerror.S#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/arm/sys/ptrace.S#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/gdtoa/_hdtoa.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/confstr.3#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/err.3#5 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/sysconf.3#6 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/sysconf.c#9 integrate .. //depot/projects/trustedbsd/base/lib/libc/i386/gd_qnan.h#1 branch .. //depot/projects/trustedbsd/base/lib/libc/i386/gen/modf.S#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/i386/net/Makefile.inc#2 delete .. //depot/projects/trustedbsd/base/lib/libc/i386/net/htonl.S#6 delete .. //depot/projects/trustedbsd/base/lib/libc/i386/net/htons.S#4 delete .. //depot/projects/trustedbsd/base/lib/libc/i386/net/ntohl.S#6 delete .. //depot/projects/trustedbsd/base/lib/libc/i386/net/ntohs.S#4 delete .. //depot/projects/trustedbsd/base/lib/libc/ia64/gd_qnan.h#1 branch .. //depot/projects/trustedbsd/base/lib/libc/ia64/net/Makefile.inc#2 delete .. //depot/projects/trustedbsd/base/lib/libc/ia64/net/byte_swap_2.S#4 delete .. //depot/projects/trustedbsd/base/lib/libc/ia64/net/byte_swap_4.S#4 delete .. //depot/projects/trustedbsd/base/lib/libc/ia64/net/htonl.S#4 delete .. //depot/projects/trustedbsd/base/lib/libc/ia64/net/htons.S#4 delete .. //depot/projects/trustedbsd/base/lib/libc/ia64/net/ntohl.S#4 delete .. //depot/projects/trustedbsd/base/lib/libc/ia64/net/ntohs.S#4 delete .. //depot/projects/trustedbsd/base/lib/libc/inet/inet_cidr_ntop.c#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/inet/inet_net_ntop.c#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/isc/eventlib_p.h#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/net/Makefile.inc#17 integrate .. //depot/projects/trustedbsd/base/lib/libc/net/nscachedcli.c#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/net/ntoh.c#1 branch .. //depot/projects/trustedbsd/base/lib/libc/net/sctp_sys_calls.c#1 branch .. //depot/projects/trustedbsd/base/lib/libc/powerpc/gd_qnan.h#1 branch .. //depot/projects/trustedbsd/base/lib/libc/powerpc/net/Makefile.inc#2 delete .. //depot/projects/trustedbsd/base/lib/libc/powerpc/net/htonl.S#2 delete .. //depot/projects/trustedbsd/base/lib/libc/powerpc/net/htons.S#2 delete .. //depot/projects/trustedbsd/base/lib/libc/powerpc/net/ntohl.S#2 delete .. //depot/projects/trustedbsd/base/lib/libc/powerpc/net/ntohs.S#2 delete .. //depot/projects/trustedbsd/base/lib/libc/resolv/mtctxres.c#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/resolv/res_init.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/resolv/res_send.c#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/sparc64/fpu/fpu_implode.c#6 integrate .. //depot/projects/trustedbsd/base/lib/libc/sparc64/gd_qnan.h#1 branch .. //depot/projects/trustedbsd/base/lib/libc/sparc64/net/Makefile.inc#3 delete .. //depot/projects/trustedbsd/base/lib/libc/sparc64/net/htonl.S#5 delete .. //depot/projects/trustedbsd/base/lib/libc/sparc64/net/htons.S#4 delete .. //depot/projects/trustedbsd/base/lib/libc/sparc64/net/ntohl.S#5 delete .. //depot/projects/trustedbsd/base/lib/libc/sparc64/net/ntohs.S#4 delete .. //depot/projects/trustedbsd/base/lib/libc/stdio/vfprintf.c#28 integrate .. //depot/projects/trustedbsd/base/lib/libc/stdlib/malloc.c#33 integrate .. //depot/projects/trustedbsd/base/lib/libc/stdtime/strftime.3#11 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/chflags.2#8 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/chmod.2#9 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/chown.2#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/close.2#6 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/extattr_get_file.2#11 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/kqueue.2#16 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/kse.2#14 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/link.2#5 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/mkdir.2#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/mkfifo.2#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/open.2#10 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/ptrace.2#9 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/recv.2#13 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/rename.2#6 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/rmdir.2#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/sendfile.2#12 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/symlink.2#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/truncate.2#6 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/unlink.2#6 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/utimes.2#8 integrate .. //depot/projects/trustedbsd/base/lib/libelf/Makefile#1 branch .. //depot/projects/trustedbsd/base/lib/libelf/Version.map#1 branch .. //depot/projects/trustedbsd/base/lib/libelf/_libelf.h#1 branch .. //depot/projects/trustedbsd/base/lib/libelf/elf.3#1 branch .. //depot/projects/trustedbsd/base/lib/libelf/elf_begin.3#1 branch .. //depot/projects/trustedbsd/base/lib/libelf/elf_begin.c#1 branch .. //depot/projects/trustedbsd/base/lib/libelf/elf_cntl.3#1 branch .. //depot/projects/trustedbsd/base/lib/libelf/elf_cntl.c#1 branch .. //depot/projects/trustedbsd/base/lib/libelf/elf_data.c#1 branch .. //depot/projects/trustedbsd/base/lib/libelf/elf_end.3#1 branch .. //depot/projects/trustedbsd/base/lib/libelf/elf_end.c#1 branch .. //depot/projects/trustedbsd/base/lib/libelf/elf_errmsg.3#1 branch .. //depot/projects/trustedbsd/base/lib/libelf/elf_errmsg.c#1 branch .. //depot/projects/trustedbsd/base/lib/libelf/elf_errno.c#1 branch .. //depot/projects/trustedbsd/base/lib/libelf/elf_fill.3#1 branch .. //depot/projects/trustedbsd/base/lib/libelf/elf_fill.c#1 branch .. //depot/projects/trustedbsd/base/lib/libelf/elf_flag.c#1 branch .. //depot/projects/trustedbsd/base/lib/libelf/elf_flagdata.3#1 branch .. //depot/projects/trustedbsd/base/lib/libelf/elf_getarhdr.3#1 branch .. //depot/projects/trustedbsd/base/lib/libelf/elf_getarhdr.c#1 branch .. //depot/projects/trustedbsd/base/lib/libelf/elf_getarsym.3#1 branch .. //depot/projects/trustedbsd/base/lib/libelf/elf_getarsym.c#1 branch .. //depot/projects/trustedbsd/base/lib/libelf/elf_getbase.3#1 branch .. //depot/projects/trustedbsd/base/lib/libelf/elf_getbase.c#1 branch .. //depot/projects/trustedbsd/base/lib/libelf/elf_getdata.3#1 branch .. //depot/projects/trustedbsd/base/lib/libelf/elf_getident.3#1 branch .. //depot/projects/trustedbsd/base/lib/libelf/elf_getident.c#1 branch .. //depot/projects/trustedbsd/base/lib/libelf/elf_getphnum.3#1 branch .. //depot/projects/trustedbsd/base/lib/libelf/elf_getscn.3#1 branch .. //depot/projects/trustedbsd/base/lib/libelf/elf_getshnum.3#1 branch .. //depot/projects/trustedbsd/base/lib/libelf/elf_getshstrndx.3#1 branch .. //depot/projects/trustedbsd/base/lib/libelf/elf_hash.3#1 branch .. //depot/projects/trustedbsd/base/lib/libelf/elf_hash.c#1 branch .. //depot/projects/trustedbsd/base/lib/libelf/elf_kind.3#1 branch .. //depot/projects/trustedbsd/base/lib/libelf/elf_kind.c#1 branch .. //depot/projects/trustedbsd/base/lib/libelf/elf_memory.3#1 branch .. //depot/projects/trustedbsd/base/lib/libelf/elf_memory.c#1 branch .. //depot/projects/trustedbsd/base/lib/libelf/elf_next.3#1 branch .. //depot/projects/trustedbsd/base/lib/libelf/elf_next.c#1 branch .. //depot/projects/trustedbsd/base/lib/libelf/elf_phnum.c#1 branch .. //depot/projects/trustedbsd/base/lib/libelf/elf_rand.3#1 branch .. //depot/projects/trustedbsd/base/lib/libelf/elf_rand.c#1 branch .. //depot/projects/trustedbsd/base/lib/libelf/elf_rawfile.3#1 branch .. //depot/projects/trustedbsd/base/lib/libelf/elf_rawfile.c#1 branch .. //depot/projects/trustedbsd/base/lib/libelf/elf_scn.c#1 branch .. //depot/projects/trustedbsd/base/lib/libelf/elf_shnum.c#1 branch .. //depot/projects/trustedbsd/base/lib/libelf/elf_shstrndx.c#1 branch .. //depot/projects/trustedbsd/base/lib/libelf/elf_strptr.3#1 branch .. //depot/projects/trustedbsd/base/lib/libelf/elf_strptr.c#1 branch .. //depot/projects/trustedbsd/base/lib/libelf/elf_types.m4#1 branch .. //depot/projects/trustedbsd/base/lib/libelf/elf_update.3#1 branch .. //depot/projects/trustedbsd/base/lib/libelf/elf_update.c#1 branch .. //depot/projects/trustedbsd/base/lib/libelf/elf_version.3#1 branch .. //depot/projects/trustedbsd/base/lib/libelf/elf_version.c#1 branch .. //depot/projects/trustedbsd/base/lib/libelf/gelf.3#1 branch .. //depot/projects/trustedbsd/base/lib/libelf/gelf.h#1 branch .. //depot/projects/trustedbsd/base/lib/libelf/gelf_cap.c#1 branch .. //depot/projects/trustedbsd/base/lib/libelf/gelf_checksum.3#1 branch .. //depot/projects/trustedbsd/base/lib/libelf/gelf_checksum.c#1 branch .. //depot/projects/trustedbsd/base/lib/libelf/gelf_dyn.c#1 branch .. //depot/projects/trustedbsd/base/lib/libelf/gelf_ehdr.c#1 branch .. //depot/projects/trustedbsd/base/lib/libelf/gelf_fsize.3#1 branch .. //depot/projects/trustedbsd/base/lib/libelf/gelf_fsize.c#1 branch .. //depot/projects/trustedbsd/base/lib/libelf/gelf_getcap.3#1 branch .. //depot/projects/trustedbsd/base/lib/libelf/gelf_getclass.3#1 branch .. //depot/projects/trustedbsd/base/lib/libelf/gelf_getclass.c#1 branch .. //depot/projects/trustedbsd/base/lib/libelf/gelf_getdyn.3#1 branch .. //depot/projects/trustedbsd/base/lib/libelf/gelf_getehdr.3#1 branch .. //depot/projects/trustedbsd/base/lib/libelf/gelf_getmove.3#1 branch .. //depot/projects/trustedbsd/base/lib/libelf/gelf_getphdr.3#1 branch .. //depot/projects/trustedbsd/base/lib/libelf/gelf_getrel.3#1 branch .. //depot/projects/trustedbsd/base/lib/libelf/gelf_getrela.3#1 branch .. //depot/projects/trustedbsd/base/lib/libelf/gelf_getshdr.3#1 branch .. //depot/projects/trustedbsd/base/lib/libelf/gelf_getsym.3#1 branch .. //depot/projects/trustedbsd/base/lib/libelf/gelf_getsyminfo.3#1 branch .. //depot/projects/trustedbsd/base/lib/libelf/gelf_getsymshndx.3#1 branch .. //depot/projects/trustedbsd/base/lib/libelf/gelf_move.c#1 branch .. //depot/projects/trustedbsd/base/lib/libelf/gelf_newehdr.3#1 branch .. //depot/projects/trustedbsd/base/lib/libelf/gelf_newphdr.3#1 branch .. //depot/projects/trustedbsd/base/lib/libelf/gelf_phdr.c#1 branch .. //depot/projects/trustedbsd/base/lib/libelf/gelf_rel.c#1 branch .. //depot/projects/trustedbsd/base/lib/libelf/gelf_rela.c#1 branch .. //depot/projects/trustedbsd/base/lib/libelf/gelf_shdr.c#1 branch .. //depot/projects/trustedbsd/base/lib/libelf/gelf_sym.c#1 branch .. //depot/projects/trustedbsd/base/lib/libelf/gelf_syminfo.c#1 branch .. //depot/projects/trustedbsd/base/lib/libelf/gelf_symshndx.c#1 branch .. //depot/projects/trustedbsd/base/lib/libelf/gelf_update_ehdr.3#1 branch .. //depot/projects/trustedbsd/base/lib/libelf/gelf_xlate.c#1 branch .. //depot/projects/trustedbsd/base/lib/libelf/gelf_xlatetof.3#1 branch .. //depot/projects/trustedbsd/base/lib/libelf/libelf.c#1 branch .. //depot/projects/trustedbsd/base/lib/libelf/libelf.h#1 branch .. //depot/projects/trustedbsd/base/lib/libelf/libelf_align.c#1 branch .. //depot/projects/trustedbsd/base/lib/libelf/libelf_allocate.c#1 branch .. //depot/projects/trustedbsd/base/lib/libelf/libelf_ar.c#1 branch .. //depot/projects/trustedbsd/base/lib/libelf/libelf_checksum.c#1 branch .. //depot/projects/trustedbsd/base/lib/libelf/libelf_convert.m4#1 branch .. //depot/projects/trustedbsd/base/lib/libelf/libelf_data.c#1 branch .. //depot/projects/trustedbsd/base/lib/libelf/libelf_ehdr.c#1 branch .. //depot/projects/trustedbsd/base/lib/libelf/libelf_extended.c#1 branch .. //depot/projects/trustedbsd/base/lib/libelf/libelf_fsize.m4#1 branch .. //depot/projects/trustedbsd/base/lib/libelf/libelf_msize.m4#1 branch .. //depot/projects/trustedbsd/base/lib/libelf/libelf_phdr.c#1 branch .. //depot/projects/trustedbsd/base/lib/libelf/libelf_shdr.c#1 branch .. //depot/projects/trustedbsd/base/lib/libelf/libelf_xlate.c#1 branch .. //depot/projects/trustedbsd/base/lib/libkvm/kvm_proc.c#30 integrate .. //depot/projects/trustedbsd/base/lib/libpam/modules/pam_exec/pam_exec.c#5 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_join.c#7 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_kern.c#31 integrate .. //depot/projects/trustedbsd/base/lib/libstand/Makefile#19 integrate .. //depot/projects/trustedbsd/base/lib/libthr/Makefile#16 integrate .. //depot/projects/trustedbsd/base/lib/libthr/arch/amd64/include/pthread_md.h#3 integrate .. //depot/projects/trustedbsd/base/lib/libthr/arch/arm/include/pthread_md.h#3 integrate .. //depot/projects/trustedbsd/base/lib/libthr/arch/i386/include/pthread_md.h#5 integrate .. //depot/projects/trustedbsd/base/lib/libthr/arch/ia64/include/pthread_md.h#3 integrate .. //depot/projects/trustedbsd/base/lib/libthr/arch/powerpc/include/pthread_md.h#3 integrate .. //depot/projects/trustedbsd/base/lib/libthr/arch/sparc64/include/pthread_md.h#2 integrate .. //depot/projects/trustedbsd/base/lib/libthr/thread/thr_barrier.c#6 integrate .. //depot/projects/trustedbsd/base/lib/libthr/thread/thr_cancel.c#8 integrate .. //depot/projects/trustedbsd/base/lib/libthr/thread/thr_cond.c#11 integrate .. //depot/projects/trustedbsd/base/lib/libthr/thread/thr_create.c#18 integrate .. //depot/projects/trustedbsd/base/lib/libthr/thread/thr_exit.c#14 integrate .. //depot/projects/trustedbsd/base/lib/libthr/thread/thr_fork.c#6 integrate .. //depot/projects/trustedbsd/base/lib/libthr/thread/thr_init.c#24 integrate .. //depot/projects/trustedbsd/base/lib/libthr/thread/thr_join.c#12 integrate .. //depot/projects/trustedbsd/base/lib/libthr/thread/thr_list.c#7 integrate .. //depot/projects/trustedbsd/base/lib/libthr/thread/thr_mutex.c#22 integrate .. //depot/projects/trustedbsd/base/lib/libthr/thread/thr_private.h#27 integrate .. //depot/projects/trustedbsd/base/lib/libthr/thread/thr_pspinlock.c#5 integrate .. //depot/projects/trustedbsd/base/lib/libthr/thread/thr_sem.c#7 integrate .. //depot/projects/trustedbsd/base/lib/libthr/thread/thr_sig.c#14 integrate .. //depot/projects/trustedbsd/base/lib/libthr/thread/thr_syscalls.c#13 integrate .. //depot/projects/trustedbsd/base/lib/libthr/thread/thr_umtx.c#6 integrate .. //depot/projects/trustedbsd/base/lib/libthr/thread/thr_umtx.h#7 integrate .. //depot/projects/trustedbsd/base/lib/libutil/login_ok.3#4 integrate .. //depot/projects/trustedbsd/base/lib/msun/Makefile#18 integrate .. //depot/projects/trustedbsd/base/lib/msun/Symbol.map#2 integrate .. //depot/projects/trustedbsd/base/lib/msun/amd64/fenv.c#3 integrate .. //depot/projects/trustedbsd/base/lib/msun/amd64/fenv.h#4 integrate .. //depot/projects/trustedbsd/base/lib/msun/i387/fenv.c#3 integrate .. //depot/projects/trustedbsd/base/lib/msun/i387/fenv.h#5 integrate .. //depot/projects/trustedbsd/base/lib/msun/man/fenv.3#5 integrate .. //depot/projects/trustedbsd/base/lib/msun/man/ieee.3#6 integrate .. //depot/projects/trustedbsd/base/lib/msun/src/math.h#21 integrate .. //depot/projects/trustedbsd/base/lib/msun/src/s_copysignl.c#2 integrate .. //depot/projects/trustedbsd/base/lib/msun/src/s_fmal.c#3 integrate .. //depot/projects/trustedbsd/base/lib/msun/src/s_modf.c#3 integrate .. //depot/projects/trustedbsd/base/lib/msun/src/s_modff.c#3 integrate .. //depot/projects/trustedbsd/base/lib/msun/src/s_modfl.c#1 branch .. //depot/projects/trustedbsd/base/release/Makefile#81 integrate .. //depot/projects/trustedbsd/base/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#71 integrate .. //depot/projects/trustedbsd/base/release/doc/en_US.ISO8859-1/readme/article.sgml#19 integrate .. //depot/projects/trustedbsd/base/release/doc/en_US.ISO8859-1/relnotes/Makefile#8 integrate .. //depot/projects/trustedbsd/base/release/doc/en_US.ISO8859-1/relnotes/Makefile.inc#2 delete .. //depot/projects/trustedbsd/base/release/doc/en_US.ISO8859-1/relnotes/amd64/Makefile#2 delete .. //depot/projects/trustedbsd/base/release/doc/en_US.ISO8859-1/relnotes/amd64/article.sgml#5 delete .. //depot/projects/trustedbsd/base/release/doc/en_US.ISO8859-1/relnotes/article.sgml#1 branch .. //depot/projects/trustedbsd/base/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#116 delete .. //depot/projects/trustedbsd/base/release/doc/en_US.ISO8859-1/relnotes/common/relnotes.ent#3 delete .. //depot/projects/trustedbsd/base/release/doc/en_US.ISO8859-1/relnotes/i386/Makefile#3 delete .. //depot/projects/trustedbsd/base/release/doc/en_US.ISO8859-1/relnotes/i386/article.sgml#6 delete .. //depot/projects/trustedbsd/base/release/doc/en_US.ISO8859-1/relnotes/ia64/Makefile#2 delete .. //depot/projects/trustedbsd/base/release/doc/en_US.ISO8859-1/relnotes/ia64/article.sgml#5 delete .. //depot/projects/trustedbsd/base/release/doc/en_US.ISO8859-1/relnotes/pc98/Makefile#2 delete .. //depot/projects/trustedbsd/base/release/doc/en_US.ISO8859-1/relnotes/pc98/article.sgml#5 delete .. //depot/projects/trustedbsd/base/release/doc/en_US.ISO8859-1/relnotes/powerpc/Makefile#2 delete .. //depot/projects/trustedbsd/base/release/doc/en_US.ISO8859-1/relnotes/powerpc/article.sgml#2 delete .. //depot/projects/trustedbsd/base/release/doc/en_US.ISO8859-1/relnotes/sparc64/Makefile#2 delete .. //depot/projects/trustedbsd/base/release/doc/en_US.ISO8859-1/relnotes/sparc64/article.sgml#7 delete .. //depot/projects/trustedbsd/base/release/doc/share/examples/Makefile.relnotesng#12 integrate .. //depot/projects/trustedbsd/base/release/doc/share/misc/dev.archlist.txt#17 integrate .. //depot/projects/trustedbsd/base/release/picobsd/bridge/crunch.conf#11 integrate .. //depot/projects/trustedbsd/base/release/picobsd/tinyware/vm/vm.c#2 integrate .. //depot/projects/trustedbsd/base/release/scripts/package-split.py#9 integrate .. //depot/projects/trustedbsd/base/release/sun4v/boot_crunch.conf#1 branch .. //depot/projects/trustedbsd/base/rescue/rescue/Makefile#20 integrate .. //depot/projects/trustedbsd/base/sbin/Makefile#37 integrate .. //depot/projects/trustedbsd/base/sbin/atm/atm/atm.8#4 integrate .. //depot/projects/trustedbsd/base/sbin/bsdlabel/bsdlabel.8#16 integrate .. //depot/projects/trustedbsd/base/sbin/camcontrol/camcontrol.c#17 integrate .. //depot/projects/trustedbsd/base/sbin/devfs/devfs.8#13 integrate .. //depot/projects/trustedbsd/base/sbin/fdisk/fdisk.8#7 integrate .. //depot/projects/trustedbsd/base/sbin/geom/class/mirror/gmirror.8#10 integrate .. //depot/projects/trustedbsd/base/sbin/ggate/Makefile#7 integrate .. //depot/projects/trustedbsd/base/sbin/ggate/ggated/ggated.c#8 integrate .. //depot/projects/trustedbsd/base/sbin/ggate/shared/ggate.c#8 integrate .. //depot/projects/trustedbsd/base/sbin/ggate/shared/ggate.h#5 integrate .. //depot/projects/trustedbsd/base/sbin/ifconfig/ifbridge.c#5 integrate .. //depot/projects/trustedbsd/base/sbin/ifconfig/ifconfig.8#44 integrate .. //depot/projects/trustedbsd/base/sbin/ifconfig/ifconfig.c#33 integrate .. //depot/projects/trustedbsd/base/sbin/ifconfig/ifieee80211.c#22 integrate .. //depot/projects/trustedbsd/base/sbin/ifconfig/ifmedia.c#10 integrate .. //depot/projects/trustedbsd/base/sbin/init/init.8#16 integrate .. //depot/projects/trustedbsd/base/sbin/ipfw/ipfw.8#50 integrate .. //depot/projects/trustedbsd/base/sbin/ipfw/ipfw2.c#45 integrate .. //depot/projects/trustedbsd/base/sbin/mount/mount.c#27 integrate .. //depot/projects/trustedbsd/base/sbin/mount/mount_fs.c#2 integrate .. //depot/projects/trustedbsd/base/sbin/mount_nfs/Makefile#5 integrate .. //depot/projects/trustedbsd/base/sbin/mount_nfs/mount_nfs.c#17 integrate .. //depot/projects/trustedbsd/base/sbin/mount_unionfs/Makefile#4 integrate .. //depot/projects/trustedbsd/base/sbin/mount_unionfs/mount_unionfs.8#9 integrate .. //depot/projects/trustedbsd/base/sbin/mount_unionfs/mount_unionfs.c#11 integrate .. //depot/projects/trustedbsd/base/sbin/quotacheck/quotacheck.8#8 integrate .. //depot/projects/trustedbsd/base/sbin/quotacheck/quotacheck.c#14 integrate .. //depot/projects/trustedbsd/base/sbin/reboot/boot_i386.8#19 integrate .. //depot/projects/trustedbsd/base/sbin/reboot/reboot.8#12 integrate .. //depot/projects/trustedbsd/base/sbin/restore/main.c#14 integrate .. //depot/projects/trustedbsd/base/sbin/restore/restore.8#17 integrate .. //depot/projects/trustedbsd/base/sbin/restore/restore.c#11 integrate .. //depot/projects/trustedbsd/base/sbin/restore/restore.h#10 integrate .. //depot/projects/trustedbsd/base/sbin/restore/tape.c#16 integrate .. //depot/projects/trustedbsd/base/sbin/routed/main.c#7 integrate .. //depot/projects/trustedbsd/base/sbin/sysctl/sysctl.c#29 integrate .. //depot/projects/trustedbsd/base/share/colldef/Makefile#27 integrate .. //depot/projects/trustedbsd/base/share/doc/IPv6/IMPLEMENTATION#7 integrate .. //depot/projects/trustedbsd/base/share/man/man1/builtin.1#9 integrate .. //depot/projects/trustedbsd/base/share/man/man1/intro.1#2 integrate .. //depot/projects/trustedbsd/base/share/man/man4/Makefile#71 integrate .. //depot/projects/trustedbsd/base/share/man/man4/aac.4#14 integrate .. //depot/projects/trustedbsd/base/share/man/man4/altq.4#13 integrate .. //depot/projects/trustedbsd/base/share/man/man4/ata.4#23 integrate .. //depot/projects/trustedbsd/base/share/man/man4/ath.4#22 integrate .. //depot/projects/trustedbsd/base/share/man/man4/audit.4#5 integrate .. //depot/projects/trustedbsd/base/share/man/man4/auditpipe.4#5 integrate .. //depot/projects/trustedbsd/base/share/man/man4/bce.4#3 integrate .. //depot/projects/trustedbsd/base/share/man/man4/blackhole.4#5 integrate .. //depot/projects/trustedbsd/base/share/man/man4/fast_ipsec.4#7 integrate .. //depot/projects/trustedbsd/base/share/man/man4/fdc.4#9 integrate .. //depot/projects/trustedbsd/base/share/man/man4/iic.4#5 integrate .. //depot/projects/trustedbsd/base/share/man/man4/inet.4#16 integrate .. //depot/projects/trustedbsd/base/share/man/man4/ipmi.4#5 integrate .. //depot/projects/trustedbsd/base/share/man/man4/ips.4#5 integrate .. //depot/projects/trustedbsd/base/share/man/man4/joy.4#7 integrate .. //depot/projects/trustedbsd/base/share/man/man4/le.4#4 integrate .. //depot/projects/trustedbsd/base/share/man/man4/lmc.4#7 integrate .. //depot/projects/trustedbsd/base/share/man/man4/man4.arm/Makefile#1 branch .. //depot/projects/trustedbsd/base/share/man/man4/man4.arm/npe.4#1 branch .. //depot/projects/trustedbsd/base/share/man/man4/man4.i386/acpi_ibm.4#8 integrate .. //depot/projects/trustedbsd/base/share/man/man4/man4.i386/padlock.4#6 integrate .. //depot/projects/trustedbsd/base/share/man/man4/man4.sparc64/ofw_console.4#2 integrate .. //depot/projects/trustedbsd/base/share/man/man4/md.4#4 integrate .. //depot/projects/trustedbsd/base/share/man/man4/miibus.4#12 integrate .. //depot/projects/trustedbsd/base/share/man/man4/msk.4#1 branch .. //depot/projects/trustedbsd/base/share/man/man4/ng_deflate.4#1 branch .. //depot/projects/trustedbsd/base/share/man/man4/ng_ksocket.4#7 integrate .. //depot/projects/trustedbsd/base/share/man/man4/ng_pred1.4#1 branch .. //depot/projects/trustedbsd/base/share/man/man4/ng_tag.4#4 integrate .. //depot/projects/trustedbsd/base/share/man/man4/pcm.4#17 integrate .. //depot/projects/trustedbsd/base/share/man/man4/polling.4#19 integrate .. //depot/projects/trustedbsd/base/share/man/man4/pty.4#7 integrate .. //depot/projects/trustedbsd/base/share/man/man4/re.4#12 integrate .. //depot/projects/trustedbsd/base/share/man/man4/sem.4#3 integrate .. //depot/projects/trustedbsd/base/share/man/man4/snd_atiixp.4#2 integrate .. //depot/projects/trustedbsd/base/share/man/man4/snd_emu10kx.4#3 integrate .. //depot/projects/trustedbsd/base/share/man/man4/snd_es137x.4#7 integrate .. //depot/projects/trustedbsd/base/share/man/man4/snd_hda.4#2 integrate .. //depot/projects/trustedbsd/base/share/man/man4/snd_spicds.4#2 integrate .. //depot/projects/trustedbsd/base/share/man/man4/snd_via8233.4#5 integrate .. //depot/projects/trustedbsd/base/share/man/man4/syscons.4#14 integrate .. //depot/projects/trustedbsd/base/share/man/man4/uark.4#1 branch .. //depot/projects/trustedbsd/base/share/man/man4/ubsa.4#5 integrate .. //depot/projects/trustedbsd/base/share/man/man4/ubser.4#6 integrate .. //depot/projects/trustedbsd/base/share/man/man4/ubtbcmfw.4#6 integrate .. //depot/projects/trustedbsd/base/share/man/man4/ucom.4#7 integrate .. //depot/projects/trustedbsd/base/share/man/man4/ucycom.4#3 integrate .. //depot/projects/trustedbsd/base/share/man/man4/udbp.4#5 integrate .. //depot/projects/trustedbsd/base/share/man/man4/ufm.4#4 integrate .. //depot/projects/trustedbsd/base/share/man/man4/ufoma.4#3 integrate .. //depot/projects/trustedbsd/base/share/man/man4/uftdi.4#6 integrate .. //depot/projects/trustedbsd/base/share/man/man4/ugen.4#4 integrate .. //depot/projects/trustedbsd/base/share/man/man4/uhid.4#6 integrate .. //depot/projects/trustedbsd/base/share/man/man4/uhidev.4#4 delete .. //depot/projects/trustedbsd/base/share/man/man4/ukbd.4#8 integrate .. //depot/projects/trustedbsd/base/share/man/man4/ulpt.4#7 integrate .. //depot/projects/trustedbsd/base/share/man/man4/umass.4#17 integrate .. //depot/projects/trustedbsd/base/share/man/man4/umct.4#5 integrate .. //depot/projects/trustedbsd/base/share/man/man4/umodem.4#7 integrate .. //depot/projects/trustedbsd/base/share/man/man4/ums.4#5 integrate .. //depot/projects/trustedbsd/base/share/man/man4/uplcom.4#11 integrate .. //depot/projects/trustedbsd/base/share/man/man4/urio.4#6 integrate .. //depot/projects/trustedbsd/base/share/man/man4/usb.4#15 integrate .. //depot/projects/trustedbsd/base/share/man/man4/uscanner.4#14 integrate .. //depot/projects/trustedbsd/base/share/man/man4/utopia.4#6 integrate .. //depot/projects/trustedbsd/base/share/man/man4/uvisor.4#8 integrate .. //depot/projects/trustedbsd/base/share/man/man4/uvscom.4#5 integrate .. //depot/projects/trustedbsd/base/share/man/man4/vlan.4#18 integrate .. //depot/projects/trustedbsd/base/share/man/man4/watchdog.4#7 integrate .. //depot/projects/trustedbsd/base/share/man/man5/elf.5#11 integrate .. //depot/projects/trustedbsd/base/share/man/man5/fdescfs.5#5 integrate .. //depot/projects/trustedbsd/base/share/man/man5/linsysfs.5#3 integrate .. //depot/projects/trustedbsd/base/share/man/man5/mqueuefs.5#3 integrate .. //depot/projects/trustedbsd/base/share/man/man5/rc.conf.5#65 integrate .. //depot/projects/trustedbsd/base/share/man/man7/build.7#15 integrate .. //depot/projects/trustedbsd/base/share/man/man7/development.7#9 integrate .. //depot/projects/trustedbsd/base/share/man/man7/environ.7#8 integrate .. //depot/projects/trustedbsd/base/share/man/man7/hier.7#30 integrate .. //depot/projects/trustedbsd/base/share/man/man7/ports.7#18 integrate .. //depot/projects/trustedbsd/base/share/man/man7/release.7#31 integrate .. //depot/projects/trustedbsd/base/share/man/man7/tuning.7#26 integrate .. //depot/projects/trustedbsd/base/share/man/man8/MAKEDEV.8#3 integrate .. //depot/projects/trustedbsd/base/share/man/man8/nanobsd.8#2 integrate .. //depot/projects/trustedbsd/base/share/man/man8/rc.subr.8#12 integrate .. //depot/projects/trustedbsd/base/share/man/man9/LOCK_PROFILING.9#1 branch .. //depot/projects/trustedbsd/base/share/man/man9/MUTEX_PROFILING.9#6 delete .. //depot/projects/trustedbsd/base/share/man/man9/Makefile#53 integrate .. //depot/projects/trustedbsd/base/share/man/man9/bpf.9#4 integrate .. //depot/projects/trustedbsd/base/share/man/man9/bus_dma.9#17 integrate .. //depot/projects/trustedbsd/base/share/man/man9/config_intrhook.9#2 integrate .. //depot/projects/trustedbsd/base/share/man/man9/cr_cansee.9#1 branch .. //depot/projects/trustedbsd/base/share/man/man9/crypto.9#10 integrate .. //depot/projects/trustedbsd/base/share/man/man9/devsw.9#4 delete .. //depot/projects/trustedbsd/base/share/man/man9/ifnet.9#18 integrate .. //depot/projects/trustedbsd/base/share/man/man9/kqueue.9#2 integrate .. //depot/projects/trustedbsd/base/share/man/man9/make_dev.9#11 integrate .. //depot/projects/trustedbsd/base/share/man/man9/mbuf.9#25 integrate .. //depot/projects/trustedbsd/base/share/man/man9/mutex.9#16 integrate .. //depot/projects/trustedbsd/base/share/man/man9/p_candebug.9#3 integrate .. //depot/projects/trustedbsd/base/share/man/man9/p_cansee.9#1 branch .. //depot/projects/trustedbsd/base/share/man/man9/priv.9#1 branch .. //depot/projects/trustedbsd/base/share/man/man9/sleepqueue.9#9 integrate .. //depot/projects/trustedbsd/base/share/man/man9/socket.9#1 branch .. //depot/projects/trustedbsd/base/share/man/man9/style.9#27 integrate .. //depot/projects/trustedbsd/base/share/man/man9/suser.9#11 integrate .. //depot/projects/trustedbsd/base/share/man/man9/sysctl.9#4 integrate .. //depot/projects/trustedbsd/base/share/man/man9/uio.9#9 integrate .. //depot/projects/trustedbsd/base/share/man/man9/usbdi.9#2 integrate .. //depot/projects/trustedbsd/base/share/man/man9/utopia.9#4 integrate .. //depot/projects/trustedbsd/base/share/man/man9/vm_map_stack.9#4 integrate .. //depot/projects/trustedbsd/base/share/man/man9/watchdog.9#3 integrate .. //depot/projects/trustedbsd/base/share/misc/bsd-family-tree#31 integrate .. //depot/projects/trustedbsd/base/share/misc/pci_vendors#23 integrate .. //depot/projects/trustedbsd/base/share/mk/bsd.endian.mk#3 integrate .. //depot/projects/trustedbsd/base/share/mk/bsd.own.mk#18 integrate .. //depot/projects/trustedbsd/base/share/mk/bsd.port.mk#5 integrate .. //depot/projects/trustedbsd/base/share/mklocale/Makefile#25 integrate .. //depot/projects/trustedbsd/base/share/monetdef/Makefile#25 integrate .. //depot/projects/trustedbsd/base/share/msgdef/Makefile#26 integrate .. //depot/projects/trustedbsd/base/share/numericdef/Makefile#25 integrate .. //depot/projects/trustedbsd/base/share/timedef/Makefile#24 integrate .. //depot/projects/trustedbsd/base/share/timedef/nn_NO.ISO8859-1.src#1 branch .. //depot/projects/trustedbsd/base/share/timedef/nn_NO.UTF-8.src#1 branch .. //depot/projects/trustedbsd/base/sys/Makefile#14 integrate .. //depot/projects/trustedbsd/base/sys/amd64/amd64/apic_vector.S#12 integrate .. //depot/projects/trustedbsd/base/sys/amd64/amd64/cpu_switch.S#11 integrate .. //depot/projects/trustedbsd/base/sys/amd64/amd64/db_disasm.c#5 integrate .. //depot/projects/trustedbsd/base/sys/amd64/amd64/db_trace.c#16 integrate .. //depot/projects/trustedbsd/base/sys/amd64/amd64/exception.S#16 integrate .. //depot/projects/trustedbsd/base/sys/amd64/amd64/genassym.c#14 integrate .. //depot/projects/trustedbsd/base/sys/amd64/amd64/intr_machdep.c#15 integrate .. //depot/projects/trustedbsd/base/sys/amd64/amd64/io_apic.c#12 integrate .. //depot/projects/trustedbsd/base/sys/amd64/amd64/local_apic.c#18 integrate .. //depot/projects/trustedbsd/base/sys/amd64/amd64/machdep.c#31 integrate .. //depot/projects/trustedbsd/base/sys/amd64/amd64/minidump_machdep.c#2 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Jan 8 05:53: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 AD87116A416; Mon, 8 Jan 2007 05:53: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 88AE516A403 for ; Mon, 8 Jan 2007 05:53:36 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 61D2513C43E for ; Mon, 8 Jan 2007 05:53:36 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l085raRw002958 for ; Mon, 8 Jan 2007 05:53:36 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l085ranv002955 for perforce@freebsd.org; Mon, 8 Jan 2007 05:53:36 GMT (envelope-from kmacy@freebsd.org) Date: Mon, 8 Jan 2007 05:53:36 GMT Message-Id: <200701080553.l085ranv002955@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 112676 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 08 Jan 2007 05:53:36 -0000 http://perforce.freebsd.org/chv.cgi?CH=112676 Change 112676 by kmacy@kmacy_storage:sam_wifi on 2007/01/08 05:52:44 add modified version of Benjamin Close's port of wpi Affected files ... .. //depot/projects/wifi/sys/dev/wpi/if_wpi.c#1 add .. //depot/projects/wifi/sys/dev/wpi/if_wpireg.h#1 add .. //depot/projects/wifi/sys/dev/wpi/if_wpivar.h#1 add .. //depot/projects/wifi/sys/dev/wpi_ucode/ipw3945.ucode#1 add .. //depot/projects/wifi/sys/modules/wpi/Makefile#1 add .. //depot/projects/wifi/sys/modules/wpi_ucode/Makefile#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Mon Jan 8 06:19: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 C7C4E16A415; Mon, 8 Jan 2007 06:19: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 A3CB516A407 for ; Mon, 8 Jan 2007 06:19:08 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 7D39413C46A for ; Mon, 8 Jan 2007 06:19:08 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l086J8dx007052 for ; Mon, 8 Jan 2007 06:19:08 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l086J84Y007049 for perforce@freebsd.org; Mon, 8 Jan 2007 06:19:08 GMT (envelope-from kmacy@freebsd.org) Date: Mon, 8 Jan 2007 06:19:08 GMT Message-Id: <200701080619.l086J84Y007049@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 112677 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 08 Jan 2007 06:19:09 -0000 http://perforce.freebsd.org/chv.cgi?CH=112677 Change 112677 by kmacy@kmacy_storage:sam_wifi on 2007/01/08 06:18:51 remove ieee80211_amrr.c Affected files ... .. //depot/projects/wifi/sys/modules/wpi/Makefile#2 edit Differences ... ==== //depot/projects/wifi/sys/modules/wpi/Makefile#2 (text+ko) ==== @@ -2,6 +2,6 @@ KMOD = if_wpi -SRCS = if_wpi.c ieee80211_amrr.c opt_bdg.h device_if.h bus_if.h pci_if.h if_wpivar.h if_wpireg.h +SRCS = if_wpi.c opt_bdg.h device_if.h bus_if.h pci_if.h if_wpivar.h if_wpireg.h .include From owner-p4-projects@FreeBSD.ORG Mon Jan 8 06:20:10 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 83B3A16A415; Mon, 8 Jan 2007 06:20:10 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 49E5716A40F for ; Mon, 8 Jan 2007 06:20:10 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 2D6E213C43E for ; Mon, 8 Jan 2007 06:20:10 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l086KAYn007115 for ; Mon, 8 Jan 2007 06:20:10 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l086K9X6007112 for perforce@freebsd.org; Mon, 8 Jan 2007 06:20:09 GMT (envelope-from kmacy@freebsd.org) Date: Mon, 8 Jan 2007 06:20:09 GMT Message-Id: <200701080620.l086K9X6007112@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 112678 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 08 Jan 2007 06:20:10 -0000 http://perforce.freebsd.org/chv.cgi?CH=112678 Change 112678 by kmacy@kmacy_storage:sam_wifi on 2007/01/08 06:19:25 make compile Affected files ... .. //depot/projects/wifi/sys/dev/wpi/if_wpi.c#2 edit Differences ... ==== //depot/projects/wifi/sys/dev/wpi/if_wpi.c#2 (text+ko) ==== @@ -447,7 +447,6 @@ IEEE80211_CHAN_DYN | IEEE80211_CHAN_2GHZ; } - ic->ic_ibss_chan = &ic->ic_channels[0]; if_initname(ifp, device_get_name(dev), device_get_unit(dev)); ifp->if_softc = sc; ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST; @@ -979,11 +978,14 @@ switch (nstate) { case IEEE80211_S_SCAN: + /* make the link LED blink while we're scanning */ + wpi_set_led(sc, WPI_LED_LINK, 20, 2); + break; +#if 0 + ieee80211_node_table_reset(&ic->ic_scan); ic->ic_flags |= IEEE80211_F_SCAN | IEEE80211_F_ASCAN; - /* make the link LED blink while we're scanning */ - wpi_set_led(sc, WPI_LED_LINK, 20, 2); if ((error = wpi_scan(sc,IEEE80211_CHAN_G)) != 0) { device_printf(sc->sc_dev, "could not initiate scan\n"); @@ -994,7 +996,7 @@ ic->ic_state = nstate; return 0; - +#endif case IEEE80211_S_AUTH: sc->config.state &= ~htole16(WPI_STATE_ASSOCIATED); sc->config.filter &= ~htole32(WPI_FILTER_BSS); @@ -1420,7 +1422,7 @@ ni = ieee80211_find_rxnode(ic, (struct ieee80211_frame_min *)wh); /* send the frame to the 802.11 layer */ - ieee80211_input(ic, m, ni, stat->rssi, 0); + ieee80211_input(ic, m, ni, stat->rssi, 0, 0); /* release node reference */ ieee80211_free_node(ni); @@ -1582,7 +1584,6 @@ if (wpi_scan(sc, IEEE80211_CHAN_A) == 0) break; } - ieee80211_end_scan(ic); break; } } @@ -1970,7 +1971,6 @@ } } - ieee80211_watchdog(&sc->sc_ic); skip: mtx_unlock(&sc->sc_mtx); @@ -2393,8 +2393,8 @@ hdr->mask = htole32(0xffffffff); hdr->magic1 = htole32(1 << 13); - hdr->esslen = ic->ic_des_esslen; - memcpy(hdr->essid, ic->ic_des_essid, ic->ic_des_esslen); + hdr->esslen = ic->ic_des_ssid[0].len; + memcpy(hdr->essid, ic->ic_des_ssid[0].ssid, ic->ic_des_ssid[0].len); /* * Build a probe request frame. Most of the following code is a @@ -2414,11 +2414,11 @@ /* add essid IE */ *frm++ = IEEE80211_ELEMID_SSID; - *frm++ = ic->ic_des_esslen; - memcpy(frm, ic->ic_des_essid, ic->ic_des_esslen); - frm += ic->ic_des_esslen; + *frm++ = ic->ic_des_ssid[0].len; + memcpy(frm, ic->ic_des_ssid[0].ssid, ic->ic_des_ssid[0].len); + frm += ic->ic_des_ssid[0].len; - mode = ieee80211_chan2mode(ic, ic->ic_ibss_chan); + mode = ieee80211_chan2mode(ic->ic_curchan); rs = &ic->ic_sup_rates[mode]; /* add supported rates IE */ @@ -2547,9 +2547,9 @@ // IEEE80211_ADDR_COPY(ic->ic_myaddr, LLADDR(ifp->if_sadl)); IEEE80211_ADDR_COPY(sc->config.myaddr, ic->ic_myaddr); /*set default channel*/ - sc->config.chan = ieee80211_chan2ieee(ic, ic->ic_ibss_chan); + sc->config.chan = ieee80211_chan2ieee(ic, ic->ic_curchan); sc->config.flags = htole32(WPI_CONFIG_TSF); - if (IEEE80211_IS_CHAN_2GHZ(ic->ic_ibss_chan)) { + if (IEEE80211_IS_CHAN_2GHZ(ic->ic_curchan)) { sc->config.flags |= htole32(WPI_CONFIG_AUTO | WPI_CONFIG_24GHZ); } @@ -2570,6 +2570,8 @@ sc->config.mode = WPI_MODE_MONITOR; sc->config.filter |= htole32(WPI_FILTER_MULTICAST | WPI_FILTER_CTL | WPI_FILTER_PROMISC); + case IEEE80211_M_WDS: + device_printf(sc->sc_dev, "warning WDS not handled"); break; } sc->config.cck_mask = 0x0f; /* not yet negotiated */ From owner-p4-projects@FreeBSD.ORG Mon Jan 8 07:02: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 00E5216A412; Mon, 8 Jan 2007 07:02: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 A7F4D16A403 for ; Mon, 8 Jan 2007 07:02:02 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 9946713C457 for ; Mon, 8 Jan 2007 07:02:02 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l08722g9013415 for ; Mon, 8 Jan 2007 07:02:02 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l08722VL013412 for perforce@freebsd.org; Mon, 8 Jan 2007 07:02:02 GMT (envelope-from kmacy@freebsd.org) Date: Mon, 8 Jan 2007 07:02:02 GMT Message-Id: <200701080702.l08722VL013412@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 112679 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 08 Jan 2007 07:02:03 -0000 http://perforce.freebsd.org/chv.cgi?CH=112679 Change 112679 by kmacy@kmacy_storage:sam_wifi on 2007/01/08 07:01:15 add basic scanning operations Affected files ... .. //depot/projects/wifi/sys/dev/wpi/if_wpi.c#3 edit Differences ... ==== //depot/projects/wifi/sys/dev/wpi/if_wpi.c#3 (text+ko) ==== @@ -63,6 +63,8 @@ #include #include +#include + #include #include @@ -167,6 +169,11 @@ struct wpi_tx_desc *); static void wpi_firmware_mem_free(struct wpi_softc *, char *, bus_dma_tag_t, bus_dmamap_t map); +static void wpi_scan_start(struct ieee80211com *); +static void wpi_scan_end(struct ieee80211com *); +static void wpi_set_channel(struct ieee80211com *); +static void wpi_ops(void *arg, int npending); + static int wpi_probe(device_t); static int wpi_attach(device_t); static int wpi_detach(device_t); @@ -307,7 +314,7 @@ struct wpi_softc *sc = device_get_softc(dev); struct ifnet *ifp; struct ieee80211com *ic = &sc->sc_ic; - int ac, error, i; + int ac, error, bands; sc->sc_dev = dev; @@ -315,6 +322,12 @@ MTX_DEF | MTX_RECURSE); callout_init(&sc->amrr_ch, 0); + sc->sc_tq = taskqueue_create("wpi_taskq", M_NOWAIT | M_ZERO, + taskqueue_thread_enqueue, &sc->sc_tq); + taskqueue_start_threads(&sc->sc_tq, 1, PI_NET, "%s taskq", + device_get_nameunit(dev)); + TASK_INIT(&sc->sc_opstask, 0, wpi_ops, sc); + if (pci_get_powerstate(dev) != PCI_POWERSTATE_D0) { device_printf(dev, "chip is in D%d power mode " "-- setting to D0\n", pci_get_powerstate(dev)); @@ -402,6 +415,11 @@ ic->ic_opmode = IEEE80211_M_STA; /* default to BSS mode */ ic->ic_state = IEEE80211_S_INIT; + ic->ic_scan_start = wpi_scan_start; + ic->ic_scan_end = wpi_scan_end; + ic->ic_set_channel = wpi_set_channel; + + /* set device capabilities */ ic->ic_caps = IEEE80211_C_IBSS | /* IBSS mode support */ @@ -414,38 +432,12 @@ wpi_read_eeprom(sc); - /* set supported .11a rates */ - ic->ic_sup_rates[IEEE80211_MODE_11A] = wpi_rateset_11a; + bands = 0; + setbit(&bands, IEEE80211_MODE_11B); + setbit(&bands, IEEE80211_MODE_11G); + setbit(&bands, IEEE80211_MODE_11A); - /* set supported .11a channels */ - for (i = 36; i <= 64; i += 4) { - ic->ic_channels[i].ic_freq = - ieee80211_ieee2mhz(i, IEEE80211_CHAN_5GHZ); - ic->ic_channels[i].ic_flags = IEEE80211_CHAN_A; - } - for (i = 100; i <= 140; i += 4) { - ic->ic_channels[i].ic_freq = - ieee80211_ieee2mhz(i, IEEE80211_CHAN_5GHZ); - ic->ic_channels[i].ic_flags = IEEE80211_CHAN_A; - } - for (i = 149; i <= 165; i += 4) { - ic->ic_channels[i].ic_freq = - ieee80211_ieee2mhz(i, IEEE80211_CHAN_5GHZ); - ic->ic_channels[i].ic_flags = IEEE80211_CHAN_A; - } - - /* set supported .11b and .11g rates */ - ic->ic_sup_rates[IEEE80211_MODE_11B] = wpi_rateset_11b; - ic->ic_sup_rates[IEEE80211_MODE_11G] = wpi_rateset_11g; - - /* set supported .11b and .11g channels (1 through 14) */ - for (i = 1; i <= 14; i++) { - ic->ic_channels[i].ic_freq = - ieee80211_ieee2mhz(i, IEEE80211_CHAN_2GHZ); - ic->ic_channels[i].ic_flags = - IEEE80211_CHAN_CCK | IEEE80211_CHAN_OFDM | - IEEE80211_CHAN_DYN | IEEE80211_CHAN_2GHZ; - } + ieee80211_init_channels(ic, 0, CTRY_DEFAULT, bands, 0, 1); if_initname(ifp, device_get_name(dev), device_get_unit(dev)); ifp->if_softc = sc; @@ -489,7 +481,6 @@ /* * Hook our interrupt after all initialization is complete. -| INTR_MPSAFE, */ error = bus_setup_intr(dev, sc->irq, INTR_TYPE_NET|INTR_MPSAFE , wpi_intr, sc, &sc->sc_ih); @@ -545,6 +536,8 @@ bus_release_resource(dev, SYS_RES_IRQ, sc->irq_rid, sc->irq); bus_release_resource(dev, SYS_RES_MEMORY, sc->mem_rid, sc->mem); + taskqueue_free(sc->sc_tq); + if_free(ifp); mtx_destroy(&sc->sc_mtx); @@ -2951,3 +2944,52 @@ i--); ni->ni_txrate = i; } + +static void +wpi_scan_start(struct ieee80211com *ic) +{ + struct ifnet *ifp = ic->ic_ifp; + struct wpi_softc *sc = ifp->if_softc; + + printf("start scan\n"); + sc->sc_scanop = WPI_SCAN_START; + taskqueue_enqueue(sc->sc_tq, &sc->sc_opstask); +} + +static void +wpi_scan_end(struct ieee80211com *ic) +{ + /* ??? */ +} + +static void +wpi_set_channel(struct ieee80211com *ic) +{ + /* ??? */ +} + +static void +wpi_ops(void *arg, int npending) +{ + struct wpi_softc *sc = arg; + struct ieee80211com *ic = &sc->sc_ic; + + WPI_LOCK(sc); + while ((ic->ic_state != IEEE80211_S_INIT) && + (sc->sc_flags & WPI_FLAG_BUSY)) { + msleep(sc, &sc->sc_mtx, 0, "wpicmd", hz/10); + } + + if (ic->ic_state == IEEE80211_S_INIT) + goto done; + + switch (sc->sc_scanop) { + + case WPI_SCAN_START: + + wpi_scan(sc, IEEE80211_CHAN_G); + break; + } +done: + WPI_UNLOCK(sc); +} From owner-p4-projects@FreeBSD.ORG Mon Jan 8 08:45: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 71D8216A40F; Mon, 8 Jan 2007 08:45: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 49F4716A403 for ; Mon, 8 Jan 2007 08:45:08 +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 22CE713C455 for ; Mon, 8 Jan 2007 08:45:08 +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 l088j8cV030482 for ; Mon, 8 Jan 2007 08:45:08 GMT (envelope-from piso@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l088j7fn030479 for perforce@freebsd.org; Mon, 8 Jan 2007 08:45:07 GMT (envelope-from piso@freebsd.org) Date: Mon, 8 Jan 2007 08:45:07 GMT Message-Id: <200701080845.l088j7fn030479@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 112680 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 08 Jan 2007 08:45:08 -0000 http://perforce.freebsd.org/chv.cgi?CH=112680 Change 112680 by piso@piso_newluxor on 2007/01/08 08:44:39 Compilation. Affected files ... .. //depot/projects/soc2006/intr_filter/amd64/amd64/intr_machdep.c#20 edit .. //depot/projects/soc2006/intr_filter/kern/kern_intr.c#31 edit .. //depot/projects/soc2006/intr_filter/sys/interrupt.h#16 edit Differences ... ==== //depot/projects/soc2006/intr_filter/amd64/amd64/intr_machdep.c#20 (text+ko) ==== @@ -79,6 +79,7 @@ static void intr_eoi_src(void *arg); static void intr_disab_eoi_src(void *arg); void intr_callout_reset(void); +static void intr_event_stray(void *cookie); #ifdef SMP static int assign_cpu; ==== //depot/projects/soc2006/intr_filter/kern/kern_intr.c#31 (text+ko) ==== @@ -613,7 +613,7 @@ return (EINVAL); } else { error = intr_event_create(&ie, NULL, IE_SOFT, NULL, - NULL, "swi%d:", pri); + NULL, NULL, NULL, "swi%d:", pri); if (error) return (error); if (eventp != NULL) ==== //depot/projects/soc2006/intr_filter/sys/interrupt.h#16 (text+ko) ==== @@ -119,16 +119,15 @@ int intr_filter_loop(struct intr_event *ie, struct trapframe *frame, struct intr_thread **ithd); void stray_detection(void *_arg); -int intr_event_handle(struct intr_event *ie, struct trapframe *frame, - void (*intr_eoi_src)(void *), void (*intr_disab_eoi_src)(void *)); +int intr_event_handle(struct intr_event *ie, struct trapframe *frame); u_char intr_priority(enum intr_type flags); int intr_event_add_handler(struct intr_event *ie, const char *name, - driver_filter_t filter, driver_intr_t handler, void *arg, u_char pri, enum intr_type flags, - void **cookiep); + driver_filter_t filter, driver_intr_t handler, void *arg, + u_char pri, enum intr_type flags, void **cookiep); int intr_event_create(struct intr_event **event, void *source, int flags, void (*enable)(void *), int (*pending)(void *), - const char *fmt, ...) - __printflike(6, 7); + void (*eoi)(void *), void (*disab)(void *), const char *fmt, ...) + __printflike(8, 9); int intr_event_destroy(struct intr_event *ie); int intr_event_remove_handler(void *cookie); int intr_event_schedule_thread(struct intr_event *ie, struct intr_thread *ithd); From owner-p4-projects@FreeBSD.ORG Mon Jan 8 18:59:30 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 C205D16A407; Mon, 8 Jan 2007 18:59:30 +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 918CD16A415 for ; Mon, 8 Jan 2007 18:59:30 +0000 (UTC) (envelope-from als@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 8130913C442 for ; Mon, 8 Jan 2007 18:59:30 +0000 (UTC) (envelope-from als@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l08IxUJU056046 for ; Mon, 8 Jan 2007 18:59:30 GMT (envelope-from als@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l08IweSS056017 for perforce@freebsd.org; Mon, 8 Jan 2007 18:58:40 GMT (envelope-from als@FreeBSD.org) Date: Mon, 8 Jan 2007 18:58:40 GMT Message-Id: <200701081858.l08IweSS056017@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to als@FreeBSD.org using -f From: Alex Lyashkov To: Perforce Change Reviews Cc: Subject: PERFORCE change 112682 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 08 Jan 2007 18:59:31 -0000 http://perforce.freebsd.org/chv.cgi?CH=112682 Change 112682 by als@als_head on 2007/01/08 18:58:14 update to today`s HEAD. Affected files ... .. //depot/projects/jail2/sys/Makefile#4 integrate .. //depot/projects/jail2/sys/amd64/amd64/apic_vector.S#2 integrate .. //depot/projects/jail2/sys/amd64/amd64/cpu_switch.S#2 integrate .. //depot/projects/jail2/sys/amd64/amd64/exception.S#2 integrate .. //depot/projects/jail2/sys/amd64/amd64/genassym.c#3 integrate .. //depot/projects/jail2/sys/amd64/amd64/intr_machdep.c#5 integrate .. //depot/projects/jail2/sys/amd64/amd64/local_apic.c#7 integrate .. //depot/projects/jail2/sys/amd64/amd64/machdep.c#9 integrate .. //depot/projects/jail2/sys/amd64/amd64/minidump_machdep.c#3 integrate .. //depot/projects/jail2/sys/amd64/amd64/mptable_pci.c#3 integrate .. //depot/projects/jail2/sys/amd64/amd64/pmap.c#6 integrate .. //depot/projects/jail2/sys/amd64/amd64/trap.c#5 integrate .. //depot/projects/jail2/sys/amd64/conf/GENERIC#7 integrate .. //depot/projects/jail2/sys/amd64/ia32/ia32_exception.S#2 integrate .. //depot/projects/jail2/sys/amd64/ia32/ia32_syscall.c#3 integrate .. //depot/projects/jail2/sys/amd64/include/apicvar.h#4 integrate .. //depot/projects/jail2/sys/amd64/include/atomic.h#2 integrate .. //depot/projects/jail2/sys/amd64/include/intr_machdep.h#4 integrate .. //depot/projects/jail2/sys/amd64/include/pmap.h#4 integrate .. //depot/projects/jail2/sys/amd64/isa/atpic.c#3 integrate .. //depot/projects/jail2/sys/amd64/isa/atpic_vector.S#3 integrate .. //depot/projects/jail2/sys/amd64/isa/clock.c#3 integrate .. //depot/projects/jail2/sys/amd64/isa/icu.h#2 integrate .. //depot/projects/jail2/sys/amd64/linux32/linux.h#5 integrate .. //depot/projects/jail2/sys/amd64/linux32/linux32_dummy.c#6 integrate .. //depot/projects/jail2/sys/amd64/linux32/linux32_machdep.c#7 integrate .. //depot/projects/jail2/sys/amd64/linux32/linux32_proto.h#7 integrate .. //depot/projects/jail2/sys/amd64/linux32/linux32_syscall.h#7 integrate .. //depot/projects/jail2/sys/amd64/linux32/linux32_sysent.c#7 integrate .. //depot/projects/jail2/sys/amd64/linux32/linux32_sysvec.c#5 integrate .. //depot/projects/jail2/sys/amd64/linux32/syscalls.master#6 integrate .. //depot/projects/jail2/sys/amd64/pci/pci_bus.c#3 integrate .. //depot/projects/jail2/sys/arm/arm/cpufunc.c#6 integrate .. //depot/projects/jail2/sys/arm/arm/genassym.c#3 integrate .. //depot/projects/jail2/sys/arm/arm/pmap.c#6 integrate .. //depot/projects/jail2/sys/arm/at91/at91_mci.c#2 integrate .. //depot/projects/jail2/sys/arm/at91/at91_pio.c#3 integrate .. //depot/projects/jail2/sys/arm/at91/at91_pioreg.h#2 integrate .. //depot/projects/jail2/sys/arm/at91/at91_pmc.c#4 integrate .. //depot/projects/jail2/sys/arm/at91/at91_spi.c#4 integrate .. //depot/projects/jail2/sys/arm/at91/at91_spireg.h#3 integrate .. //depot/projects/jail2/sys/arm/at91/at91_st.c#3 integrate .. //depot/projects/jail2/sys/arm/at91/at91_twi.c#6 integrate .. //depot/projects/jail2/sys/arm/at91/files.at91#4 integrate .. //depot/projects/jail2/sys/arm/at91/if_ate.c#6 integrate .. //depot/projects/jail2/sys/arm/at91/kb920x_machdep.c#7 integrate .. //depot/projects/jail2/sys/arm/at91/uart_dev_at91usart.c#3 integrate .. //depot/projects/jail2/sys/arm/conf/BWCT#1 branch .. //depot/projects/jail2/sys/arm/conf/BWCT.hints#1 branch .. //depot/projects/jail2/sys/arm/include/atomic.h#3 integrate .. //depot/projects/jail2/sys/arm/include/cpuconf.h#4 integrate .. //depot/projects/jail2/sys/arm/sa11x0/assabet_machdep.c#5 integrate .. //depot/projects/jail2/sys/arm/xscale/i80321/ep80219_machdep.c#4 integrate .. //depot/projects/jail2/sys/arm/xscale/i80321/i80321_space.c#3 integrate .. //depot/projects/jail2/sys/arm/xscale/i80321/i80321_wdog.c#2 integrate .. //depot/projects/jail2/sys/arm/xscale/i80321/iq31244_machdep.c#6 integrate .. //depot/projects/jail2/sys/arm/xscale/ixp425/avila_machdep.c#2 integrate .. //depot/projects/jail2/sys/arm/xscale/ixp425/files.ixp425#2 integrate .. //depot/projects/jail2/sys/arm/xscale/ixp425/ixdp425reg.h#2 integrate .. //depot/projects/jail2/sys/boot/arm/at91/Makefile.inc#5 integrate .. //depot/projects/jail2/sys/boot/arm/at91/boot0spi/main.c#5 integrate .. //depot/projects/jail2/sys/boot/arm/at91/libat91/arm_init.S#2 integrate .. //depot/projects/jail2/sys/boot/arm/at91/libat91/at91rm9200_lowlevel.h#4 integrate .. //depot/projects/jail2/sys/boot/arm/at91/libat91/eeprom.c#3 integrate .. //depot/projects/jail2/sys/boot/arm/at91/libat91/emac.c#5 integrate .. //depot/projects/jail2/sys/boot/arm/at91/libat91/emac_init.c#4 integrate .. //depot/projects/jail2/sys/boot/arm/at91/libat91/lib.h#4 integrate .. //depot/projects/jail2/sys/boot/arm/at91/libat91/spi_flash.c#3 integrate .. //depot/projects/jail2/sys/boot/arm/at91/libat91/spi_flash.h#2 integrate .. //depot/projects/jail2/sys/boot/common/bootstrap.h#3 integrate .. //depot/projects/jail2/sys/boot/common/loader.8#4 integrate .. //depot/projects/jail2/sys/boot/forth/loader.conf#4 integrate .. //depot/projects/jail2/sys/boot/i386/btx/btx/btx.S#3 integrate .. //depot/projects/jail2/sys/boot/sparc64/loader/main.c#3 integrate .. //depot/projects/jail2/sys/bsm/audit.h#4 integrate .. //depot/projects/jail2/sys/bsm/audit_internal.h#5 integrate .. //depot/projects/jail2/sys/bsm/audit_kevents.h#6 integrate .. //depot/projects/jail2/sys/bsm/audit_record.h#6 integrate .. //depot/projects/jail2/sys/cam/cam_ccb.h#3 integrate .. //depot/projects/jail2/sys/cam/cam_periph.c#3 integrate .. //depot/projects/jail2/sys/cam/cam_xpt.c#6 integrate .. //depot/projects/jail2/sys/cam/cam_xpt.h#2 integrate .. //depot/projects/jail2/sys/cam/scsi/scsi_all.h#4 integrate .. //depot/projects/jail2/sys/cam/scsi/scsi_cd.c#3 integrate .. //depot/projects/jail2/sys/cam/scsi/scsi_ch.c#2 integrate .. //depot/projects/jail2/sys/cam/scsi/scsi_da.c#5 integrate .. //depot/projects/jail2/sys/cam/scsi/scsi_pass.c#3 integrate .. //depot/projects/jail2/sys/cam/scsi/scsi_pt.c#2 integrate .. //depot/projects/jail2/sys/cam/scsi/scsi_sa.c#2 integrate .. //depot/projects/jail2/sys/cam/scsi/scsi_ses.c#2 integrate .. //depot/projects/jail2/sys/cam/scsi/scsi_targ_bh.c#2 integrate .. //depot/projects/jail2/sys/cam/scsi/scsi_target.c#2 integrate .. //depot/projects/jail2/sys/compat/freebsd32/freebsd32_misc.c#5 integrate .. //depot/projects/jail2/sys/compat/freebsd32/freebsd32_proto.h#10 integrate .. //depot/projects/jail2/sys/compat/freebsd32/freebsd32_syscall.h#10 integrate .. //depot/projects/jail2/sys/compat/freebsd32/freebsd32_syscalls.c#10 integrate .. //depot/projects/jail2/sys/compat/freebsd32/freebsd32_sysent.c#10 integrate .. //depot/projects/jail2/sys/compat/freebsd32/syscalls.master#9 integrate .. //depot/projects/jail2/sys/compat/linprocfs/linprocfs.c#5 integrate .. //depot/projects/jail2/sys/compat/linsysfs/linsysfs.c#2 integrate .. //depot/projects/jail2/sys/compat/linux/linux_emul.c#5 integrate .. //depot/projects/jail2/sys/compat/linux/linux_emul.h#3 integrate .. //depot/projects/jail2/sys/compat/linux/linux_ipc.c#4 integrate .. //depot/projects/jail2/sys/compat/linux/linux_ipc.h#2 integrate .. //depot/projects/jail2/sys/compat/linux/linux_mib.c#3 integrate .. //depot/projects/jail2/sys/compat/linux/linux_mib.h#2 integrate .. //depot/projects/jail2/sys/compat/linux/linux_misc.c#10 integrate .. //depot/projects/jail2/sys/compat/linux/linux_misc.h#2 integrate .. //depot/projects/jail2/sys/compat/linux/linux_signal.c#4 integrate .. //depot/projects/jail2/sys/compat/linux/linux_stats.c#5 integrate .. //depot/projects/jail2/sys/compat/linux/linux_time.c#2 integrate .. //depot/projects/jail2/sys/compat/ndis/subr_ntoskrnl.c#2 integrate .. //depot/projects/jail2/sys/conf/NOTES#10 integrate .. //depot/projects/jail2/sys/conf/files#10 integrate .. //depot/projects/jail2/sys/conf/files.amd64#8 integrate .. //depot/projects/jail2/sys/conf/files.arm#4 integrate .. //depot/projects/jail2/sys/conf/files.i386#7 integrate .. //depot/projects/jail2/sys/conf/files.pc98#5 integrate .. //depot/projects/jail2/sys/conf/files.powerpc#5 integrate .. //depot/projects/jail2/sys/conf/files.sparc64#3 integrate .. //depot/projects/jail2/sys/conf/files.sun4v#5 integrate .. //depot/projects/jail2/sys/conf/kern.mk#3 integrate .. //depot/projects/jail2/sys/conf/kern.post.mk#5 integrate .. //depot/projects/jail2/sys/conf/options#9 integrate .. //depot/projects/jail2/sys/conf/options.arm#5 integrate .. //depot/projects/jail2/sys/contrib/dev/ath/ah.h#2 integrate .. //depot/projects/jail2/sys/contrib/dev/ath/ah_desc.h#2 integrate .. //depot/projects/jail2/sys/contrib/dev/ath/ah_devid.h#2 integrate .. //depot/projects/jail2/sys/contrib/dev/ath/public/alpha-elf.hal.o.uu#2 integrate .. //depot/projects/jail2/sys/contrib/dev/ath/public/alpha-elf.inc#2 integrate .. //depot/projects/jail2/sys/contrib/dev/ath/public/ap30.hal.o.uu#2 integrate .. //depot/projects/jail2/sys/contrib/dev/ath/public/ap43.hal.o.uu#2 integrate .. //depot/projects/jail2/sys/contrib/dev/ath/public/ap51.hal.o.uu#2 integrate .. //depot/projects/jail2/sys/contrib/dev/ath/public/ap61.hal.o.uu#2 integrate .. //depot/projects/jail2/sys/contrib/dev/ath/public/arm9-le-thumb-elf.hal.o.uu#2 integrate .. //depot/projects/jail2/sys/contrib/dev/ath/public/arm9-le-thumb-elf.inc#2 integrate .. //depot/projects/jail2/sys/contrib/dev/ath/public/armv4-be-elf.hal.o.uu#2 integrate .. //depot/projects/jail2/sys/contrib/dev/ath/public/armv4-be-elf.inc#2 integrate .. //depot/projects/jail2/sys/contrib/dev/ath/public/armv4-le-elf.hal.o.uu#2 integrate .. //depot/projects/jail2/sys/contrib/dev/ath/public/armv4-le-elf.inc#2 integrate .. //depot/projects/jail2/sys/contrib/dev/ath/public/i386-elf.hal.o.uu#2 integrate .. //depot/projects/jail2/sys/contrib/dev/ath/public/mips-be-elf.hal.o.uu#2 integrate .. //depot/projects/jail2/sys/contrib/dev/ath/public/mips-le-elf.hal.o.uu#2 integrate .. //depot/projects/jail2/sys/contrib/dev/ath/public/mips1-be-elf.hal.o.uu#2 integrate .. //depot/projects/jail2/sys/contrib/dev/ath/public/mips1-le-elf.hal.o.uu#2 integrate .. //depot/projects/jail2/sys/contrib/dev/ath/public/mipsisa32-be-elf.hal.o.uu#2 integrate .. //depot/projects/jail2/sys/contrib/dev/ath/public/mipsisa32-le-elf.hal.o.uu#2 integrate .. //depot/projects/jail2/sys/contrib/dev/ath/public/powerpc-be-eabi.hal.o.uu#2 integrate .. //depot/projects/jail2/sys/contrib/dev/ath/public/powerpc-be-elf.hal.o.uu#2 integrate .. //depot/projects/jail2/sys/contrib/dev/ath/public/powerpc-le-eabi.hal.o.uu#2 integrate .. //depot/projects/jail2/sys/contrib/dev/ath/public/sh4-le-elf.hal.o.uu#2 integrate .. //depot/projects/jail2/sys/contrib/dev/ath/public/sparc-be-elf.hal.o.uu#2 integrate .. //depot/projects/jail2/sys/contrib/dev/ath/public/sparc64-be-elf.hal.o.uu#2 integrate .. //depot/projects/jail2/sys/contrib/dev/ath/public/wackelf.c#1 branch .. //depot/projects/jail2/sys/contrib/dev/ath/public/x86_64-elf.hal.o.uu#2 integrate .. //depot/projects/jail2/sys/contrib/dev/ath/public/xscale-be-elf.hal.o.uu#2 integrate .. //depot/projects/jail2/sys/contrib/dev/ath/public/xscale-be-elf.inc#2 integrate .. //depot/projects/jail2/sys/contrib/dev/ath/public/xscale-le-elf.hal.o.uu#2 integrate .. //depot/projects/jail2/sys/contrib/dev/ath/public/xscale-le-elf.inc#2 integrate .. //depot/projects/jail2/sys/contrib/dev/ath/version.h#2 integrate .. //depot/projects/jail2/sys/contrib/ipfilter/netinet/ip_state.c#3 integrate .. //depot/projects/jail2/sys/contrib/pf/net/if_pfsync.c#5 integrate .. //depot/projects/jail2/sys/contrib/pf/net/pf.c#4 integrate .. //depot/projects/jail2/sys/contrib/pf/net/pf_ioctl.c#4 integrate .. //depot/projects/jail2/sys/ddb/db_ps.c#5 integrate .. //depot/projects/jail2/sys/dev/aac/aac_linux.c#2 integrate .. //depot/projects/jail2/sys/dev/aac/aac_pci.c#4 integrate .. //depot/projects/jail2/sys/dev/acpica/acpi_battery.c#2 integrate .. //depot/projects/jail2/sys/dev/acpica/acpi_pcib_acpi.c#3 integrate .. //depot/projects/jail2/sys/dev/advansys/adv_eisa.c#2 integrate .. //depot/projects/jail2/sys/dev/advansys/adv_isa.c#2 integrate .. //depot/projects/jail2/sys/dev/advansys/adv_pci.c#2 integrate .. //depot/projects/jail2/sys/dev/advansys/advansys.c#3 integrate .. //depot/projects/jail2/sys/dev/advansys/adw_pci.c#2 integrate .. //depot/projects/jail2/sys/dev/advansys/adwcam.c#3 integrate .. //depot/projects/jail2/sys/dev/aha/aha.c#3 integrate .. //depot/projects/jail2/sys/dev/aha/aha_isa.c#2 integrate .. //depot/projects/jail2/sys/dev/aha/aha_mca.c#2 integrate .. //depot/projects/jail2/sys/dev/ahb/ahb.c#3 integrate .. //depot/projects/jail2/sys/dev/aic7xxx/aic7xxx.seq#2 integrate .. //depot/projects/jail2/sys/dev/aic7xxx/aicasm/aicasm_gram.y#2 integrate .. //depot/projects/jail2/sys/dev/aic7xxx/aicasm/aicasm_macro_gram.y#2 integrate .. //depot/projects/jail2/sys/dev/amd/amd.c#3 integrate .. //depot/projects/jail2/sys/dev/amr/amr_pci.c#2 integrate .. //depot/projects/jail2/sys/dev/arcmsr/arcmsr.c#4 integrate .. //depot/projects/jail2/sys/dev/arcmsr/arcmsr.h#2 integrate .. //depot/projects/jail2/sys/dev/arl/if_arl.c#3 integrate .. //depot/projects/jail2/sys/dev/asr/asr.c#4 integrate .. //depot/projects/jail2/sys/dev/ata/ata-all.c#4 integrate .. //depot/projects/jail2/sys/dev/ata/ata-chipset.c#7 integrate .. //depot/projects/jail2/sys/dev/ata/ata-pci.h#4 integrate .. //depot/projects/jail2/sys/dev/ata/ata-queue.c#3 integrate .. //depot/projects/jail2/sys/dev/ath/ath_rate/amrr/amrr.c#2 integrate .. //depot/projects/jail2/sys/dev/ath/ath_rate/onoe/onoe.c#2 integrate .. //depot/projects/jail2/sys/dev/ath/ath_rate/sample/sample.c#2 integrate .. //depot/projects/jail2/sys/dev/ath/ath_rate/sample/sample.h#3 integrate .. //depot/projects/jail2/sys/dev/ath/if_ath.c#6 integrate .. //depot/projects/jail2/sys/dev/ath/if_ath_pci.c#2 integrate .. //depot/projects/jail2/sys/dev/ath/if_athrate.h#2 integrate .. //depot/projects/jail2/sys/dev/ath/if_athvar.h#6 integrate .. //depot/projects/jail2/sys/dev/atkbdc/psm.c#2 integrate .. //depot/projects/jail2/sys/dev/awi/awivar.h#2 integrate .. //depot/projects/jail2/sys/dev/bce/if_bce.c#7 integrate .. //depot/projects/jail2/sys/dev/bge/if_bge.c#9 integrate .. //depot/projects/jail2/sys/dev/bge/if_bgereg.h#6 integrate .. //depot/projects/jail2/sys/dev/bktr/bktr_i2c.c#3 integrate .. //depot/projects/jail2/sys/dev/buslogic/bt.c#3 integrate .. //depot/projects/jail2/sys/dev/buslogic/bt_eisa.c#2 integrate .. //depot/projects/jail2/sys/dev/buslogic/bt_isa.c#2 integrate .. //depot/projects/jail2/sys/dev/buslogic/bt_mca.c#2 integrate .. //depot/projects/jail2/sys/dev/buslogic/bt_pci.c#2 integrate .. //depot/projects/jail2/sys/dev/ce/if_ce.c#3 integrate .. //depot/projects/jail2/sys/dev/ciss/ciss.c#3 integrate .. //depot/projects/jail2/sys/dev/cp/if_cp.c#3 integrate .. //depot/projects/jail2/sys/dev/ctau/if_ct.c#3 integrate .. //depot/projects/jail2/sys/dev/cx/if_cx.c#3 integrate .. //depot/projects/jail2/sys/dev/dc/if_dc.c#4 integrate .. //depot/projects/jail2/sys/dev/dc/if_dcreg.h#3 integrate .. //depot/projects/jail2/sys/dev/dpt/dpt_eisa.c#2 integrate .. //depot/projects/jail2/sys/dev/dpt/dpt_isa.c#2 integrate .. //depot/projects/jail2/sys/dev/dpt/dpt_pci.c#2 integrate .. //depot/projects/jail2/sys/dev/drm/drm_agpsupport.c#2 integrate .. //depot/projects/jail2/sys/dev/en/midway.c#3 integrate .. //depot/projects/jail2/sys/dev/ep/if_ep.c#2 integrate .. //depot/projects/jail2/sys/dev/esp/esp_sbus.c#2 integrate .. //depot/projects/jail2/sys/dev/firewire/fwdev.c#2 integrate .. //depot/projects/jail2/sys/dev/firewire/if_fwip.c#2 integrate .. //depot/projects/jail2/sys/dev/flash/at45d.c#1 branch .. //depot/projects/jail2/sys/dev/fxp/if_fxp.c#5 integrate .. //depot/projects/jail2/sys/dev/fxp/if_fxpvar.h#2 integrate .. //depot/projects/jail2/sys/dev/gem/if_gem.c#3 integrate .. //depot/projects/jail2/sys/dev/gem/if_gemvar.h#2 integrate .. //depot/projects/jail2/sys/dev/hme/if_hme.c#3 integrate .. //depot/projects/jail2/sys/dev/hme/if_hmevar.h#2 integrate .. //depot/projects/jail2/sys/dev/hptmv/entry.c#2 integrate .. //depot/projects/jail2/sys/dev/ichwd/ichwd.c#2 integrate .. //depot/projects/jail2/sys/dev/if_ndis/if_ndis.c#3 integrate .. //depot/projects/jail2/sys/dev/iicbus/iic.h#3 integrate .. //depot/projects/jail2/sys/dev/iicbus/iicbb.c#4 integrate .. //depot/projects/jail2/sys/dev/iicbus/iicbus_if.m#3 integrate .. //depot/projects/jail2/sys/dev/iicbus/iiconf.c#3 integrate .. //depot/projects/jail2/sys/dev/iicbus/iiconf.h#3 integrate .. //depot/projects/jail2/sys/dev/iir/iir_pci.c#2 integrate .. //depot/projects/jail2/sys/dev/ipmi/ipmi.c#5 integrate .. //depot/projects/jail2/sys/dev/isp/isp.c#6 integrate .. //depot/projects/jail2/sys/dev/isp/isp_freebsd.c#7 integrate .. //depot/projects/jail2/sys/dev/isp/isp_freebsd.h#7 integrate .. //depot/projects/jail2/sys/dev/isp/isp_pci.c#7 integrate .. //depot/projects/jail2/sys/dev/isp/isp_sbus.c#5 integrate .. //depot/projects/jail2/sys/dev/isp/isp_target.c#4 integrate .. //depot/projects/jail2/sys/dev/isp/ispmbox.h#5 integrate .. //depot/projects/jail2/sys/dev/isp/ispvar.h#5 integrate .. //depot/projects/jail2/sys/dev/ispfw/ispfw.c#4 integrate .. //depot/projects/jail2/sys/dev/iwi/if_iwi.c#5 integrate .. //depot/projects/jail2/sys/dev/le/am7990.c#2 integrate .. //depot/projects/jail2/sys/dev/le/am79900.c#2 integrate .. //depot/projects/jail2/sys/dev/le/lance.c#2 integrate .. //depot/projects/jail2/sys/dev/le/lancevar.h#2 integrate .. //depot/projects/jail2/sys/dev/md/md.c#3 integrate .. //depot/projects/jail2/sys/dev/mfi/mfi.c#9 integrate .. //depot/projects/jail2/sys/dev/mfi/mfi_ioctl.h#3 integrate .. //depot/projects/jail2/sys/dev/mfi/mfireg.h#5 integrate .. //depot/projects/jail2/sys/dev/mii/acphy.c#3 integrate .. //depot/projects/jail2/sys/dev/mii/amphy.c#3 integrate .. //depot/projects/jail2/sys/dev/mii/bmtphy.c#3 integrate .. //depot/projects/jail2/sys/dev/mii/brgphy.c#5 integrate .. //depot/projects/jail2/sys/dev/mii/ciphy.c#3 integrate .. //depot/projects/jail2/sys/dev/mii/e1000phy.c#3 integrate .. //depot/projects/jail2/sys/dev/mii/e1000phyreg.h#2 integrate .. //depot/projects/jail2/sys/dev/mii/gentbi.c#2 integrate .. //depot/projects/jail2/sys/dev/mii/inphy.c#3 integrate .. //depot/projects/jail2/sys/dev/mii/ip1000phy.c#2 integrate .. //depot/projects/jail2/sys/dev/mii/lxtphy.c#3 integrate .. //depot/projects/jail2/sys/dev/mii/mii_physubr.c#3 integrate .. //depot/projects/jail2/sys/dev/mii/miidevs#4 integrate .. //depot/projects/jail2/sys/dev/mii/miivar.h#2 integrate .. //depot/projects/jail2/sys/dev/mii/mlphy.c#3 integrate .. //depot/projects/jail2/sys/dev/mii/nsgphy.c#3 integrate .. //depot/projects/jail2/sys/dev/mii/nsphy.c#3 integrate .. //depot/projects/jail2/sys/dev/mii/pnaphy.c#3 integrate .. //depot/projects/jail2/sys/dev/mii/qsphy.c#3 integrate .. //depot/projects/jail2/sys/dev/mii/rgephy.c#4 integrate .. //depot/projects/jail2/sys/dev/mii/rlphy.c#3 integrate .. //depot/projects/jail2/sys/dev/mii/rlswitch.c#1 branch .. //depot/projects/jail2/sys/dev/mii/tdkphy.c#3 integrate .. //depot/projects/jail2/sys/dev/mii/tlphy.c#3 integrate .. //depot/projects/jail2/sys/dev/mii/xmphy.c#3 integrate .. //depot/projects/jail2/sys/dev/mk48txx/mk48txx.c#3 integrate .. //depot/projects/jail2/sys/dev/mly/mly.c#3 integrate .. //depot/projects/jail2/sys/dev/mpt/mpt.c#6 integrate .. //depot/projects/jail2/sys/dev/mpt/mpt.h#6 integrate .. //depot/projects/jail2/sys/dev/mpt/mpt_cam.c#8 integrate .. //depot/projects/jail2/sys/dev/mpt/mpt_debug.c#3 integrate .. //depot/projects/jail2/sys/dev/mpt/mpt_pci.c#6 integrate .. //depot/projects/jail2/sys/dev/mpt/mpt_raid.c#4 integrate .. //depot/projects/jail2/sys/dev/msk/if_msk.c#1 branch .. //depot/projects/jail2/sys/dev/msk/if_mskreg.h#1 branch .. //depot/projects/jail2/sys/dev/mxge/if_mxge.c#6 integrate .. //depot/projects/jail2/sys/dev/my/if_my.c#3 integrate .. //depot/projects/jail2/sys/dev/nfe/if_nfe.c#6 integrate .. //depot/projects/jail2/sys/dev/nfe/if_nfereg.h#4 integrate .. //depot/projects/jail2/sys/dev/nfe/if_nfevar.h#2 integrate .. //depot/projects/jail2/sys/dev/nve/if_nvereg.h#2 integrate .. //depot/projects/jail2/sys/dev/pci/pci.c#7 integrate .. //depot/projects/jail2/sys/dev/pci/pci_private.h#5 integrate .. //depot/projects/jail2/sys/dev/pci/pcib_private.h#3 integrate .. //depot/projects/jail2/sys/dev/pci/pcireg.h#3 integrate .. //depot/projects/jail2/sys/dev/pci/pcivar.h#5 integrate .. //depot/projects/jail2/sys/dev/ppbus/if_plip.c#2 integrate .. //depot/projects/jail2/sys/dev/ppbus/vpo.c#2 integrate .. //depot/projects/jail2/sys/dev/ral/rt2560.c#3 integrate .. //depot/projects/jail2/sys/dev/ral/rt2560var.h#2 integrate .. //depot/projects/jail2/sys/dev/ral/rt2661.c#2 integrate .. //depot/projects/jail2/sys/dev/ral/rt2661var.h#2 integrate .. //depot/projects/jail2/sys/dev/re/if_re.c#6 integrate .. //depot/projects/jail2/sys/dev/sk/if_sk.c#4 integrate .. //depot/projects/jail2/sys/dev/sk/if_skreg.h#4 integrate .. //depot/projects/jail2/sys/dev/sound/pci/atiixp.c#3 integrate .. //depot/projects/jail2/sys/dev/sound/pci/cmi.c#4 integrate .. //depot/projects/jail2/sys/dev/sound/pci/emu10kx-pcm.c#2 integrate .. //depot/projects/jail2/sys/dev/sound/pci/emu10kx.c#2 integrate .. //depot/projects/jail2/sys/dev/sound/pci/emu10kx.h#2 integrate .. //depot/projects/jail2/sys/dev/sound/pci/envy24.c#5 integrate .. //depot/projects/jail2/sys/dev/sound/pci/envy24ht.c#2 integrate .. //depot/projects/jail2/sys/dev/sound/pci/envy24ht.h#2 integrate .. //depot/projects/jail2/sys/dev/sound/pci/es137x.c#3 integrate .. //depot/projects/jail2/sys/dev/sound/pci/hda/hda_reg.h#2 integrate .. //depot/projects/jail2/sys/dev/sound/pci/hda/hdac.c#3 integrate .. //depot/projects/jail2/sys/dev/sound/pci/hda/hdac_private.h#2 integrate .. //depot/projects/jail2/sys/dev/sound/pci/ich.c#4 integrate .. //depot/projects/jail2/sys/dev/sound/pci/via8233.c#3 integrate .. //depot/projects/jail2/sys/dev/sound/pcm/ac97.c#3 integrate .. //depot/projects/jail2/sys/dev/sound/pcm/ac97.h#2 integrate .. //depot/projects/jail2/sys/dev/sound/pcm/buffer.c#4 integrate .. //depot/projects/jail2/sys/dev/sound/pcm/buffer.h#4 integrate .. //depot/projects/jail2/sys/dev/sound/pcm/channel.c#4 integrate .. //depot/projects/jail2/sys/dev/sound/pcm/channel.h#3 integrate .. //depot/projects/jail2/sys/dev/sound/pcm/dsp.c#5 integrate .. //depot/projects/jail2/sys/dev/sound/pcm/fake.c#2 integrate .. //depot/projects/jail2/sys/dev/sound/pcm/feeder.c#2 integrate .. //depot/projects/jail2/sys/dev/sound/pcm/feeder.h#2 integrate .. //depot/projects/jail2/sys/dev/sound/pcm/feeder_fmt.c#2 integrate .. //depot/projects/jail2/sys/dev/sound/pcm/feeder_rate.c#3 integrate .. //depot/projects/jail2/sys/dev/sound/pcm/feeder_volume.c#2 integrate .. //depot/projects/jail2/sys/dev/sound/pcm/mixer.c#4 integrate .. //depot/projects/jail2/sys/dev/sound/pcm/sndstat.c#2 integrate .. //depot/projects/jail2/sys/dev/sound/pcm/sound.c#5 integrate .. //depot/projects/jail2/sys/dev/sound/pcm/sound.h#5 integrate .. //depot/projects/jail2/sys/dev/sound/pcm/vchan.c#3 integrate .. //depot/projects/jail2/sys/dev/sound/usb/uaudio.c#3 integrate .. //depot/projects/jail2/sys/dev/trm/trm.c#3 integrate .. //depot/projects/jail2/sys/dev/twa/tw_osl_freebsd.c#2 integrate .. //depot/projects/jail2/sys/dev/usb/if_aue.c#5 integrate .. //depot/projects/jail2/sys/dev/usb/if_auereg.h#2 integrate .. //depot/projects/jail2/sys/dev/usb/ukbd.c#5 integrate .. //depot/projects/jail2/sys/dev/usb/uplcom.c#5 integrate .. //depot/projects/jail2/sys/dev/usb/usb_ethersubr.c#3 integrate .. //depot/projects/jail2/sys/dev/usb/usb_ethersubr.h#2 integrate .. //depot/projects/jail2/sys/dev/usb/usb_quirks.c#5 integrate .. //depot/projects/jail2/sys/dev/usb/usb_quirks.h#2 integrate .. //depot/projects/jail2/sys/dev/usb/usbdevs#6 integrate .. //depot/projects/jail2/sys/dev/usb/usbdi.c#5 integrate .. //depot/projects/jail2/sys/dev/usb/usbdi_util.h#3 integrate .. //depot/projects/jail2/sys/dev/vge/if_vge.c#3 integrate .. //depot/projects/jail2/sys/dev/watchdog/watchdog.c#2 integrate .. //depot/projects/jail2/sys/dev/wds/wd7000.c#2 integrate .. //depot/projects/jail2/sys/dev/wi/if_wi.c#4 integrate .. //depot/projects/jail2/sys/dev/wi/if_wivar.h#2 integrate .. //depot/projects/jail2/sys/fs/msdosfs/bpb.h#2 integrate .. //depot/projects/jail2/sys/fs/msdosfs/msdosfs_conv.c#4 integrate .. //depot/projects/jail2/sys/fs/msdosfs/msdosfs_vfsops.c#5 integrate .. //depot/projects/jail2/sys/fs/msdosfs/msdosfs_vnops.c#4 integrate .. //depot/projects/jail2/sys/fs/procfs/procfs_status.c#4 integrate .. //depot/projects/jail2/sys/fs/pseudofs/pseudofs_vncache.c#2 integrate .. //depot/projects/jail2/sys/fs/udf/udf_vnops.c#2 integrate .. //depot/projects/jail2/sys/fs/unionfs/union.h#2 integrate .. //depot/projects/jail2/sys/fs/unionfs/union_subr.c#2 edit .. //depot/projects/jail2/sys/fs/unionfs/union_vfsops.c#3 integrate .. //depot/projects/jail2/sys/fs/unionfs/union_vnops.c#3 integrate .. //depot/projects/jail2/sys/geom/journal/g_journal.c#2 integrate .. //depot/projects/jail2/sys/i386/conf/GENERIC#6 integrate .. //depot/projects/jail2/sys/i386/i386/apic_vector.s#2 integrate .. //depot/projects/jail2/sys/i386/i386/elan-mmcr.c#2 integrate .. //depot/projects/jail2/sys/i386/i386/exception.s#2 integrate .. //depot/projects/jail2/sys/i386/i386/genassym.c#3 integrate .. //depot/projects/jail2/sys/i386/i386/intr_machdep.c#5 integrate .. //depot/projects/jail2/sys/i386/i386/local_apic.c#7 integrate .. //depot/projects/jail2/sys/i386/i386/machdep.c#8 integrate .. //depot/projects/jail2/sys/i386/i386/mptable_pci.c#3 integrate .. //depot/projects/jail2/sys/i386/i386/swtch.s#2 integrate .. //depot/projects/jail2/sys/i386/i386/trap.c#5 integrate .. //depot/projects/jail2/sys/i386/i386/vm86.c#3 integrate .. //depot/projects/jail2/sys/i386/i386/vm86bios.s#2 integrate .. //depot/projects/jail2/sys/i386/include/apicvar.h#4 integrate .. //depot/projects/jail2/sys/i386/include/atomic.h#2 integrate .. //depot/projects/jail2/sys/i386/include/intr_machdep.h#4 integrate .. //depot/projects/jail2/sys/i386/isa/atpic.c#3 integrate .. //depot/projects/jail2/sys/i386/isa/atpic_vector.s#3 integrate .. //depot/projects/jail2/sys/i386/isa/clock.c#4 integrate .. //depot/projects/jail2/sys/i386/isa/icu.h#2 integrate .. //depot/projects/jail2/sys/i386/linux/linux.h#4 integrate .. //depot/projects/jail2/sys/i386/linux/linux_dummy.c#6 integrate .. //depot/projects/jail2/sys/i386/linux/linux_proto.h#8 integrate .. //depot/projects/jail2/sys/i386/linux/linux_syscall.h#7 integrate .. //depot/projects/jail2/sys/i386/linux/linux_sysent.c#7 integrate .. //depot/projects/jail2/sys/i386/linux/syscalls.master#7 integrate .. //depot/projects/jail2/sys/i386/pci/pci_bus.c#3 integrate .. //depot/projects/jail2/sys/i386/pci/pci_cfgreg.c#2 integrate .. //depot/projects/jail2/sys/i4b/driver/i4b_ipr.c#3 integrate .. //depot/projects/jail2/sys/ia64/ia64/machdep.c#5 integrate .. //depot/projects/jail2/sys/isa/pnpparse.c#2 integrate .. //depot/projects/jail2/sys/isofs/cd9660/cd9660_node.h#2 integrate .. //depot/projects/jail2/sys/kern/init_main.c#7 integrate .. //depot/projects/jail2/sys/kern/kern_clock.c#3 integrate .. //depot/projects/jail2/sys/kern/kern_condvar.c#3 integrate .. //depot/projects/jail2/sys/kern/kern_descrip.c#10 integrate .. //depot/projects/jail2/sys/kern/kern_fork.c#6 integrate .. //depot/projects/jail2/sys/kern/kern_idle.c#4 integrate .. //depot/projects/jail2/sys/kern/kern_intr.c#4 integrate .. //depot/projects/jail2/sys/kern/kern_kse.c#3 integrate .. //depot/projects/jail2/sys/kern/kern_ktrace.c#6 integrate .. //depot/projects/jail2/sys/kern/kern_mac.c#5 delete .. //depot/projects/jail2/sys/kern/kern_mutex.c#4 integrate .. //depot/projects/jail2/sys/kern/kern_poll.c#3 integrate .. //depot/projects/jail2/sys/kern/kern_proc.c#7 integrate .. //depot/projects/jail2/sys/kern/kern_resource.c#8 integrate .. //depot/projects/jail2/sys/kern/kern_sig.c#6 integrate .. //depot/projects/jail2/sys/kern/kern_subr.c#4 integrate .. //depot/projects/jail2/sys/kern/kern_switch.c#3 integrate .. //depot/projects/jail2/sys/kern/kern_synch.c#4 integrate .. //depot/projects/jail2/sys/kern/kern_thr.c#8 integrate .. //depot/projects/jail2/sys/kern/kern_thread.c#5 integrate .. //depot/projects/jail2/sys/kern/kern_time.c#7 integrate .. //depot/projects/jail2/sys/kern/kern_umtx.c#8 integrate .. //depot/projects/jail2/sys/kern/ksched.c#2 integrate .. //depot/projects/jail2/sys/kern/link_elf_obj.c#4 integrate .. //depot/projects/jail2/sys/kern/sched_4bsd.c#6 integrate .. //depot/projects/jail2/sys/kern/sched_core.c#4 integrate .. //depot/projects/jail2/sys/kern/sched_ule.c#5 integrate .. //depot/projects/jail2/sys/kern/subr_lock.c#3 integrate .. //depot/projects/jail2/sys/kern/subr_prf.c#6 integrate .. //depot/projects/jail2/sys/kern/subr_rman.c#4 integrate .. //depot/projects/jail2/sys/kern/subr_sleepqueue.c#3 integrate .. //depot/projects/jail2/sys/kern/subr_trap.c#3 integrate .. //depot/projects/jail2/sys/kern/sys_pipe.c#3 integrate .. //depot/projects/jail2/sys/kern/sysv_ipc.c#4 integrate .. //depot/projects/jail2/sys/kern/sysv_msg.c#7 integrate .. //depot/projects/jail2/sys/kern/tty.c#8 integrate .. //depot/projects/jail2/sys/kern/uipc_mbuf.c#4 integrate .. //depot/projects/jail2/sys/kern/uipc_socket.c#9 integrate .. //depot/projects/jail2/sys/kern/uipc_usrreq.c#7 integrate .. //depot/projects/jail2/sys/kern/vfs_bio.c#5 integrate .. //depot/projects/jail2/sys/kern/vfs_export.c#3 integrate .. //depot/projects/jail2/sys/kern/vfs_extattr.c#1 branch .. //depot/projects/jail2/sys/kern/vfs_mount.c#9 integrate .. //depot/projects/jail2/sys/kern/vfs_syscalls.c#9 integrate .. //depot/projects/jail2/sys/modules/Makefile#7 integrate .. //depot/projects/jail2/sys/modules/acpi/Makefile#4 integrate .. //depot/projects/jail2/sys/modules/acpi/acpi/Makefile#2 integrate .. //depot/projects/jail2/sys/modules/isp/Makefile#2 integrate .. //depot/projects/jail2/sys/modules/msk/Makefile#1 branch .. //depot/projects/jail2/sys/modules/netgraph/Makefile#3 integrate .. //depot/projects/jail2/sys/modules/netgraph/deflate/Makefile#1 branch .. //depot/projects/jail2/sys/modules/netgraph/pred1/Makefile#1 branch .. //depot/projects/jail2/sys/modules/sound/driver/emu10kx/Makefile#2 integrate .. //depot/projects/jail2/sys/modules/ufs/Makefile#3 integrate .. //depot/projects/jail2/sys/modules/wlan_amrr/Makefile#1 branch .. //depot/projects/jail2/sys/net/bridgestp.c#6 integrate .. //depot/projects/jail2/sys/net/bridgestp.h#4 integrate .. //depot/projects/jail2/sys/net/ethernet.h#3 integrate .. //depot/projects/jail2/sys/net/if.c#8 integrate .. //depot/projects/jail2/sys/net/if_atmsubr.c#4 integrate .. //depot/projects/jail2/sys/net/if_bridge.c#9 integrate .. //depot/projects/jail2/sys/net/if_bridgevar.h#5 integrate .. //depot/projects/jail2/sys/net/if_enc.c#3 integrate .. //depot/projects/jail2/sys/net/if_ethersubr.c#6 integrate .. //depot/projects/jail2/sys/net/if_llc.h#2 integrate .. //depot/projects/jail2/sys/net/if_media.h#2 integrate .. //depot/projects/jail2/sys/net/if_ppp.c#6 integrate .. //depot/projects/jail2/sys/net/if_pppvar.h#3 integrate .. //depot/projects/jail2/sys/net/if_spppsubr.c#4 integrate .. //depot/projects/jail2/sys/net/if_vlan.c#7 integrate .. //depot/projects/jail2/sys/net/netisr.c#2 integrate .. //depot/projects/jail2/sys/net/ppp_tty.c#4 integrate .. //depot/projects/jail2/sys/net80211/_ieee80211.h#2 integrate .. //depot/projects/jail2/sys/net80211/ieee80211.c#3 integrate .. //depot/projects/jail2/sys/net80211/ieee80211.h#3 integrate .. //depot/projects/jail2/sys/net80211/ieee80211_amrr.c#1 branch .. //depot/projects/jail2/sys/net80211/ieee80211_amrr.h#1 branch .. //depot/projects/jail2/sys/net80211/ieee80211_input.c#4 integrate .. //depot/projects/jail2/sys/net80211/ieee80211_node.c#2 integrate .. //depot/projects/jail2/sys/net80211/ieee80211_output.c#4 integrate .. //depot/projects/jail2/sys/net80211/ieee80211_proto.c#3 integrate .. //depot/projects/jail2/sys/net80211/ieee80211_var.h#3 integrate .. //depot/projects/jail2/sys/netgraph/ng_deflate.c#1 branch .. //depot/projects/jail2/sys/netgraph/ng_deflate.h#1 branch .. //depot/projects/jail2/sys/netgraph/ng_nat.c#3 integrate .. //depot/projects/jail2/sys/netgraph/ng_ppp.c#2 integrate .. //depot/projects/jail2/sys/netgraph/ng_ppp.h#2 integrate .. //depot/projects/jail2/sys/netgraph/ng_pred1.c#1 branch .. //depot/projects/jail2/sys/netgraph/ng_pred1.h#1 branch .. //depot/projects/jail2/sys/netgraph/ng_sppp.c#2 integrate .. //depot/projects/jail2/sys/netinet/igmp.c#3 integrate .. //depot/projects/jail2/sys/netinet/in.h#2 integrate .. //depot/projects/jail2/sys/netinet/in_pcb.c#7 integrate .. //depot/projects/jail2/sys/netinet/ip_carp.h#2 integrate .. //depot/projects/jail2/sys/netinet/ip_divert.c#5 integrate .. //depot/projects/jail2/sys/netinet/ip_fw.h#3 integrate .. //depot/projects/jail2/sys/netinet/ip_fw2.c#10 integrate .. //depot/projects/jail2/sys/netinet/ip_fw_pfil.c#3 integrate .. //depot/projects/jail2/sys/netinet/ip_output.c#7 integrate .. //depot/projects/jail2/sys/netinet/libalias/alias.c#3 integrate .. //depot/projects/jail2/sys/netinet/libalias/alias.h#3 integrate .. //depot/projects/jail2/sys/netinet/libalias/alias_db.c#3 integrate .. //depot/projects/jail2/sys/netinet/libalias/alias_local.h#3 integrate .. //depot/projects/jail2/sys/netinet/libalias/alias_mod.c#2 integrate .. //depot/projects/jail2/sys/netinet/libalias/alias_proxy.c#3 integrate .. //depot/projects/jail2/sys/netinet/libalias/alias_util.c#3 integrate .. //depot/projects/jail2/sys/netinet/raw_ip.c#7 integrate .. //depot/projects/jail2/sys/netinet/sctp_asconf.c#3 integrate .. //depot/projects/jail2/sys/netinet/sctp_asconf.h#2 integrate .. //depot/projects/jail2/sys/netinet/sctp_auth.c#2 integrate .. //depot/projects/jail2/sys/netinet/sctp_bsd_addr.c#3 integrate .. //depot/projects/jail2/sys/netinet/sctp_constants.h#3 integrate .. //depot/projects/jail2/sys/netinet/sctp_indata.c#4 integrate .. //depot/projects/jail2/sys/netinet/sctp_input.c#4 integrate .. //depot/projects/jail2/sys/netinet/sctp_lock_bsd.h#2 integrate .. //depot/projects/jail2/sys/netinet/sctp_os.h#2 integrate .. //depot/projects/jail2/sys/netinet/sctp_os_bsd.h#2 integrate .. //depot/projects/jail2/sys/netinet/sctp_output.c#4 integrate .. //depot/projects/jail2/sys/netinet/sctp_pcb.c#3 integrate .. //depot/projects/jail2/sys/netinet/sctp_pcb.h#2 integrate .. //depot/projects/jail2/sys/netinet/sctp_peeloff.c#2 integrate .. //depot/projects/jail2/sys/netinet/sctp_structs.h#3 integrate .. //depot/projects/jail2/sys/netinet/sctp_timer.c#3 integrate .. //depot/projects/jail2/sys/netinet/sctp_uio.h#4 integrate .. //depot/projects/jail2/sys/netinet/sctp_usrreq.c#4 integrate .. //depot/projects/jail2/sys/netinet/sctp_var.h#2 integrate .. //depot/projects/jail2/sys/netinet/sctputil.c#4 integrate .. //depot/projects/jail2/sys/netinet/sctputil.h#4 integrate .. //depot/projects/jail2/sys/netinet/tcp_hostcache.c#2 integrate .. //depot/projects/jail2/sys/netinet/tcp_input.c#8 integrate .. //depot/projects/jail2/sys/netinet/tcp_subr.c#8 integrate .. //depot/projects/jail2/sys/netinet/tcp_syncache.c#5 integrate .. //depot/projects/jail2/sys/netinet/udp_usrreq.c#7 integrate .. //depot/projects/jail2/sys/netinet6/frag6.c#3 integrate .. //depot/projects/jail2/sys/netinet6/icmp6.c#5 integrate .. //depot/projects/jail2/sys/netinet6/in6.c#6 integrate .. //depot/projects/jail2/sys/netinet6/in6_gif.c#3 integrate .. //depot/projects/jail2/sys/netinet6/in6_src.c#4 integrate .. //depot/projects/jail2/sys/netinet6/in6_var.h#3 integrate .. //depot/projects/jail2/sys/netinet6/ip6_forward.c#4 integrate .. //depot/projects/jail2/sys/netinet6/ip6_input.c#3 integrate .. //depot/projects/jail2/sys/netinet6/ip6_mroute.c#3 integrate .. //depot/projects/jail2/sys/netinet6/ipsec.c#4 integrate .. //depot/projects/jail2/sys/netinet6/mld6.c#3 integrate .. //depot/projects/jail2/sys/netinet6/nd6.c#7 integrate .. //depot/projects/jail2/sys/netinet6/nd6_nbr.c#3 integrate .. //depot/projects/jail2/sys/netinet6/nd6_rtr.c#3 integrate .. //depot/projects/jail2/sys/netinet6/scope6.c#2 integrate .. //depot/projects/jail2/sys/netinet6/sctp6_usrreq.c#3 integrate .. //depot/projects/jail2/sys/netinet6/udp6_usrreq.c#5 integrate .. //depot/projects/jail2/sys/netipsec/ipsec.c#3 integrate .. //depot/projects/jail2/sys/netipsec/ipsec_input.c#3 integrate .. //depot/projects/jail2/sys/nfs/nfsproto.h#2 integrate .. //depot/projects/jail2/sys/nfs4client/nfs4_subs.c#2 integrate .. //depot/projects/jail2/sys/nfs4client/nfs4_vn_subs.c#2 integrate .. //depot/projects/jail2/sys/nfsclient/bootp_subr.c#5 integrate .. //depot/projects/jail2/sys/nfsclient/nfs_diskless.c#3 integrate .. //depot/projects/jail2/sys/nfsclient/nfs_node.c#4 integrate .. //depot/projects/jail2/sys/nfsclient/nfs_socket.c#6 integrate .. //depot/projects/jail2/sys/nfsclient/nfs_vfsops.c#6 integrate .. //depot/projects/jail2/sys/nfsclient/nfsdiskless.h#2 integrate .. //depot/projects/jail2/sys/nfsserver/nfs_srvsubs.c#4 integrate .. //depot/projects/jail2/sys/nfsserver/nfs_syscalls.c#5 integrate .. //depot/projects/jail2/sys/nfsserver/nfsm_subs.h#2 integrate .. //depot/projects/jail2/sys/pc98/pc98/machdep.c#7 integrate .. //depot/projects/jail2/sys/pci/agp_intel.c#2 integrate .. //depot/projects/jail2/sys/pci/agpreg.h#2 integrate .. //depot/projects/jail2/sys/pci/if_pcn.c#3 integrate .. //depot/projects/jail2/sys/pci/if_pcnreg.h#3 integrate .. //depot/projects/jail2/sys/pci/if_rl.c#3 integrate .. //depot/projects/jail2/sys/pci/if_rlreg.h#5 integrate .. //depot/projects/jail2/sys/pci/if_xl.c#4 integrate .. //depot/projects/jail2/sys/pci/if_xlreg.h#3 integrate .. //depot/projects/jail2/sys/powerpc/include/bus.h#2 integrate .. //depot/projects/jail2/sys/powerpc/include/pmap.h#2 integrate .. //depot/projects/jail2/sys/powerpc/powerpc/genassym.c#3 integrate .. //depot/projects/jail2/sys/powerpc/powerpc/intr_machdep.c#3 integrate .. //depot/projects/jail2/sys/powerpc/powerpc/machdep.c#4 integrate .. //depot/projects/jail2/sys/powerpc/powerpc/mmu_if.m#3 integrate .. //depot/projects/jail2/sys/powerpc/powerpc/mmu_oea.c#5 integrate .. //depot/projects/jail2/sys/powerpc/powerpc/ofw_machdep.c#3 integrate .. //depot/projects/jail2/sys/powerpc/powerpc/pmap_dispatch.c#4 integrate .. //depot/projects/jail2/sys/powerpc/powerpc/uio_machdep.c#2 integrate .. //depot/projects/jail2/sys/powerpc/powerpc/vm_machdep.c#3 integrate .. //depot/projects/jail2/sys/security/audit/audit.c#5 integrate .. //depot/projects/jail2/sys/security/audit/audit_arg.c#5 integrate .. //depot/projects/jail2/sys/security/audit/audit_bsm_klib.c#2 integrate .. //depot/projects/jail2/sys/security/audit/audit_bsm_token.c#6 integrate .. //depot/projects/jail2/sys/security/audit/audit_syscalls.c#6 integrate .. //depot/projects/jail2/sys/security/audit/audit_trigger.c#2 integrate .. //depot/projects/jail2/sys/security/audit/audit_worker.c#5 integrate .. //depot/projects/jail2/sys/security/mac/mac_framework.c#1 branch .. //depot/projects/jail2/sys/security/mac/mac_framework.h#4 integrate .. //depot/projects/jail2/sys/security/mac/mac_inet.c#5 integrate .. //depot/projects/jail2/sys/security/mac/mac_internal.h#5 integrate .. //depot/projects/jail2/sys/security/mac/mac_label.c#3 integrate .. //depot/projects/jail2/sys/security/mac/mac_net.c#5 integrate .. //depot/projects/jail2/sys/security/mac/mac_pipe.c#4 integrate .. //depot/projects/jail2/sys/security/mac/mac_policy.h#1 branch .. //depot/projects/jail2/sys/security/mac/mac_posix_sem.c#5 integrate .. //depot/projects/jail2/sys/security/mac/mac_priv.c#2 integrate .. //depot/projects/jail2/sys/security/mac/mac_process.c#4 integrate .. //depot/projects/jail2/sys/security/mac/mac_socket.c#4 integrate .. //depot/projects/jail2/sys/security/mac/mac_syscalls.c#1 branch .. //depot/projects/jail2/sys/security/mac/mac_system.c#4 integrate .. //depot/projects/jail2/sys/security/mac/mac_sysv_msg.c#4 integrate .. //depot/projects/jail2/sys/security/mac/mac_sysv_sem.c#4 integrate .. //depot/projects/jail2/sys/security/mac/mac_sysv_shm.c#4 integrate .. //depot/projects/jail2/sys/security/mac/mac_vfs.c#5 integrate .. //depot/projects/jail2/sys/security/mac_biba/mac_biba.c#5 integrate .. //depot/projects/jail2/sys/security/mac_bsdextended/mac_bsdextended.c#3 integrate .. //depot/projects/jail2/sys/security/mac_ifoff/mac_ifoff.c#2 integrate .. //depot/projects/jail2/sys/security/mac_lomac/mac_lomac.c#5 integrate .. //depot/projects/jail2/sys/security/mac_mls/mac_mls.c#5 integrate .. //depot/projects/jail2/sys/security/mac_none/mac_none.c#2 integrate .. //depot/projects/jail2/sys/security/mac_partition/mac_partition.c#3 integrate .. //depot/projects/jail2/sys/security/mac_portacl/mac_portacl.c#4 integrate .. //depot/projects/jail2/sys/security/mac_seeotheruids/mac_seeotheruids.c#3 integrate .. //depot/projects/jail2/sys/security/mac_stub/mac_stub.c#4 integrate .. //depot/projects/jail2/sys/security/mac_test/mac_test.c#3 integrate .. //depot/projects/jail2/sys/sparc64/include/param.h#2 integrate .. //depot/projects/jail2/sys/sparc64/sparc64/elf_machdep.c#2 integrate .. //depot/projects/jail2/sys/sparc64/sparc64/genassym.c#4 integrate .. //depot/projects/jail2/sys/sparc64/sparc64/machdep.c#3 integrate .. //depot/projects/jail2/sys/sun4v/conf/GENERIC#5 integrate .. //depot/projects/jail2/sys/sun4v/include/cddl/mdesc.h#2 integrate .. //depot/projects/jail2/sys/sun4v/include/hv_api.h#2 integrate .. //depot/projects/jail2/sys/sun4v/include/pcb.h#2 integrate .. //depot/projects/jail2/sys/sun4v/include/pcpu.h#3 integrate .. //depot/projects/jail2/sys/sun4v/include/smp.h#3 integrate .. //depot/projects/jail2/sys/sun4v/include/trap.h#3 integrate .. //depot/projects/jail2/sys/sun4v/include/tsb.h#3 integrate .. //depot/projects/jail2/sys/sun4v/mdesc/mdesc_init.c#3 integrate .. //depot/projects/jail2/sys/sun4v/mdesc/mdesc_vdevfindnode.c#1 branch .. //depot/projects/jail2/sys/sun4v/mdesc/mdesc_vdevfindval.c#2 integrate .. //depot/projects/jail2/sys/sun4v/sun4v/exception.S#4 integrate .. //depot/projects/jail2/sys/sun4v/sun4v/interrupt.S#4 integrate .. //depot/projects/jail2/sys/sun4v/sun4v/machdep.c#4 integrate .. //depot/projects/jail2/sys/sun4v/sun4v/mp_machdep.c#3 integrate .. //depot/projects/jail2/sys/sun4v/sun4v/pmap.c#4 integrate .. //depot/projects/jail2/sys/sun4v/sun4v/tick.c#2 integrate .. //depot/projects/jail2/sys/sun4v/sun4v/trap.c#4 integrate .. //depot/projects/jail2/sys/sun4v/sun4v/tsb.c#4 integrate .. //depot/projects/jail2/sys/sun4v/sun4v/tte.c#3 integrate .. //depot/projects/jail2/sys/sun4v/sun4v/tte_hash.c#3 integrate .. //depot/projects/jail2/sys/sun4v/sun4v/uio_machdep.c#2 integrate .. //depot/projects/jail2/sys/sun4v/sun4v/vm_machdep.c#2 integrate .. //depot/projects/jail2/sys/sun4v/sun4v/vnex.c#4 integrate .. //depot/projects/jail2/sys/sun4v/sun4v/wbuf.S#3 integrate .. //depot/projects/jail2/sys/sys/copyright.h#3 integrate .. //depot/projects/jail2/sys/sys/file.h#2 integrate .. //depot/projects/jail2/sys/sys/interrupt.h#2 integrate .. //depot/projects/jail2/sys/sys/lock_profile.h#2 integrate .. //depot/projects/jail2/sys/sys/mac_policy.h#6 delete .. //depot/projects/jail2/sys/sys/mount.h#5 integrate .. //depot/projects/jail2/sys/sys/mouse.h#2 integrate .. //depot/projects/jail2/sys/sys/mutex.h#4 integrate .. //depot/projects/jail2/sys/sys/param.h#8 integrate .. //depot/projects/jail2/sys/sys/pcpu.h#3 integrate .. //depot/projects/jail2/sys/sys/proc.h#6 integrate .. //depot/projects/jail2/sys/sys/rtprio.h#4 integrate .. //depot/projects/jail2/sys/sys/runq.h#2 integrate .. //depot/projects/jail2/sys/sys/sched.h#5 integrate .. //depot/projects/jail2/sys/sys/sleepqueue.h#3 integrate .. //depot/projects/jail2/sys/sys/soundcard.h#4 integrate .. //depot/projects/jail2/sys/sys/syscallsubr.h#3 integrate .. //depot/projects/jail2/sys/sys/sysent.h#3 integrate .. //depot/projects/jail2/sys/sys/systm.h#8 integrate .. //depot/projects/jail2/sys/sys/uio.h#2 integrate .. //depot/projects/jail2/sys/sys/umtx.h#6 integrate .. //depot/projects/jail2/sys/sys/unpcb.h#3 integrate .. //depot/projects/jail2/sys/sys/vmmeter.h#3 integrate .. //depot/projects/jail2/sys/sys/vnode.h#4 integrate .. //depot/projects/jail2/sys/sys/watchdog.h#2 integrate .. //depot/projects/jail2/sys/vm/swap_pager.c#5 integrate .. //depot/projects/jail2/sys/vm/uma.h#2 integrate .. //depot/projects/jail2/sys/vm/uma_core.c#4 integrate .. //depot/projects/jail2/sys/vm/vm_glue.c#3 integrate .. //depot/projects/jail2/sys/vm/vm_kern.c#4 integrate .. //depot/projects/jail2/sys/vm/vm_object.c#6 integrate .. //depot/projects/jail2/sys/vm/vm_page.c#8 integrate .. //depot/projects/jail2/sys/vm/vm_zeroidle.c#4 integrate Differences ... ==== //depot/projects/jail2/sys/Makefile#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/Makefile,v 1.39 2006/11/11 16:26:55 trhodes Exp $ +# $FreeBSD: src/sys/Makefile,v 1.40 2006/11/26 18:27:16 maxim Exp $ .include @@ -8,8 +8,8 @@ .endif # Directories to include in cscope name file and TAGS. -CSCOPEDIRS= coda compat conf contrib crypto ddb dev fs geom gnu i4b isa \ - isofs kern libkern modules net net80211 netatalk netatm \ +CSCOPEDIRS= cam coda compat conf contrib crypto ddb dev fs geom gnu i4b \ + isa isofs kern libkern modules net net80211 netatalk netatm \ netgraph netinet netinet6 netipx netkey netnatm netncp \ netsmb nfs nfsclient nfs4client rpc pccard pci sys \ ufs vm ${ARCHDIR} ==== //depot/projects/jail2/sys/amd64/amd64/apic_vector.S#2 (text+ko) ==== @@ -28,7 +28,7 @@ * SUCH DAMAGE. * * from: vector.s, 386BSD 0.1 unknown origin - * $FreeBSD: src/sys/amd64/amd64/apic_vector.S,v 1.109 2006/05/01 21:36:46 jhb Exp $ + * $FreeBSD: src/sys/amd64/amd64/apic_vector.S,v 1.110 2006/12/17 06:48:39 kmacy Exp $ */ /* @@ -60,6 +60,7 @@ jz 2f ; \ addl $(32 * index),%eax ; \ 1: ; \ + movq %rsp, %rsi ; \ movl %eax, %edi ; /* pass the IRQ */ \ call lapic_handle_intr ; \ MEXITCOUNT ; \ @@ -98,7 +99,7 @@ IDTVEC(timerint) PUSH_FRAME FAKE_MCOUNT(TF_RIP(%rsp)) - + movq %rsp, %rdi call lapic_handle_timer MEXITCOUNT jmp doreti ==== //depot/projects/jail2/sys/amd64/amd64/cpu_switch.S#2 (text+ko) ==== @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/amd64/cpu_switch.S,v 1.154 2005/10/17 23:10:31 davidxu Exp $ + * $FreeBSD: src/sys/amd64/amd64/cpu_switch.S,v 1.155 2006/12/20 04:40:38 davidxu Exp $ */ #include @@ -206,6 +206,11 @@ movq %rbx, (%rax) movq %rbx, PCPU(RSP0) + movl TD_TID(%rsi), %eax + movq %r8, PCPU(CURPCB) + movl %eax, PCPU(CURTID) + movq %rsi, PCPU(CURTHREAD) /* into next thread */ + /* Restore context. */ movq PCB_RBX(%r8),%rbx movq PCB_RSP(%r8),%rsp @@ -217,9 +222,6 @@ movq PCB_RIP(%r8),%rax movq %rax,(%rsp) - movq %r8, PCPU(CURPCB) - movq %rsi, PCPU(CURTHREAD) /* into next thread */ - /* Test if debug registers should be restored. */ testl $PCB_DBREGS,PCB_FLAGS(%r8) jz 1f ==== //depot/projects/jail2/sys/amd64/amd64/exception.S#2 (text+ko) ==== @@ -27,7 +27,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/amd64/exception.S,v 1.127 2005/08/27 16:03:40 jkoshy Exp $ + * $FreeBSD: src/sys/amd64/amd64/exception.S,v 1.129 2006/12/23 03:30:50 davidxu Exp $ */ #include "opt_atpic.h" @@ -165,6 +165,7 @@ .globl calltrap .type calltrap,@function calltrap: + movq %rsp, %rdi call trap MEXITCOUNT jmp doreti /* Handle any pending ASTs */ @@ -267,6 +268,7 @@ movq %r14,TF_R14(%rsp) /* C preserved */ movq %r15,TF_R15(%rsp) /* C preserved */ FAKE_MCOUNT(TF_RIP(%rsp)) + movq %rsp, %rdi call syscall movq PCPU(CURPCB),%rax testq $PCB_FULLCTX,PCB_FLAGS(%rax) @@ -363,6 +365,7 @@ /* Note: this label is also used by ddb and gdb: */ nmi_calltrap: FAKE_MCOUNT(TF_RIP(%rsp)) + movq %rsp, %rdi call trap MEXITCOUNT testl %ebx,%ebx ==== //depot/projects/jail2/sys/amd64/amd64/genassym.c#3 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/genassym.c,v 1.158 2006/11/01 04:54:49 jb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/genassym.c,v 1.160 2006/12/20 04:40:38 davidxu Exp $"); #include "opt_compat.h" #include "opt_kstack_pages.h" @@ -79,6 +79,7 @@ ASSYM(TD_FLAGS, offsetof(struct thread, td_flags)); ASSYM(TD_PCB, offsetof(struct thread, td_pcb)); ASSYM(TD_PROC, offsetof(struct thread, td_proc)); +ASSYM(TD_TID, offsetof(struct thread, td_tid)); ASSYM(TDF_ASTPENDING, TDF_ASTPENDING); ASSYM(TDF_NEEDRESCHED, TDF_NEEDRESCHED); @@ -185,12 +186,12 @@ ASSYM(PC_FPCURTHREAD, offsetof(struct pcpu, pc_fpcurthread)); ASSYM(PC_IDLETHREAD, offsetof(struct pcpu, pc_idlethread)); ASSYM(PC_CURPCB, offsetof(struct pcpu, pc_curpcb)); -ASSYM(PC_CONS_BUFR, offsetof(struct pcpu, pc_cons_bufr)); ASSYM(PC_CPUID, offsetof(struct pcpu, pc_cpuid)); ASSYM(PC_SCRATCH_RSP, offsetof(struct pcpu, pc_scratch_rsp)); ASSYM(PC_CURPMAP, offsetof(struct pcpu, pc_curpmap)); ASSYM(PC_TSSP, offsetof(struct pcpu, pc_tssp)); ASSYM(PC_RSP0, offsetof(struct pcpu, pc_rsp0)); +ASSYM(PC_CURTID, offsetof(struct pcpu, pc_curtid)); ASSYM(LA_VER, offsetof(struct LAPIC, version)); ASSYM(LA_TPR, offsetof(struct LAPIC, tpr)); ==== //depot/projects/jail2/sys/amd64/amd64/intr_machdep.c#5 (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.26 2006/11/17 16:41:03 jhb Exp $ + * $FreeBSD: src/sys/amd64/amd64/intr_machdep.c,v 1.27 2006/12/12 19:20:18 jhb Exp $ */ /* @@ -190,13 +190,13 @@ int intr_remove_handler(void *cookie) { + struct intsrc *isrc; int error; + isrc = intr_handler_source(cookie); error = intr_event_remove_handler(cookie); -#ifdef XXX if (error == 0) - intrcnt_updatename(/* XXX */); -#endif + intrcnt_updatename(isrc); return (error); } ==== //depot/projects/jail2/sys/amd64/amd64/local_apic.c#7 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/local_apic.c,v 1.33 2006/11/13 22:23:32 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/local_apic.c,v 1.34 2006/12/17 06:48:39 kmacy Exp $"); #include "opt_hwpmc_hooks.h" @@ -610,18 +610,18 @@ } void -lapic_handle_intr(int vector, struct trapframe frame) +lapic_handle_intr(int vector, struct trapframe *frame) { struct intsrc *isrc; if (vector == -1) panic("Couldn't get vector from ISR!"); isrc = intr_lookup_source(apic_idt_to_irq(vector)); - intr_execute_handlers(isrc, &frame); + intr_execute_handlers(isrc, frame); } void -lapic_handle_timer(struct trapframe frame) +lapic_handle_timer(struct trapframe *frame) { struct lapic *la; @@ -654,16 +654,16 @@ if (la->la_hard_ticks >= lapic_timer_hz) { la->la_hard_ticks -= lapic_timer_hz; if (PCPU_GET(cpuid) == 0) - hardclock(TRAPF_USERMODE(&frame), TRAPF_PC(&frame)); + hardclock(TRAPF_USERMODE(frame), TRAPF_PC(frame)); else - hardclock_cpu(TRAPF_USERMODE(&frame)); + hardclock_cpu(TRAPF_USERMODE(frame)); } /* Fire statclock at stathz. */ la->la_stat_ticks += stathz; if (la->la_stat_ticks >= lapic_timer_hz) { la->la_stat_ticks -= lapic_timer_hz; - statclock(TRAPF_USERMODE(&frame)); + statclock(TRAPF_USERMODE(frame)); } /* Fire profclock at profhz, but only when needed. */ @@ -671,7 +671,7 @@ if (la->la_prof_ticks >= lapic_timer_hz) { la->la_prof_ticks -= lapic_timer_hz; if (profprocs != 0) - profclock(TRAPF_USERMODE(&frame), TRAPF_PC(&frame)); + profclock(TRAPF_USERMODE(frame), TRAPF_PC(frame)); } critical_exit(); } ==== //depot/projects/jail2/sys/amd64/amd64/machdep.c#9 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.664 2006/11/19 20:54:57 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.667 2006/12/20 04:40:38 davidxu Exp $"); #include "opt_atalk.h" #include "opt_atpic.h" @@ -514,6 +514,7 @@ * help lock contention somewhat, and this is critical for HTT. -Peter */ static int cpu_idle_hlt = 1; +TUNABLE_INT("machdep.cpu_idle_hlt", &cpu_idle_hlt); SYSCTL_INT(_machdep, OID_AUTO, cpu_idle_hlt, CTLFLAG_RW, &cpu_idle_hlt, 0, "Idle loop HLT enable"); @@ -1121,11 +1122,7 @@ * This may be done better later if it gets more high level * components in it. If so just link td->td_proc here. */ -#ifdef KSE - proc_linkup(&proc0, &ksegrp0, &thread0); -#else proc_linkup(&proc0, &thread0); -#endif preload_metadata = (caddr_t)(uintptr_t)(modulep + KERNBASE); preload_bootstrap_relocate(KERNBASE); @@ -1167,6 +1164,7 @@ PCPU_SET(prvspace, pc); PCPU_SET(curthread, &thread0); PCPU_SET(curpcb, thread0.td_pcb); + PCPU_SET(curtid, thread0.td_tid); PCPU_SET(tssp, &common_tss[0]); /* ==== //depot/projects/jail2/sys/amd64/amd64/minidump_machdep.c#3 (text) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/minidump_machdep.c,v 1.1 2006/04/21 04:24:50 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/minidump_machdep.c,v 1.2 2006/12/05 11:31:33 ru Exp $"); #include #include @@ -219,7 +219,7 @@ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Jan 8 20:04: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 33B7416A417; Mon, 8 Jan 2007 20:04: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 E8CF416A415 for ; Mon, 8 Jan 2007 20:04: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 D8DAC13C467 for ; Mon, 8 Jan 2007 20:04: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 l08K4qBX076852 for ; Mon, 8 Jan 2007 20:04:52 GMT (envelope-from mjacob@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l08K4oxt076849 for perforce@freebsd.org; Mon, 8 Jan 2007 20:04:50 GMT (envelope-from mjacob@freebsd.org) Date: Mon, 8 Jan 2007 20:04:50 GMT Message-Id: <200701082004.l08K4oxt076849@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 112683 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 08 Jan 2007 20:04:53 -0000 http://perforce.freebsd.org/chv.cgi?CH=112683 Change 112683 by mjacob@mjexp on 2007/01/08 20:04:37 IFC Affected files ... .. //depot/projects/mjexp/games/fortune/datfiles/fortunes#8 integrate .. //depot/projects/mjexp/games/fortune/datfiles/fortunes.sp.ok#2 integrate .. //depot/projects/mjexp/games/fortune/datfiles/fortunes2-o#2 integrate .. //depot/projects/mjexp/games/fortune/datfiles/zippy#2 integrate .. //depot/projects/mjexp/include/mqueue.h#2 integrate .. //depot/projects/mjexp/lib/libc/i386/gen/modf.S#2 integrate .. //depot/projects/mjexp/lib/libc/sys/open.2#2 integrate .. //depot/projects/mjexp/lib/msun/Makefile#2 integrate .. //depot/projects/mjexp/lib/msun/Symbol.map#2 integrate .. //depot/projects/mjexp/lib/msun/amd64/fenv.h#2 integrate .. //depot/projects/mjexp/lib/msun/i387/fenv.h#3 integrate .. //depot/projects/mjexp/lib/msun/man/ieee.3#2 integrate .. //depot/projects/mjexp/lib/msun/src/math.h#2 integrate .. //depot/projects/mjexp/lib/msun/src/s_copysignl.c#2 integrate .. //depot/projects/mjexp/lib/msun/src/s_fmal.c#2 integrate .. //depot/projects/mjexp/lib/msun/src/s_modf.c#2 integrate .. //depot/projects/mjexp/lib/msun/src/s_modff.c#2 integrate .. //depot/projects/mjexp/lib/msun/src/s_modfl.c#1 branch .. //depot/projects/mjexp/sbin/ipfw/ipfw2.c#3 integrate .. //depot/projects/mjexp/sys/amd64/linux32/linux32_machdep.c#4 integrate .. //depot/projects/mjexp/sys/bsm/audit.h#2 integrate .. //depot/projects/mjexp/sys/bsm/audit_internal.h#2 integrate .. //depot/projects/mjexp/sys/bsm/audit_kevents.h#2 integrate .. //depot/projects/mjexp/sys/bsm/audit_record.h#2 integrate .. //depot/projects/mjexp/sys/dev/isp/isp_freebsd.h#4 integrate .. //depot/projects/mjexp/sys/dev/mfi/mfi.c#6 integrate .. //depot/projects/mjexp/sys/dev/sound/pci/emu10kx-pcm.c#2 integrate .. //depot/projects/mjexp/sys/dev/sound/pci/emu10kx.c#2 integrate .. //depot/projects/mjexp/sys/dev/sound/pci/emu10kx.h#2 integrate .. //depot/projects/mjexp/sys/dev/sound/pcm/feeder.c#3 integrate .. //depot/projects/mjexp/sys/dev/sound/usb/uaudio.c#3 integrate .. //depot/projects/mjexp/sys/fs/msdosfs/msdosfs_vfsops.c#4 integrate .. //depot/projects/mjexp/sys/kern/sched_ule.c#7 integrate .. //depot/projects/mjexp/sys/modules/sound/driver/emu10kx/Makefile#2 integrate .. //depot/projects/mjexp/sys/net80211/ieee80211.c#4 integrate .. //depot/projects/mjexp/sys/net80211/ieee80211_var.h#4 integrate .. //depot/projects/mjexp/sys/netinet/udp_usrreq.c#6 integrate .. //depot/projects/mjexp/sys/pc98/pc98/machdep.c#6 integrate .. //depot/projects/mjexp/sys/pci/agp_intel.c#3 integrate .. //depot/projects/mjexp/sys/security/audit/audit_arg.c#4 integrate .. //depot/projects/mjexp/sys/vm/vm_kern.c#4 integrate .. //depot/projects/mjexp/tools/regression/lib/msun/test-rem.c#2 integrate .. //depot/projects/mjexp/tools/regression/mqueue/mqtest1/Makefile#2 integrate .. //depot/projects/mjexp/tools/regression/mqueue/mqtest1/mqtest1.c#2 integrate .. //depot/projects/mjexp/tools/regression/mqueue/mqtest2/Makefile#2 integrate .. //depot/projects/mjexp/tools/regression/mqueue/mqtest2/mqtest2.c#2 integrate .. //depot/projects/mjexp/tools/regression/mqueue/mqtest3/Makefile#2 integrate .. //depot/projects/mjexp/tools/regression/mqueue/mqtest3/mqtest3.c#2 integrate .. //depot/projects/mjexp/tools/regression/mqueue/mqtest4/Makefile#2 integrate .. //depot/projects/mjexp/tools/regression/mqueue/mqtest4/mqtest4.c#2 integrate .. //depot/projects/mjexp/tools/regression/mqueue/mqtest5/Makefile#2 integrate .. //depot/projects/mjexp/tools/regression/mqueue/mqtest5/mqtest5.c#2 integrate .. //depot/projects/mjexp/tools/sched/schedgraph.py#2 integrate .. //depot/projects/mjexp/usr.bin/kdump/kdump.c#3 integrate Differences ... ==== //depot/projects/mjexp/games/fortune/datfiles/fortunes#8 (text+ko) ==== @@ -1,5 +1,5 @@ This fortune brought to you by: -$FreeBSD: src/games/fortune/datfiles/fortunes,v 1.233 2006/12/30 21:54:41 dougb Exp $ +$FreeBSD: src/games/fortune/datfiles/fortunes,v 1.234 2007/01/06 22:04:45 dougb Exp $ % ======================================================================= @@ -2840,21 +2840,6 @@ -- being told in Poland, 1987 % - Joan, the rather well-proportioned secretary, spent almost all of -her vacation sunbathing on the roof of her hotel. She wore a bathing suit -the first day, but on the second, she decided that no one could see her -way up there, and she slipped out of it for an overall tan. She'd hardly -begun when she heard someone running up the stairs; she was lying on her -stomach, so she just pulled a towel over her rear. - "Excuse me, miss," said the flustered little assistant manager of -the hotel, out of breath from running up the stairs. "The Hilton doesn't -mind your sunbathing on the roof, but we would very much appreciate your -wearing a bathing suit as you did yesterday." - "What difference does it make," Joan asked rather calmly. "No one -can see me up here, and besides, I'm covered with a towel." - "Not exactly," said the embarrassed little man. "You're lying on -the dining room skylight." -% Lassie looked brilliant, in part because the farm family she lived with was made up of idiots. Remember? One of them was always getting pinned under the tractor, and Lassie was always rushing back to @@ -5504,11 +5489,6 @@ have examined the evidence. In some circles it is even encouraged. -- Carl Sagan, "The Burden of Skepticism" % -... bleakness ... desolation ... plastic forks ... -% -"... bleakness... desolation... plastic forks..." - -- Zippy the Pinhead -% ... But as records of courts and justice are admissible, it can easily be proved that powerful and malevolent magicians once existed and were a scourge to mankind. The evidence (including confession) @@ -6415,9 +6395,6 @@ A businessman is a hybrid of a dancer and a calculator. -- Paul Valery % -"A can of ASPARAGUS, 73 pigeons, some LIVE ammo, and a FROZEN DAIQURI!!" - -- Zippy the Pinhead -% A candidate is a person who gets money from the rich and votes from the poor to protect them from each other. % @@ -9713,9 +9690,6 @@ All I ask of life is a constant and exaggerated sense of my own importance. % -All I can think of is a platter of organic PRUNE CRISPS being trampled -by an army of swarthy, Italian LOUNGE SINGERS ... -% All I kin say is when you finds yo'self wanderin' in a peach orchard, ya don't go lookin' for rutabagas. -- Kingfish @@ -15810,9 +15784,6 @@ % Did you ever wonder what you'd say to God if He sneezed? % -"Did YOU find a DIGITAL WATCH in YOUR box of VELVEETA?" - -- Zippy the Pinhead -% Did you hear about the model who sat on a broken bottle and cut a nice figure? % @@ -15888,9 +15859,6 @@ % Didja hear about the dyslexic devil worshipper who sold his soul to Santa? % -"Didn't I buy a 1951 Packard from you last March in Cairo?" - -- Zippy the Pinhead -% Die? I should say not, dear fellow. No Barrymore would allow such a conventional thing to happen to him. -- John Barrymore's dying words @@ -23576,9 +23544,6 @@ I didn't like the play, but I saw it under adverse conditions. The curtain was up. % -"I didn't order any WOO-WOO... Maybe a YUBBA... But no WOO-WOO!" - -- Zippy the Pinhead -% I disagree with what you say, but will defend to the death your right to tell such LIES! % @@ -24150,9 +24115,6 @@ I have a very strange feeling about this... -- Luke Skywalker % -"I have accepted Provolone into my life!" - -- Zippy the Pinhead -% I have already given two cousins to the war and I stand ready to sacrifice my wife's brother. -- Artemus Ward @@ -24413,8 +24375,6 @@ I think I saw God. -- B. Hathrume Duk % -I just forgot my whole philosophy of life!!! -% I just got off the phone with Sonny Barger [President of the Hell's Angels]. He wants me to appear as a character witness for him at his murder trial and said he'd be glad to appear as a character witness on my behalf if I @@ -25488,9 +25448,6 @@ HAW"!!'" -- Berke Breathed, "Bloom County" % -I want to kill everyone here with a cute colorful Hydrogen Bomb!! - -- Zippy the Pinhead -% I want to marry a girl just like the girl that married dear old dad. -- Freud % @@ -28081,9 +28038,6 @@ I'm an evolutionist; I refuse to believe that I could have been created by man. % -"I'm ANN LANDERS!! I can SHOPLIFT!!" - -- Zippy the Pinhead -% I'm changing my name to Chrysler I'm going down to Washington, D.C. I'll tell some power broker @@ -28102,7 +28056,7 @@ -- Oscar Wilde, his last words, while sipping champagne % "I'm dying," he croaked. -"My experiment was a success," the chemist retorted . +"My experiment was a success," the chemist retorted. "You can't really train a beagle," he dogmatized. "That's no beagle, it's a mongrel," she muttered. "The fire is going out," he bellowed. @@ -29362,10 +29316,6 @@ % Is a person who blows up banks an econoclast? % -"Is a tatoo real, like a curb or a battleship? -Or are we suffering in Safeway?" - -- Zippy the Pinhead -% Is a wedding successful if it comes off without a hitch? % Is death legally binding? @@ -35153,9 +35103,6 @@ would be to deny our history, our capabilities. -- James A. Michener % -"My pants just went on a wild rampage through a Long Island Bowling Alley!!" - -- Zippy the Pinhead -% My parents went to Niagra Falls and all I got was this crummy life. % My pen is at the bottom of a page, @@ -37384,8 +37331,6 @@ Keith and Kim," she said. As she began to get up, she quickly added, "Oh, and God, this is goodbye. We're moving to Hollywood." % -On the road, ZIPPY is a pinhead without a purpose, but never without a POINT. -% On the subject of C program indentation: "In My Egotistical Opinion, most people's C programs should be @@ -57657,10 +57602,6 @@ % Who will take care of the world after you're gone? % -"WHOA!! Ken and Barbie are having TOO MUCH FUN!! -It must be the NEGATIVE IONS!!" - -- Zippy the Pinhead -% Whoever dies with the most toys wins. % Whoever fights monsters should see to it that in the process he does not @@ -60906,30 +60847,6 @@ "TOMORROW! I haven't even prepared for *_________yesterday* yet!" % -"Yow! Am I having fun yet?" - -- Zippy the Pinhead -% -"Yow! Am I in Milwaukee?" - -- Zippy the Pinhead -% -"Yow! And then we could sit on the hoods of cars at stop lights!" - -- Zippy the Pinhead -% -"Yow! Did something bad happen or am I in a drive-in movie?" - -- Zippy the Pinhead -% -YOW!! Everybody out of the GENETIC POOL! -% -"Yow! Is this sexual intercourse yet? Is it, huh, is it?" - -- Zippy the Pinhead -% -"Yow!! Those people look exactly like Donnie and Marie Osmond!!" - -- Zippy the Pinhead -% -"Yow! Now I get to think about all the BAD THINGS I did -to a BOWLING BALL when I was in JUNIOR HIGH SCHOOL!" - -- Zippy the Pinhead -% YO-YO: Something that is occasionally up but normally down. (see also Computer). ==== //depot/projects/mjexp/games/fortune/datfiles/fortunes.sp.ok#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/games/fortune/datfiles/fortunes.sp.ok,v 1.6 2004/07/26 21:18:58 des Exp $ +# $FreeBSD: src/games/fortune/datfiles/fortunes.sp.ok,v 1.7 2007/01/06 22:04:46 dougb Exp $ A.A.A.A.A A.D AAAAAAAAAaaaaaaaaaaaaaaaccccccccckkkkkk @@ -1249,7 +1249,6 @@ Youngman Yuletide Yutang -ZIPPY ZORAC Zanuck Zappa @@ -1259,7 +1258,6 @@ Zeno's Zern Zilla -Zippy Zonker Zorkmids Zorro ==== //depot/projects/mjexp/games/fortune/datfiles/fortunes2-o#2 (text+ko) ==== @@ -1,5 +1,5 @@ This fortune brought to you by: -$FreeBSD: src/games/fortune/datfiles/fortunes2-o,v 1.34 2005/09/10 08:27:07 schweikh Exp $ +$FreeBSD: src/games/fortune/datfiles/fortunes2-o,v 1.35 2007/01/06 22:04:46 dougb Exp $ % PLAYGIRL, Inc. Philadelphia, Pa. 19369 @@ -7076,9 +7076,6 @@ At a mouthful of spunk, But the smell of his ass makes me sick!" % -"Hello? Enema Bondage? I'm calling because I want to be happy, I guess..." - -- Zippy the Pinhead -% Hello, children!! This is Uncle Dennis welcoming you to your very own fortune. Today we are going to hear a story, so sit right here on my lap ==== //depot/projects/mjexp/games/fortune/datfiles/zippy#2 (text+ko) ==== @@ -1,4 +1,4 @@ -%% $FreeBSD: src/games/fortune/datfiles/zippy,v 1.4 2005/02/01 16:34:38 ru Exp $ +%% $FreeBSD: src/games/fortune/datfiles/zippy,v 1.5 2007/01/06 22:04:46 dougb Exp $ A can of ASPARAGUS, 73 pigeons, some LIVE ammo, and a FROZEN DAQUIRI!! % A dwarf is passing out somewhere in Detroit! @@ -217,8 +217,6 @@ Hand me a pair of leather pants and a CASIO keyboard -- I'm living for today! % -Has everybody got HALVAH spread all over their ANKLES?? -% Has everybody got HALVAH spread all over their ANKLES?? ... Now, it's time to "HAVE A NAGEELA"!! % ==== //depot/projects/mjexp/include/mqueue.h#2 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/include/mqueue.h,v 1.2 2005/11/30 07:26:36 davidxu Exp $ + * $FreeBSD: src/include/mqueue.h,v 1.3 2007/01/06 11:30:04 davidxu Exp $ */ #ifndef _MQUEUE_H_ @@ -50,5 +50,7 @@ int mq_timedsend(mqd_t, const char *, size_t, unsigned, const struct timespec *); int mq_unlink(const char *); +int __mq_oshandle(mqd_t mqd); + __END_DECLS #endif ==== //depot/projects/mjexp/lib/libc/i386/gen/modf.S#2 (text+ko) ==== @@ -38,7 +38,7 @@ .asciz "@(#)modf.s 5.5 (Berkeley) 3/18/91" #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/i386/gen/modf.S,v 1.9 2002/03/23 02:05:17 obrien Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/i386/gen/modf.S,v 1.10 2007/01/06 21:50:04 das Exp $"); /* * modf(value, iptr): return fractional part of value, and stores the @@ -53,6 +53,12 @@ ENTRY(modf) pushl %ebp movl %esp,%ebp + /* Check for Inf/NaN */ + movl 12(%ebp),%eax + andl $0x7fffffff,%eax + cmpl $0x7ff00000,%eax + jae 1f + /* Finite value */ subl $16,%esp fnstcw -12(%ebp) movw -12(%ebp),%dx @@ -70,7 +76,13 @@ movl %ecx,4(%eax) fldl 8(%ebp) fsubl -8(%ebp) - jmp L1 -L1: + leave + ret + /* Inf/NaN handling */ +1: fldl 8(%ebp) + movl 16(%ebp),%edx + fstl (%edx) + fldz + fdivp /* return +/- 0 for +/- Inf, NaN for NaN */ leave ret ==== //depot/projects/mjexp/lib/libc/sys/open.2#2 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)open.2 8.2 (Berkeley) 11/16/93 -.\" $FreeBSD: src/lib/libc/sys/open.2,v 1.33 2006/09/17 21:27:34 ru Exp $ +.\" $FreeBSD: src/lib/libc/sys/open.2,v 1.34 2007/01/07 17:32:16 pjd Exp $ .\" .Dd January 10, 2006 .Dt OPEN 2 @@ -238,7 +238,7 @@ Too many symbolic links were encountered in translating the pathname. .It Bq Er EISDIR The named file is a directory, and the arguments specify -it is to be opened for writing. +it is to be modified. .It Bq Er EROFS The named file resides on a read-only file system, and the file is to be modified. ==== //depot/projects/mjexp/lib/msun/Makefile#2 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 5.1beta 93/09/24 -# $FreeBSD: src/lib/msun/Makefile,v 1.75 2006/03/27 23:59:44 deischen Exp $ +# $FreeBSD: src/lib/msun/Makefile,v 1.76 2007/01/07 07:54:20 das Exp $ # # ==================================================== # Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved. @@ -69,7 +69,7 @@ .endif # C99 long double functions -COMMON_SRCS+= s_copysignl.c s_fabsl.c +COMMON_SRCS+= s_copysignl.c s_fabsl.c s_modfl.c .if ${LDBL_PREC} != 53 # If long double != double use these; otherwise, we alias the double versions. COMMON_SRCS+= s_fmal.c s_frexpl.c s_nextafterl.c s_nexttoward.c s_scalbnl.c ==== //depot/projects/mjexp/lib/msun/Symbol.map#2 (text) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/msun/Symbol.map,v 1.1 2006/03/27 23:59:44 deischen Exp $ +# $FreeBSD: src/lib/msun/Symbol.map,v 1.3 2007/01/07 07:54:21 das Exp $ FBSD_1.0 { __fe_dfl_env; tgamma; @@ -133,8 +133,8 @@ lround; lroundf; lroundl; - modf; modff; + modfl; nearbyint; nearbyintf; nextafter; ==== //depot/projects/mjexp/lib/msun/amd64/fenv.h#2 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/msun/amd64/fenv.h,v 1.5 2005/03/16 22:34:14 das Exp $ + * $FreeBSD: src/lib/msun/amd64/fenv.h,v 1.6 2007/01/06 21:46:23 das Exp $ */ #ifndef _FENV_H_ @@ -78,6 +78,9 @@ #define __fldcw(__cw) __asm __volatile("fldcw %0" : : "m" (__cw)) #define __fldenv(__env) __asm __volatile("fldenv %0" : : "m" (__env)) +#define __fldenvx(__env) __asm __volatile("fldenv %0" : : "m" (__env) \ + : "st", "st(1)", "st(2)", "st(3)", "st(4)", \ + "st(5)", "st(6)", "st(7)") #define __fnclex() __asm __volatile("fnclex") #define __fnstenv(__env) __asm __volatile("fnstenv %0" : "=m" (*(__env))) #define __fnstcw(__cw) __asm __volatile("fnstcw %0" : "=m" (*(__cw))) @@ -171,7 +174,15 @@ fesetenv(const fenv_t *__envp) { - __fldenv(__envp->__x87); + /* + * XXX Using fldenvx() instead of fldenv() tells the compiler that this + * instruction clobbers the i387 register stack. This happens because + * we restore the tag word from the saved environment. Normally, this + * would happen anyway and we wouldn't care, because the ABI allows + * function calls to clobber the i387 regs. However, fesetenv() is + * inlined, so we need to be more careful. + */ + __fldenvx(__envp->__x87); __ldmxcsr(__envp->__mxcsr); return (0); } ==== //depot/projects/mjexp/lib/msun/i387/fenv.h#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/msun/i387/fenv.h,v 1.5 2006/10/14 20:35:56 bde Exp $ + * $FreeBSD: src/lib/msun/i387/fenv.h,v 1.6 2007/01/06 21:46:23 das Exp $ */ #ifndef _FENV_H_ @@ -99,6 +99,9 @@ #define __fldcw(__cw) __asm __volatile("fldcw %0" : : "m" (__cw)) #define __fldenv(__env) __asm __volatile("fldenv %0" : : "m" (__env)) +#define __fldenvx(__env) __asm __volatile("fldenv %0" : : "m" (__env) \ + : "st", "st(1)", "st(2)", "st(3)", "st(4)", \ + "st(5)", "st(6)", "st(7)") #define __fnclex() __asm __volatile("fnclex") #define __fnstenv(__env) __asm __volatile("fnstenv %0" : "=m" (*(__env))) #define __fnstcw(__cw) __asm __volatile("fnstcw %0" : "=m" (*(__cw))) @@ -207,7 +210,15 @@ __mxcsr = __get_mxcsr(__env); __set_mxcsr(__env, 0xffffffff); - __fldenv(__env); + /* + * XXX Using fldenvx() instead of fldenv() tells the compiler that this + * instruction clobbers the i387 register stack. This happens because + * we restore the tag word from the saved environment. Normally, this + * would happen anyway and we wouldn't care, because the ABI allows + * function calls to clobber the i387 regs. However, fesetenv() is + * inlined, so we need to be more careful. + */ + __fldenvx(__env); if (__HAS_SSE()) __ldmxcsr(__mxcsr); return (0); ==== //depot/projects/mjexp/lib/msun/man/ieee.3#2 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" from: @(#)ieee.3 6.4 (Berkeley) 5/6/91 -.\" $FreeBSD: src/lib/msun/man/ieee.3,v 1.22 2005/06/16 21:55:45 ru Exp $ +.\" $FreeBSD: src/lib/msun/man/ieee.3,v 1.23 2007/01/06 21:23:20 das Exp $ .\" .Dd January 26, 2005 .Dt IEEE 3 @@ -226,7 +226,7 @@ Precision: 64 significant bits, roughly like 19 significant decimals. .Bd -ragged -offset indent -compact -If x and x' are consecutive positive double-precision +If x and x' are consecutive positive extended-precision numbers (they differ by 1 .Em ulp ) , then @@ -256,7 +256,7 @@ Precision: 113 significant bits, roughly like 34 significant decimals. .Bd -ragged -offset indent -compact -If x and x' are consecutive positive double-precision +If x and x' are consecutive positive quad-extended-precision numbers (they differ by 1 .Em ulp ) , then ==== //depot/projects/mjexp/lib/msun/src/math.h#2 (text+ko) ==== @@ -11,7 +11,7 @@ /* * from: @(#)fdlibm.h 5.1 93/09/24 - * $FreeBSD: src/lib/msun/src/math.h,v 1.61 2005/04/16 21:12:47 das Exp $ + * $FreeBSD: src/lib/msun/src/math.h,v 1.62 2007/01/07 07:54:21 das Exp $ */ #ifndef _MATH_H_ @@ -439,8 +439,8 @@ long lrintl(long double); #endif long lroundl(long double); +long double modfl(long double, long double *); /* fundamentally !__pure2 */ #if 0 -long double modfl(long double, long double *); /* fundamentally !__pure2 */ long double nanl(const char *) __pure2; long double nearbyintl(long double); #endif ==== //depot/projects/mjexp/lib/msun/src/s_copysignl.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/msun/src/s_copysignl.c,v 1.1 2004/05/07 18:56:31 stefanf Exp $ + * $FreeBSD: src/lib/msun/src/s_copysignl.c,v 1.2 2007/01/07 07:54:21 das Exp $ */ #include ==== //depot/projects/mjexp/lib/msun/src/s_fmal.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/msun/src/s_fmal.c,v 1.2 2005/03/18 02:27:59 das Exp $"); +__FBSDID("$FreeBSD: src/lib/msun/src/s_fmal.c,v 1.3 2007/01/07 07:54:21 das Exp $"); #include #include ==== //depot/projects/mjexp/lib/msun/src/s_modf.c#2 (text+ko) ==== @@ -11,7 +11,7 @@ */ #ifndef lint -static char rcsid[] = "$FreeBSD: src/lib/msun/src/s_modf.c,v 1.7 2002/05/28 18:15:04 alfred Exp $"; +static char rcsid[] = "$FreeBSD: src/lib/msun/src/s_modf.c,v 1.8 2007/01/06 21:22:38 das Exp $"; #endif /* @@ -55,6 +55,10 @@ } } else if (j0>51) { /* no fraction part */ u_int32_t high; + if (j0 == 0x400) { /* inf/NaN */ + *iptr = x; + return 0.0 / x; + } *iptr = x*one; GET_HIGH_WORD(high,x); INSERT_WORDS(x,high&0x80000000,0); /* return +-0 */ ==== //depot/projects/mjexp/lib/msun/src/s_modff.c#2 (text+ko) ==== @@ -14,7 +14,7 @@ */ #ifndef lint -static char rcsid[] = "$FreeBSD: src/lib/msun/src/s_modff.c,v 1.7 2002/05/28 18:15:04 alfred Exp $"; +static char rcsid[] = "$FreeBSD: src/lib/msun/src/s_modff.c,v 1.8 2007/01/06 21:22:57 das Exp $"; #endif #include "math.h" @@ -49,6 +49,8 @@ } else { /* no fraction part */ u_int32_t ix; *iptr = x*one; + if (x != x) /* NaN */ + return x; GET_FLOAT_WORD(ix,x); SET_FLOAT_WORD(x,ix&0x80000000); /* return +-0 */ return x; ==== //depot/projects/mjexp/sbin/ipfw/ipfw2.c#3 (text+ko) ==== @@ -17,7 +17,7 @@ * * NEW command line interface for IP firewall facility * - * $FreeBSD: src/sbin/ipfw/ipfw2.c,v 1.100 2006/12/29 21:59:17 piso Exp $ + * $FreeBSD: src/sbin/ipfw/ipfw2.c,v 1.101 2007/01/07 03:02:02 mlaier Exp $ */ #include @@ -2763,13 +2763,17 @@ * ',' indicating another address follows, '{' indicating a * set of addresses of unspecified size. */ - char *p = strpbrk(av, "/:,{"); + char *t = NULL, *p = strpbrk(av, "/:,{"); int masklen; - char md; + char md, nd; if (p) { md = *p; *p++ = '\0'; + if ((t = strpbrk(p, ",{")) != NULL) { + nd = *t; + *t = '\0'; + } } else md = '\0'; @@ -2803,6 +2807,8 @@ break; } d[0] &= d[1]; /* mask base address with mask */ + if (t) + *t = nd; /* find next separator */ if (p) p = strpbrk(p, ",{"); ==== //depot/projects/mjexp/sys/amd64/linux32/linux32_machdep.c#4 (text+ko) ==== @@ -29,11 +29,13 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_machdep.c,v 1.23 2006/12/20 20:17:34 jkim Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_machdep.c,v 1.24 2007/01/06 15:58:34 netchild Exp $"); #include #include #include +#include +#include #include #include #include @@ -728,9 +730,20 @@ off_t pos; } */ bsd_args; int error; + struct file *fp; error = 0; bsd_args.flags = 0; + fp = NULL; + + /* + * Linux mmap(2): + * You must specify exactly one of MAP_SHARED and MAP_PRIVATE + */ + if (! ((linux_args->flags & LINUX_MAP_SHARED) ^ + (linux_args->flags & LINUX_MAP_PRIVATE))) + return (EINVAL); + if (linux_args->flags & LINUX_MAP_SHARED) bsd_args.flags |= MAP_SHARED; if (linux_args->flags & LINUX_MAP_PRIVATE) @@ -813,17 +826,44 @@ bsd_args.addr = (caddr_t)PTRIN(linux_args->addr); bsd_args.len = linux_args->len; } + /* - * XXX i386 Linux always emulator forces PROT_READ on (why?) - * so we do the same. We add PROT_EXEC to work around buggy - * applications (e.g. Java) that take advantage of the fact - * that execute permissions are not enforced by x86 CPUs. + * We add PROT_EXEC to work around buggy applications (e.g. Java) + * that take advantage of the fact that execute permissions are not + * enforced by x86 CPUs. */ - bsd_args.prot = linux_args->prot | PROT_EXEC | PROT_READ; + bsd_args.prot = linux_args->prot | PROT_EXEC; if (linux_args->flags & LINUX_MAP_ANON) bsd_args.fd = -1; - else + else { + /* + * Linux follows Solaris mmap(2) description: + * The file descriptor fildes is opened with + * read permission, regardless of the + * protection options specified. + * If PROT_WRITE is specified, the application + * must have opened the file descriptor + * fildes with write permission unless + * MAP_PRIVATE is specified in the flag + * argument as described below. + */ + + if ((error = fget(td, linux_args->fd, &fp)) != 0) + return (error); + if (fp->f_type != DTYPE_VNODE) { + fdrop(fp, td); + return (EINVAL); + } + + /* Linux mmap() just fails for O_WRONLY files */ + if (! (fp->f_flag & FREAD)) { + fdrop(fp, td); + return (EACCES); + } + bsd_args.fd = linux_args->fd; + fdrop(fp, td); + } bsd_args.pos = (off_t)linux_args->pgoff * PAGE_SIZE; bsd_args.pad = 0; ==== //depot/projects/mjexp/sys/bsm/audit.h#2 (text) ==== ==== //depot/projects/mjexp/sys/bsm/audit_internal.h#2 (text) ==== ==== //depot/projects/mjexp/sys/bsm/audit_kevents.h#2 (text) ==== ==== //depot/projects/mjexp/sys/bsm/audit_record.h#2 (text) ==== ==== //depot/projects/mjexp/sys/dev/isp/isp_freebsd.h#4 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/dev/isp/isp_freebsd.h,v 1.95 2006/11/14 08:45:48 mjacob Exp $ */ +/* $FreeBSD: src/sys/dev/isp/isp_freebsd.h,v 1.96 2007/01/05 23:01:54 mjacob Exp $ */ /*- * Qlogic ISP SCSI Host Adapter FreeBSD Wrapper Definitions * ==== //depot/projects/mjexp/sys/dev/mfi/mfi.c#6 (text) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/mfi/mfi.c,v 1.25 2007/01/02 04:12:34 scottl Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/mfi/mfi.c,v 1.26 2007/01/07 06:43:25 scottl Exp $"); #include "opt_mfi.h" @@ -90,7 +90,7 @@ SYSCTL_INT(_hw_mfi, OID_AUTO, event_locale, CTLFLAG_RW, &mfi_event_locale, 0, "event message locale"); -static int mfi_event_class = 10; +static int mfi_event_class = MFI_EVT_CLASS_INFO; TUNABLE_INT("hw.mfi.event_class", &mfi_event_class); SYSCTL_INT(_hw_mfi, OID_AUTO, event_class, CTLFLAG_RW, &mfi_event_class, 0, "event message class"); ==== //depot/projects/mjexp/sys/dev/sound/pci/emu10kx-pcm.c#2 (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/sound/pci/emu10kx-pcm.c,v 1.4 2006/08/07 22:55:21 netchild Exp $ + * $FreeBSD: src/sys/dev/sound/pci/emu10kx-pcm.c,v 1.5 2007/01/06 18:59:35 netchild Exp $ */ #include @@ -79,12 +79,13 @@ struct emu_pcm_info *pcm; }; -/* Hardware channels for front output */ +/* XXX Hardware playback channels */ #define MAX_CHANNELS 4 #if MAX_CHANNELS > 13 #error Too many hardware channels defined. 13 is the maximum #endif + struct emu_pcm_info { struct mtx *lock; device_t dev; /* device information */ @@ -92,7 +93,8 @@ struct emu_sc_info *card; struct emu_pcm_pchinfo pch[MAX_CHANNELS]; /* hardware channels */ int pnum; /* next free channel number */ - struct emu_pcm_rchinfo rch; + struct emu_pcm_rchinfo rch_adc; + struct emu_pcm_rchinfo rch_efx; struct emu_route rt; struct emu_route rt_mono; int route; @@ -104,14 +106,26 @@ }; -static uint32_t emu_rfmt[] = { +static uint32_t emu_rfmt_adc[] = { AFMT_S16_LE, AFMT_STEREO | AFMT_S16_LE, 0 }; -static struct pcmchan_caps emu_reccaps = { - /* XXX should be "8000, 48000, emu_rfmt, 0", but 8000/8bit/mono is broken */ - 11025, 48000, emu_rfmt, 0 +static struct pcmchan_caps emu_reccaps_adc = { + 8000, 48000, emu_rfmt_adc, 0 +}; + +static uint32_t emu_rfmt_efx[] = { + AFMT_S16_LE, + 0 +}; + +static struct pcmchan_caps emu_reccaps_efx_live = { + 48000*32, 48000*32, emu_rfmt_efx, 0 +}; + +static struct pcmchan_caps emu_reccaps_efx_audigy = { + 48000*64, 48000*64, emu_rfmt_efx, 0 }; static uint32_t emu_pfmt[] = { @@ -433,8 +447,7 @@ ch->buffer = b; ch->pcm = sc; ch->channel = c; - /* XXX blksz should not be modified, see emu10kx.h for reasons */ - ch->blksz = EMU_PLAY_BUFSZ; + ch->blksz = sc->bufsz; ch->fmt = AFMT_U8; ch->spd = 8000; ch->master = emu_valloc(sc->card); @@ -575,13 +588,13 @@ struct emu_pcm_rchinfo *ch; KASSERT(dir == PCMDIR_REC, ("emurchan_init: bad direction")); - ch = &sc->rch; + ch = &sc->rch_adc; ch->buffer = b; ch->pcm = sc; ch->channel = c; - ch->blksz = sc->bufsz; + ch->blksz = sc->bufsz / 2; /* We rise interrupt for half-full buffer */ ch->fmt = AFMT_U8; - ch->spd = 11025; /* XXX 8000 Hz does not work */ + ch->spd = 8000; ch->idxreg = sc->is_emu10k1 ? ADCIDX : A_ADCIDX; ch->basereg = ADCBA; ch->sizereg = ADCBS; @@ -627,7 +640,11 @@ struct emu_pcm_rchinfo *ch = c_devinfo; ch->blksz = blocksize; - return (blocksize); + /* If blocksize is less than half of buffer size we will not get + interrupt in time and channel will die due to interrupt timeout */ + if(ch->blksz < (ch->pcm->bufsz / 2)) + ch->blksz = ch->pcm->bufsz / 2; + return (ch->blksz); } static int @@ -706,7 +723,7 @@ static struct pcmchan_caps * emurchan_getcaps(kobj_t obj __unused, void *c_devinfo __unused) { - return (&emu_reccaps); + return (&emu_reccaps_adc); } static kobj_method_t emurchan_methods[] = { @@ -721,7 +738,175 @@ }; CHANNEL_DECLARE(emurchan); +static void * +emufxrchan_init(kobj_t obj __unused, void *devinfo, struct snd_dbuf *b, struct pcm_channel *c, int dir __unused) +{ + struct emu_pcm_info *sc = devinfo; + struct emu_pcm_rchinfo *ch; + + KASSERT(dir == PCMDIR_REC, ("emurchan_init: bad direction")); + + if (sc == NULL) return (NULL); + + ch = &(sc->rch_efx); + ch->fmt = AFMT_S16_LE; + ch->spd = sc->is_emu10k1 ? 48000*32 : 48000 * 64; + ch->idxreg = FXIDX; + ch->basereg = FXBA; + ch->sizereg = FXBS; + ch->irqmask = INTE_EFXBUFENABLE; + ch->iprmask = IPR_EFXBUFFULL | IPR_EFXBUFHALFFULL; + ch->buffer = b; + ch->pcm = sc; + ch->channel = c; + ch->blksz = sc->bufsz; + + if (sndbuf_alloc(ch->buffer, emu_gettag(sc->card), sc->bufsz) != 0) + return (NULL); + else { + emu_wrptr(sc->card, 0, ch->basereg, sndbuf_getbufaddr(ch->buffer)); + emu_wrptr(sc->card, 0, ch->sizereg, 0); /* off */ + return (ch); + } +} + +static int +emufxrchan_setformat(kobj_t obj __unused, void *c_devinfo __unused, uint32_t format) +{ + if (format == AFMT_S16_LE) return (0); + return (-1); +} + +static int +emufxrchan_setspeed(kobj_t obj __unused, void *c_devinfo, uint32_t speed) +{ + struct emu_pcm_rchinfo *ch = c_devinfo; + + /* FIXED RATE CHANNEL */ + return (ch->spd); +} + +static int >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Jan 9 13:55:51 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CC4B816A415; Tue, 9 Jan 2007 13:55: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 8958416A40F for ; Tue, 9 Jan 2007 13:55:50 +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 7549613C45D for ; Tue, 9 Jan 2007 13:55:50 +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 l09DtoBk009264 for ; Tue, 9 Jan 2007 13:55:50 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 l09DsbFp008550 for perforce@freebsd.org; Tue, 9 Jan 2007 13:54:37 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 9 Jan 2007 13:54:37 GMT Message-Id: <200701091354.l09DsbFp008550@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 112693 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 09 Jan 2007 13:55:51 -0000 http://perforce.freebsd.org/chv.cgi?CH=112693 Change 112693 by rwatson@rwatson_zoo on 2007/01/09 13:53:42 Integrate trustedbsd_mac branch. Affected files ... .. //depot/projects/trustedbsd/mac/COPYRIGHT#6 integrate .. //depot/projects/trustedbsd/mac/MAINTAINERS#36 integrate .. //depot/projects/trustedbsd/mac/Makefile#41 integrate .. //depot/projects/trustedbsd/mac/Makefile.inc1#69 integrate .. //depot/projects/trustedbsd/mac/ObsoleteFiles.inc#10 integrate .. //depot/projects/trustedbsd/mac/UPDATING#59 integrate .. //depot/projects/trustedbsd/mac/bin/cat/cat.1#6 integrate .. //depot/projects/trustedbsd/mac/bin/chmod/chmod.1#13 integrate .. //depot/projects/trustedbsd/mac/bin/cp/cp.1#12 integrate .. //depot/projects/trustedbsd/mac/bin/domainname/domainname.1#7 integrate .. //depot/projects/trustedbsd/mac/bin/hostname/hostname.1#8 integrate .. //depot/projects/trustedbsd/mac/bin/hostname/hostname.c#9 integrate .. //depot/projects/trustedbsd/mac/bin/mkdir/mkdir.1#8 integrate .. //depot/projects/trustedbsd/mac/bin/pax/cpio.c#9 integrate .. //depot/projects/trustedbsd/mac/bin/pax/tar.c#10 integrate .. //depot/projects/trustedbsd/mac/bin/rm/rm.1#13 integrate .. //depot/projects/trustedbsd/mac/bin/rm/rm.c#19 integrate .. //depot/projects/trustedbsd/mac/bin/rmdir/rmdir.1#8 integrate .. //depot/projects/trustedbsd/mac/bin/sh/expand.c#17 integrate .. //depot/projects/trustedbsd/mac/bin/sh/parser.c#17 integrate .. //depot/projects/trustedbsd/mac/bin/sh/parser.h#5 integrate .. //depot/projects/trustedbsd/mac/bin/test/test.1#8 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/CHANGES#5 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/COPYRIGHT#3 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/FAQ#4 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/FAQ.xml#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/Makefile.in#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/README#4 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/check/named-checkconf.8#3 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/check/named-checkconf.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/check/named-checkconf.html#3 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/check/named-checkzone.8#3 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/check/named-checkzone.docbook#3 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/check/named-checkzone.html#3 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/dig/dig.1#3 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/dig/dig.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/dig/dig.html#3 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/dig/dighost.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/dig/host.1#3 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/dig/host.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/dig/host.html#3 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/dig/include/dig/dig.h#4 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/dig/nslookup.1#3 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/dig/nslookup.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/dig/nslookup.docbook#3 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/dig/nslookup.html#3 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/dnssec/dnssec-keygen.8#3 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/dnssec/dnssec-keygen.html#3 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/dnssec/dnssec-signzone.8#3 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/dnssec/dnssec-signzone.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/dnssec/dnssec-signzone.html#3 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/named/aclconf.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/named/client.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/named/config.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/named/controlconf.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/named/include/named/aclconf.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/named/include/named/client.h#3 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/named/include/named/config.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/named/include/named/control.h#3 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/named/include/named/globals.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/named/include/named/logconf.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/named/include/named/lwresd.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/named/include/named/server.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/named/include/named/sortlist.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/named/include/named/tkeyconf.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/named/include/named/tsigconf.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/named/include/named/zoneconf.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/named/interfacemgr.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/named/logconf.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/named/lwdgabn.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/named/lwdgrbn.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/named/lwresd.8#3 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/named/lwresd.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/named/lwresd.html#3 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/named/main.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/named/named.8#3 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/named/named.conf.5#4 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/named/named.conf.docbook#4 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/named/named.conf.html#4 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/named/named.docbook#3 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/named/named.html#3 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/named/query.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/named/server.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/named/sortlist.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/named/tkeyconf.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/named/tsigconf.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/named/unix/os.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/named/update.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/named/zoneconf.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/nsupdate/nsupdate.8#3 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/nsupdate/nsupdate.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/nsupdate/nsupdate.html#3 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/rndc/rndc-confgen.8#3 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/rndc/rndc-confgen.html#3 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/rndc/rndc.8#3 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/rndc/rndc.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/rndc/rndc.conf.5#3 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/rndc/rndc.conf.html#3 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/rndc/rndc.html#3 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/config.threads.in#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/configure.in#4 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/doc/arm/Bv9ARM-book.xml#4 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/doc/arm/Bv9ARM.ch01.html#3 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/doc/arm/Bv9ARM.ch02.html#3 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/doc/arm/Bv9ARM.ch03.html#4 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/doc/arm/Bv9ARM.ch04.html#4 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/doc/arm/Bv9ARM.ch05.html#4 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/doc/arm/Bv9ARM.ch06.html#4 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/doc/arm/Bv9ARM.ch07.html#4 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/doc/arm/Bv9ARM.ch08.html#4 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/doc/arm/Bv9ARM.ch09.html#4 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/doc/arm/Bv9ARM.html#4 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/doc/arm/Bv9ARM.pdf#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/bind/Makefile.in#4 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/bind/api#4 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/bind/config.h.in#4 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/bind/configure#4 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/bind/configure.in#4 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/bind/dst/dst_api.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/bind/dst/hmac_link.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/bind/include/arpa/nameser_compat.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/bind/include/isc/list.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/bind/include/netdb.h#3 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/bind/inet/inet_cidr_ntop.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/bind/inet/inet_net_ntop.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/bind/irs/dns.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/bind/irs/dns_ho.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/bind/irs/gai_strerror.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/bind/irs/gen_ho.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/bind/irs/getaddrinfo.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/bind/irs/gethostent.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/bind/irs/getnameinfo.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/bind/irs/getprotoent_r.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/bind/irs/getservent_r.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/bind/irs/irp.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/bind/irs/irp_nw.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/bind/irs/irpmarshall.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/bind/irs/irs_data.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/bind/irs/lcl_ho.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/bind/irs/lcl_pr.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/bind/isc/ev_connects.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/bind/isc/eventlib.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/bind/isc/eventlib_p.h#4 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/bind/isc/heap.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/bind/isc/hex.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/bind/isc/memcluster.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/bind/nameser/ns_sign.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/bind/nameser/ns_verify.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/bind/port_after.h.in#4 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/bind/port_before.h.in#3 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/bind/resolv/mtctxres.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/bind/resolv/res_init.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/bind/resolv/res_send.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/bind/resolv/res_sendsigned.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/bind9/api#4 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/bind9/check.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/bind9/include/bind9/check.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/dns/Makefile.in#3 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/dns/acl.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/dns/adb.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/dns/api#4 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/dns/cache.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/dns/compress.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/dns/dispatch.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/dns/dnssec.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/dns/dst_api.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/dns/gen.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/dns/include/dns/acl.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/dns/include/dns/cache.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/dns/include/dns/compress.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/dns/include/dns/keytable.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/dns/include/dns/message.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/dns/include/dns/name.h#3 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/dns/include/dns/peer.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/dns/include/dns/rdataset.h#3 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/dns/include/dns/resolver.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/dns/include/dns/types.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/dns/include/dns/validator.h#3 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/dns/include/dns/xfrin.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/dns/include/dns/zone.h#3 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/dns/keytable.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/dns/lookup.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/dns/masterdump.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/dns/message.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/dns/name.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/dns/openssl_link.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/dns/openssldh_link.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/dns/openssldsa_link.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/dns/opensslrsa_link.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/dns/peer.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/dns/portlist.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/dns/rbtdb.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/dns/rdata.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/dns/rdata/generic/dlv_32769.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/dns/rdata/generic/dlv_32769.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/dns/rdata/generic/dlv_65323.c#2 delete .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/dns/rdata/generic/dlv_65323.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/dns/rdataset.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/dns/request.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/dns/resolver.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/dns/tcpmsg.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/dns/tkey.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/dns/tsig.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/dns/validator.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/dns/xfrin.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/dns/zone.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/isc/api#4 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/isc/hash.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/isc/heap.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/isc/hmacmd5.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/isc/include/isc/heap.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/isc/include/isc/list.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/isc/include/isc/sockaddr.h#3 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/isc/include/isc/symtab.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/isc/lex.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/isc/log.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/isc/netscope.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/isc/nothreads/condition.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/isc/nothreads/mutex.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/isc/print.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/isc/sockaddr.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/isc/taskpool.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/isc/timer.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/isc/unix/entropy.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/isc/unix/fsaccess.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/isc/unix/ifiter_ioctl.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/isc/unix/ipv6.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/isc/unix/socket.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/isccc/api#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/isccfg/include/isccfg/cfg.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/isccfg/include/isccfg/grammar.h#3 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/isccfg/namedconf.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/isccfg/parser.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/lwres/api#4 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/lwres/gai_strerror.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/lwres/getaddrinfo.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/lwres/lwconfig.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/lwres/man/lwres.3#3 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/lwres/man/lwres.html#3 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/lwres/man/lwres_buffer.3#3 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/lwres/man/lwres_buffer.html#3 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/lwres/man/lwres_config.3#3 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/lwres/man/lwres_config.html#3 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/lwres/man/lwres_context.3#3 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/lwres/man/lwres_context.html#3 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/lwres/man/lwres_gabn.3#3 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/lwres/man/lwres_gabn.html#3 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/lwres/man/lwres_gai_strerror.3#3 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/lwres/man/lwres_gai_strerror.html#3 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/lwres/man/lwres_getaddrinfo.3#3 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/lwres/man/lwres_getaddrinfo.html#3 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/lwres/man/lwres_gethostent.3#3 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/lwres/man/lwres_gethostent.html#3 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/lwres/man/lwres_getipnode.3#3 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/lwres/man/lwres_getipnode.html#3 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/lwres/man/lwres_getnameinfo.3#3 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/lwres/man/lwres_getnameinfo.html#3 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/lwres/man/lwres_getrrsetbyname.3#3 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/lwres/man/lwres_getrrsetbyname.html#3 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/lwres/man/lwres_gnba.3#3 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/lwres/man/lwres_gnba.html#3 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/lwres/man/lwres_hstrerror.3#3 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/lwres/man/lwres_hstrerror.html#3 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/lwres/man/lwres_inetntop.3#3 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/lwres/man/lwres_inetntop.html#3 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/lwres/man/lwres_noop.3#3 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/lwres/man/lwres_noop.html#3 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/lwres/man/lwres_packet.3#3 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/lwres/man/lwres_packet.html#3 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/lwres/man/lwres_resutil.3#3 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/lwres/man/lwres_resutil.html#3 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/libtool.m4#3 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/ltmain.sh#3 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/make/rules.in#3 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/version#5 integrate .. //depot/projects/trustedbsd/mac/contrib/bsnmp/snmp_mibII/mibII.c#11 integrate .. //depot/projects/trustedbsd/mac/contrib/bsnmp/snmpd/action.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/bsnmp/snmpd/tree.def#4 integrate .. //depot/projects/trustedbsd/mac/contrib/cvs/src/log.c#8 integrate .. //depot/projects/trustedbsd/mac/contrib/gdtoa/README#3 integrate .. //depot/projects/trustedbsd/mac/contrib/gdtoa/arithchk.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gdtoa/dmisc.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gdtoa/dtoa.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gdtoa/g_Qfmt.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gdtoa/g__fmt.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/gdtoa/g_ddfmt.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gdtoa/g_dfmt.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gdtoa/g_ffmt.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gdtoa/g_xLfmt.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gdtoa/g_xfmt.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gdtoa/gdtoa.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gdtoa/gdtoa.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gdtoa/gdtoaimp.h#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gdtoa/gethex.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/gdtoa/gmisc.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gdtoa/hd_init.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gdtoa/hexnan.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gdtoa/makefile#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gdtoa/misc.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gdtoa/qnan.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/gdtoa/smisc.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gdtoa/strtoIQ.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gdtoa/strtoId.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gdtoa/strtoIdd.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gdtoa/strtoIf.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gdtoa/strtoIg.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gdtoa/strtoIx.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gdtoa/strtoIxL.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gdtoa/strtod.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/gdtoa/strtodI.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gdtoa/strtodg.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/gdtoa/strtodnrp.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/gdtoa/strtof.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gdtoa/strtopQ.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gdtoa/strtopd.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gdtoa/strtopdd.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gdtoa/strtopf.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gdtoa/strtopx.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gdtoa/strtopxL.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gdtoa/strtorQ.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gdtoa/strtord.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gdtoa/strtordd.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gdtoa/strtorf.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gdtoa/strtorx.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gdtoa/strtorxL.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gdtoa/sum.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gdtoa/test/Qtest.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gdtoa/test/dItest.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gdtoa/test/ddtest.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gdtoa/test/dt.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gdtoa/test/dtest.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gdtoa/test/dtst.out#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gdtoa/test/ftest.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gdtoa/test/getround.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gdtoa/test/makefile#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gdtoa/test/strtodt.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gdtoa/test/x.ou0#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gdtoa/test/x.ou1#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gdtoa/test/xL.ou1#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gdtoa/test/xLtest.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gdtoa/test/xsum0.out#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gdtoa/test/xtest.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gdtoa/ulp.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gdtoa/xsum0.out#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/tmac/doc-common#17 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/tmac/doc-syms#11 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/tmac/groff_mdoc.man#16 integrate .. //depot/projects/trustedbsd/mac/contrib/libbegemot/rpoll.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/libbegemot/rpoll.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/libbegemot/rpoll.man#3 integrate .. //depot/projects/trustedbsd/mac/contrib/libreadline/CHANGELOG#6 integrate .. //depot/projects/trustedbsd/mac/contrib/libreadline/CHANGES#6 integrate .. //depot/projects/trustedbsd/mac/contrib/libreadline/FREEBSD-upgrade#7 integrate .. //depot/projects/trustedbsd/mac/contrib/libreadline/INSTALL#6 integrate .. //depot/projects/trustedbsd/mac/contrib/libreadline/NEWS#3 integrate .. //depot/projects/trustedbsd/mac/contrib/libreadline/README#6 integrate .. //depot/projects/trustedbsd/mac/contrib/libreadline/aclocal.m4#6 integrate .. //depot/projects/trustedbsd/mac/contrib/libreadline/bind.c#7 integrate .. //depot/projects/trustedbsd/mac/contrib/libreadline/callback.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/libreadline/complete.c#7 integrate .. //depot/projects/trustedbsd/mac/contrib/libreadline/config.h.in#6 integrate .. //depot/projects/trustedbsd/mac/contrib/libreadline/configure#6 integrate .. //depot/projects/trustedbsd/mac/contrib/libreadline/configure.in#6 integrate .. //depot/projects/trustedbsd/mac/contrib/libreadline/display.c#7 integrate .. //depot/projects/trustedbsd/mac/contrib/libreadline/doc/history.texi#2 integrate .. //depot/projects/trustedbsd/mac/contrib/libreadline/doc/hstech.texi#2 integrate .. //depot/projects/trustedbsd/mac/contrib/libreadline/doc/hsuser.texi#2 integrate .. //depot/projects/trustedbsd/mac/contrib/libreadline/doc/readline.3#7 integrate .. //depot/projects/trustedbsd/mac/contrib/libreadline/doc/rlman.texi#2 integrate .. //depot/projects/trustedbsd/mac/contrib/libreadline/doc/rltech.texi#3 integrate .. //depot/projects/trustedbsd/mac/contrib/libreadline/doc/rluser.texi#3 integrate .. //depot/projects/trustedbsd/mac/contrib/libreadline/doc/rluserman.texi#3 integrate .. //depot/projects/trustedbsd/mac/contrib/libreadline/doc/version.texi#3 integrate .. //depot/projects/trustedbsd/mac/contrib/libreadline/examples/excallback.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/libreadline/examples/rlfe/Makefile.in#2 integrate .. //depot/projects/trustedbsd/mac/contrib/libreadline/histexpand.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/libreadline/histfile.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/libreadline/history.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/libreadline/input.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/libreadline/isearch.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/libreadline/kill.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/libreadline/macro.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/libreadline/misc.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/libreadline/readline.c#7 integrate .. //depot/projects/trustedbsd/mac/contrib/libreadline/readline.h#8 integrate .. //depot/projects/trustedbsd/mac/contrib/libreadline/rlconf.h#6 integrate .. //depot/projects/trustedbsd/mac/contrib/libreadline/rlmbutil.h#4 integrate .. //depot/projects/trustedbsd/mac/contrib/libreadline/rlprivate.h#6 integrate .. //depot/projects/trustedbsd/mac/contrib/libreadline/rltty.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/libreadline/search.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/libreadline/signals.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/libreadline/support/shlib-install#6 integrate .. //depot/projects/trustedbsd/mac/contrib/libreadline/support/shobj-conf#6 integrate .. //depot/projects/trustedbsd/mac/contrib/libreadline/terminal.c#7 integrate .. //depot/projects/trustedbsd/mac/contrib/libreadline/text.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/libreadline/tilde.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/libreadline/undo.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/libreadline/vi_mode.c#7 integrate .. //depot/projects/trustedbsd/mac/contrib/pf/man/pf.conf.5#7 integrate .. //depot/projects/trustedbsd/mac/contrib/pf/pfctl/pfctl_altq.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/top/sigconv.awk#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/ChangeLog#13 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/Makefile.in#12 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/README#12 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/audit-bsm.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/auth-rsa.c#10 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/auth.c#13 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/bufaux.h#8 delete .. //depot/projects/trustedbsd/mac/crypto/openssh/bufbn.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/buildpkg.sh.in#5 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/clientloop.c#14 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/configure.ac#13 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/dh.c#10 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/entropy.c#7 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/kexdhc.c#5 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/kexdhs.c#5 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/kexgexc.c#5 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/kexgexs.c#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/key.c#13 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/moduli.c#7 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/monitor.c#15 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/monitor_fdpass.c#6 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/openbsd-compat/port-solaris.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/rsa.c#5 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/scard.c#7 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/scard/Makefile.in#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/serverloop.c#13 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/session.c#26 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/sftp-client.c#15 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/sftp.c#15 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/ssh-agent.c#17 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/ssh-dss.c#8 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/ssh-keygen.c#14 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/ssh-keyscan.1#8 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/ssh-keyscan.c#14 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/ssh.1#15 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/ssh.c#16 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/ssh_config#20 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/ssh_config.5#16 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/sshconnect.c#14 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/sshconnect1.c#11 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/sshd.c#19 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/sshd_config#21 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/sshd_config.5#18 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/version.h#20 integrate .. //depot/projects/trustedbsd/mac/etc/amd.map#4 integrate .. //depot/projects/trustedbsd/mac/etc/defaults/rc.conf#51 integrate .. //depot/projects/trustedbsd/mac/etc/mtree/BSD.include.dist#44 integrate .. //depot/projects/trustedbsd/mac/etc/mtree/BSD.local.dist#30 integrate .. //depot/projects/trustedbsd/mac/etc/mtree/BSD.usr.dist#41 integrate .. //depot/projects/trustedbsd/mac/etc/network.subr#13 integrate .. //depot/projects/trustedbsd/mac/etc/pccard_ether#14 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/abi#8 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/accounting#7 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/archdep#10 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/atm1#8 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/auto_linklocal#2 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/bluetooth#2 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/bootconf.sh#5 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/bridge#2 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/geli#2 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/hcsecd#3 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/ip6fw#7 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/ipfilter#16 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/ipfw#13 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/ipnat#11 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/jail#15 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/ldconfig#14 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/lpd#7 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/mdconfig#3 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/mdconfig2#3 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/mountcritremote#12 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/moused#9 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/natd#5 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/netif#13 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/nfsclient#6 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/nfsserver#5 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/nsswitch#5 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/pf#9 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/pflog#6 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/pfsync#2 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/pppoed#4 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/sdpd#3 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/syscons#12 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/syslogd#8 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/ugidfw#5 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/var#5 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/ypbind#9 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/yppasswdd#9 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/ypserv#10 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/ypset#7 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/ypupdated#6 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/ypxfrd#8 integrate .. //depot/projects/trustedbsd/mac/etc/rc.firewall#8 integrate .. //depot/projects/trustedbsd/mac/etc/rc.initdiskless#6 integrate .. //depot/projects/trustedbsd/mac/etc/rc.subr#27 integrate .. //depot/projects/trustedbsd/mac/etc/snmpd.config#5 integrate .. //depot/projects/trustedbsd/mac/games/fortune/datfiles/fortunes#45 integrate .. //depot/projects/trustedbsd/mac/games/fortune/datfiles/fortunes-o.real#8 integrate .. //depot/projects/trustedbsd/mac/games/fortune/datfiles/fortunes.sp.ok#5 integrate .. //depot/projects/trustedbsd/mac/games/fortune/datfiles/fortunes2-o#13 integrate .. //depot/projects/trustedbsd/mac/games/fortune/datfiles/freebsd-tips#21 integrate .. //depot/projects/trustedbsd/mac/games/fortune/datfiles/zippy#4 integrate .. //depot/projects/trustedbsd/mac/gnu/lib/libreadline/Makefile.inc#8 integrate .. //depot/projects/trustedbsd/mac/gnu/lib/libreadline/config.h#5 integrate .. //depot/projects/trustedbsd/mac/gnu/usr.bin/binutils/libiberty/config.h#6 integrate .. //depot/projects/trustedbsd/mac/gnu/usr.bin/cc/cc_tools/arm.md.diff#2 integrate .. //depot/projects/trustedbsd/mac/gnu/usr.bin/groff/tmac/mdoc.local#28 integrate .. //depot/projects/trustedbsd/mac/gnu/usr.bin/man/apropos/apropos.man#9 integrate .. //depot/projects/trustedbsd/mac/gnu/usr.bin/man/man/man.man#8 integrate .. //depot/projects/trustedbsd/mac/gnu/usr.bin/man/manpath/manpath.man#3 integrate .. //depot/projects/trustedbsd/mac/gnu/usr.bin/send-pr/send-pr.sh#11 integrate .. //depot/projects/trustedbsd/mac/include/Makefile#57 integrate .. //depot/projects/trustedbsd/mac/include/ar.h#2 integrate .. //depot/projects/trustedbsd/mac/include/arpa/nameser_compat.h#4 integrate .. //depot/projects/trustedbsd/mac/include/mqueue.h#2 integrate .. //depot/projects/trustedbsd/mac/include/unistd.h#22 integrate .. //depot/projects/trustedbsd/mac/lib/Makefile#42 integrate .. //depot/projects/trustedbsd/mac/lib/bind/bind/config.h#4 integrate .. //depot/projects/trustedbsd/mac/lib/bind/bind/port_after.h#3 integrate .. //depot/projects/trustedbsd/mac/lib/bind/bind/port_before.h#3 integrate .. //depot/projects/trustedbsd/mac/lib/bind/config.h#5 integrate .. //depot/projects/trustedbsd/mac/lib/bind/dns/code.h#3 integrate .. //depot/projects/trustedbsd/mac/lib/bind/dns/dns/enumclass.h#3 integrate .. //depot/projects/trustedbsd/mac/lib/bind/dns/dns/enumtype.h#3 integrate .. //depot/projects/trustedbsd/mac/lib/bind/dns/dns/rdatastruct.h#3 integrate .. //depot/projects/trustedbsd/mac/lib/bind/lwres/lwres/platform.h#3 integrate .. //depot/projects/trustedbsd/mac/lib/libarchive/Makefile#18 integrate .. //depot/projects/trustedbsd/mac/lib/libarchive/archive.h.in#12 integrate .. //depot/projects/trustedbsd/mac/lib/libarchive/archive_check_magic.c#4 integrate .. //depot/projects/trustedbsd/mac/lib/libarchive/archive_entry.c#13 integrate .. //depot/projects/trustedbsd/mac/lib/libarchive/archive_platform.h#11 integrate .. //depot/projects/trustedbsd/mac/lib/libarchive/archive_private.h#12 integrate .. //depot/projects/trustedbsd/mac/lib/libarchive/archive_read.3#10 integrate .. //depot/projects/trustedbsd/mac/lib/libarchive/archive_read.c#11 integrate .. //depot/projects/trustedbsd/mac/lib/libarchive/archive_read_data_into_buffer.c#4 integrate .. //depot/projects/trustedbsd/mac/lib/libarchive/archive_read_data_into_fd.c#6 integrate .. //depot/projects/trustedbsd/mac/lib/libarchive/archive_read_extract.c#13 integrate .. //depot/projects/trustedbsd/mac/lib/libarchive/archive_read_open_fd.c#6 integrate .. //depot/projects/trustedbsd/mac/lib/libarchive/archive_read_open_file.c#9 integrate .. //depot/projects/trustedbsd/mac/lib/libarchive/archive_read_open_filename.c#1 branch .. //depot/projects/trustedbsd/mac/lib/libarchive/archive_read_open_memory.c#1 branch .. //depot/projects/trustedbsd/mac/lib/libarchive/archive_read_support_compression_bzip2.c#7 integrate .. //depot/projects/trustedbsd/mac/lib/libarchive/archive_read_support_compression_compress.c#5 integrate .. //depot/projects/trustedbsd/mac/lib/libarchive/archive_read_support_compression_gzip.c#7 integrate .. //depot/projects/trustedbsd/mac/lib/libarchive/archive_read_support_compression_none.c#6 integrate .. //depot/projects/trustedbsd/mac/lib/libarchive/archive_read_support_format_cpio.c#11 integrate .. //depot/projects/trustedbsd/mac/lib/libarchive/archive_read_support_format_iso9660.c#6 integrate .. //depot/projects/trustedbsd/mac/lib/libarchive/archive_read_support_format_tar.c#14 integrate .. //depot/projects/trustedbsd/mac/lib/libarchive/archive_read_support_format_zip.c#4 integrate .. //depot/projects/trustedbsd/mac/lib/libarchive/archive_string.c#5 integrate .. //depot/projects/trustedbsd/mac/lib/libarchive/archive_string.h#5 integrate .. //depot/projects/trustedbsd/mac/lib/libarchive/archive_util.c#6 integrate .. //depot/projects/trustedbsd/mac/lib/libarchive/archive_write.3#8 integrate .. //depot/projects/trustedbsd/mac/lib/libarchive/archive_write.c#10 integrate .. //depot/projects/trustedbsd/mac/lib/libarchive/archive_write_open_fd.c#4 integrate .. //depot/projects/trustedbsd/mac/lib/libarchive/archive_write_open_file.c#7 integrate .. //depot/projects/trustedbsd/mac/lib/libarchive/archive_write_open_filename.c#1 branch .. //depot/projects/trustedbsd/mac/lib/libarchive/archive_write_open_memory.c#1 branch .. //depot/projects/trustedbsd/mac/lib/libarchive/archive_write_set_compression_bzip2.c#6 integrate .. //depot/projects/trustedbsd/mac/lib/libarchive/archive_write_set_compression_gzip.c#6 integrate .. //depot/projects/trustedbsd/mac/lib/libarchive/archive_write_set_compression_none.c#6 integrate .. //depot/projects/trustedbsd/mac/lib/libarchive/archive_write_set_format.c#2 integrate .. //depot/projects/trustedbsd/mac/lib/libarchive/archive_write_set_format_by_name.c#3 integrate .. //depot/projects/trustedbsd/mac/lib/libarchive/archive_write_set_format_cpio.c#5 integrate .. //depot/projects/trustedbsd/mac/lib/libarchive/archive_write_set_format_pax.c#14 integrate .. //depot/projects/trustedbsd/mac/lib/libarchive/archive_write_set_format_shar.c#5 integrate .. //depot/projects/trustedbsd/mac/lib/libarchive/archive_write_set_format_ustar.c#7 integrate .. //depot/projects/trustedbsd/mac/lib/libarchive/config_freebsd.h#1 branch .. //depot/projects/trustedbsd/mac/lib/libarchive/libarchive.3#4 integrate .. //depot/projects/trustedbsd/mac/lib/libc/amd64/gd_qnan.h#1 branch .. //depot/projects/trustedbsd/mac/lib/libc/amd64/net/Makefile.inc#2 delete .. //depot/projects/trustedbsd/mac/lib/libc/amd64/net/htonl.S#2 delete .. //depot/projects/trustedbsd/mac/lib/libc/amd64/net/htons.S#2 delete .. //depot/projects/trustedbsd/mac/lib/libc/amd64/net/ntohl.S#2 delete .. //depot/projects/trustedbsd/mac/lib/libc/amd64/net/ntohs.S#2 delete .. //depot/projects/trustedbsd/mac/lib/libc/arm/arith.h#2 integrate .. //depot/projects/trustedbsd/mac/lib/libc/arm/gd_qnan.h#1 branch .. //depot/projects/trustedbsd/mac/lib/libc/arm/net/Makefile.inc#2 delete .. //depot/projects/trustedbsd/mac/lib/libc/arm/net/htonl.S#3 delete .. //depot/projects/trustedbsd/mac/lib/libc/arm/net/htons.S#3 delete .. //depot/projects/trustedbsd/mac/lib/libc/arm/net/ntohl.S#3 delete .. //depot/projects/trustedbsd/mac/lib/libc/arm/net/ntohs.S#3 delete .. //depot/projects/trustedbsd/mac/lib/libc/arm/sys/cerror.S#3 integrate .. //depot/projects/trustedbsd/mac/lib/libc/arm/sys/ptrace.S#3 integrate .. //depot/projects/trustedbsd/mac/lib/libc/gdtoa/_hdtoa.c#3 integrate .. //depot/projects/trustedbsd/mac/lib/libc/gen/confstr.3#4 integrate .. //depot/projects/trustedbsd/mac/lib/libc/gen/err.3#5 integrate .. //depot/projects/trustedbsd/mac/lib/libc/gen/sysconf.3#6 integrate .. //depot/projects/trustedbsd/mac/lib/libc/gen/sysconf.c#9 integrate .. //depot/projects/trustedbsd/mac/lib/libc/gmon/Makefile.inc#5 integrate .. //depot/projects/trustedbsd/mac/lib/libc/i386/gd_qnan.h#1 branch .. //depot/projects/trustedbsd/mac/lib/libc/i386/gen/modf.S#3 integrate .. //depot/projects/trustedbsd/mac/lib/libc/i386/net/Makefile.inc#2 delete .. //depot/projects/trustedbsd/mac/lib/libc/i386/net/htonl.S#6 delete .. //depot/projects/trustedbsd/mac/lib/libc/i386/net/htons.S#4 delete .. //depot/projects/trustedbsd/mac/lib/libc/i386/net/ntohl.S#6 delete .. //depot/projects/trustedbsd/mac/lib/libc/i386/net/ntohs.S#4 delete .. //depot/projects/trustedbsd/mac/lib/libc/ia64/gd_qnan.h#1 branch .. //depot/projects/trustedbsd/mac/lib/libc/ia64/net/Makefile.inc#2 delete .. //depot/projects/trustedbsd/mac/lib/libc/ia64/net/byte_swap_2.S#4 delete .. //depot/projects/trustedbsd/mac/lib/libc/ia64/net/byte_swap_4.S#4 delete .. //depot/projects/trustedbsd/mac/lib/libc/ia64/net/htonl.S#4 delete .. //depot/projects/trustedbsd/mac/lib/libc/ia64/net/htons.S#4 delete .. //depot/projects/trustedbsd/mac/lib/libc/ia64/net/ntohl.S#4 delete .. //depot/projects/trustedbsd/mac/lib/libc/ia64/net/ntohs.S#4 delete .. //depot/projects/trustedbsd/mac/lib/libc/inet/inet_cidr_ntop.c#2 integrate .. //depot/projects/trustedbsd/mac/lib/libc/inet/inet_net_ntop.c#2 integrate .. //depot/projects/trustedbsd/mac/lib/libc/isc/eventlib_p.h#3 integrate .. //depot/projects/trustedbsd/mac/lib/libc/net/Makefile.inc#17 integrate .. //depot/projects/trustedbsd/mac/lib/libc/net/gethostbyname.3#12 integrate .. //depot/projects/trustedbsd/mac/lib/libc/net/inet.3#7 integrate .. //depot/projects/trustedbsd/mac/lib/libc/net/nscachedcli.c#2 integrate .. //depot/projects/trustedbsd/mac/lib/libc/net/ntoh.c#1 branch .. //depot/projects/trustedbsd/mac/lib/libc/net/resolver.3#8 integrate .. //depot/projects/trustedbsd/mac/lib/libc/net/sctp_sys_calls.c#1 branch .. //depot/projects/trustedbsd/mac/lib/libc/powerpc/gd_qnan.h#1 branch .. //depot/projects/trustedbsd/mac/lib/libc/powerpc/net/Makefile.inc#2 delete .. //depot/projects/trustedbsd/mac/lib/libc/powerpc/net/htonl.S#2 delete .. //depot/projects/trustedbsd/mac/lib/libc/powerpc/net/htons.S#2 delete .. //depot/projects/trustedbsd/mac/lib/libc/powerpc/net/ntohl.S#2 delete .. //depot/projects/trustedbsd/mac/lib/libc/powerpc/net/ntohs.S#2 delete .. //depot/projects/trustedbsd/mac/lib/libc/resolv/mtctxres.c#2 integrate .. //depot/projects/trustedbsd/mac/lib/libc/resolv/res_init.c#3 integrate .. //depot/projects/trustedbsd/mac/lib/libc/resolv/res_send.c#4 integrate .. //depot/projects/trustedbsd/mac/lib/libc/sparc64/fpu/fpu_implode.c#6 integrate .. //depot/projects/trustedbsd/mac/lib/libc/sparc64/gd_qnan.h#1 branch .. //depot/projects/trustedbsd/mac/lib/libc/sparc64/net/Makefile.inc#3 delete .. //depot/projects/trustedbsd/mac/lib/libc/sparc64/net/htonl.S#5 delete .. //depot/projects/trustedbsd/mac/lib/libc/sparc64/net/htons.S#4 delete .. //depot/projects/trustedbsd/mac/lib/libc/sparc64/net/ntohl.S#5 delete .. //depot/projects/trustedbsd/mac/lib/libc/sparc64/net/ntohs.S#4 delete .. //depot/projects/trustedbsd/mac/lib/libc/sparc64/sys/Makefile.inc#8 integrate .. //depot/projects/trustedbsd/mac/lib/libc/sparc64/sys/__sparc_utrap_gen.S#5 integrate .. //depot/projects/trustedbsd/mac/lib/libc/stdio/vfprintf.c#25 integrate .. //depot/projects/trustedbsd/mac/lib/libc/stdlib/malloc.c#27 integrate .. //depot/projects/trustedbsd/mac/lib/libc/stdtime/strftime.3#11 integrate .. //depot/projects/trustedbsd/mac/lib/libc/sys/chflags.2#8 integrate .. //depot/projects/trustedbsd/mac/lib/libc/sys/chmod.2#9 integrate .. //depot/projects/trustedbsd/mac/lib/libc/sys/chown.2#4 integrate .. //depot/projects/trustedbsd/mac/lib/libc/sys/clock_gettime.2#9 integrate .. //depot/projects/trustedbsd/mac/lib/libc/sys/close.2#6 integrate .. //depot/projects/trustedbsd/mac/lib/libc/sys/extattr_get_file.2#11 integrate .. //depot/projects/trustedbsd/mac/lib/libc/sys/getpid.2#3 integrate .. //depot/projects/trustedbsd/mac/lib/libc/sys/kqueue.2#14 integrate .. //depot/projects/trustedbsd/mac/lib/libc/sys/kse.2#13 integrate .. //depot/projects/trustedbsd/mac/lib/libc/sys/link.2#5 integrate .. //depot/projects/trustedbsd/mac/lib/libc/sys/mkdir.2#3 integrate .. //depot/projects/trustedbsd/mac/lib/libc/sys/mkfifo.2#3 integrate .. //depot/projects/trustedbsd/mac/lib/libc/sys/open.2#10 integrate .. //depot/projects/trustedbsd/mac/lib/libc/sys/ptrace.2#8 integrate .. //depot/projects/trustedbsd/mac/lib/libc/sys/recv.2#13 integrate .. //depot/projects/trustedbsd/mac/lib/libc/sys/rename.2#6 integrate .. //depot/projects/trustedbsd/mac/lib/libc/sys/rmdir.2#4 integrate .. //depot/projects/trustedbsd/mac/lib/libc/sys/sendfile.2#12 integrate .. //depot/projects/trustedbsd/mac/lib/libc/sys/statfs.2#8 integrate .. //depot/projects/trustedbsd/mac/lib/libc/sys/symlink.2#3 integrate .. //depot/projects/trustedbsd/mac/lib/libc/sys/truncate.2#6 integrate .. //depot/projects/trustedbsd/mac/lib/libc/sys/unlink.2#6 integrate .. //depot/projects/trustedbsd/mac/lib/libc/sys/utimes.2#8 integrate .. //depot/projects/trustedbsd/mac/lib/libcam/camlib.c#6 integrate .. //depot/projects/trustedbsd/mac/lib/libelf/Makefile#1 branch .. //depot/projects/trustedbsd/mac/lib/libelf/Version.map#1 branch .. //depot/projects/trustedbsd/mac/lib/libelf/_libelf.h#1 branch .. //depot/projects/trustedbsd/mac/lib/libelf/elf.3#1 branch .. //depot/projects/trustedbsd/mac/lib/libelf/elf_begin.3#1 branch .. //depot/projects/trustedbsd/mac/lib/libelf/elf_begin.c#1 branch .. //depot/projects/trustedbsd/mac/lib/libelf/elf_cntl.3#1 branch .. //depot/projects/trustedbsd/mac/lib/libelf/elf_cntl.c#1 branch .. //depot/projects/trustedbsd/mac/lib/libelf/elf_data.c#1 branch .. //depot/projects/trustedbsd/mac/lib/libelf/elf_end.3#1 branch .. //depot/projects/trustedbsd/mac/lib/libelf/elf_end.c#1 branch .. //depot/projects/trustedbsd/mac/lib/libelf/elf_errmsg.3#1 branch .. //depot/projects/trustedbsd/mac/lib/libelf/elf_errmsg.c#1 branch .. //depot/projects/trustedbsd/mac/lib/libelf/elf_errno.c#1 branch .. //depot/projects/trustedbsd/mac/lib/libelf/elf_fill.3#1 branch .. //depot/projects/trustedbsd/mac/lib/libelf/elf_fill.c#1 branch .. //depot/projects/trustedbsd/mac/lib/libelf/elf_flag.c#1 branch .. //depot/projects/trustedbsd/mac/lib/libelf/elf_flagdata.3#1 branch .. //depot/projects/trustedbsd/mac/lib/libelf/elf_getarhdr.3#1 branch .. //depot/projects/trustedbsd/mac/lib/libelf/elf_getarhdr.c#1 branch .. //depot/projects/trustedbsd/mac/lib/libelf/elf_getarsym.3#1 branch .. //depot/projects/trustedbsd/mac/lib/libelf/elf_getarsym.c#1 branch .. //depot/projects/trustedbsd/mac/lib/libelf/elf_getbase.3#1 branch .. //depot/projects/trustedbsd/mac/lib/libelf/elf_getbase.c#1 branch .. //depot/projects/trustedbsd/mac/lib/libelf/elf_getdata.3#1 branch .. //depot/projects/trustedbsd/mac/lib/libelf/elf_getident.3#1 branch .. //depot/projects/trustedbsd/mac/lib/libelf/elf_getident.c#1 branch .. //depot/projects/trustedbsd/mac/lib/libelf/elf_getphnum.3#1 branch .. //depot/projects/trustedbsd/mac/lib/libelf/elf_getscn.3#1 branch .. //depot/projects/trustedbsd/mac/lib/libelf/elf_getshnum.3#1 branch .. //depot/projects/trustedbsd/mac/lib/libelf/elf_getshstrndx.3#1 branch .. //depot/projects/trustedbsd/mac/lib/libelf/elf_hash.3#1 branch .. //depot/projects/trustedbsd/mac/lib/libelf/elf_hash.c#1 branch .. //depot/projects/trustedbsd/mac/lib/libelf/elf_kind.3#1 branch .. //depot/projects/trustedbsd/mac/lib/libelf/elf_kind.c#1 branch .. //depot/projects/trustedbsd/mac/lib/libelf/elf_memory.3#1 branch .. //depot/projects/trustedbsd/mac/lib/libelf/elf_memory.c#1 branch .. //depot/projects/trustedbsd/mac/lib/libelf/elf_next.3#1 branch .. //depot/projects/trustedbsd/mac/lib/libelf/elf_next.c#1 branch .. //depot/projects/trustedbsd/mac/lib/libelf/elf_phnum.c#1 branch .. //depot/projects/trustedbsd/mac/lib/libelf/elf_rand.3#1 branch .. //depot/projects/trustedbsd/mac/lib/libelf/elf_rand.c#1 branch .. //depot/projects/trustedbsd/mac/lib/libelf/elf_rawfile.3#1 branch .. //depot/projects/trustedbsd/mac/lib/libelf/elf_rawfile.c#1 branch .. //depot/projects/trustedbsd/mac/lib/libelf/elf_scn.c#1 branch .. //depot/projects/trustedbsd/mac/lib/libelf/elf_shnum.c#1 branch .. //depot/projects/trustedbsd/mac/lib/libelf/elf_shstrndx.c#1 branch .. //depot/projects/trustedbsd/mac/lib/libelf/elf_strptr.3#1 branch .. //depot/projects/trustedbsd/mac/lib/libelf/elf_strptr.c#1 branch .. //depot/projects/trustedbsd/mac/lib/libelf/elf_types.m4#1 branch .. //depot/projects/trustedbsd/mac/lib/libelf/elf_update.3#1 branch .. //depot/projects/trustedbsd/mac/lib/libelf/elf_update.c#1 branch .. //depot/projects/trustedbsd/mac/lib/libelf/elf_version.3#1 branch .. //depot/projects/trustedbsd/mac/lib/libelf/elf_version.c#1 branch .. //depot/projects/trustedbsd/mac/lib/libelf/gelf.3#1 branch .. //depot/projects/trustedbsd/mac/lib/libelf/gelf.h#1 branch .. //depot/projects/trustedbsd/mac/lib/libelf/gelf_cap.c#1 branch .. //depot/projects/trustedbsd/mac/lib/libelf/gelf_checksum.3#1 branch .. //depot/projects/trustedbsd/mac/lib/libelf/gelf_checksum.c#1 branch .. //depot/projects/trustedbsd/mac/lib/libelf/gelf_dyn.c#1 branch .. //depot/projects/trustedbsd/mac/lib/libelf/gelf_ehdr.c#1 branch .. //depot/projects/trustedbsd/mac/lib/libelf/gelf_fsize.3#1 branch .. //depot/projects/trustedbsd/mac/lib/libelf/gelf_fsize.c#1 branch .. //depot/projects/trustedbsd/mac/lib/libelf/gelf_getcap.3#1 branch .. //depot/projects/trustedbsd/mac/lib/libelf/gelf_getclass.3#1 branch .. //depot/projects/trustedbsd/mac/lib/libelf/gelf_getclass.c#1 branch .. //depot/projects/trustedbsd/mac/lib/libelf/gelf_getdyn.3#1 branch .. //depot/projects/trustedbsd/mac/lib/libelf/gelf_getehdr.3#1 branch .. //depot/projects/trustedbsd/mac/lib/libelf/gelf_getmove.3#1 branch .. //depot/projects/trustedbsd/mac/lib/libelf/gelf_getphdr.3#1 branch .. //depot/projects/trustedbsd/mac/lib/libelf/gelf_getrel.3#1 branch .. //depot/projects/trustedbsd/mac/lib/libelf/gelf_getrela.3#1 branch .. //depot/projects/trustedbsd/mac/lib/libelf/gelf_getshdr.3#1 branch .. //depot/projects/trustedbsd/mac/lib/libelf/gelf_getsym.3#1 branch .. //depot/projects/trustedbsd/mac/lib/libelf/gelf_getsyminfo.3#1 branch .. //depot/projects/trustedbsd/mac/lib/libelf/gelf_getsymshndx.3#1 branch .. //depot/projects/trustedbsd/mac/lib/libelf/gelf_move.c#1 branch .. //depot/projects/trustedbsd/mac/lib/libelf/gelf_newehdr.3#1 branch .. //depot/projects/trustedbsd/mac/lib/libelf/gelf_newphdr.3#1 branch .. //depot/projects/trustedbsd/mac/lib/libelf/gelf_phdr.c#1 branch .. //depot/projects/trustedbsd/mac/lib/libelf/gelf_rel.c#1 branch .. //depot/projects/trustedbsd/mac/lib/libelf/gelf_rela.c#1 branch .. //depot/projects/trustedbsd/mac/lib/libelf/gelf_shdr.c#1 branch .. //depot/projects/trustedbsd/mac/lib/libelf/gelf_sym.c#1 branch .. //depot/projects/trustedbsd/mac/lib/libelf/gelf_syminfo.c#1 branch .. //depot/projects/trustedbsd/mac/lib/libelf/gelf_symshndx.c#1 branch .. //depot/projects/trustedbsd/mac/lib/libelf/gelf_update_ehdr.3#1 branch .. //depot/projects/trustedbsd/mac/lib/libelf/gelf_xlate.c#1 branch .. //depot/projects/trustedbsd/mac/lib/libelf/gelf_xlatetof.3#1 branch .. //depot/projects/trustedbsd/mac/lib/libelf/libelf.c#1 branch .. //depot/projects/trustedbsd/mac/lib/libelf/libelf.h#1 branch .. //depot/projects/trustedbsd/mac/lib/libelf/libelf_align.c#1 branch .. //depot/projects/trustedbsd/mac/lib/libelf/libelf_allocate.c#1 branch .. //depot/projects/trustedbsd/mac/lib/libelf/libelf_ar.c#1 branch .. //depot/projects/trustedbsd/mac/lib/libelf/libelf_checksum.c#1 branch .. //depot/projects/trustedbsd/mac/lib/libelf/libelf_convert.m4#1 branch .. //depot/projects/trustedbsd/mac/lib/libelf/libelf_data.c#1 branch .. //depot/projects/trustedbsd/mac/lib/libelf/libelf_ehdr.c#1 branch .. //depot/projects/trustedbsd/mac/lib/libelf/libelf_extended.c#1 branch .. //depot/projects/trustedbsd/mac/lib/libelf/libelf_fsize.m4#1 branch .. //depot/projects/trustedbsd/mac/lib/libelf/libelf_msize.m4#1 branch .. //depot/projects/trustedbsd/mac/lib/libelf/libelf_phdr.c#1 branch .. //depot/projects/trustedbsd/mac/lib/libelf/libelf_shdr.c#1 branch .. //depot/projects/trustedbsd/mac/lib/libelf/libelf_xlate.c#1 branch .. //depot/projects/trustedbsd/mac/lib/libkvm/kvm_proc.c#26 integrate .. //depot/projects/trustedbsd/mac/lib/libpam/modules/pam_exec/pam_exec.c#5 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_join.c#7 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_kern.c#24 integrate .. //depot/projects/trustedbsd/mac/lib/libstand/Makefile#19 integrate .. //depot/projects/trustedbsd/mac/lib/libtacplus/libtacplus.3#6 integrate .. //depot/projects/trustedbsd/mac/lib/libthr/Makefile#16 integrate .. //depot/projects/trustedbsd/mac/lib/libthr/arch/amd64/include/pthread_md.h#3 integrate .. //depot/projects/trustedbsd/mac/lib/libthr/arch/arm/include/pthread_md.h#3 integrate .. //depot/projects/trustedbsd/mac/lib/libthr/arch/i386/include/pthread_md.h#5 integrate .. //depot/projects/trustedbsd/mac/lib/libthr/arch/ia64/include/pthread_md.h#3 integrate .. //depot/projects/trustedbsd/mac/lib/libthr/arch/powerpc/include/pthread_md.h#3 integrate .. //depot/projects/trustedbsd/mac/lib/libthr/arch/sparc64/include/pthread_md.h#2 integrate .. //depot/projects/trustedbsd/mac/lib/libthr/thread/thr_barrier.c#6 integrate .. //depot/projects/trustedbsd/mac/lib/libthr/thread/thr_cancel.c#8 integrate .. //depot/projects/trustedbsd/mac/lib/libthr/thread/thr_cond.c#10 integrate .. //depot/projects/trustedbsd/mac/lib/libthr/thread/thr_create.c#14 integrate .. //depot/projects/trustedbsd/mac/lib/libthr/thread/thr_exit.c#12 integrate .. //depot/projects/trustedbsd/mac/lib/libthr/thread/thr_fork.c#5 integrate .. //depot/projects/trustedbsd/mac/lib/libthr/thread/thr_init.c#19 integrate .. //depot/projects/trustedbsd/mac/lib/libthr/thread/thr_join.c#11 integrate .. //depot/projects/trustedbsd/mac/lib/libthr/thread/thr_list.c#6 integrate .. //depot/projects/trustedbsd/mac/lib/libthr/thread/thr_mutex.c#18 integrate .. //depot/projects/trustedbsd/mac/lib/libthr/thread/thr_private.h#19 integrate .. //depot/projects/trustedbsd/mac/lib/libthr/thread/thr_pspinlock.c#4 integrate .. //depot/projects/trustedbsd/mac/lib/libthr/thread/thr_sem.c#7 integrate .. //depot/projects/trustedbsd/mac/lib/libthr/thread/thr_sig.c#13 integrate .. //depot/projects/trustedbsd/mac/lib/libthr/thread/thr_syscalls.c#11 integrate .. //depot/projects/trustedbsd/mac/lib/libthr/thread/thr_umtx.c#4 integrate .. //depot/projects/trustedbsd/mac/lib/libthr/thread/thr_umtx.h#5 integrate .. //depot/projects/trustedbsd/mac/lib/libufs/Makefile#8 integrate .. //depot/projects/trustedbsd/mac/lib/libufs/cgread.3#4 integrate .. //depot/projects/trustedbsd/mac/lib/libufs/cgroup.c#3 integrate .. //depot/projects/trustedbsd/mac/lib/libufs/libufs.3#4 integrate .. //depot/projects/trustedbsd/mac/lib/libufs/libufs.h#7 integrate .. //depot/projects/trustedbsd/mac/lib/libutil/login_ok.3#4 integrate .. //depot/projects/trustedbsd/mac/lib/msun/Makefile#17 integrate .. //depot/projects/trustedbsd/mac/lib/msun/Symbol.map#2 integrate .. //depot/projects/trustedbsd/mac/lib/msun/amd64/fenv.c#3 integrate .. //depot/projects/trustedbsd/mac/lib/msun/amd64/fenv.h#4 integrate .. //depot/projects/trustedbsd/mac/lib/msun/i387/fenv.c#3 integrate .. //depot/projects/trustedbsd/mac/lib/msun/i387/fenv.h#5 integrate .. //depot/projects/trustedbsd/mac/lib/msun/man/fenv.3#5 integrate .. //depot/projects/trustedbsd/mac/lib/msun/man/ieee.3#6 integrate .. //depot/projects/trustedbsd/mac/lib/msun/src/math.h#19 integrate .. //depot/projects/trustedbsd/mac/lib/msun/src/s_copysignl.c#2 integrate .. //depot/projects/trustedbsd/mac/lib/msun/src/s_fmal.c#3 integrate .. //depot/projects/trustedbsd/mac/lib/msun/src/s_modf.c#3 integrate .. //depot/projects/trustedbsd/mac/lib/msun/src/s_modff.c#3 integrate .. //depot/projects/trustedbsd/mac/lib/msun/src/s_modfl.c#1 branch .. //depot/projects/trustedbsd/mac/release/Makefile#72 integrate .. //depot/projects/trustedbsd/mac/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#61 integrate .. //depot/projects/trustedbsd/mac/release/doc/en_US.ISO8859-1/readme/article.sgml#16 integrate .. //depot/projects/trustedbsd/mac/release/doc/en_US.ISO8859-1/relnotes/Makefile#8 integrate .. //depot/projects/trustedbsd/mac/release/doc/en_US.ISO8859-1/relnotes/Makefile.inc#2 delete .. //depot/projects/trustedbsd/mac/release/doc/en_US.ISO8859-1/relnotes/amd64/Makefile#2 delete .. //depot/projects/trustedbsd/mac/release/doc/en_US.ISO8859-1/relnotes/amd64/article.sgml#4 delete .. //depot/projects/trustedbsd/mac/release/doc/en_US.ISO8859-1/relnotes/article.sgml#1 branch .. //depot/projects/trustedbsd/mac/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#89 delete .. //depot/projects/trustedbsd/mac/release/doc/en_US.ISO8859-1/relnotes/common/relnotes.ent#3 delete .. //depot/projects/trustedbsd/mac/release/doc/en_US.ISO8859-1/relnotes/i386/Makefile#3 delete .. //depot/projects/trustedbsd/mac/release/doc/en_US.ISO8859-1/relnotes/i386/article.sgml#5 delete .. //depot/projects/trustedbsd/mac/release/doc/en_US.ISO8859-1/relnotes/ia64/Makefile#2 delete .. //depot/projects/trustedbsd/mac/release/doc/en_US.ISO8859-1/relnotes/ia64/article.sgml#4 delete .. //depot/projects/trustedbsd/mac/release/doc/en_US.ISO8859-1/relnotes/pc98/Makefile#2 delete .. //depot/projects/trustedbsd/mac/release/doc/en_US.ISO8859-1/relnotes/pc98/article.sgml#4 delete .. //depot/projects/trustedbsd/mac/release/doc/en_US.ISO8859-1/relnotes/powerpc/Makefile#2 delete .. //depot/projects/trustedbsd/mac/release/doc/en_US.ISO8859-1/relnotes/powerpc/article.sgml#2 delete .. //depot/projects/trustedbsd/mac/release/doc/en_US.ISO8859-1/relnotes/sparc64/Makefile#2 delete .. //depot/projects/trustedbsd/mac/release/doc/en_US.ISO8859-1/relnotes/sparc64/article.sgml#6 delete .. //depot/projects/trustedbsd/mac/release/doc/share/examples/Makefile.relnotesng#12 integrate .. //depot/projects/trustedbsd/mac/release/doc/share/misc/dev.archlist.txt#14 integrate .. //depot/projects/trustedbsd/mac/release/picobsd/bridge/crunch.conf#11 integrate .. //depot/projects/trustedbsd/mac/release/picobsd/tinyware/vm/vm.c#2 integrate .. //depot/projects/trustedbsd/mac/release/scripts/package-split.py#8 integrate .. //depot/projects/trustedbsd/mac/release/sun4v/boot_crunch.conf#1 branch .. //depot/projects/trustedbsd/mac/rescue/rescue/Makefile#18 integrate .. //depot/projects/trustedbsd/mac/sbin/Makefile#38 integrate .. //depot/projects/trustedbsd/mac/sbin/atm/atm/atm.8#4 integrate .. //depot/projects/trustedbsd/mac/sbin/bsdlabel/bsdlabel.8#12 integrate .. //depot/projects/trustedbsd/mac/sbin/camcontrol/camcontrol.c#16 integrate .. //depot/projects/trustedbsd/mac/sbin/devfs/devfs.8#12 integrate .. //depot/projects/trustedbsd/mac/sbin/dumpfs/dumpfs.c#17 integrate .. //depot/projects/trustedbsd/mac/sbin/dumpon/dumpon.c#9 integrate .. //depot/projects/trustedbsd/mac/sbin/fdisk/fdisk.8#7 integrate .. //depot/projects/trustedbsd/mac/sbin/fsck_ffs/Makefile#8 integrate .. //depot/projects/trustedbsd/mac/sbin/fsck_ffs/fsck.h#15 integrate .. //depot/projects/trustedbsd/mac/sbin/fsck_ffs/fsutil.c#17 integrate .. //depot/projects/trustedbsd/mac/sbin/fsck_ffs/gjournal.c#1 branch .. //depot/projects/trustedbsd/mac/sbin/fsck_ffs/inode.c#12 integrate .. //depot/projects/trustedbsd/mac/sbin/fsck_ffs/main.c#18 integrate .. //depot/projects/trustedbsd/mac/sbin/fsck_ffs/pass5.c#18 integrate .. //depot/projects/trustedbsd/mac/sbin/fsck_ffs/setup.c#23 integrate .. //depot/projects/trustedbsd/mac/sbin/fsdb/fsdb.c#13 integrate .. //depot/projects/trustedbsd/mac/sbin/fsdb/fsdb.h#8 integrate .. //depot/projects/trustedbsd/mac/sbin/geom/class/Makefile#7 integrate .. //depot/projects/trustedbsd/mac/sbin/geom/class/cache/geom_cache.c#2 integrate .. //depot/projects/trustedbsd/mac/sbin/geom/class/journal/Makefile#1 branch .. //depot/projects/trustedbsd/mac/sbin/geom/class/journal/geom_journal.c#1 branch .. //depot/projects/trustedbsd/mac/sbin/geom/class/journal/geom_journal.h#1 branch .. //depot/projects/trustedbsd/mac/sbin/geom/class/journal/geom_journal_ufs.c#1 branch .. //depot/projects/trustedbsd/mac/sbin/geom/class/mirror/geom_mirror.c#7 integrate .. //depot/projects/trustedbsd/mac/sbin/geom/class/mirror/gmirror.8#9 integrate .. //depot/projects/trustedbsd/mac/sbin/geom/class/raid3/geom_raid3.c#8 integrate .. //depot/projects/trustedbsd/mac/sbin/geom/class/raid3/graid3.8#6 integrate .. //depot/projects/trustedbsd/mac/sbin/ggate/Makefile#6 integrate .. //depot/projects/trustedbsd/mac/sbin/ggate/ggated/ggated.c#6 integrate .. //depot/projects/trustedbsd/mac/sbin/ggate/shared/ggate.c#5 integrate .. //depot/projects/trustedbsd/mac/sbin/ggate/shared/ggate.h#4 integrate .. //depot/projects/trustedbsd/mac/sbin/growfs/debug.c#7 integrate .. //depot/projects/trustedbsd/mac/sbin/ifconfig/ifbridge.c#4 integrate .. //depot/projects/trustedbsd/mac/sbin/ifconfig/ifconfig.8#38 integrate .. //depot/projects/trustedbsd/mac/sbin/ifconfig/ifconfig.c#32 integrate .. //depot/projects/trustedbsd/mac/sbin/ifconfig/ifieee80211.c#19 integrate .. //depot/projects/trustedbsd/mac/sbin/ifconfig/ifmedia.c#10 integrate .. //depot/projects/trustedbsd/mac/sbin/init/init.8#15 integrate .. //depot/projects/trustedbsd/mac/sbin/ipfw/ipfw.8#41 integrate .. //depot/projects/trustedbsd/mac/sbin/ipfw/ipfw2.c#36 integrate .. //depot/projects/trustedbsd/mac/sbin/mdmfs/mdmfs.8#18 integrate .. //depot/projects/trustedbsd/mac/sbin/mdmfs/mdmfs.c#18 integrate .. //depot/projects/trustedbsd/mac/sbin/mount/mount.c#25 integrate .. //depot/projects/trustedbsd/mac/sbin/mount/mount_fs.c#2 integrate .. //depot/projects/trustedbsd/mac/sbin/mount_nfs/Makefile#5 integrate .. //depot/projects/trustedbsd/mac/sbin/mount_nfs/mount_nfs.c#14 integrate .. //depot/projects/trustedbsd/mac/sbin/mount_unionfs/Makefile#4 integrate .. //depot/projects/trustedbsd/mac/sbin/mount_unionfs/mount_unionfs.8#8 integrate .. //depot/projects/trustedbsd/mac/sbin/mount_unionfs/mount_unionfs.c#10 integrate .. //depot/projects/trustedbsd/mac/sbin/newfs/mkfs.c#27 integrate .. //depot/projects/trustedbsd/mac/sbin/newfs/newfs.8#21 integrate .. //depot/projects/trustedbsd/mac/sbin/newfs/newfs.c#20 integrate .. //depot/projects/trustedbsd/mac/sbin/newfs/newfs.h#13 integrate .. //depot/projects/trustedbsd/mac/sbin/quotacheck/quotacheck.8#7 integrate .. //depot/projects/trustedbsd/mac/sbin/quotacheck/quotacheck.c#13 integrate .. //depot/projects/trustedbsd/mac/sbin/reboot/boot_i386.8#16 integrate .. //depot/projects/trustedbsd/mac/sbin/reboot/reboot.8#11 integrate .. //depot/projects/trustedbsd/mac/sbin/restore/main.c#13 integrate .. //depot/projects/trustedbsd/mac/sbin/restore/restore.8#15 integrate .. //depot/projects/trustedbsd/mac/sbin/restore/restore.c#10 integrate .. //depot/projects/trustedbsd/mac/sbin/restore/restore.h#9 integrate .. //depot/projects/trustedbsd/mac/sbin/restore/tape.c#15 integrate .. //depot/projects/trustedbsd/mac/sbin/routed/main.c#6 integrate .. //depot/projects/trustedbsd/mac/sbin/sysctl/sysctl.c#25 integrate .. //depot/projects/trustedbsd/mac/sbin/tunefs/tunefs.8#18 integrate .. //depot/projects/trustedbsd/mac/sbin/tunefs/tunefs.c#16 integrate .. //depot/projects/trustedbsd/mac/share/colldef/Makefile#24 integrate .. //depot/projects/trustedbsd/mac/share/doc/IPv6/IMPLEMENTATION#7 integrate .. //depot/projects/trustedbsd/mac/share/man/man1/builtin.1#9 integrate .. //depot/projects/trustedbsd/mac/share/man/man1/intro.1#2 integrate .. //depot/projects/trustedbsd/mac/share/man/man3/pthread_cond_init.3#3 integrate .. //depot/projects/trustedbsd/mac/share/man/man3/pthread_create.3#4 integrate .. //depot/projects/trustedbsd/mac/share/man/man3/pthread_mutex_init.3#3 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/Makefile#63 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/aac.4#12 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/altq.4#12 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/ata.4#21 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/ath.4#17 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/audit.4#4 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/auditpipe.4#3 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/bce.4#3 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/blackhole.4#5 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/ddb.4#11 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/fast_ipsec.4#6 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/fdc.4#7 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/iic.4#4 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/inet.4#15 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/ipmi.4#4 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/ips.4#4 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/joy.4#7 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/le.4#3 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/lmc.4#7 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/man4.arm/Makefile#1 branch .. //depot/projects/trustedbsd/mac/share/man/man4/man4.arm/npe.4#1 branch .. //depot/projects/trustedbsd/mac/share/man/man4/man4.i386/acpi_ibm.4#8 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/man4.i386/acpi_sony.4#4 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/man4.i386/padlock.4#6 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/man4.sparc64/ofw_console.4#2 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/md.4#4 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/miibus.4#12 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/msk.4#1 branch .. //depot/projects/trustedbsd/mac/share/man/man4/ng_deflate.4#1 branch .. //depot/projects/trustedbsd/mac/share/man/man4/ng_ksocket.4#7 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/ng_pred1.4#1 branch .. //depot/projects/trustedbsd/mac/share/man/man4/ng_tag.4#3 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/pcm.4#14 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/polling.4#18 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/pty.4#6 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/re.4#11 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/sem.4#3 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/sis.4#9 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/snd_atiixp.4#2 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/snd_emu10kx.4#3 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/snd_es137x.4#7 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/snd_hda.4#2 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/snd_spicds.4#2 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/snd_via8233.4#5 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/syscons.4#13 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/uark.4#1 branch .. //depot/projects/trustedbsd/mac/share/man/man4/ubsa.4#5 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/ubser.4#5 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/ubtbcmfw.4#6 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/ucom.4#6 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/ucycom.4#3 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/udbp.4#5 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/ufm.4#4 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/ufoma.4#3 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/uftdi.4#5 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/ugen.4#4 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/uhid.4#6 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/uhidev.4#4 delete .. //depot/projects/trustedbsd/mac/share/man/man4/ukbd.4#8 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/ulpt.4#6 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/umass.4#17 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/umct.4#4 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/umodem.4#6 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/ums.4#5 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/uplcom.4#10 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/urio.4#6 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/usb.4#14 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/uscanner.4#13 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/utopia.4#6 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/uvisor.4#7 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/uvscom.4#4 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/vlan.4#16 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/watchdog.4#6 integrate .. //depot/projects/trustedbsd/mac/share/man/man5/elf.5#10 integrate .. //depot/projects/trustedbsd/mac/share/man/man5/fdescfs.5#5 integrate .. //depot/projects/trustedbsd/mac/share/man/man5/fs.5#10 integrate .. //depot/projects/trustedbsd/mac/share/man/man5/linsysfs.5#3 integrate .. //depot/projects/trustedbsd/mac/share/man/man5/mqueuefs.5#3 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Jan 9 14:45: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 12C8416A412; Tue, 9 Jan 2007 14:45: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 DE34116A403 for ; Tue, 9 Jan 2007 14:45:08 +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 BD9F013C45A for ; Tue, 9 Jan 2007 14:45:08 +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 l09Ej8xq034764 for ; Tue, 9 Jan 2007 14:45:08 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 l09Ehrqu034740 for perforce@freebsd.org; Tue, 9 Jan 2007 14:43:53 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 9 Jan 2007 14:43:53 GMT Message-Id: <200701091443.l09Ehrqu034740@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 112694 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 09 Jan 2007 14:45:09 -0000 http://perforce.freebsd.org/chv.cgi?CH=112694 Change 112694 by rwatson@rwatson_zoo on 2007/01/09 14:43:43 Integrate trustedbsd_audit3. Affected files ... .. //depot/projects/trustedbsd/audit3/COPYRIGHT#4 integrate .. //depot/projects/trustedbsd/audit3/MAINTAINERS#14 integrate .. //depot/projects/trustedbsd/audit3/Makefile#11 integrate .. //depot/projects/trustedbsd/audit3/Makefile.inc1#17 integrate .. //depot/projects/trustedbsd/audit3/ObsoleteFiles.inc#11 integrate .. //depot/projects/trustedbsd/audit3/UPDATING#17 integrate .. //depot/projects/trustedbsd/audit3/bin/cat/cat.1#3 integrate .. //depot/projects/trustedbsd/audit3/bin/chmod/chmod.1#3 integrate .. //depot/projects/trustedbsd/audit3/bin/domainname/domainname.1#4 integrate .. //depot/projects/trustedbsd/audit3/bin/hostname/hostname.1#4 integrate .. //depot/projects/trustedbsd/audit3/bin/hostname/hostname.c#3 integrate .. //depot/projects/trustedbsd/audit3/bin/mkdir/mkdir.1#4 integrate .. //depot/projects/trustedbsd/audit3/bin/pax/cpio.c#2 integrate .. //depot/projects/trustedbsd/audit3/bin/pax/tar.c#3 integrate .. //depot/projects/trustedbsd/audit3/bin/rm/rm.1#7 integrate .. //depot/projects/trustedbsd/audit3/bin/rmdir/rmdir.1#4 integrate .. //depot/projects/trustedbsd/audit3/bin/sh/expand.c#4 integrate .. //depot/projects/trustedbsd/audit3/bin/sh/parser.c#5 integrate .. //depot/projects/trustedbsd/audit3/bin/sh/parser.h#2 integrate .. //depot/projects/trustedbsd/audit3/bin/test/test.1#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/CHANGES#6 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/COPYRIGHT#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/FAQ#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/FAQ.xml#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/Makefile.in#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/README#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/bin/check/named-checkconf.8#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/bin/check/named-checkconf.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/bin/check/named-checkconf.html#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/bin/check/named-checkzone.8#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/bin/check/named-checkzone.docbook#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/bin/check/named-checkzone.html#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/bin/dig/dig.1#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/bin/dig/dig.c#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/bin/dig/dig.html#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/bin/dig/dighost.c#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/bin/dig/host.1#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/bin/dig/host.c#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/bin/dig/host.html#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/bin/dig/include/dig/dig.h#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/bin/dig/nslookup.1#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/bin/dig/nslookup.c#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/bin/dig/nslookup.docbook#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/bin/dig/nslookup.html#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/bin/dnssec/dnssec-keygen.8#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/bin/dnssec/dnssec-keygen.html#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/bin/dnssec/dnssec-signzone.8#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/bin/dnssec/dnssec-signzone.c#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/bin/dnssec/dnssec-signzone.html#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/bin/named/aclconf.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/bin/named/client.c#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/bin/named/config.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/bin/named/controlconf.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/bin/named/include/named/aclconf.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/bin/named/include/named/client.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/bin/named/include/named/config.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/bin/named/include/named/control.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/bin/named/include/named/globals.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/bin/named/include/named/logconf.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/bin/named/include/named/lwresd.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/bin/named/include/named/server.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/bin/named/include/named/sortlist.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/bin/named/include/named/tkeyconf.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/bin/named/include/named/tsigconf.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/bin/named/include/named/zoneconf.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/bin/named/interfacemgr.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/bin/named/logconf.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/bin/named/lwdgabn.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/bin/named/lwdgrbn.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/bin/named/lwresd.8#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/bin/named/lwresd.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/bin/named/lwresd.html#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/bin/named/main.c#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/bin/named/named.8#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/bin/named/named.conf.5#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/bin/named/named.conf.docbook#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/bin/named/named.conf.html#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/bin/named/named.docbook#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/bin/named/named.html#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/bin/named/query.c#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/bin/named/server.c#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/bin/named/sortlist.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/bin/named/tkeyconf.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/bin/named/tsigconf.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/bin/named/unix/os.c#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/bin/named/update.c#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/bin/named/zoneconf.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/bin/nsupdate/nsupdate.8#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/bin/nsupdate/nsupdate.c#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/bin/nsupdate/nsupdate.html#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/bin/rndc/rndc-confgen.8#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/bin/rndc/rndc-confgen.html#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/bin/rndc/rndc.8#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/bin/rndc/rndc.c#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/bin/rndc/rndc.conf.5#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/bin/rndc/rndc.conf.html#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/bin/rndc/rndc.html#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/config.threads.in#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/configure.in#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/doc/arm/Bv9ARM-book.xml#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/doc/arm/Bv9ARM.ch01.html#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/doc/arm/Bv9ARM.ch02.html#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/doc/arm/Bv9ARM.ch03.html#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/doc/arm/Bv9ARM.ch04.html#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/doc/arm/Bv9ARM.ch05.html#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/doc/arm/Bv9ARM.ch06.html#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/doc/arm/Bv9ARM.ch07.html#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/doc/arm/Bv9ARM.ch08.html#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/doc/arm/Bv9ARM.ch09.html#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/doc/arm/Bv9ARM.html#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/doc/arm/Bv9ARM.pdf#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/bind/Makefile.in#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/bind/api#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/bind/config.h.in#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/bind/configure#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/bind/configure.in#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/bind/dst/dst_api.c#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/bind/dst/hmac_link.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/bind/include/arpa/nameser_compat.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/bind/include/isc/list.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/bind/include/netdb.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/bind/inet/inet_cidr_ntop.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/bind/inet/inet_net_ntop.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/bind/irs/dns.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/bind/irs/dns_ho.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/bind/irs/gai_strerror.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/bind/irs/gen_ho.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/bind/irs/getaddrinfo.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/bind/irs/gethostent.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/bind/irs/getnameinfo.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/bind/irs/getprotoent_r.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/bind/irs/getservent_r.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/bind/irs/irp.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/bind/irs/irp_nw.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/bind/irs/irpmarshall.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/bind/irs/irs_data.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/bind/irs/lcl_ho.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/bind/irs/lcl_pr.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/bind/isc/ev_connects.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/bind/isc/eventlib.c#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/bind/isc/eventlib_p.h#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/bind/isc/heap.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/bind/isc/hex.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/bind/isc/memcluster.c#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/bind/nameser/ns_sign.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/bind/nameser/ns_verify.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/bind/port_after.h.in#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/bind/port_before.h.in#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/bind/resolv/mtctxres.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/bind/resolv/res_init.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/bind/resolv/res_send.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/bind/resolv/res_sendsigned.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/bind9/api#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/bind9/check.c#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/bind9/include/bind9/check.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/Makefile.in#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/acl.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/adb.c#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/api#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/cache.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/compress.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/dispatch.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/dnssec.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/dst_api.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/gen.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/include/dns/acl.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/include/dns/cache.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/include/dns/compress.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/include/dns/keytable.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/include/dns/message.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/include/dns/name.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/include/dns/peer.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/include/dns/rdataset.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/include/dns/resolver.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/include/dns/types.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/include/dns/validator.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/include/dns/xfrin.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/include/dns/zone.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/keytable.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/lookup.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/masterdump.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/message.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/name.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/openssl_link.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/openssldh_link.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/openssldsa_link.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/opensslrsa_link.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/peer.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/portlist.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/rbtdb.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/rdata.c#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/rdata/generic/dlv_32769.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/rdata/generic/dlv_32769.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/rdata/generic/dlv_65323.c#2 delete .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/rdata/generic/dlv_65323.h#2 delete .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/rdataset.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/request.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/resolver.c#7 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/tcpmsg.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/tkey.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/tsig.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/validator.c#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/xfrin.c#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/zone.c#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/isc/api#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/isc/hash.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/isc/heap.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/isc/hmacmd5.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/isc/include/isc/heap.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/isc/include/isc/list.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/isc/include/isc/sockaddr.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/isc/include/isc/symtab.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/isc/lex.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/isc/log.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/isc/netscope.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/isc/nothreads/condition.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/isc/nothreads/mutex.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/isc/print.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/isc/sockaddr.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/isc/taskpool.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/isc/timer.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/isc/unix/entropy.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/isc/unix/fsaccess.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/isc/unix/ifiter_ioctl.c#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/isc/unix/ipv6.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/isc/unix/socket.c#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/isccc/api#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/isccfg/include/isccfg/cfg.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/isccfg/include/isccfg/grammar.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/isccfg/namedconf.c#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/isccfg/parser.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/lwres/api#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/lwres/gai_strerror.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/lwres/getaddrinfo.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/lwres/lwconfig.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/lwres/man/lwres.3#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/lwres/man/lwres.html#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/lwres/man/lwres_buffer.3#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/lwres/man/lwres_buffer.html#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/lwres/man/lwres_config.3#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/lwres/man/lwres_config.html#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/lwres/man/lwres_context.3#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/lwres/man/lwres_context.html#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/lwres/man/lwres_gabn.3#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/lwres/man/lwres_gabn.html#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/lwres/man/lwres_gai_strerror.3#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/lwres/man/lwres_gai_strerror.html#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/lwres/man/lwres_getaddrinfo.3#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/lwres/man/lwres_getaddrinfo.html#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/lwres/man/lwres_gethostent.3#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/lwres/man/lwres_gethostent.html#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/lwres/man/lwres_getipnode.3#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/lwres/man/lwres_getipnode.html#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/lwres/man/lwres_getnameinfo.3#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/lwres/man/lwres_getnameinfo.html#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/lwres/man/lwres_getrrsetbyname.3#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/lwres/man/lwres_getrrsetbyname.html#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/lwres/man/lwres_gnba.3#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/lwres/man/lwres_gnba.html#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/lwres/man/lwres_hstrerror.3#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/lwres/man/lwres_hstrerror.html#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/lwres/man/lwres_inetntop.3#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/lwres/man/lwres_inetntop.html#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/lwres/man/lwres_noop.3#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/lwres/man/lwres_noop.html#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/lwres/man/lwres_packet.3#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/lwres/man/lwres_packet.html#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/lwres/man/lwres_resutil.3#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/lwres/man/lwres_resutil.html#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/libtool.m4#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/ltmain.sh#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/make/rules.in#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/version#6 integrate .. //depot/projects/trustedbsd/audit3/contrib/cvs/src/log.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/gdtoa/README#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/gdtoa/arithchk.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/gdtoa/dmisc.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/gdtoa/dtoa.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/gdtoa/g_Qfmt.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/gdtoa/g__fmt.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/gdtoa/g_ddfmt.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/gdtoa/g_dfmt.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/gdtoa/g_ffmt.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/gdtoa/g_xLfmt.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/gdtoa/g_xfmt.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/gdtoa/gdtoa.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/gdtoa/gdtoa.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/gdtoa/gdtoaimp.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/gdtoa/gethex.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/gdtoa/gmisc.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/gdtoa/hd_init.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/gdtoa/hexnan.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/gdtoa/makefile#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/gdtoa/misc.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/gdtoa/qnan.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gdtoa/smisc.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/gdtoa/strtoIQ.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/gdtoa/strtoId.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/gdtoa/strtoIdd.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/gdtoa/strtoIf.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/gdtoa/strtoIg.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/gdtoa/strtoIx.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/gdtoa/strtoIxL.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/gdtoa/strtod.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/gdtoa/strtodI.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/gdtoa/strtodg.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/gdtoa/strtodnrp.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gdtoa/strtof.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/gdtoa/strtopQ.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/gdtoa/strtopd.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/gdtoa/strtopdd.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/gdtoa/strtopf.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/gdtoa/strtopx.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/gdtoa/strtopxL.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/gdtoa/strtorQ.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/gdtoa/strtord.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/gdtoa/strtordd.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/gdtoa/strtorf.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/gdtoa/strtorx.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/gdtoa/strtorxL.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/gdtoa/sum.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/gdtoa/test/Qtest.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/gdtoa/test/dItest.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/gdtoa/test/ddtest.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/gdtoa/test/dt.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/gdtoa/test/dtest.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/gdtoa/test/dtst.out#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/gdtoa/test/ftest.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/gdtoa/test/getround.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/gdtoa/test/makefile#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/gdtoa/test/strtodt.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/gdtoa/test/x.ou0#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/gdtoa/test/x.ou1#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/gdtoa/test/xL.ou1#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/gdtoa/test/xLtest.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/gdtoa/test/xsum0.out#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/gdtoa/test/xtest.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/gdtoa/ulp.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/gdtoa/xsum0.out#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/tmac/doc-common#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/tmac/doc-syms#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/tmac/groff_mdoc.man#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/libbegemot/rpoll.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/libbegemot/rpoll.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/libbegemot/rpoll.man#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/libreadline/CHANGELOG#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/libreadline/CHANGES#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/libreadline/FREEBSD-upgrade#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/libreadline/INSTALL#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/libreadline/NEWS#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/libreadline/README#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/libreadline/aclocal.m4#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/libreadline/bind.c#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/libreadline/callback.c#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/libreadline/complete.c#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/libreadline/config.h.in#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/libreadline/configure#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/libreadline/configure.in#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/libreadline/display.c#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/libreadline/doc/history.texi#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/libreadline/doc/hstech.texi#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/libreadline/doc/hsuser.texi#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/libreadline/doc/readline.3#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/libreadline/doc/rlman.texi#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/libreadline/doc/rltech.texi#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/libreadline/doc/rluser.texi#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/libreadline/doc/rluserman.texi#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/libreadline/doc/version.texi#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/libreadline/examples/excallback.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/libreadline/examples/rlfe/Makefile.in#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/libreadline/histexpand.c#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/libreadline/histfile.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/libreadline/history.c#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/libreadline/input.c#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/libreadline/isearch.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/libreadline/kill.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/libreadline/macro.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/libreadline/misc.c#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/libreadline/readline.c#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/libreadline/readline.h#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/libreadline/rlconf.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/libreadline/rlmbutil.h#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/libreadline/rlprivate.h#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/libreadline/rltty.c#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/libreadline/search.c#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/libreadline/signals.c#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/libreadline/support/shlib-install#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/libreadline/support/shobj-conf#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/libreadline/terminal.c#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/libreadline/text.c#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/libreadline/tilde.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/libreadline/undo.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/libreadline/vi_mode.c#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/pf/pfctl/pfctl_altq.c#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/top/sigconv.awk#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/ChangeLog#6 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/Makefile.in#6 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/README#6 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/audit-bsm.c#3 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/auth-rsa.c#5 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/auth.c#5 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/bufaux.h#4 delete .. //depot/projects/trustedbsd/audit3/crypto/openssh/bufbn.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/buildpkg.sh.in#5 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/clientloop.c#6 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/configure.ac#6 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/dh.c#4 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/entropy.c#5 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/kexdhc.c#5 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/kexdhs.c#5 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/kexgexc.c#4 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/kexgexs.c#4 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/key.c#5 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/moduli.c#5 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/monitor.c#7 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/monitor_fdpass.c#4 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/openbsd-compat/port-solaris.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/rsa.c#3 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/scard.c#4 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/scard/Makefile.in#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/serverloop.c#6 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/session.c#6 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/sftp-client.c#6 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/sftp.c#6 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/ssh-agent.c#6 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/ssh-dss.c#3 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/ssh-keygen.c#6 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/ssh-keyscan.1#5 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/ssh-keyscan.c#6 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/ssh.1#6 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/ssh.c#6 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/ssh_config#6 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/ssh_config.5#6 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/sshconnect.c#6 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/sshconnect1.c#6 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/sshd.c#7 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/sshd_config#6 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/sshd_config.5#6 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/version.h#6 integrate .. //depot/projects/trustedbsd/audit3/etc/amd.map#2 integrate .. //depot/projects/trustedbsd/audit3/etc/defaults/rc.conf#19 integrate .. //depot/projects/trustedbsd/audit3/etc/mtree/BSD.local.dist#8 integrate .. //depot/projects/trustedbsd/audit3/etc/mtree/BSD.usr.dist#9 integrate .. //depot/projects/trustedbsd/audit3/etc/pccard_ether#8 integrate .. //depot/projects/trustedbsd/audit3/etc/rc.d/abi#6 integrate .. //depot/projects/trustedbsd/audit3/etc/rc.d/accounting#3 integrate .. //depot/projects/trustedbsd/audit3/etc/rc.d/archdep#6 integrate .. //depot/projects/trustedbsd/audit3/etc/rc.d/atm1#3 integrate .. //depot/projects/trustedbsd/audit3/etc/rc.d/auto_linklocal#2 integrate .. //depot/projects/trustedbsd/audit3/etc/rc.d/bluetooth#2 integrate .. //depot/projects/trustedbsd/audit3/etc/rc.d/bootconf.sh#2 integrate .. //depot/projects/trustedbsd/audit3/etc/rc.d/bridge#2 integrate .. //depot/projects/trustedbsd/audit3/etc/rc.d/geli#3 integrate .. //depot/projects/trustedbsd/audit3/etc/rc.d/hcsecd#2 integrate .. //depot/projects/trustedbsd/audit3/etc/rc.d/ip6fw#4 integrate .. //depot/projects/trustedbsd/audit3/etc/rc.d/ipfilter#4 integrate .. //depot/projects/trustedbsd/audit3/etc/rc.d/ipfw#7 integrate .. //depot/projects/trustedbsd/audit3/etc/rc.d/ipnat#3 integrate .. //depot/projects/trustedbsd/audit3/etc/rc.d/jail#7 integrate .. //depot/projects/trustedbsd/audit3/etc/rc.d/ldconfig#6 integrate .. //depot/projects/trustedbsd/audit3/etc/rc.d/lpd#4 integrate .. //depot/projects/trustedbsd/audit3/etc/rc.d/mdconfig#3 integrate .. //depot/projects/trustedbsd/audit3/etc/rc.d/mdconfig2#3 integrate .. //depot/projects/trustedbsd/audit3/etc/rc.d/mountcritremote#5 integrate .. //depot/projects/trustedbsd/audit3/etc/rc.d/moused#6 integrate .. //depot/projects/trustedbsd/audit3/etc/rc.d/natd#5 integrate .. //depot/projects/trustedbsd/audit3/etc/rc.d/netif#8 integrate .. //depot/projects/trustedbsd/audit3/etc/rc.d/nfsclient#3 integrate .. //depot/projects/trustedbsd/audit3/etc/rc.d/nfsserver#3 integrate .. //depot/projects/trustedbsd/audit3/etc/rc.d/nsswitch#3 integrate .. //depot/projects/trustedbsd/audit3/etc/rc.d/pf#8 integrate .. //depot/projects/trustedbsd/audit3/etc/rc.d/pflog#7 integrate .. //depot/projects/trustedbsd/audit3/etc/rc.d/pfsync#2 integrate .. //depot/projects/trustedbsd/audit3/etc/rc.d/pppoed#3 integrate .. //depot/projects/trustedbsd/audit3/etc/rc.d/sdpd#2 integrate .. //depot/projects/trustedbsd/audit3/etc/rc.d/syscons#5 integrate .. //depot/projects/trustedbsd/audit3/etc/rc.d/syslogd#4 integrate .. //depot/projects/trustedbsd/audit3/etc/rc.d/ugidfw#4 integrate .. //depot/projects/trustedbsd/audit3/etc/rc.d/var#4 integrate .. //depot/projects/trustedbsd/audit3/etc/rc.d/ypbind#3 integrate .. //depot/projects/trustedbsd/audit3/etc/rc.d/yppasswdd#3 integrate .. //depot/projects/trustedbsd/audit3/etc/rc.d/ypserv#3 integrate .. //depot/projects/trustedbsd/audit3/etc/rc.d/ypset#3 integrate .. //depot/projects/trustedbsd/audit3/etc/rc.d/ypupdated#3 integrate .. //depot/projects/trustedbsd/audit3/etc/rc.d/ypxfrd#4 integrate .. //depot/projects/trustedbsd/audit3/etc/rc.firewall#4 integrate .. //depot/projects/trustedbsd/audit3/etc/rc.initdiskless#6 integrate .. //depot/projects/trustedbsd/audit3/etc/rc.subr#12 integrate .. //depot/projects/trustedbsd/audit3/etc/snmpd.config#6 integrate .. //depot/projects/trustedbsd/audit3/games/fortune/datfiles/fortunes#17 integrate .. //depot/projects/trustedbsd/audit3/games/fortune/datfiles/fortunes-o.real#2 integrate .. //depot/projects/trustedbsd/audit3/games/fortune/datfiles/fortunes.sp.ok#3 integrate .. //depot/projects/trustedbsd/audit3/games/fortune/datfiles/fortunes2-o#5 integrate .. //depot/projects/trustedbsd/audit3/games/fortune/datfiles/freebsd-tips#6 integrate .. //depot/projects/trustedbsd/audit3/games/fortune/datfiles/zippy#3 integrate .. //depot/projects/trustedbsd/audit3/gnu/lib/libreadline/Makefile.inc#5 integrate .. //depot/projects/trustedbsd/audit3/gnu/lib/libreadline/config.h#4 integrate .. //depot/projects/trustedbsd/audit3/gnu/usr.bin/binutils/libiberty/config.h#4 integrate .. //depot/projects/trustedbsd/audit3/gnu/usr.bin/cc/cc_tools/arm.md.diff#2 integrate .. //depot/projects/trustedbsd/audit3/gnu/usr.bin/groff/tmac/mdoc.local#7 integrate .. //depot/projects/trustedbsd/audit3/gnu/usr.bin/man/apropos/apropos.man#6 integrate .. //depot/projects/trustedbsd/audit3/gnu/usr.bin/man/man/man.man#6 integrate .. //depot/projects/trustedbsd/audit3/gnu/usr.bin/man/manpath/manpath.man#3 integrate .. //depot/projects/trustedbsd/audit3/include/Makefile#12 integrate .. //depot/projects/trustedbsd/audit3/include/ar.h#2 integrate .. //depot/projects/trustedbsd/audit3/include/arpa/nameser_compat.h#3 integrate .. //depot/projects/trustedbsd/audit3/include/mqueue.h#2 integrate .. //depot/projects/trustedbsd/audit3/include/unistd.h#4 integrate .. //depot/projects/trustedbsd/audit3/lib/Makefile#15 integrate .. //depot/projects/trustedbsd/audit3/lib/bind/bind/config.h#4 integrate .. //depot/projects/trustedbsd/audit3/lib/bind/bind/port_after.h#3 integrate .. //depot/projects/trustedbsd/audit3/lib/bind/bind/port_before.h#3 integrate .. //depot/projects/trustedbsd/audit3/lib/bind/config.h#5 integrate .. //depot/projects/trustedbsd/audit3/lib/bind/dns/code.h#3 integrate .. //depot/projects/trustedbsd/audit3/lib/bind/dns/dns/enumclass.h#3 integrate .. //depot/projects/trustedbsd/audit3/lib/bind/dns/dns/enumtype.h#3 integrate .. //depot/projects/trustedbsd/audit3/lib/bind/dns/dns/rdatastruct.h#3 integrate .. //depot/projects/trustedbsd/audit3/lib/bind/lwres/lwres/platform.h#3 integrate .. //depot/projects/trustedbsd/audit3/lib/libarchive/Makefile#9 integrate .. //depot/projects/trustedbsd/audit3/lib/libarchive/archive.h.in#9 integrate .. //depot/projects/trustedbsd/audit3/lib/libarchive/archive_check_magic.c#3 integrate .. //depot/projects/trustedbsd/audit3/lib/libarchive/archive_entry.c#8 integrate .. //depot/projects/trustedbsd/audit3/lib/libarchive/archive_platform.h#7 integrate .. //depot/projects/trustedbsd/audit3/lib/libarchive/archive_private.h#9 integrate .. //depot/projects/trustedbsd/audit3/lib/libarchive/archive_read.3#8 integrate .. //depot/projects/trustedbsd/audit3/lib/libarchive/archive_read.c#9 integrate .. //depot/projects/trustedbsd/audit3/lib/libarchive/archive_read_data_into_buffer.c#3 integrate .. //depot/projects/trustedbsd/audit3/lib/libarchive/archive_read_data_into_fd.c#5 integrate .. //depot/projects/trustedbsd/audit3/lib/libarchive/archive_read_extract.c#8 integrate .. //depot/projects/trustedbsd/audit3/lib/libarchive/archive_read_open_fd.c#6 integrate .. //depot/projects/trustedbsd/audit3/lib/libarchive/archive_read_open_file.c#7 integrate .. //depot/projects/trustedbsd/audit3/lib/libarchive/archive_read_open_filename.c#1 branch .. //depot/projects/trustedbsd/audit3/lib/libarchive/archive_read_open_memory.c#1 branch .. //depot/projects/trustedbsd/audit3/lib/libarchive/archive_read_support_compression_bzip2.c#6 integrate .. //depot/projects/trustedbsd/audit3/lib/libarchive/archive_read_support_compression_compress.c#4 integrate .. //depot/projects/trustedbsd/audit3/lib/libarchive/archive_read_support_compression_gzip.c#5 integrate .. //depot/projects/trustedbsd/audit3/lib/libarchive/archive_read_support_compression_none.c#5 integrate .. //depot/projects/trustedbsd/audit3/lib/libarchive/archive_read_support_format_cpio.c#9 integrate .. //depot/projects/trustedbsd/audit3/lib/libarchive/archive_read_support_format_iso9660.c#5 integrate .. //depot/projects/trustedbsd/audit3/lib/libarchive/archive_read_support_format_tar.c#11 integrate .. //depot/projects/trustedbsd/audit3/lib/libarchive/archive_read_support_format_zip.c#4 integrate .. //depot/projects/trustedbsd/audit3/lib/libarchive/archive_string.c#4 integrate .. //depot/projects/trustedbsd/audit3/lib/libarchive/archive_string.h#3 integrate .. //depot/projects/trustedbsd/audit3/lib/libarchive/archive_util.c#5 integrate .. //depot/projects/trustedbsd/audit3/lib/libarchive/archive_write.3#6 integrate .. //depot/projects/trustedbsd/audit3/lib/libarchive/archive_write.c#8 integrate .. //depot/projects/trustedbsd/audit3/lib/libarchive/archive_write_open_fd.c#3 integrate .. //depot/projects/trustedbsd/audit3/lib/libarchive/archive_write_open_file.c#4 integrate .. //depot/projects/trustedbsd/audit3/lib/libarchive/archive_write_open_filename.c#1 branch .. //depot/projects/trustedbsd/audit3/lib/libarchive/archive_write_open_memory.c#1 branch .. //depot/projects/trustedbsd/audit3/lib/libarchive/archive_write_set_compression_bzip2.c#5 integrate .. //depot/projects/trustedbsd/audit3/lib/libarchive/archive_write_set_compression_gzip.c#5 integrate .. //depot/projects/trustedbsd/audit3/lib/libarchive/archive_write_set_compression_none.c#5 integrate .. //depot/projects/trustedbsd/audit3/lib/libarchive/archive_write_set_format.c#2 integrate .. //depot/projects/trustedbsd/audit3/lib/libarchive/archive_write_set_format_by_name.c#3 integrate .. //depot/projects/trustedbsd/audit3/lib/libarchive/archive_write_set_format_cpio.c#4 integrate .. //depot/projects/trustedbsd/audit3/lib/libarchive/archive_write_set_format_pax.c#9 integrate .. //depot/projects/trustedbsd/audit3/lib/libarchive/archive_write_set_format_shar.c#4 integrate .. //depot/projects/trustedbsd/audit3/lib/libarchive/archive_write_set_format_ustar.c#6 integrate .. //depot/projects/trustedbsd/audit3/lib/libarchive/config_freebsd.h#1 branch .. //depot/projects/trustedbsd/audit3/lib/libarchive/libarchive.3#4 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/amd64/gd_qnan.h#1 branch .. //depot/projects/trustedbsd/audit3/lib/libc/amd64/net/Makefile.inc#2 delete .. //depot/projects/trustedbsd/audit3/lib/libc/amd64/net/htonl.S#2 delete .. //depot/projects/trustedbsd/audit3/lib/libc/amd64/net/htons.S#2 delete .. //depot/projects/trustedbsd/audit3/lib/libc/amd64/net/ntohl.S#2 delete .. //depot/projects/trustedbsd/audit3/lib/libc/amd64/net/ntohs.S#2 delete .. //depot/projects/trustedbsd/audit3/lib/libc/arm/arith.h#2 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/arm/gd_qnan.h#1 branch .. //depot/projects/trustedbsd/audit3/lib/libc/arm/net/Makefile.inc#2 delete .. //depot/projects/trustedbsd/audit3/lib/libc/arm/net/htonl.S#3 delete .. //depot/projects/trustedbsd/audit3/lib/libc/arm/net/htons.S#3 delete .. //depot/projects/trustedbsd/audit3/lib/libc/arm/net/ntohl.S#3 delete .. //depot/projects/trustedbsd/audit3/lib/libc/arm/net/ntohs.S#3 delete .. //depot/projects/trustedbsd/audit3/lib/libc/arm/sys/cerror.S#3 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/arm/sys/ptrace.S#3 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/gdtoa/_hdtoa.c#3 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/gen/confstr.3#2 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/gen/err.3#4 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/gen/sysconf.3#3 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/gen/sysconf.c#2 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/i386/gd_qnan.h#1 branch .. //depot/projects/trustedbsd/audit3/lib/libc/i386/gen/modf.S#2 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/i386/net/Makefile.inc#2 delete .. //depot/projects/trustedbsd/audit3/lib/libc/i386/net/htonl.S#4 delete .. //depot/projects/trustedbsd/audit3/lib/libc/i386/net/htons.S#2 delete .. //depot/projects/trustedbsd/audit3/lib/libc/i386/net/ntohl.S#4 delete .. //depot/projects/trustedbsd/audit3/lib/libc/i386/net/ntohs.S#2 delete .. //depot/projects/trustedbsd/audit3/lib/libc/ia64/gd_qnan.h#1 branch .. //depot/projects/trustedbsd/audit3/lib/libc/ia64/net/Makefile.inc#2 delete .. //depot/projects/trustedbsd/audit3/lib/libc/ia64/net/byte_swap_2.S#2 delete .. //depot/projects/trustedbsd/audit3/lib/libc/ia64/net/byte_swap_4.S#2 delete .. //depot/projects/trustedbsd/audit3/lib/libc/ia64/net/htonl.S#2 delete .. //depot/projects/trustedbsd/audit3/lib/libc/ia64/net/htons.S#2 delete .. //depot/projects/trustedbsd/audit3/lib/libc/ia64/net/ntohl.S#2 delete .. //depot/projects/trustedbsd/audit3/lib/libc/ia64/net/ntohs.S#2 delete .. //depot/projects/trustedbsd/audit3/lib/libc/inet/inet_cidr_ntop.c#2 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/inet/inet_net_ntop.c#2 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/isc/eventlib_p.h#3 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/net/Makefile.inc#7 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/net/nscachedcli.c#2 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/net/ntoh.c#1 branch .. //depot/projects/trustedbsd/audit3/lib/libc/net/sctp_sys_calls.c#1 branch .. //depot/projects/trustedbsd/audit3/lib/libc/powerpc/gd_qnan.h#1 branch .. //depot/projects/trustedbsd/audit3/lib/libc/powerpc/net/Makefile.inc#2 delete .. //depot/projects/trustedbsd/audit3/lib/libc/powerpc/net/htonl.S#2 delete .. //depot/projects/trustedbsd/audit3/lib/libc/powerpc/net/htons.S#2 delete .. //depot/projects/trustedbsd/audit3/lib/libc/powerpc/net/ntohl.S#2 delete .. //depot/projects/trustedbsd/audit3/lib/libc/powerpc/net/ntohs.S#2 delete .. //depot/projects/trustedbsd/audit3/lib/libc/resolv/mtctxres.c#2 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/resolv/res_init.c#3 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/resolv/res_send.c#4 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/sparc64/fpu/fpu_implode.c#3 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/sparc64/gd_qnan.h#1 branch .. //depot/projects/trustedbsd/audit3/lib/libc/sparc64/net/Makefile.inc#2 delete .. //depot/projects/trustedbsd/audit3/lib/libc/sparc64/net/htonl.S#2 delete .. //depot/projects/trustedbsd/audit3/lib/libc/sparc64/net/htons.S#2 delete .. //depot/projects/trustedbsd/audit3/lib/libc/sparc64/net/ntohl.S#2 delete .. //depot/projects/trustedbsd/audit3/lib/libc/sparc64/net/ntohs.S#2 delete .. //depot/projects/trustedbsd/audit3/lib/libc/stdio/vfprintf.c#8 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/stdlib/malloc.c#14 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/stdtime/strftime.3#5 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/sys/chflags.2#5 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/sys/chmod.2#4 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/sys/chown.2#2 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/sys/close.2#3 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/sys/extattr_get_file.2#5 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/sys/kqueue.2#6 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/sys/kse.2#7 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/sys/link.2#3 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/sys/mkdir.2#2 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/sys/mkfifo.2#2 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/sys/open.2#5 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/sys/ptrace.2#4 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/sys/recv.2#9 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/sys/rename.2#4 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/sys/rmdir.2#3 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/sys/sendfile.2#5 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/sys/symlink.2#2 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/sys/truncate.2#5 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/sys/unlink.2#4 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/sys/utimes.2#4 integrate .. //depot/projects/trustedbsd/audit3/lib/libelf/Makefile#1 branch .. //depot/projects/trustedbsd/audit3/lib/libelf/Version.map#1 branch .. //depot/projects/trustedbsd/audit3/lib/libelf/_libelf.h#1 branch .. //depot/projects/trustedbsd/audit3/lib/libelf/elf.3#1 branch .. //depot/projects/trustedbsd/audit3/lib/libelf/elf_begin.3#1 branch .. //depot/projects/trustedbsd/audit3/lib/libelf/elf_begin.c#1 branch .. //depot/projects/trustedbsd/audit3/lib/libelf/elf_cntl.3#1 branch .. //depot/projects/trustedbsd/audit3/lib/libelf/elf_cntl.c#1 branch .. //depot/projects/trustedbsd/audit3/lib/libelf/elf_data.c#1 branch .. //depot/projects/trustedbsd/audit3/lib/libelf/elf_end.3#1 branch .. //depot/projects/trustedbsd/audit3/lib/libelf/elf_end.c#1 branch .. //depot/projects/trustedbsd/audit3/lib/libelf/elf_errmsg.3#1 branch .. //depot/projects/trustedbsd/audit3/lib/libelf/elf_errmsg.c#1 branch .. //depot/projects/trustedbsd/audit3/lib/libelf/elf_errno.c#1 branch .. //depot/projects/trustedbsd/audit3/lib/libelf/elf_fill.3#1 branch .. //depot/projects/trustedbsd/audit3/lib/libelf/elf_fill.c#1 branch .. //depot/projects/trustedbsd/audit3/lib/libelf/elf_flag.c#1 branch .. //depot/projects/trustedbsd/audit3/lib/libelf/elf_flagdata.3#1 branch .. //depot/projects/trustedbsd/audit3/lib/libelf/elf_getarhdr.3#1 branch .. //depot/projects/trustedbsd/audit3/lib/libelf/elf_getarhdr.c#1 branch .. //depot/projects/trustedbsd/audit3/lib/libelf/elf_getarsym.3#1 branch .. //depot/projects/trustedbsd/audit3/lib/libelf/elf_getarsym.c#1 branch .. //depot/projects/trustedbsd/audit3/lib/libelf/elf_getbase.3#1 branch .. //depot/projects/trustedbsd/audit3/lib/libelf/elf_getbase.c#1 branch .. //depot/projects/trustedbsd/audit3/lib/libelf/elf_getdata.3#1 branch .. //depot/projects/trustedbsd/audit3/lib/libelf/elf_getident.3#1 branch .. //depot/projects/trustedbsd/audit3/lib/libelf/elf_getident.c#1 branch .. //depot/projects/trustedbsd/audit3/lib/libelf/elf_getphnum.3#1 branch .. //depot/projects/trustedbsd/audit3/lib/libelf/elf_getscn.3#1 branch .. //depot/projects/trustedbsd/audit3/lib/libelf/elf_getshnum.3#1 branch .. //depot/projects/trustedbsd/audit3/lib/libelf/elf_getshstrndx.3#1 branch .. //depot/projects/trustedbsd/audit3/lib/libelf/elf_hash.3#1 branch .. //depot/projects/trustedbsd/audit3/lib/libelf/elf_hash.c#1 branch .. //depot/projects/trustedbsd/audit3/lib/libelf/elf_kind.3#1 branch .. //depot/projects/trustedbsd/audit3/lib/libelf/elf_kind.c#1 branch .. //depot/projects/trustedbsd/audit3/lib/libelf/elf_memory.3#1 branch .. //depot/projects/trustedbsd/audit3/lib/libelf/elf_memory.c#1 branch .. //depot/projects/trustedbsd/audit3/lib/libelf/elf_next.3#1 branch .. //depot/projects/trustedbsd/audit3/lib/libelf/elf_next.c#1 branch .. //depot/projects/trustedbsd/audit3/lib/libelf/elf_phnum.c#1 branch .. //depot/projects/trustedbsd/audit3/lib/libelf/elf_rand.3#1 branch .. //depot/projects/trustedbsd/audit3/lib/libelf/elf_rand.c#1 branch .. //depot/projects/trustedbsd/audit3/lib/libelf/elf_rawfile.3#1 branch .. //depot/projects/trustedbsd/audit3/lib/libelf/elf_rawfile.c#1 branch .. //depot/projects/trustedbsd/audit3/lib/libelf/elf_scn.c#1 branch .. //depot/projects/trustedbsd/audit3/lib/libelf/elf_shnum.c#1 branch .. //depot/projects/trustedbsd/audit3/lib/libelf/elf_shstrndx.c#1 branch .. //depot/projects/trustedbsd/audit3/lib/libelf/elf_strptr.3#1 branch .. //depot/projects/trustedbsd/audit3/lib/libelf/elf_strptr.c#1 branch .. //depot/projects/trustedbsd/audit3/lib/libelf/elf_types.m4#1 branch .. //depot/projects/trustedbsd/audit3/lib/libelf/elf_update.3#1 branch .. //depot/projects/trustedbsd/audit3/lib/libelf/elf_update.c#1 branch .. //depot/projects/trustedbsd/audit3/lib/libelf/elf_version.3#1 branch .. //depot/projects/trustedbsd/audit3/lib/libelf/elf_version.c#1 branch .. //depot/projects/trustedbsd/audit3/lib/libelf/gelf.3#1 branch .. //depot/projects/trustedbsd/audit3/lib/libelf/gelf.h#1 branch .. //depot/projects/trustedbsd/audit3/lib/libelf/gelf_cap.c#1 branch .. //depot/projects/trustedbsd/audit3/lib/libelf/gelf_checksum.3#1 branch .. //depot/projects/trustedbsd/audit3/lib/libelf/gelf_checksum.c#1 branch .. //depot/projects/trustedbsd/audit3/lib/libelf/gelf_dyn.c#1 branch .. //depot/projects/trustedbsd/audit3/lib/libelf/gelf_ehdr.c#1 branch .. //depot/projects/trustedbsd/audit3/lib/libelf/gelf_fsize.3#1 branch .. //depot/projects/trustedbsd/audit3/lib/libelf/gelf_fsize.c#1 branch .. //depot/projects/trustedbsd/audit3/lib/libelf/gelf_getcap.3#1 branch .. //depot/projects/trustedbsd/audit3/lib/libelf/gelf_getclass.3#1 branch .. //depot/projects/trustedbsd/audit3/lib/libelf/gelf_getclass.c#1 branch .. //depot/projects/trustedbsd/audit3/lib/libelf/gelf_getdyn.3#1 branch .. //depot/projects/trustedbsd/audit3/lib/libelf/gelf_getehdr.3#1 branch .. //depot/projects/trustedbsd/audit3/lib/libelf/gelf_getmove.3#1 branch .. //depot/projects/trustedbsd/audit3/lib/libelf/gelf_getphdr.3#1 branch .. //depot/projects/trustedbsd/audit3/lib/libelf/gelf_getrel.3#1 branch .. //depot/projects/trustedbsd/audit3/lib/libelf/gelf_getrela.3#1 branch .. //depot/projects/trustedbsd/audit3/lib/libelf/gelf_getshdr.3#1 branch .. //depot/projects/trustedbsd/audit3/lib/libelf/gelf_getsym.3#1 branch .. //depot/projects/trustedbsd/audit3/lib/libelf/gelf_getsyminfo.3#1 branch .. //depot/projects/trustedbsd/audit3/lib/libelf/gelf_getsymshndx.3#1 branch .. //depot/projects/trustedbsd/audit3/lib/libelf/gelf_move.c#1 branch .. //depot/projects/trustedbsd/audit3/lib/libelf/gelf_newehdr.3#1 branch .. //depot/projects/trustedbsd/audit3/lib/libelf/gelf_newphdr.3#1 branch .. //depot/projects/trustedbsd/audit3/lib/libelf/gelf_phdr.c#1 branch .. //depot/projects/trustedbsd/audit3/lib/libelf/gelf_rel.c#1 branch .. //depot/projects/trustedbsd/audit3/lib/libelf/gelf_rela.c#1 branch .. //depot/projects/trustedbsd/audit3/lib/libelf/gelf_shdr.c#1 branch .. //depot/projects/trustedbsd/audit3/lib/libelf/gelf_sym.c#1 branch .. //depot/projects/trustedbsd/audit3/lib/libelf/gelf_syminfo.c#1 branch .. //depot/projects/trustedbsd/audit3/lib/libelf/gelf_symshndx.c#1 branch .. //depot/projects/trustedbsd/audit3/lib/libelf/gelf_update_ehdr.3#1 branch .. //depot/projects/trustedbsd/audit3/lib/libelf/gelf_xlate.c#1 branch .. //depot/projects/trustedbsd/audit3/lib/libelf/gelf_xlatetof.3#1 branch .. //depot/projects/trustedbsd/audit3/lib/libelf/libelf.c#1 branch .. //depot/projects/trustedbsd/audit3/lib/libelf/libelf.h#1 branch .. //depot/projects/trustedbsd/audit3/lib/libelf/libelf_align.c#1 branch .. //depot/projects/trustedbsd/audit3/lib/libelf/libelf_allocate.c#1 branch .. //depot/projects/trustedbsd/audit3/lib/libelf/libelf_ar.c#1 branch .. //depot/projects/trustedbsd/audit3/lib/libelf/libelf_checksum.c#1 branch .. //depot/projects/trustedbsd/audit3/lib/libelf/libelf_convert.m4#1 branch .. //depot/projects/trustedbsd/audit3/lib/libelf/libelf_data.c#1 branch .. //depot/projects/trustedbsd/audit3/lib/libelf/libelf_ehdr.c#1 branch .. //depot/projects/trustedbsd/audit3/lib/libelf/libelf_extended.c#1 branch .. //depot/projects/trustedbsd/audit3/lib/libelf/libelf_fsize.m4#1 branch .. //depot/projects/trustedbsd/audit3/lib/libelf/libelf_msize.m4#1 branch .. //depot/projects/trustedbsd/audit3/lib/libelf/libelf_phdr.c#1 branch .. //depot/projects/trustedbsd/audit3/lib/libelf/libelf_shdr.c#1 branch .. //depot/projects/trustedbsd/audit3/lib/libelf/libelf_xlate.c#1 branch .. //depot/projects/trustedbsd/audit3/lib/libkvm/kvm_proc.c#7 integrate .. //depot/projects/trustedbsd/audit3/lib/libpam/modules/pam_exec/pam_exec.c#4 integrate .. //depot/projects/trustedbsd/audit3/lib/libpthread/thread/thr_join.c#3 integrate .. //depot/projects/trustedbsd/audit3/lib/libpthread/thread/thr_kern.c#9 integrate .. //depot/projects/trustedbsd/audit3/lib/libstand/Makefile#7 integrate .. //depot/projects/trustedbsd/audit3/lib/libthr/Makefile#9 integrate .. //depot/projects/trustedbsd/audit3/lib/libthr/arch/amd64/include/pthread_md.h#3 integrate .. //depot/projects/trustedbsd/audit3/lib/libthr/arch/arm/include/pthread_md.h#3 integrate .. //depot/projects/trustedbsd/audit3/lib/libthr/arch/i386/include/pthread_md.h#4 integrate .. //depot/projects/trustedbsd/audit3/lib/libthr/arch/ia64/include/pthread_md.h#3 integrate .. //depot/projects/trustedbsd/audit3/lib/libthr/arch/powerpc/include/pthread_md.h#3 integrate .. //depot/projects/trustedbsd/audit3/lib/libthr/arch/sparc64/include/pthread_md.h#2 integrate .. //depot/projects/trustedbsd/audit3/lib/libthr/thread/thr_barrier.c#6 integrate .. //depot/projects/trustedbsd/audit3/lib/libthr/thread/thr_cancel.c#5 integrate .. //depot/projects/trustedbsd/audit3/lib/libthr/thread/thr_cond.c#6 integrate .. //depot/projects/trustedbsd/audit3/lib/libthr/thread/thr_create.c#10 integrate .. //depot/projects/trustedbsd/audit3/lib/libthr/thread/thr_exit.c#6 integrate .. //depot/projects/trustedbsd/audit3/lib/libthr/thread/thr_fork.c#6 integrate .. //depot/projects/trustedbsd/audit3/lib/libthr/thread/thr_init.c#13 integrate .. //depot/projects/trustedbsd/audit3/lib/libthr/thread/thr_join.c#6 integrate .. //depot/projects/trustedbsd/audit3/lib/libthr/thread/thr_list.c#7 integrate .. //depot/projects/trustedbsd/audit3/lib/libthr/thread/thr_mutex.c#13 integrate .. //depot/projects/trustedbsd/audit3/lib/libthr/thread/thr_private.h#15 integrate .. //depot/projects/trustedbsd/audit3/lib/libthr/thread/thr_pspinlock.c#5 integrate .. //depot/projects/trustedbsd/audit3/lib/libthr/thread/thr_sem.c#6 integrate .. //depot/projects/trustedbsd/audit3/lib/libthr/thread/thr_sig.c#8 integrate .. //depot/projects/trustedbsd/audit3/lib/libthr/thread/thr_syscalls.c#8 integrate .. //depot/projects/trustedbsd/audit3/lib/libthr/thread/thr_umtx.c#6 integrate .. //depot/projects/trustedbsd/audit3/lib/libthr/thread/thr_umtx.h#7 integrate .. //depot/projects/trustedbsd/audit3/lib/libutil/login_ok.3#3 integrate .. //depot/projects/trustedbsd/audit3/lib/msun/Makefile#7 integrate .. //depot/projects/trustedbsd/audit3/lib/msun/Symbol.map#2 integrate .. //depot/projects/trustedbsd/audit3/lib/msun/amd64/fenv.c#3 integrate .. //depot/projects/trustedbsd/audit3/lib/msun/amd64/fenv.h#3 integrate .. //depot/projects/trustedbsd/audit3/lib/msun/i387/fenv.c#3 integrate .. //depot/projects/trustedbsd/audit3/lib/msun/i387/fenv.h#4 integrate .. //depot/projects/trustedbsd/audit3/lib/msun/man/fenv.3#4 integrate .. //depot/projects/trustedbsd/audit3/lib/msun/man/ieee.3#5 integrate .. //depot/projects/trustedbsd/audit3/lib/msun/src/math.h#4 integrate .. //depot/projects/trustedbsd/audit3/lib/msun/src/s_copysignl.c#2 integrate .. //depot/projects/trustedbsd/audit3/lib/msun/src/s_fmal.c#2 integrate .. //depot/projects/trustedbsd/audit3/lib/msun/src/s_modf.c#2 integrate .. //depot/projects/trustedbsd/audit3/lib/msun/src/s_modff.c#2 integrate .. //depot/projects/trustedbsd/audit3/lib/msun/src/s_modfl.c#1 branch .. //depot/projects/trustedbsd/audit3/release/Makefile#14 integrate .. //depot/projects/trustedbsd/audit3/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#12 integrate .. //depot/projects/trustedbsd/audit3/release/doc/en_US.ISO8859-1/readme/article.sgml#4 integrate .. //depot/projects/trustedbsd/audit3/release/doc/en_US.ISO8859-1/relnotes/Makefile#4 integrate .. //depot/projects/trustedbsd/audit3/release/doc/en_US.ISO8859-1/relnotes/Makefile.inc#2 delete .. //depot/projects/trustedbsd/audit3/release/doc/en_US.ISO8859-1/relnotes/amd64/Makefile#2 delete .. //depot/projects/trustedbsd/audit3/release/doc/en_US.ISO8859-1/relnotes/amd64/article.sgml#3 delete .. //depot/projects/trustedbsd/audit3/release/doc/en_US.ISO8859-1/relnotes/article.sgml#1 branch .. //depot/projects/trustedbsd/audit3/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#21 delete .. //depot/projects/trustedbsd/audit3/release/doc/en_US.ISO8859-1/relnotes/common/relnotes.ent#2 delete .. //depot/projects/trustedbsd/audit3/release/doc/en_US.ISO8859-1/relnotes/i386/Makefile#3 delete .. //depot/projects/trustedbsd/audit3/release/doc/en_US.ISO8859-1/relnotes/i386/article.sgml#3 delete .. //depot/projects/trustedbsd/audit3/release/doc/en_US.ISO8859-1/relnotes/ia64/Makefile#2 delete .. //depot/projects/trustedbsd/audit3/release/doc/en_US.ISO8859-1/relnotes/ia64/article.sgml#3 delete .. //depot/projects/trustedbsd/audit3/release/doc/en_US.ISO8859-1/relnotes/pc98/Makefile#2 delete .. //depot/projects/trustedbsd/audit3/release/doc/en_US.ISO8859-1/relnotes/pc98/article.sgml#3 delete .. //depot/projects/trustedbsd/audit3/release/doc/en_US.ISO8859-1/relnotes/powerpc/Makefile#2 delete .. //depot/projects/trustedbsd/audit3/release/doc/en_US.ISO8859-1/relnotes/powerpc/article.sgml#2 delete .. //depot/projects/trustedbsd/audit3/release/doc/en_US.ISO8859-1/relnotes/sparc64/Makefile#2 delete .. //depot/projects/trustedbsd/audit3/release/doc/en_US.ISO8859-1/relnotes/sparc64/article.sgml#3 delete .. //depot/projects/trustedbsd/audit3/release/doc/share/examples/Makefile.relnotesng#6 integrate .. //depot/projects/trustedbsd/audit3/release/doc/share/misc/dev.archlist.txt#11 integrate .. //depot/projects/trustedbsd/audit3/release/picobsd/bridge/crunch.conf#5 integrate .. //depot/projects/trustedbsd/audit3/release/picobsd/tinyware/vm/vm.c#2 integrate .. //depot/projects/trustedbsd/audit3/release/scripts/package-split.py#6 integrate .. //depot/projects/trustedbsd/audit3/release/sun4v/boot_crunch.conf#1 branch .. //depot/projects/trustedbsd/audit3/rescue/rescue/Makefile#9 integrate .. //depot/projects/trustedbsd/audit3/sbin/Makefile#10 integrate .. //depot/projects/trustedbsd/audit3/sbin/atm/atm/atm.8#2 integrate .. //depot/projects/trustedbsd/audit3/sbin/bsdlabel/bsdlabel.8#9 integrate .. //depot/projects/trustedbsd/audit3/sbin/camcontrol/camcontrol.c#5 integrate .. //depot/projects/trustedbsd/audit3/sbin/devfs/devfs.8#4 integrate .. //depot/projects/trustedbsd/audit3/sbin/fdisk/fdisk.8#3 integrate .. //depot/projects/trustedbsd/audit3/sbin/geom/class/mirror/gmirror.8#6 integrate .. //depot/projects/trustedbsd/audit3/sbin/ggate/Makefile#5 integrate .. //depot/projects/trustedbsd/audit3/sbin/ggate/ggated/ggated.c#4 integrate .. //depot/projects/trustedbsd/audit3/sbin/ggate/shared/ggate.c#5 integrate .. //depot/projects/trustedbsd/audit3/sbin/ggate/shared/ggate.h#4 integrate .. //depot/projects/trustedbsd/audit3/sbin/ifconfig/ifbridge.c#4 integrate .. //depot/projects/trustedbsd/audit3/sbin/ifconfig/ifconfig.8#15 integrate .. //depot/projects/trustedbsd/audit3/sbin/ifconfig/ifconfig.c#11 integrate .. //depot/projects/trustedbsd/audit3/sbin/ifconfig/ifieee80211.c#11 integrate .. //depot/projects/trustedbsd/audit3/sbin/ifconfig/ifmedia.c#5 integrate .. //depot/projects/trustedbsd/audit3/sbin/init/init.8#6 integrate .. //depot/projects/trustedbsd/audit3/sbin/ipfw/ipfw.8#14 integrate .. //depot/projects/trustedbsd/audit3/sbin/ipfw/ipfw2.c#14 integrate .. //depot/projects/trustedbsd/audit3/sbin/mount/mount.c#10 integrate .. //depot/projects/trustedbsd/audit3/sbin/mount/mount_fs.c#2 integrate .. //depot/projects/trustedbsd/audit3/sbin/mount_nfs/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/sbin/mount_nfs/mount_nfs.c#5 integrate .. //depot/projects/trustedbsd/audit3/sbin/mount_unionfs/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/sbin/mount_unionfs/mount_unionfs.8#4 integrate .. //depot/projects/trustedbsd/audit3/sbin/mount_unionfs/mount_unionfs.c#4 integrate .. //depot/projects/trustedbsd/audit3/sbin/quotacheck/quotacheck.8#3 integrate .. //depot/projects/trustedbsd/audit3/sbin/quotacheck/quotacheck.c#3 integrate .. //depot/projects/trustedbsd/audit3/sbin/reboot/boot_i386.8#7 integrate .. //depot/projects/trustedbsd/audit3/sbin/reboot/reboot.8#3 integrate .. //depot/projects/trustedbsd/audit3/sbin/restore/main.c#3 integrate .. //depot/projects/trustedbsd/audit3/sbin/restore/restore.8#6 integrate .. //depot/projects/trustedbsd/audit3/sbin/restore/restore.c#3 integrate .. //depot/projects/trustedbsd/audit3/sbin/restore/restore.h#3 integrate .. //depot/projects/trustedbsd/audit3/sbin/restore/tape.c#5 integrate .. //depot/projects/trustedbsd/audit3/sbin/routed/main.c#3 integrate .. //depot/projects/trustedbsd/audit3/sbin/sysctl/sysctl.c#11 integrate .. //depot/projects/trustedbsd/audit3/share/colldef/Makefile#5 integrate .. //depot/projects/trustedbsd/audit3/share/doc/IPv6/IMPLEMENTATION#4 integrate .. //depot/projects/trustedbsd/audit3/share/man/man1/builtin.1#6 integrate .. //depot/projects/trustedbsd/audit3/share/man/man1/intro.1#2 integrate .. //depot/projects/trustedbsd/audit3/share/man/man4/Makefile#15 integrate .. //depot/projects/trustedbsd/audit3/share/man/man4/aac.4#6 integrate .. //depot/projects/trustedbsd/audit3/share/man/man4/altq.4#11 integrate .. //depot/projects/trustedbsd/audit3/share/man/man4/ata.4#11 integrate .. //depot/projects/trustedbsd/audit3/share/man/man4/ath.4#7 integrate .. //depot/projects/trustedbsd/audit3/share/man/man4/audit.4#6 integrate .. //depot/projects/trustedbsd/audit3/share/man/man4/auditpipe.4#10 integrate .. //depot/projects/trustedbsd/audit3/share/man/man4/bce.4#3 integrate .. //depot/projects/trustedbsd/audit3/share/man/man4/blackhole.4#3 integrate .. //depot/projects/trustedbsd/audit3/share/man/man4/fast_ipsec.4#6 integrate .. //depot/projects/trustedbsd/audit3/share/man/man4/fdc.4#5 integrate .. //depot/projects/trustedbsd/audit3/share/man/man4/iic.4#5 integrate .. //depot/projects/trustedbsd/audit3/share/man/man4/inet.4#6 integrate .. //depot/projects/trustedbsd/audit3/share/man/man4/ipmi.4#5 integrate .. //depot/projects/trustedbsd/audit3/share/man/man4/ips.4#4 integrate .. //depot/projects/trustedbsd/audit3/share/man/man4/joy.4#5 integrate .. //depot/projects/trustedbsd/audit3/share/man/man4/le.4#4 integrate .. //depot/projects/trustedbsd/audit3/share/man/man4/lmc.4#3 integrate .. //depot/projects/trustedbsd/audit3/share/man/man4/man4.arm/Makefile#1 branch .. //depot/projects/trustedbsd/audit3/share/man/man4/man4.arm/npe.4#1 branch .. //depot/projects/trustedbsd/audit3/share/man/man4/man4.i386/acpi_ibm.4#6 integrate .. //depot/projects/trustedbsd/audit3/share/man/man4/man4.i386/padlock.4#6 integrate .. //depot/projects/trustedbsd/audit3/share/man/man4/man4.sparc64/ofw_console.4#2 integrate .. //depot/projects/trustedbsd/audit3/share/man/man4/md.4#2 integrate .. //depot/projects/trustedbsd/audit3/share/man/man4/miibus.4#6 integrate .. //depot/projects/trustedbsd/audit3/share/man/man4/msk.4#1 branch .. //depot/projects/trustedbsd/audit3/share/man/man4/ng_deflate.4#1 branch .. //depot/projects/trustedbsd/audit3/share/man/man4/ng_ksocket.4#5 integrate .. //depot/projects/trustedbsd/audit3/share/man/man4/ng_pred1.4#1 branch .. //depot/projects/trustedbsd/audit3/share/man/man4/ng_tag.4#4 integrate .. //depot/projects/trustedbsd/audit3/share/man/man4/pcm.4#7 integrate .. //depot/projects/trustedbsd/audit3/share/man/man4/polling.4#7 integrate .. //depot/projects/trustedbsd/audit3/share/man/man4/pty.4#6 integrate .. //depot/projects/trustedbsd/audit3/share/man/man4/re.4#7 integrate .. //depot/projects/trustedbsd/audit3/share/man/man4/sem.4#2 integrate .. //depot/projects/trustedbsd/audit3/share/man/man4/snd_atiixp.4#2 integrate .. //depot/projects/trustedbsd/audit3/share/man/man4/snd_emu10kx.4#3 integrate .. //depot/projects/trustedbsd/audit3/share/man/man4/snd_es137x.4#5 integrate .. //depot/projects/trustedbsd/audit3/share/man/man4/snd_hda.4#2 integrate .. //depot/projects/trustedbsd/audit3/share/man/man4/snd_spicds.4#2 integrate .. //depot/projects/trustedbsd/audit3/share/man/man4/snd_via8233.4#5 integrate .. //depot/projects/trustedbsd/audit3/share/man/man4/syscons.4#7 integrate .. //depot/projects/trustedbsd/audit3/share/man/man4/uark.4#1 branch .. //depot/projects/trustedbsd/audit3/share/man/man4/ubsa.4#3 integrate .. //depot/projects/trustedbsd/audit3/share/man/man4/ubser.4#4 integrate .. //depot/projects/trustedbsd/audit3/share/man/man4/ubtbcmfw.4#4 integrate .. //depot/projects/trustedbsd/audit3/share/man/man4/ucom.4#4 integrate .. //depot/projects/trustedbsd/audit3/share/man/man4/ucycom.4#3 integrate .. //depot/projects/trustedbsd/audit3/share/man/man4/udbp.4#3 integrate .. //depot/projects/trustedbsd/audit3/share/man/man4/ufm.4#4 integrate .. //depot/projects/trustedbsd/audit3/share/man/man4/ufoma.4#3 integrate .. //depot/projects/trustedbsd/audit3/share/man/man4/uftdi.4#5 integrate .. //depot/projects/trustedbsd/audit3/share/man/man4/ugen.4#2 integrate .. //depot/projects/trustedbsd/audit3/share/man/man4/uhid.4#4 integrate .. //depot/projects/trustedbsd/audit3/share/man/man4/uhidev.4#3 delete .. //depot/projects/trustedbsd/audit3/share/man/man4/ukbd.4#3 integrate .. //depot/projects/trustedbsd/audit3/share/man/man4/ulpt.4#3 integrate .. //depot/projects/trustedbsd/audit3/share/man/man4/umass.4#6 integrate .. //depot/projects/trustedbsd/audit3/share/man/man4/umct.4#4 integrate .. //depot/projects/trustedbsd/audit3/share/man/man4/umodem.4#5 integrate .. //depot/projects/trustedbsd/audit3/share/man/man4/ums.4#4 integrate .. //depot/projects/trustedbsd/audit3/share/man/man4/uplcom.4#7 integrate .. //depot/projects/trustedbsd/audit3/share/man/man4/urio.4#4 integrate .. //depot/projects/trustedbsd/audit3/share/man/man4/usb.4#5 integrate .. //depot/projects/trustedbsd/audit3/share/man/man4/uscanner.4#8 integrate .. //depot/projects/trustedbsd/audit3/share/man/man4/utopia.4#3 integrate .. //depot/projects/trustedbsd/audit3/share/man/man4/uvisor.4#6 integrate .. //depot/projects/trustedbsd/audit3/share/man/man4/uvscom.4#3 integrate .. //depot/projects/trustedbsd/audit3/share/man/man4/vlan.4#9 integrate .. //depot/projects/trustedbsd/audit3/share/man/man4/watchdog.4#4 integrate .. //depot/projects/trustedbsd/audit3/share/man/man5/elf.5#7 integrate .. //depot/projects/trustedbsd/audit3/share/man/man5/fdescfs.5#3 integrate .. //depot/projects/trustedbsd/audit3/share/man/man5/linsysfs.5#3 integrate .. //depot/projects/trustedbsd/audit3/share/man/man5/mqueuefs.5#3 integrate .. //depot/projects/trustedbsd/audit3/share/man/man5/rc.conf.5#15 integrate .. //depot/projects/trustedbsd/audit3/share/man/man7/build.7#9 integrate .. //depot/projects/trustedbsd/audit3/share/man/man7/development.7#6 integrate .. //depot/projects/trustedbsd/audit3/share/man/man7/environ.7#4 integrate .. //depot/projects/trustedbsd/audit3/share/man/man7/hier.7#7 integrate .. //depot/projects/trustedbsd/audit3/share/man/man7/ports.7#7 integrate .. //depot/projects/trustedbsd/audit3/share/man/man7/release.7#7 integrate .. //depot/projects/trustedbsd/audit3/share/man/man7/tuning.7#5 integrate .. //depot/projects/trustedbsd/audit3/share/man/man8/MAKEDEV.8#2 integrate .. //depot/projects/trustedbsd/audit3/share/man/man8/nanobsd.8#2 integrate .. //depot/projects/trustedbsd/audit3/share/man/man8/rc.subr.8#9 integrate .. //depot/projects/trustedbsd/audit3/share/man/man9/LOCK_PROFILING.9#1 branch .. //depot/projects/trustedbsd/audit3/share/man/man9/MUTEX_PROFILING.9#5 delete .. //depot/projects/trustedbsd/audit3/share/man/man9/Makefile#11 integrate .. //depot/projects/trustedbsd/audit3/share/man/man9/bpf.9#4 integrate .. //depot/projects/trustedbsd/audit3/share/man/man9/bus_dma.9#10 integrate .. //depot/projects/trustedbsd/audit3/share/man/man9/config_intrhook.9#2 integrate .. //depot/projects/trustedbsd/audit3/share/man/man9/cr_cansee.9#1 branch .. //depot/projects/trustedbsd/audit3/share/man/man9/crypto.9#6 integrate .. //depot/projects/trustedbsd/audit3/share/man/man9/devsw.9#3 delete .. //depot/projects/trustedbsd/audit3/share/man/man9/ifnet.9#5 integrate .. //depot/projects/trustedbsd/audit3/share/man/man9/kqueue.9#2 integrate .. //depot/projects/trustedbsd/audit3/share/man/man9/make_dev.9#6 integrate .. //depot/projects/trustedbsd/audit3/share/man/man9/mbuf.9#8 integrate .. //depot/projects/trustedbsd/audit3/share/man/man9/mutex.9#7 integrate .. //depot/projects/trustedbsd/audit3/share/man/man9/p_candebug.9#3 integrate .. //depot/projects/trustedbsd/audit3/share/man/man9/p_cansee.9#1 branch .. //depot/projects/trustedbsd/audit3/share/man/man9/priv.9#1 branch .. //depot/projects/trustedbsd/audit3/share/man/man9/sleepqueue.9#4 integrate .. //depot/projects/trustedbsd/audit3/share/man/man9/socket.9#1 branch .. //depot/projects/trustedbsd/audit3/share/man/man9/style.9#5 integrate .. //depot/projects/trustedbsd/audit3/share/man/man9/suser.9#5 integrate .. //depot/projects/trustedbsd/audit3/share/man/man9/sysctl.9#4 integrate .. //depot/projects/trustedbsd/audit3/share/man/man9/uio.9#4 integrate .. //depot/projects/trustedbsd/audit3/share/man/man9/usbdi.9#2 integrate .. //depot/projects/trustedbsd/audit3/share/man/man9/utopia.9#3 integrate .. //depot/projects/trustedbsd/audit3/share/man/man9/vm_map_stack.9#4 integrate .. //depot/projects/trustedbsd/audit3/share/man/man9/watchdog.9#3 integrate .. //depot/projects/trustedbsd/audit3/share/misc/bsd-family-tree#11 integrate .. //depot/projects/trustedbsd/audit3/share/misc/pci_vendors#5 integrate .. //depot/projects/trustedbsd/audit3/share/mk/bsd.endian.mk#3 integrate .. //depot/projects/trustedbsd/audit3/share/mk/bsd.own.mk#6 integrate .. //depot/projects/trustedbsd/audit3/share/mk/bsd.port.mk#4 integrate .. //depot/projects/trustedbsd/audit3/share/mklocale/Makefile#5 integrate .. //depot/projects/trustedbsd/audit3/share/monetdef/Makefile#5 integrate .. //depot/projects/trustedbsd/audit3/share/msgdef/Makefile#6 integrate .. //depot/projects/trustedbsd/audit3/share/numericdef/Makefile#5 integrate .. //depot/projects/trustedbsd/audit3/share/timedef/Makefile#5 integrate .. //depot/projects/trustedbsd/audit3/share/timedef/nn_NO.ISO8859-1.src#1 branch .. //depot/projects/trustedbsd/audit3/share/timedef/nn_NO.UTF-8.src#1 branch .. //depot/projects/trustedbsd/audit3/sys/Makefile#9 integrate .. //depot/projects/trustedbsd/audit3/sys/amd64/amd64/apic_vector.S#7 integrate .. //depot/projects/trustedbsd/audit3/sys/amd64/amd64/cpu_switch.S#4 integrate .. //depot/projects/trustedbsd/audit3/sys/amd64/amd64/db_disasm.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/amd64/amd64/db_trace.c#10 integrate .. //depot/projects/trustedbsd/audit3/sys/amd64/amd64/exception.S#5 integrate .. //depot/projects/trustedbsd/audit3/sys/amd64/amd64/genassym.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/amd64/amd64/intr_machdep.c#10 integrate .. //depot/projects/trustedbsd/audit3/sys/amd64/amd64/io_apic.c#8 integrate .. //depot/projects/trustedbsd/audit3/sys/amd64/amd64/local_apic.c#11 integrate .. //depot/projects/trustedbsd/audit3/sys/amd64/amd64/machdep.c#13 integrate .. //depot/projects/trustedbsd/audit3/sys/amd64/amd64/minidump_machdep.c#2 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Jan 9 19:46: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 7781716A549; Tue, 9 Jan 2007 19:46:25 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id D550716A659; Tue, 9 Jan 2007 19:46:24 +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 64EA113C458; Tue, 9 Jan 2007 19:46:24 +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.6/8.13.6) with ESMTP id l09JkDJA077936; Tue, 9 Jan 2007 14:46:19 -0500 (EST) (envelope-from jhb@freebsd.org) From: John Baldwin To: Divacky Roman Date: Tue, 9 Jan 2007 13:17:06 -0500 User-Agent: KMail/1.9.1 References: <200701050802.l0582Gnq067583@repoman.freebsd.org> <200701051232.28019.jhb@freebsd.org> <20070106144030.GB1353@stud.fit.vutbr.cz> In-Reply-To: <20070106144030.GB1353@stud.fit.vutbr.cz> MIME-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit Content-Disposition: inline Message-Id: <200701091317.06685.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, 09 Jan 2007 14:46:19 -0500 (EST) X-Virus-Scanned: ClamAV 0.88.3/2430/Tue Jan 9 12:35:51 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: Roman Divacky , Perforce Change Reviews Subject: Re: PERFORCE change 112535 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 09 Jan 2007 19:46:26 -0000 On Saturday 06 January 2007 09:40, Divacky Roman wrote: > On Fri, Jan 05, 2007 at 12:32:27PM -0500, John Baldwin wrote: > > On Friday 05 January 2007 03:02, Roman Divacky wrote: > > > http://perforce.freebsd.org/chv.cgi?CH=112535 > > > > > > Change 112535 by rdivacky@rdivacky_witten on 2007/01/05 08:01:24 > > > > > > No need to lock prison in a case of linux_use26 becuase the int > > > setting is atomic and process cannot leave jail. > > > > > > Submitted by: kib > > > Reviewed by: jhb > > > > > > Affected files ... > > > > > > .. //depot/projects/linuxolator/src/sys/compat/linux/linux_mib.c#6 edit > > > > > > Differences ... > > > > > > ==== //depot/projects/linuxolator/src/sys/compat/linux/linux_mib.c#6 > > (text+ko) ==== > > > > > > @@ -237,12 +237,10 @@ > > > > > > pr = td->td_ucred->cr_prison; > > > if (pr != NULL) { > > > - mtx_lock(&pr->pr_mtx); > > > if (pr->pr_linux != NULL) { > > > lpr = (struct linux_prison *)pr->pr_linux; > > > use26 = lpr->pr_use_linux26; > > > } > > > - mtx_unlock(&pr->pr_mtx); > > > } else > > > use26 = linux_use_linux26; > > > > > > > > > > Hmm, what is use26 set to if pr != NULL but pr->pr_linux == NULL? > > to the default value of 0 Shouldn't it be set to linux_use_26 in that case? -- John Baldwin From owner-p4-projects@FreeBSD.ORG Tue Jan 9 20:33:12 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 06A7E16A40F; Tue, 9 Jan 2007 20:33:12 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id C452716A407; Tue, 9 Jan 2007 20:33:11 +0000 (UTC) (envelope-from xdivac02@stud.fit.vutbr.cz) Received: from eva.fit.vutbr.cz (eva.fit.vutbr.cz [147.229.176.14]) by mx1.freebsd.org (Postfix) with ESMTP id 5778613C45E; Tue, 9 Jan 2007 20:33:11 +0000 (UTC) (envelope-from xdivac02@stud.fit.vutbr.cz) Received: from eva.fit.vutbr.cz (localhost [127.0.0.1]) by eva.fit.vutbr.cz (envelope-from xdivac02@eva.fit.vutbr.cz) (8.13.8/8.13.7) with ESMTP id l09KX89N032459 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Tue, 9 Jan 2007 21:33:08 +0100 (CET) Received: (from xdivac02@localhost) by eva.fit.vutbr.cz (8.13.8/8.13.3/Submit) id l09KX84P032458; Tue, 9 Jan 2007 21:33:08 +0100 (CET) Date: Tue, 9 Jan 2007 21:33:08 +0100 From: Divacky Roman To: John Baldwin Message-ID: <20070109203308.GA32081@stud.fit.vutbr.cz> References: <200701050802.l0582Gnq067583@repoman.freebsd.org> <200701051232.28019.jhb@freebsd.org> <20070106144030.GB1353@stud.fit.vutbr.cz> <200701091317.06685.jhb@freebsd.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <200701091317.06685.jhb@freebsd.org> User-Agent: Mutt/1.4.2.2i X-Scanned-By: MIMEDefang 2.57 on 147.229.176.14 Cc: Roman Divacky , Perforce Change Reviews Subject: Re: PERFORCE change 112535 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 09 Jan 2007 20:33:12 -0000 On Tue, Jan 09, 2007 at 01:17:06PM -0500, John Baldwin wrote: > > > > @@ -237,12 +237,10 @@ > > > > > > > > pr = td->td_ucred->cr_prison; > > > > if (pr != NULL) { > > > > - mtx_lock(&pr->pr_mtx); > > > > if (pr->pr_linux != NULL) { > > > > lpr = (struct linux_prison *)pr->pr_linux; > > > > use26 = lpr->pr_use_linux26; > > > > } > > > > - mtx_unlock(&pr->pr_mtx); > > > > } else > > > > use26 = linux_use_linux26; > > > > > > > > > > > > > > Hmm, what is use26 set to if pr != NULL but pr->pr_linux == NULL? > > > > to the default value of 0 > > Shouldn't it be set to linux_use_26 in that case? as I understand the code such condition should not happen under normal condition and is a sign of something bad's going on. so its better to be safe and not enable the "higher" emulation. the point is - a defined value is returned and it even happens to be the same value (0) as the linux_use_26. From owner-p4-projects@FreeBSD.ORG Tue Jan 9 21:12: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 75E6C16A492; Tue, 9 Jan 2007 21:12: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 C12B116A415; Tue, 9 Jan 2007 21:12:27 +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 47E9213C455; Tue, 9 Jan 2007 21:12:27 +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.6/8.13.6) with ESMTP id l09LCOD8078595; Tue, 9 Jan 2007 16:12:25 -0500 (EST) (envelope-from jhb@freebsd.org) From: John Baldwin To: Divacky Roman Date: Tue, 9 Jan 2007 16:07:21 -0500 User-Agent: KMail/1.9.1 References: <200701050802.l0582Gnq067583@repoman.freebsd.org> <200701091317.06685.jhb@freebsd.org> <20070109203308.GA32081@stud.fit.vutbr.cz> In-Reply-To: <20070109203308.GA32081@stud.fit.vutbr.cz> MIME-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit Content-Disposition: inline Message-Id: <200701091607.22013.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, 09 Jan 2007 16:12:25 -0500 (EST) X-Virus-Scanned: ClamAV 0.88.3/2430/Tue Jan 9 12:35:51 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: Roman Divacky , Perforce Change Reviews Subject: Re: PERFORCE change 112535 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 09 Jan 2007 21:12:28 -0000 On Tuesday 09 January 2007 15:33, Divacky Roman wrote: > On Tue, Jan 09, 2007 at 01:17:06PM -0500, John Baldwin wrote: > > > > > @@ -237,12 +237,10 @@ > > > > > > > > > > pr = td->td_ucred->cr_prison; > > > > > if (pr != NULL) { > > > > > - mtx_lock(&pr->pr_mtx); > > > > > if (pr->pr_linux != NULL) { > > > > > lpr = (struct linux_prison *)pr->pr_linux; > > > > > use26 = lpr->pr_use_linux26; > > > > > } > > > > > - mtx_unlock(&pr->pr_mtx); > > > > > } else > > > > > use26 = linux_use_linux26; > > > > > > > > > > > > > > > > > > Hmm, what is use26 set to if pr != NULL but pr->pr_linux == NULL? > > > > > > to the default value of 0 > > > > Shouldn't it be set to linux_use_26 in that case? > > as I understand the code such condition should not happen under > normal condition and is a sign of something bad's going on. No, it is quite normal. By default linux processes in a jail use the base system's settings. When you go to change a setting via sysctl inside a jail, then that jail grows its own linux prison "on demand" to hold those settings and not change the settings in the base system. The case you are ignoring here is that the sysadmin has set the Linux OS version for the base system to be "2.6.12". By default all jails should be inheriting that. In fact, linux_get_osname() will return "2.6.12", so glibc inside the jail will think it is on a 2.6.x system, as will 'uname'. However, the linux compat layer will incorrectly think it isn't and apps will probably break. Look at linux_get_osname()'s logic for example: void linux_get_osname(struct thread *td, char *dst) { register struct prison *pr; register struct linux_prison *lpr; pr = td->td_ucred->cr_prison; if (pr != NULL) { mtx_lock(&pr->pr_mtx); if (pr->pr_linux != NULL) { lpr = (struct linux_prison *)pr->pr_linux; if (lpr->pr_osname[0]) { bcopy(lpr->pr_osname, dst, LINUX_MAX_UTSNAME); mtx_unlock(&pr->pr_mtx); return; } } mtx_unlock(&pr->pr_mtx); } mtx_lock(&osname_lock); bcopy(linux_osname, dst, LINUX_MAX_UTSNAME); mtx_unlock(&osname_lock); } -- John Baldwin From owner-p4-projects@FreeBSD.ORG Tue Jan 9 22:46:58 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 65F4D16A415; Tue, 9 Jan 2007 22:46:58 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 292B616A407 for ; Tue, 9 Jan 2007 22:46:58 +0000 (UTC) (envelope-from adamartin@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 1926013C441 for ; Tue, 9 Jan 2007 22:46:58 +0000 (UTC) (envelope-from adamartin@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l09Mkv0s066332 for ; Tue, 9 Jan 2007 22:46:57 GMT (envelope-from adamartin@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l09Mkvbp066329 for perforce@freebsd.org; Tue, 9 Jan 2007 22:46:57 GMT (envelope-from adamartin@FreeBSD.org) Date: Tue, 9 Jan 2007 22:46:57 GMT Message-Id: <200701092246.l09Mkvbp066329@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to adamartin@FreeBSD.org using -f From: Adam Martin To: Perforce Change Reviews Cc: Subject: PERFORCE change 112695 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 09 Jan 2007 22:46:58 -0000 http://perforce.freebsd.org/chv.cgi?CH=112695 Change 112695 by adamartin@adamartin_hobbes on 2007/01/09 22:46:42 Some changes to autofs, for protocol handling, and checking-in, before restructuring the way the autofs-datatypes are handled. Affected files ... .. //depot/projects/soc2006/adamartin_autofs/autofs/autofs.c#8 edit .. //depot/projects/soc2006/adamartin_autofs/autofs/autofs.h#8 edit .. //depot/projects/soc2006/adamartin_autofs/autofs/autofs_ctl.c#7 edit .. //depot/projects/soc2006/adamartin_autofs/autofs/autofs_ctl.h#6 edit .. //depot/projects/soc2006/adamartin_autofs/autofs/autofs_dev.c#7 edit .. //depot/projects/soc2006/adamartin_autofs/autofs/autofs_dev.h#5 edit .. //depot/projects/soc2006/adamartin_autofs/autofs/autofs_pfsops.c#7 edit .. //depot/projects/soc2006/adamartin_autofs/autofs/protocol.c#6 edit .. //depot/projects/soc2006/adamartin_autofs/autofs/protocol.h#6 edit .. //depot/projects/soc2006/adamartin_autofs/pseudofs/pseudofs_vnops.c#4 edit Differences ... ==== //depot/projects/soc2006/adamartin_autofs/autofs/autofs.c#8 (text+ko) ==== @@ -56,12 +56,13 @@ - - static int autofs_handle_loader( struct module *mod, int action, void *args ) { - int err= 0; + int err; + + err= 0; + switch( action ) { case MOD_LOAD: @@ -90,6 +91,7 @@ break; case MOD_UNLOAD: + //cleanup_autofs(); destroy_dev( autofs_ctl_dev ); //free( autofs_ctl_state, M_AUTOFS_CTL_NODES ); EPRINTF( "AutoFS unloaded.\n" ); @@ -109,6 +111,7 @@ +#if 0 static int vn_iscdev( struct vnode *vp, int *errp ) { @@ -139,4 +142,7 @@ $return ( error == 0 ); } +#endif + + DEV_MODULE( AutoFS, autofs_handle_loader, NULL ); ==== //depot/projects/soc2006/adamartin_autofs/autofs/autofs.h#8 (text+ko) ==== @@ -64,19 +64,23 @@ #define KPRINTF EPRINTF + +/** TODO: move this to autofs_types.h **/ + /**************** FORWARD DEFINITIONS ******************/ struct autofs_instance; struct autofs_dev_bufs; -struct autofs_mounts; +struct autofs_mount; struct vnode; struct pfs_node; +struct autofs_transaction; struct proc; - +typedef struct autofs_transaction autofs_transaction_t; typedef struct proc kthread_t; typedef struct autofs_instance autofs_instance_t; -typedef struct autofs_mounts autofs_mounts_t; +typedef struct autofs_mount autofs_mount_t; /************** END FORWARD DEFINITIONS *****************/ @@ -84,26 +88,65 @@ //typedef struct autofs_dev_bufs autofs_dev_bufs_t; + +/* This is needed as there's no true private field on pfs_node */ +#define pn_priv pn_data + + struct autofs_instance { - struct autofs_dev_bufs *device; - kthread_t *controller_thread; + struct autofs_dev_bufs *device; + kthread_t *controller_thread; - autofs_mounts_t *mount_list; + autofs_mounts_t *mount_list; /** This will be a hash **/ + autofs_transaction_t *in_flight; /** A hash of inflight + transactions **/ - void *extensions; + void *extensions; }; -struct autofs_mounts +/*** TODO: store in a hash, not a linked list. ***/ +struct autofs_mount { - autofs_mounts_t *next; + /** FIXME: Not ANSI C, but I'll fix it later. **/ + union + { + autofs_mounts_t *next; /** This field is deprecated **/ + uint32_t hash_code; + }; + autofs_instance_t *instance_p; char *mountpoint; - struct pfs_node *mount_file; /**The pn_data field points to the autofs mount - structure **/ + + int state; + unsigned long long int flags; + + struct pfs_node *mount_file; /* The pn_priv field points to + the autofs mount structure */ + int timeout; /* Timeout in seconds */ - int time_remaining; /* Time remaining until next timeout event */ + int time_remaining; /* Time remaining until next + timeout event */ }; + +struct autofs_transaction +{ + uint32_t hash_code; + uint32_t transaction_id; + int32_t next_expected_command; + struct message_header last_message; /** This must be freed, after a successful command, with the expected transaction ID **/ +} + +#define AUTOFS_NODE_GET_PRIVATE( p_node )\ + ( (autofs_mount_t *) ( ( p_node )->pn_priv ) ) + +#define AUTOFS_NODE_GET_INSTANCE( p_node )\ + ( (autofs_instance_t *)\ + ( AUTOFS_NODE_GET_PRIVATE( p_node )->instance_p ) ) + +#define AUTOFS_NODE_GET_BUFFERS( p_node )\ + ( (autofs_instance_t *) ( AUTOFS_GET_INSTANCE( p_node )->device ) ) + #endif /*** __AUTOFS_MAIN_HEADER__ ***/ ==== //depot/projects/soc2006/adamartin_autofs/autofs/autofs_ctl.c#7 (text+ko) ==== @@ -93,7 +93,7 @@ } static int -create_autofs_node( int num ) +create_autofs_node( int num, autofs_instance_t *instance ) { int error; struct cdevsw *autofs_cdevsw; @@ -110,6 +110,7 @@ autofs_dev_data->input= autofs_queue_init(); autofs_dev_data->output= autofs_queue_init(); autofs_dev_data->instances= 0; + autofs_dev_data->this_instance= instance; autofs_cdevsw->d_open= autofs_dev_open; autofs_cdevsw->d_close= autofs_dev_close; ==== //depot/projects/soc2006/adamartin_autofs/autofs/autofs_ctl.h#6 (text+ko) ==== ==== //depot/projects/soc2006/adamartin_autofs/autofs/autofs_dev.c#7 (text+ko) ==== @@ -140,7 +140,8 @@ { remains= autofs_queue_remaining( q ); /* - * We really should do SOME kind of sleep. This is more a spinlock + * We really should do SOME kind of sleep. This is + * more a spinlock * right now. */ } ==== //depot/projects/soc2006/adamartin_autofs/autofs/autofs_dev.h#5 (text+ko) ==== @@ -50,6 +50,7 @@ struct autofs_dev_bufs; typedef struct autofs_dev_bufs autofs_dev_bufs_t; +typedef struct autofs_dev_bufs autofs_info_t; struct autofs_dev_bufs { @@ -63,6 +64,9 @@ +#define AUTOFS_GET_PRIVATE( p_info )\ + ( (autofs_info_t *) AUTOFS_GET_BUFFERS( p_info ) ) + #define AUTOFS_GET_BUFFERS( p_info )\ ( AUTOFS_DEV_GET_BUFFERS( AUTOFS_GET_DEV( ( p_info ) ) ) ) @@ -70,6 +74,15 @@ #define AUTOFS_DEV_GET_BUFFERS( afs_dev )\ ( (struct autofs_dev_bufs *) ( ( afs_dev )->si_priv ) ) + +#define AUTOFS_DEV_GET_INSTANCE( afs_dev )\ + ( (autofs_instance_t *) ( AUTOFS_DEV_GET_PRIVATE( \ + afs_dev )->this_instance ) ) + +#define AUTOFS_DEV_GET_TXNS( afs_dev )\ + ( (autofs_transaction_t *) ( AUTOFS_DEV_GET_INSTANCE( \ + afs_dev )->in_flight ) ) + #define AUTOFS_GET_DEV( p_info )\ ( (struct cdev *) ( ( p_info )->pi_priv ) ) ==== //depot/projects/soc2006/adamartin_autofs/autofs/autofs_pfsops.c#7 (text+ko) ==== @@ -56,13 +56,16 @@ #include +#include + #include "protocol.h" #include "debug.h" #include "autofs_ctl.h" #include "autofs_dev.h" -MALLOC_DEFINE(M_AUTOFS_MOUNTBUF, "AutoFS mntbuf", "AutoFS mountpoint data, to simulate filesystem contents."); +MALLOC_DEFINE( M_AUTOFS_MOUNTBUF, "AutoFS mntbuf", + "AutoFS mountpoint data, to simulate filesystem contents."); struct pfs_node *foo; @@ -74,23 +77,42 @@ } static int -autofs_attr(PFS_ATTR_ARGS) +autofs_attr( PFS_ATTR_ARGS ) { KPRINTF( "autofs attr called\n" ); return 0; } + +static uint64_t +generate_tid( void ) +{ + struct timeval tm; + + /** Get kernel time, to microsecond **/ + microtime( &tm ); + + /** Generate a 64-bit value: concatenate seconds and useconds. **/ + return ( uint64_t ) + ( ( tm.tv_sec << 32 ) | + ( tm.tv_usec ) ); +} + + static int -autofs_lookup(PFS_LOOKUP_ARGS) +autofs_lookup( PFS_LOOKUP_ARGS ) { struct componentname c= *cnp; struct message_header msg; struct mount_request mr; struct pfs_info *pi; + autofs_info_t *instance; pi= pn->pn_info; + instance= AUTOFS_GET_PRIVATE( pi ); + DEBUG1 KPRINTF( "autofs lookup called\n" ); DEBUG7 KPRINTF( "cn_nameptr= %s, cn_pnbuf= %s\n", c.cn_nameptr, c.cn_pnbuf ); @@ -99,7 +121,7 @@ /* Prepare a mount message */ msg.flags= 0; - msg.transaction_id= 0; + msg.transaction_id= generate_tid(); msg.message_type= COMMAND_MOUNT_REQUEST; msg.message_data= (char *) &mr; @@ -111,7 +133,7 @@ //if( take_autofs_lock( instance, node ) ) //{ - send_mount_request( &msg, AUTOFS_GET_BUFFERS( pi )->output ); + send_mount_request( &msg, instance->output ); //} return 1; ==== //depot/projects/soc2006/adamartin_autofs/autofs/protocol.c#6 (text+ko) ==== @@ -37,6 +37,7 @@ #include "autofs_dev.h" +int process_mount_complete( struct message_header *, autofs_instance_t * ); int @@ -55,3 +56,21 @@ return 0; } + +#define BOGUS ( 0xDEADBEEF ) + +int +process_mount_complete( struct message_header *req, + autofs_instance_t *instance ) +{ + + /* Lookup the mount ID, via TID */ + + /* Set mount's flags to mounted */ + + /* Clear the lock on the mount */ + + /* Send the waiting objects a wakeup */ + + return BOGUS; +} ==== //depot/projects/soc2006/adamartin_autofs/autofs/protocol.h#6 (text+ko) ==== @@ -125,7 +125,8 @@ struct mount_done { uint32_t status; /* Status of the mount-related attempt */ - + #define STATUS_SUCCESS ( 0x00 ) /* No errors */ + /** Other conditions should all be failures. */ }; @@ -157,8 +158,11 @@ struct greeting { uint32_t status; /* The status of the greeting. This may have future - use. */ + use. */ uint32_t proto_ver; /* Kernel supported protocol. */ + + char autofs_id_string[ 1024 ]; /* The CVS Id of the autofs build */ + uint32_t n_mounts; /* Number of mounts to report */ struct managed_mount mounts[]; /* current notion of mount state */ }; ==== //depot/projects/soc2006/adamartin_autofs/pseudofs/pseudofs_vnops.c#4 (text+ko) ==== @@ -411,6 +411,10 @@ } + PFS_RETURN (ENOENT); + + got_pnode: + /* * ADAM Martin: * Use PFS lookup on a resolved Vnode, don't actually get @@ -427,8 +431,6 @@ /**/ - PFS_RETURN (ENOENT); - got_pnode: if (pn != pd->pn_parent && !pn->pn_parent) pn->pn_parent = pd; if (!pfs_visible(curthread, pn, pvd->pvd_pid, NULL)) { From owner-p4-projects@FreeBSD.ORG Wed Jan 10 05:53:38 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E03E516A407; Wed, 10 Jan 2007 05:53: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 91AEA16A415 for ; Wed, 10 Jan 2007 05:53:37 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 6928E13C45B for ; Wed, 10 Jan 2007 05:53:37 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l0A5rbJe054422 for ; Wed, 10 Jan 2007 05:53:37 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0A5rbkC054419 for perforce@freebsd.org; Wed, 10 Jan 2007 05:53:37 GMT (envelope-from kmacy@freebsd.org) Date: Wed, 10 Jan 2007 05:53:37 GMT Message-Id: <200701100553.l0A5rbkC054419@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 112696 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 10 Jan 2007 05:53:38 -0000 http://perforce.freebsd.org/chv.cgi?CH=112696 Change 112696 by kmacy@kmacy_serendipity:sam_wifi on 2007/01/10 05:52:53 fix panic when enabling ad-hoc mode Affected files ... .. //depot/projects/wifi/sys/dev/wi/if_wi.c#28 edit Differences ... ==== //depot/projects/wifi/sys/dev/wi/if_wi.c#28 (text+ko) ==== @@ -827,7 +827,7 @@ ic->ic_opmode == IEEE80211_M_IBSS || ic->ic_opmode == IEEE80211_M_MONITOR || ic->ic_opmode == IEEE80211_M_HOSTAP) - ieee80211_create_ibss(ic, ic->ic_bsschan); + ieee80211_create_ibss(ic, ic->ic_curchan); /* Enable interrupts */ CSR_WRITE_2(sc, WI_INT_EN, WI_INTRS); From owner-p4-projects@FreeBSD.ORG Wed Jan 10 06:16: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 41DC216A40F; Wed, 10 Jan 2007 06:16: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 1CF0116A403 for ; Wed, 10 Jan 2007 06:16:05 +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 0C46D13C428 for ; Wed, 10 Jan 2007 06:16:05 +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 l0A6G4f4058463 for ; Wed, 10 Jan 2007 06:16:04 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0A6G4dV058460 for perforce@freebsd.org; Wed, 10 Jan 2007 06:16:04 GMT (envelope-from sam@freebsd.org) Date: Wed, 10 Jan 2007 06:16:04 GMT Message-Id: <200701100616.l0A6G4dV058460@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 112697 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 10 Jan 2007 06:16:05 -0000 http://perforce.freebsd.org/chv.cgi?CH=112697 Change 112697 by sam@sam_ebb on 2007/01/10 06:15:49 bandaid problem with probing the initial bss node created in adhoc mode; if we send a null data frame w/o any rates defined the driver may blow up; this'll get fixed properly by setting up a proper initial rate set for the node soon Affected files ... .. //depot/projects/wifi/sys/net80211/ieee80211_node.c#75 edit Differences ... ==== //depot/projects/wifi/sys/net80211/ieee80211_node.c#75 (text+ko) ==== @@ -1471,9 +1471,16 @@ * send a null data frame which may not be * universally supported by drivers (need it * for ps-poll support so it should be...). + * + * XXX don't probe the station unless we've + * received a frame from them (and have + * some idea of the rates they are capable + * of); this will get fixed more properly + * soon with better handling of the rate set. */ if (0 < ni->ni_inact && - ni->ni_inact <= ic->ic_inact_probe) { + ni->ni_inact <= ic->ic_inact_probe && + ni->ni_rates.rs_nrates != 0) { IEEE80211_NOTE(ic, IEEE80211_MSG_INACT | IEEE80211_MSG_NODE, ni, "%s", From owner-p4-projects@FreeBSD.ORG Wed Jan 10 06:53:51 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B1A9416A4AB; Wed, 10 Jan 2007 06:53:51 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 7C44216A4A7 for ; Wed, 10 Jan 2007 06:53:51 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 52B9D13C459 for ; Wed, 10 Jan 2007 06:53:51 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l0A6rpBJ065604 for ; Wed, 10 Jan 2007 06:53:51 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0A6rpHf065601 for perforce@freebsd.org; Wed, 10 Jan 2007 06:53:51 GMT (envelope-from imp@freebsd.org) Date: Wed, 10 Jan 2007 06:53:51 GMT Message-Id: <200701100653.l0A6rpHf065601@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 112698 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 10 Jan 2007 06:53:52 -0000 http://perforce.freebsd.org/chv.cgi?CH=112698 Change 112698 by imp@imp_lighthouse on 2007/01/10 06:53:29 fix mismerge Affected files ... .. //depot/projects/arm/src/sys/arm/conf/TSC4370#20 edit Differences ... ==== //depot/projects/arm/src/sys/arm/conf/TSC4370#20 (text+ko) ==== @@ -65,8 +65,7 @@ options MUTEX_NOINLINE options NO_FFS_SNAPSHOT options NO_SWAPPING -options PPS_SYNC # ntp time sync with pps -options ARM32_NEW_VM_LAYOUT + device genclock device loop device random From owner-p4-projects@FreeBSD.ORG Wed Jan 10 06:54: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 74A8916A492; Wed, 10 Jan 2007 06:54: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 3AE7B16A47B for ; Wed, 10 Jan 2007 06:54:53 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 29F6613C45A for ; Wed, 10 Jan 2007 06:54:53 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l0A6srYJ065678 for ; Wed, 10 Jan 2007 06:54:53 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0A6sqfW065675 for perforce@freebsd.org; Wed, 10 Jan 2007 06:54:52 GMT (envelope-from imp@freebsd.org) Date: Wed, 10 Jan 2007 06:54:52 GMT Message-Id: <200701100654.l0A6sqfW065675@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 112699 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 10 Jan 2007 06:54:53 -0000 http://perforce.freebsd.org/chv.cgi?CH=112699 Change 112699 by imp@imp_lighthouse on 2007/01/10 06:54:10 MF FreeBSD-tsc-6: for flash writes, we have to wait until the device can handle the next write before starting it. Affected files ... .. //depot/projects/arm/src/sys/dev/flash/at45d.c#12 edit Differences ... ==== //depot/projects/arm/src/sys/dev/flash/at45d.c#12 (text+ko) ==== @@ -77,94 +77,6 @@ #define PROGRAM_THROUGH_BUFFER 0x82 #define MANUFACTURER_ID 0x9F -#if 0 - -/*************************** GLOBAL FUNCTIONS ********************************/ - - -/* - * .KB_C_FN_DEFINITION_START - * void SPI_ReadFlash(unsigned flash_addr, unsigned dest_addr, unsigned size) - * Global function to read the SPI flash device using the continuous read - * array command. - * .KB_C_FN_DEFINITION_END - */ -void -SPI_ReadFlash(unsigned flash_addr, char *dest_addr, unsigned size) -{ - unsigned pageAddress, byteAddress; - - // determine page address - pageAddress = flash_addr / FLASH_PAGE_SIZE; - - // determine byte address - byteAddress = flash_addr % FLASH_PAGE_SIZE; - - p_memset(tx_commandBuffer, 0, 8); - tx_commandBuffer[0] = CONTINUOUS_ARRAY_READ_HF; - tx_commandBuffer[1] = ((pageAddress >> 5) & 0xFF); - tx_commandBuffer[2] = ((pageAddress << 3) & 0xF8) | - ((byteAddress >> 8) & 0x7); - tx_commandBuffer[3] = byteAddress & 0xFF; - spi_command.tx_cmd = tx_commandBuffer; - spi_command.tx_cmd_size = 5; - spi_command.tx_data_size = size; - spi_command.tx_data = dest_addr; - - p_memset(rx_commandBuffer, 0, 8); - spi_command.rx_cmd = rx_commandBuffer; - spi_command.rx_cmd_size = 5; - spi_command.rx_data_size = size; - spi_command.rx_data = dest_addr; - - SendCommand(&spi_command); -} - - -/* - * .KB_C_FN_DEFINITION_START - * void SPI_WriteFlash(unsigned flash_addr, unsigned src_addr, unsigned size) - * Global function to program the SPI flash device. Notice the warning - * provided in lower-level functions regarding corruption of data in non- - * page aligned write operations. - * .KB_C_FN_DEFINITION_END - */ -void -SPI_WriteFlash(unsigned flash_addr, char *src_addr, unsigned size) -{ - unsigned pageAddress, byteAddress; - - // determine page address - pageAddress = flash_addr / FLASH_PAGE_SIZE; - - // determine byte address - byteAddress = flash_addr % FLASH_PAGE_SIZE; - - p_memset(tx_commandBuffer, 0, 8); - tx_commandBuffer[0] = PROGRAM_THROUGH_BUFFER; - tx_commandBuffer[1] = ((pageAddress >> 5) & 0xFF); - tx_commandBuffer[2] = ((pageAddress << 3) & 0xF8) | - ((byteAddress >> 8) & 0x7); - tx_commandBuffer[3] = (byteAddress & 0xFF); - - p_memset(rx_commandBuffer, 0, 8); - - spi_command.tx_cmd = tx_commandBuffer; - spi_command.rx_cmd = rx_commandBuffer; - spi_command.rx_cmd_size = 4; - spi_command.tx_cmd_size = 4; - - spi_command.tx_data_size = size; - spi_command.tx_data = src_addr; - spi_command.rx_data_size = size; - spi_command.rx_data = src_addr; - - SendCommand(&spi_command); - - WaitForDeviceReady(); -} -#endif - static uint8_t at45d_get_status(device_t dev) { @@ -255,9 +167,7 @@ uint8_t buf[4]; at45d_get_mfg_info(sc->dev, buf); -// printf("Reply is %#x %#x %#x %#x\n", buf[0], buf[1], buf[2], buf[3]); at45d_wait_for_device_ready(sc->dev); -// printf("Status is %#x\n", at45d_get_status(sc->dev)); sc->disk = disk_alloc(); sc->disk->d_open = at45d_open; @@ -349,6 +259,8 @@ cmd.rx_data_sz = sz; err = SPIBUS_TRANSFER(pdev, dev, &cmd); // XXX err check? + if (bp->bio_cmd != BIO_READ) + at45d_wait_for_device_ready(dev); } biodone(bp); } From owner-p4-projects@FreeBSD.ORG Wed Jan 10 06:56: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 80D7E16A417; Wed, 10 Jan 2007 06:56: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 43A9516A415 for ; Wed, 10 Jan 2007 06:56:56 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 32D9113C458 for ; Wed, 10 Jan 2007 06:56:56 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l0A6uuFB065803 for ; Wed, 10 Jan 2007 06:56:56 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0A6uuTm065800 for perforce@freebsd.org; Wed, 10 Jan 2007 06:56:56 GMT (envelope-from imp@freebsd.org) Date: Wed, 10 Jan 2007 06:56:56 GMT Message-Id: <200701100656.l0A6uuTm065800@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 112700 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 10 Jan 2007 06:56:56 -0000 http://perforce.freebsd.org/chv.cgi?CH=112700 Change 112700 by imp@imp_lighthouse on 2007/01/10 06:56:33 MF FreeBSD-tsc-6: slow down spi bus enough to make the dataflash parts reliable on read. MCK / 2 is too fast. I think MCK / 4 would work too, but MCK / 20 was rock solid. I think this works in the boot loader because we're running with the caches off, slowing things down, but I am actually a bit baffled. Maybe I just have a bad board... Affected files ... .. //depot/projects/arm/src/sys/arm/at91/at91_spi.c#16 edit Differences ... ==== //depot/projects/arm/src/sys/arm/at91/at91_spi.c#16 (text+ko) ==== @@ -115,7 +115,7 @@ WR4(sc, SPI_MR, (0xf << 24) | SPI_MR_MSTR | SPI_MR_MODFDIS | (0xE << 16)); - WR4(sc, SPI_CSR0, SPI_CSR_CPOL | (4 << 16) | (2 << 8)); + WR4(sc, SPI_CSR0, SPI_CSR_CPOL | (4 << 16) | (20 << 8)); WR4(sc, SPI_CR, SPI_CR_SPIEN); WR4(sc, PDC_PTCR, PDC_PTCR_TXTDIS); From owner-p4-projects@FreeBSD.ORG Wed Jan 10 07:03: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 BC7BA16A415; Wed, 10 Jan 2007 07:03: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 7EA2F16A40F for ; Wed, 10 Jan 2007 07:03:04 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 6DBA513C428 for ; Wed, 10 Jan 2007 07:03:04 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l0A734s7068014 for ; Wed, 10 Jan 2007 07:03:04 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0A734xi068010 for perforce@freebsd.org; Wed, 10 Jan 2007 07:03:04 GMT (envelope-from imp@freebsd.org) Date: Wed, 10 Jan 2007 07:03:04 GMT Message-Id: <200701100703.l0A734xi068010@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 112701 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 10 Jan 2007 07:03:05 -0000 http://perforce.freebsd.org/chv.cgi?CH=112701 Change 112701 by imp@imp_lighthouse on 2007/01/10 07:02:04 Add a comment about why we need to do the dance we do with enabling the PDC, along with a simplified version of the code. Affected files ... .. //depot/projects/arm/src/sys/arm/at91/at91_mci.c#30 edit Differences ... ==== //depot/projects/arm/src/sys/arm/at91/at91_mci.c#30 (text+ko) ==== @@ -402,16 +402,27 @@ } } // printf("CMDR %x ARGR %x with data\n", cmdr, cmd->arg); + /* + * For Reads, we need to enable the DMA buffer before we send + * the command. For writes, alas, it has to be enabled after + * we send the command. If enabled after the CMDR write for + * reads, fast SD parts could win the race that's present and + * the result would be corrupted data because the ENDRX bit + * would be set, but the dma wouldn't have started yet. When + * that interrupt returned, we'd enable DMA. We'd then get a + * RXBUFF interrupt and then a CMDRDY interrupt. We'd process + * things int he ISR. But since the DMA started after we got + * the ENDRX and RXBUFF interrupts, when we got the CMDRDY + * interrupt the data would still be in flight, leading to + * corruption. This race was 'hard' to trigger for slow parts, + * but easy to trigger for faster ones. + */ WR4(sc, MCI_ARGR, cmd->arg); - if (cmdr & MCI_CMDR_TRCMD_START) { - if (cmdr & MCI_CMDR_TRDIR) { - WR4(sc, PDC_PTCR, PDC_PTCR_RXTEN); - WR4(sc, MCI_CMDR, cmdr); - } else { - WR4(sc, MCI_CMDR, cmdr); - WR4(sc, PDC_PTCR, PDC_PTCR_TXTEN); - } - } + if ((cmdr & MCI_CMDR_TRCMD_START) && (cmdr & MCI_CMDR_TRDIR)) + WR4(sc, PDC_PTCR, PDC_PTCR_RXTEN); + WR4(sc, MCI_CMDR, cmdr); + if ((cmdr & MCI_CMDR_TRCMD_START) && !(cmdr & MCI_CMDR_TRDIR)) + WR4(sc, PDC_PTCR, PDC_PTCR_TXTEN); WR4(sc, MCI_IER, MCI_SR_ERROR | ier); } From owner-p4-projects@FreeBSD.ORG Wed Jan 10 07:11:15 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 23C1D16A40F; Wed, 10 Jan 2007 07:11:15 +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 F2CC016A403 for ; Wed, 10 Jan 2007 07:11:14 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id E214613C459 for ; Wed, 10 Jan 2007 07:11:14 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l0A7BEl8069109 for ; Wed, 10 Jan 2007 07:11:14 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0A7BE1s069102 for perforce@freebsd.org; Wed, 10 Jan 2007 07:11:14 GMT (envelope-from kmacy@freebsd.org) Date: Wed, 10 Jan 2007 07:11:14 GMT Message-Id: <200701100711.l0A7BE1s069102@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 112702 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 10 Jan 2007 07:11:15 -0000 http://perforce.freebsd.org/chv.cgi?CH=112702 Change 112702 by kmacy@kmacy_storage:sam_wifi on 2007/01/10 07:10:28 a more correct fix for creating an ibss - but channels set by ifconfig still are not sticking Affected files ... .. //depot/projects/wifi/sys/dev/wi/if_wi.c#29 edit .. //depot/projects/wifi/sys/dev/wi/if_wivar.h#10 edit Differences ... ==== //depot/projects/wifi/sys/dev/wi/if_wi.c#29 (text+ko) ==== @@ -480,7 +480,7 @@ sc->sc_system_scale = 1; sc->sc_cnfauthmode = IEEE80211_AUTH_OPEN; sc->sc_roaming_mode = 1; - + sc->wi_channel = IEEE80211_CHAN_ANYC; sc->sc_portnum = WI_DEFAULT_PORT; sc->sc_authtype = WI_DEFAULT_AUTHTYPE; @@ -669,6 +669,7 @@ struct ifnet *ifp = sc->sc_ifp; struct ieee80211com *ic = &sc->sc_ic; struct wi_joinreq join; + struct ieee80211_channel *chan; int i; int error = 0, wasenabled; @@ -826,9 +827,11 @@ if (ic->ic_opmode == IEEE80211_M_AHDEMO || ic->ic_opmode == IEEE80211_M_IBSS || ic->ic_opmode == IEEE80211_M_MONITOR || - ic->ic_opmode == IEEE80211_M_HOSTAP) - ieee80211_create_ibss(ic, ic->ic_curchan); - + ic->ic_opmode == IEEE80211_M_HOSTAP) { + chan = (sc->wi_channel == IEEE80211_CHAN_ANYC) ? + ic->ic_curchan : sc->wi_channel; + ieee80211_create_ibss(ic, chan); + } /* Enable interrupts */ CSR_WRITE_2(sc, WI_INT_EN, WI_INTRS); @@ -3501,7 +3504,14 @@ static void wi_set_channel(struct ieee80211com *ic) { - return; + struct ifnet *ifp = ic->ic_ifp; + struct wi_softc *sc = ifp->if_softc; + + WI_LOCK(sc); + if (!(sc->sc_flags & WI_FLAGS_SCANNING)) { + sc->wi_channel = ic->ic_curchan; + } + WI_UNLOCK(sc); } static void @@ -3511,6 +3521,7 @@ struct wi_softc *sc = ifp->if_softc; WI_LOCK(sc); + sc->sc_flags |= WI_FLAGS_SCANNING; wi_scan_ap(sc, 0x3fff, 0x000f); WI_UNLOCK(sc); @@ -3519,5 +3530,10 @@ static void wi_scan_end(struct ieee80211com *ic) { - return; + struct ifnet *ifp = ic->ic_ifp; + struct wi_softc *sc = ifp->if_softc; + + WI_LOCK(sc); + sc->sc_flags &= ~WI_FLAGS_SCANNING; + WI_UNLOCK(sc); } ==== //depot/projects/wifi/sys/dev/wi/if_wivar.h#10 (text+ko) ==== @@ -100,6 +100,7 @@ bus_space_handle_t wi_bmemhandle; bus_space_tag_t wi_bmemtag; void * wi_intrhand; + struct ieee80211_channel *wi_channel; int wi_io_addr; int wi_cmd_count; @@ -108,7 +109,7 @@ int sc_if_flags; int sc_bap_id; int sc_bap_off; - + u_int16_t sc_procframe; u_int16_t sc_portnum; @@ -201,6 +202,8 @@ #define WI_FLAGS_BUG_AUTOINC 0x0100 #define WI_FLAGS_HAS_FRAGTHR 0x0200 #define WI_FLAGS_HAS_DBMADJUST 0x0400 +#define WI_FLAGS_SCANNING 0x0800 + /* driver-specific node state */ struct wi_node { From owner-p4-projects@FreeBSD.ORG Wed Jan 10 08:35:00 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 25DF416A415; Wed, 10 Jan 2007 08:35:00 +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 D623B16A407 for ; Wed, 10 Jan 2007 08:34:59 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id AD43D13C428 for ; Wed, 10 Jan 2007 08:34:59 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l0A8YxKC082513 for ; Wed, 10 Jan 2007 08:34:59 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0A8YxB7082510 for perforce@freebsd.org; Wed, 10 Jan 2007 08:34:59 GMT (envelope-from imp@freebsd.org) Date: Wed, 10 Jan 2007 08:34:59 GMT Message-Id: <200701100834.l0A8YxB7082510@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 112703 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 10 Jan 2007 08:35:00 -0000 http://perforce.freebsd.org/chv.cgi?CH=112703 Change 112703 by imp@imp_lighthouse on 2007/01/10 08:34:50 Return time_state rather than 0/-1 to userland. Affected files ... .. //depot/projects/arm/src/sys/kern/kern_ntptime.c#4 edit Differences ... ==== //depot/projects/arm/src/sys/kern/kern_ntptime.c#4 (text+ko) ==== @@ -268,6 +268,7 @@ ntp_gettime1(&ntv); mtx_unlock(&Giant); + td->td_retvall[0] = ntv.time_state; return (copyout(&ntv, uap->ntvp, sizeof(ntv))); } From owner-p4-projects@FreeBSD.ORG Wed Jan 10 09:41: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 D5AF016A407; Wed, 10 Jan 2007 09:41: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 AF43116A417 for ; Wed, 10 Jan 2007 09:41:53 +0000 (UTC) (envelope-from ticso@cicely12.cicely.de) Received: from raven.bwct.de (raven.bwct.de [85.159.14.73]) by mx1.freebsd.org (Postfix) with ESMTP id 41D5F13C44C for ; Wed, 10 Jan 2007 09:41:53 +0000 (UTC) (envelope-from ticso@cicely12.cicely.de) Received: from cicely5.cicely.de ([10.1.1.7]) by raven.bwct.de (8.13.4/8.13.4) with ESMTP id l0A9JUX2062431; Wed, 10 Jan 2007 10:19:30 +0100 (CET) (envelope-from ticso@cicely12.cicely.de) Received: from cicely12.cicely.de (cicely12.cicely.de [10.1.1.14]) by cicely5.cicely.de (8.13.4/8.13.4) with ESMTP id l0A9JJw9022498 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Wed, 10 Jan 2007 10:19:19 +0100 (CET) (envelope-from ticso@cicely12.cicely.de) Received: from cicely12.cicely.de (localhost [127.0.0.1]) by cicely12.cicely.de (8.13.4/8.13.3) with ESMTP id l0A9JJUa087099; Wed, 10 Jan 2007 10:19:19 +0100 (CET) (envelope-from ticso@cicely12.cicely.de) Received: (from ticso@localhost) by cicely12.cicely.de (8.13.4/8.13.3/Submit) id l0A9JJ7l087098; Wed, 10 Jan 2007 10:19:19 +0100 (CET) (envelope-from ticso) Date: Wed, 10 Jan 2007 10:19:18 +0100 From: Bernd Walter To: Warner Losh Message-ID: <20070110091917.GF80390@cicely12.cicely.de> References: <200701100656.l0A6uuTm065800@repoman.freebsd.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <200701100656.l0A6uuTm065800@repoman.freebsd.org> X-Operating-System: FreeBSD cicely12.cicely.de 5.4-STABLE alpha User-Agent: Mutt/1.5.9i X-Spam-Status: No, score=-4.4 required=5.0 tests=ALL_TRUSTED=-1.8, BAYES_00=-2.599 autolearn=ham version=3.1.7 X-Spam-Checker-Version: SpamAssassin 3.1.7 (2006-10-05) on cicely12.cicely.de Cc: Perforce Change Reviews Subject: Re: PERFORCE change 112700 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: ticso@cicely.de List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 10 Jan 2007 09:41:54 -0000 On Wed, Jan 10, 2007 at 06:56:56AM +0000, Warner Losh wrote: > http://perforce.freebsd.org/chv.cgi?CH=112700 > > Change 112700 by imp@imp_lighthouse on 2007/01/10 06:56:33 > > MF FreeBSD-tsc-6: slow down spi bus enough to make the dataflash > parts reliable on read. MCK / 2 is too fast. I think MCK / 4 > would work too, but MCK / 20 was rock solid. > > I think this works in the boot loader because we're running with > the caches off, slowing things down, but I am actually a bit > baffled. Maybe I just have a bad board... Mmm - you have a 'D' type flash, which allows 33MHz in low frequency mode. My 'C' type allows 33MHz as well. So in theory MCK/2 (30MHz) should work. Older 'B' type max out at 20MHz. I've just used flash access in the bootloader however. > Affected files ... > > .. //depot/projects/arm/src/sys/arm/at91/at91_spi.c#16 edit > > Differences ... > > ==== //depot/projects/arm/src/sys/arm/at91/at91_spi.c#16 (text+ko) ==== > > @@ -115,7 +115,7 @@ > WR4(sc, SPI_MR, (0xf << 24) | SPI_MR_MSTR | SPI_MR_MODFDIS | > (0xE << 16)); > > - WR4(sc, SPI_CSR0, SPI_CSR_CPOL | (4 << 16) | (2 << 8)); > + WR4(sc, SPI_CSR0, SPI_CSR_CPOL | (4 << 16) | (20 << 8)); > WR4(sc, SPI_CR, SPI_CR_SPIEN); > > WR4(sc, PDC_PTCR, PDC_PTCR_TXTDIS); -- B.Walter http://www.bwct.de http://www.fizon.de bernd@bwct.de info@bwct.de support@fizon.de From owner-p4-projects@FreeBSD.ORG Wed Jan 10 09:41:55 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3F00616A562; Wed, 10 Jan 2007 09:41:55 +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 0416F16A55A for ; Wed, 10 Jan 2007 09:41:54 +0000 (UTC) (envelope-from ticso@cicely12.cicely.de) Received: from raven.bwct.de (raven.bwct.de [85.159.14.73]) by mx1.freebsd.org (Postfix) with ESMTP id 3A5C913C448 for ; Wed, 10 Jan 2007 09:41:54 +0000 (UTC) (envelope-from ticso@cicely12.cicely.de) Received: from cicely5.cicely.de ([10.1.1.7]) by raven.bwct.de (8.13.4/8.13.4) with ESMTP id l0A9N0Qb062506; Wed, 10 Jan 2007 10:23:00 +0100 (CET) (envelope-from ticso@cicely12.cicely.de) Received: from cicely12.cicely.de (cicely12.cicely.de [10.1.1.14]) by cicely5.cicely.de (8.13.4/8.13.4) with ESMTP id l0A9MqOb022548 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Wed, 10 Jan 2007 10:22:53 +0100 (CET) (envelope-from ticso@cicely12.cicely.de) Received: from cicely12.cicely.de (localhost [127.0.0.1]) by cicely12.cicely.de (8.13.4/8.13.3) with ESMTP id l0A9MqwZ087123; Wed, 10 Jan 2007 10:22:52 +0100 (CET) (envelope-from ticso@cicely12.cicely.de) Received: (from ticso@localhost) by cicely12.cicely.de (8.13.4/8.13.3/Submit) id l0A9Mqij087122; Wed, 10 Jan 2007 10:22:52 +0100 (CET) (envelope-from ticso) Date: Wed, 10 Jan 2007 10:22:52 +0100 From: Bernd Walter To: Warner Losh Message-ID: <20070110092251.GG80390@cicely12.cicely.de> References: <200701100703.l0A734xi068010@repoman.freebsd.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <200701100703.l0A734xi068010@repoman.freebsd.org> X-Operating-System: FreeBSD cicely12.cicely.de 5.4-STABLE alpha User-Agent: Mutt/1.5.9i X-Spam-Status: No, score=-4.4 required=5.0 tests=ALL_TRUSTED=-1.8, BAYES_00=-2.599 autolearn=ham version=3.1.7 X-Spam-Checker-Version: SpamAssassin 3.1.7 (2006-10-05) on cicely12.cicely.de Cc: Perforce Change Reviews Subject: Re: PERFORCE change 112701 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: ticso@cicely.de List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 10 Jan 2007 09:41:55 -0000 On Wed, Jan 10, 2007 at 07:03:04AM +0000, Warner Losh wrote: > http://perforce.freebsd.org/chv.cgi?CH=112701 > > Change 112701 by imp@imp_lighthouse on 2007/01/10 07:02:04 > > Add a comment about why we need to do the dance we do with enabling > the PDC, along with a simplified version of the code. > > Affected files ... > > .. //depot/projects/arm/src/sys/arm/at91/at91_mci.c#30 edit > > Differences ... > > ==== //depot/projects/arm/src/sys/arm/at91/at91_mci.c#30 (text+ko) ==== > > @@ -402,16 +402,27 @@ > } > } > // printf("CMDR %x ARGR %x with data\n", cmdr, cmd->arg); > + /* > + * For Reads, we need to enable the DMA buffer before we send > + * the command. For writes, alas, it has to be enabled after > + * we send the command. If enabled after the CMDR write for > + * reads, fast SD parts could win the race that's present and > + * the result would be corrupted data because the ENDRX bit > + * would be set, but the dma wouldn't have started yet. When > + * that interrupt returned, we'd enable DMA. We'd then get a > + * RXBUFF interrupt and then a CMDRDY interrupt. We'd process > + * things int he ISR. But since the DMA started after we got > + * the ENDRX and RXBUFF interrupts, when we got the CMDRDY > + * interrupt the data would still be in flight, leading to > + * corruption. This race was 'hard' to trigger for slow parts, > + * but easy to trigger for faster ones. > + */ > WR4(sc, MCI_ARGR, cmd->arg); > - if (cmdr & MCI_CMDR_TRCMD_START) { > - if (cmdr & MCI_CMDR_TRDIR) { > - WR4(sc, PDC_PTCR, PDC_PTCR_RXTEN); > - WR4(sc, MCI_CMDR, cmdr); > - } else { > - WR4(sc, MCI_CMDR, cmdr); > - WR4(sc, PDC_PTCR, PDC_PTCR_TXTEN); > - } > - } > + if ((cmdr & MCI_CMDR_TRCMD_START) && (cmdr & MCI_CMDR_TRDIR)) > + WR4(sc, PDC_PTCR, PDC_PTCR_RXTEN); > + WR4(sc, MCI_CMDR, cmdr); > + if ((cmdr & MCI_CMDR_TRCMD_START) && !(cmdr & MCI_CMDR_TRDIR)) > + WR4(sc, PDC_PTCR, PDC_PTCR_TXTEN); > WR4(sc, MCI_IER, MCI_SR_ERROR | ier); > } > This moves MCI_CMDR writing out of the (cmdr & MCI_CMDR_TRCMD_START) check. -- B.Walter http://www.bwct.de http://www.fizon.de bernd@bwct.de info@bwct.de support@fizon.de From owner-p4-projects@FreeBSD.ORG Wed Jan 10 11:14:19 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 6CF0016A415; Wed, 10 Jan 2007 11:14:19 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 46AEF16A403 for ; Wed, 10 Jan 2007 11:14:19 +0000 (UTC) (envelope-from zec@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 36B5813C458 for ; Wed, 10 Jan 2007 11:14:19 +0000 (UTC) (envelope-from zec@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l0ABEJEm018126 for ; Wed, 10 Jan 2007 11:14:19 GMT (envelope-from zec@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0ABEGMF018123 for perforce@freebsd.org; Wed, 10 Jan 2007 11:14:16 GMT (envelope-from zec@FreeBSD.org) Date: Wed, 10 Jan 2007 11:14:16 GMT Message-Id: <200701101114.l0ABEGMF018123@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@FreeBSD.org using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 112704 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 10 Jan 2007 11:14:19 -0000 http://perforce.freebsd.org/chv.cgi?CH=112704 Change 112704 by zec@zec_tpx32 on 2007/01/10 11:13:48 IFC Affected files ... .. //depot/projects/vimage/src/sys/amd64/include/atomic.h#2 integrate .. //depot/projects/vimage/src/sys/amd64/linux32/linux32_dummy.c#2 integrate .. //depot/projects/vimage/src/sys/amd64/linux32/linux32_machdep.c#3 integrate .. //depot/projects/vimage/src/sys/amd64/linux32/linux32_proto.h#2 integrate .. //depot/projects/vimage/src/sys/amd64/linux32/linux32_syscall.h#2 integrate .. //depot/projects/vimage/src/sys/amd64/linux32/linux32_sysent.c#2 integrate .. //depot/projects/vimage/src/sys/amd64/linux32/syscalls.master#2 integrate .. //depot/projects/vimage/src/sys/arm/at91/at91_mci.c#2 integrate .. //depot/projects/vimage/src/sys/arm/at91/at91_pioreg.h#2 integrate .. //depot/projects/vimage/src/sys/arm/at91/at91_pmc.c#2 integrate .. //depot/projects/vimage/src/sys/arm/at91/at91_spireg.h#2 integrate .. //depot/projects/vimage/src/sys/arm/at91/at91_st.c#3 integrate .. //depot/projects/vimage/src/sys/arm/at91/files.at91#2 integrate .. //depot/projects/vimage/src/sys/arm/at91/if_ate.c#2 integrate .. //depot/projects/vimage/src/sys/arm/conf/BWCT#1 branch .. //depot/projects/vimage/src/sys/arm/conf/BWCT.hints#1 branch .. //depot/projects/vimage/src/sys/arm/include/atomic.h#2 integrate .. //depot/projects/vimage/src/sys/bsm/audit.h#2 integrate .. //depot/projects/vimage/src/sys/bsm/audit_internal.h#2 integrate .. //depot/projects/vimage/src/sys/bsm/audit_kevents.h#2 integrate .. //depot/projects/vimage/src/sys/bsm/audit_record.h#2 integrate .. //depot/projects/vimage/src/sys/compat/linux/linux_emul.c#2 integrate .. //depot/projects/vimage/src/sys/compat/linux/linux_emul.h#2 integrate .. //depot/projects/vimage/src/sys/compat/linux/linux_mib.c#2 integrate .. //depot/projects/vimage/src/sys/compat/linux/linux_mib.h#2 integrate .. //depot/projects/vimage/src/sys/compat/linux/linux_misc.c#3 integrate .. //depot/projects/vimage/src/sys/compat/linux/linux_misc.h#2 integrate .. //depot/projects/vimage/src/sys/compat/linux/linux_signal.c#2 integrate .. //depot/projects/vimage/src/sys/conf/NOTES#4 integrate .. //depot/projects/vimage/src/sys/conf/files#5 integrate .. //depot/projects/vimage/src/sys/conf/kern.post.mk#2 integrate .. //depot/projects/vimage/src/sys/conf/options#5 integrate .. //depot/projects/vimage/src/sys/conf/options.arm#2 integrate .. //depot/projects/vimage/src/sys/contrib/pf/net/if_pfsync.c#2 integrate .. //depot/projects/vimage/src/sys/contrib/pf/net/pf.c#2 integrate .. //depot/projects/vimage/src/sys/contrib/pf/net/pf_ioctl.c#2 integrate .. //depot/projects/vimage/src/sys/dev/aic7xxx/aic7xxx.seq#2 integrate .. //depot/projects/vimage/src/sys/dev/aic7xxx/aicasm/aicasm_gram.y#2 integrate .. //depot/projects/vimage/src/sys/dev/aic7xxx/aicasm/aicasm_macro_gram.y#2 integrate .. //depot/projects/vimage/src/sys/dev/arl/if_arl.c#2 integrate .. //depot/projects/vimage/src/sys/dev/ata/ata-chipset.c#2 integrate .. //depot/projects/vimage/src/sys/dev/ata/ata-pci.h#2 integrate .. //depot/projects/vimage/src/sys/dev/ath/if_ath.c#3 integrate .. //depot/projects/vimage/src/sys/dev/ath/if_athvar.h#3 integrate .. //depot/projects/vimage/src/sys/dev/bktr/bktr_i2c.c#2 integrate .. //depot/projects/vimage/src/sys/dev/ce/if_ce.c#2 integrate .. //depot/projects/vimage/src/sys/dev/cp/if_cp.c#2 integrate .. //depot/projects/vimage/src/sys/dev/ctau/if_ct.c#2 integrate .. //depot/projects/vimage/src/sys/dev/cx/if_cx.c#2 integrate .. //depot/projects/vimage/src/sys/dev/drm/drm_agpsupport.c#2 integrate .. //depot/projects/vimage/src/sys/dev/en/midway.c#2 integrate .. //depot/projects/vimage/src/sys/dev/firewire/if_fwip.c#2 integrate .. //depot/projects/vimage/src/sys/dev/hptmv/entry.c#2 integrate .. //depot/projects/vimage/src/sys/dev/if_ndis/if_ndis.c#2 integrate .. //depot/projects/vimage/src/sys/dev/isp/isp.c#4 integrate .. //depot/projects/vimage/src/sys/dev/isp/isp_freebsd.h#2 integrate .. //depot/projects/vimage/src/sys/dev/isp/isp_pci.c#4 integrate .. //depot/projects/vimage/src/sys/dev/mfi/mfi.c#3 integrate .. //depot/projects/vimage/src/sys/dev/mii/miidevs#3 integrate .. //depot/projects/vimage/src/sys/dev/mii/rlswitch.c#1 branch .. //depot/projects/vimage/src/sys/dev/mpt/mpt.c#3 integrate .. //depot/projects/vimage/src/sys/dev/mpt/mpt.h#3 integrate .. //depot/projects/vimage/src/sys/dev/mpt/mpt_cam.c#4 integrate .. //depot/projects/vimage/src/sys/dev/mpt/mpt_pci.c#3 integrate .. //depot/projects/vimage/src/sys/dev/msk/if_msk.c#2 integrate .. //depot/projects/vimage/src/sys/dev/msk/if_mskreg.h#2 integrate .. //depot/projects/vimage/src/sys/dev/my/if_my.c#2 integrate .. //depot/projects/vimage/src/sys/dev/pci/pci.c#3 integrate .. //depot/projects/vimage/src/sys/dev/ppbus/if_plip.c#2 integrate .. //depot/projects/vimage/src/sys/dev/sound/pci/emu10kx-pcm.c#2 integrate .. //depot/projects/vimage/src/sys/dev/sound/pci/emu10kx.c#2 integrate .. //depot/projects/vimage/src/sys/dev/sound/pci/emu10kx.h#2 integrate .. //depot/projects/vimage/src/sys/dev/sound/pci/hda/hdac.c#4 integrate .. //depot/projects/vimage/src/sys/dev/sound/pcm/feeder.c#2 integrate .. //depot/projects/vimage/src/sys/dev/sound/usb/uaudio.c#2 integrate .. //depot/projects/vimage/src/sys/dev/usb/usbdi_util.h#2 integrate .. //depot/projects/vimage/src/sys/fs/msdosfs/bpb.h#3 integrate .. //depot/projects/vimage/src/sys/fs/msdosfs/msdosfs_vfsops.c#3 integrate .. //depot/projects/vimage/src/sys/fs/pseudofs/pseudofs_vncache.c#2 integrate .. //depot/projects/vimage/src/sys/fs/unionfs/union_subr.c#3 integrate .. //depot/projects/vimage/src/sys/fs/unionfs/union_vnops.c#3 integrate .. //depot/projects/vimage/src/sys/i386/include/atomic.h#2 integrate .. //depot/projects/vimage/src/sys/i386/linux/linux_dummy.c#2 integrate .. //depot/projects/vimage/src/sys/i386/linux/linux_proto.h#3 integrate .. //depot/projects/vimage/src/sys/i386/linux/linux_syscall.h#3 integrate .. //depot/projects/vimage/src/sys/i386/linux/linux_sysent.c#3 integrate .. //depot/projects/vimage/src/sys/i386/linux/syscalls.master#3 integrate .. //depot/projects/vimage/src/sys/i4b/driver/i4b_ipr.c#2 integrate .. //depot/projects/vimage/src/sys/isa/pnpparse.c#2 integrate .. //depot/projects/vimage/src/sys/kern/kern_descrip.c#2 integrate .. //depot/projects/vimage/src/sys/kern/kern_mac.c#3 delete .. //depot/projects/vimage/src/sys/kern/kern_switch.c#3 integrate .. //depot/projects/vimage/src/sys/kern/kern_synch.c#4 integrate .. //depot/projects/vimage/src/sys/kern/kern_thread.c#4 integrate .. //depot/projects/vimage/src/sys/kern/sched_4bsd.c#4 integrate .. //depot/projects/vimage/src/sys/kern/sched_core.c#2 integrate .. //depot/projects/vimage/src/sys/kern/sched_ule.c#3 edit .. //depot/projects/vimage/src/sys/kern/uipc_usrreq.c#2 integrate .. //depot/projects/vimage/src/sys/modules/netgraph/Makefile#2 integrate .. //depot/projects/vimage/src/sys/modules/netgraph/deflate/Makefile#1 branch .. //depot/projects/vimage/src/sys/modules/netgraph/pred1/Makefile#1 branch .. //depot/projects/vimage/src/sys/modules/sound/driver/emu10kx/Makefile#2 integrate .. //depot/projects/vimage/src/sys/net/ethernet.h#2 integrate .. //depot/projects/vimage/src/sys/net/if_enc.c#2 integrate .. //depot/projects/vimage/src/sys/net/if_media.h#2 integrate .. //depot/projects/vimage/src/sys/net/if_vlan.c#2 integrate .. //depot/projects/vimage/src/sys/net80211/_ieee80211.h#2 integrate .. //depot/projects/vimage/src/sys/net80211/ieee80211.c#2 integrate .. //depot/projects/vimage/src/sys/net80211/ieee80211_node.c#2 integrate .. //depot/projects/vimage/src/sys/net80211/ieee80211_output.c#3 integrate .. //depot/projects/vimage/src/sys/net80211/ieee80211_proto.c#2 integrate .. //depot/projects/vimage/src/sys/net80211/ieee80211_var.h#2 integrate .. //depot/projects/vimage/src/sys/netgraph/ng_deflate.c#1 branch .. //depot/projects/vimage/src/sys/netgraph/ng_deflate.h#1 branch .. //depot/projects/vimage/src/sys/netgraph/ng_ppp.c#2 integrate .. //depot/projects/vimage/src/sys/netgraph/ng_ppp.h#2 integrate .. //depot/projects/vimage/src/sys/netgraph/ng_pred1.c#1 branch .. //depot/projects/vimage/src/sys/netgraph/ng_pred1.h#1 branch .. //depot/projects/vimage/src/sys/netgraph/ng_sppp.c#2 integrate .. //depot/projects/vimage/src/sys/netinet/in.h#2 integrate .. //depot/projects/vimage/src/sys/netinet/in_pcb.c#5 integrate .. //depot/projects/vimage/src/sys/netinet/ip_divert.c#3 integrate .. //depot/projects/vimage/src/sys/netinet/ip_fw.h#2 integrate .. //depot/projects/vimage/src/sys/netinet/ip_fw2.c#4 integrate .. //depot/projects/vimage/src/sys/netinet/ip_fw_pfil.c#2 integrate .. //depot/projects/vimage/src/sys/netinet/raw_ip.c#5 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_asconf.c#3 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_asconf.h#2 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_auth.c#2 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_bsd_addr.c#2 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_indata.c#3 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_input.c#3 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_os.h#2 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_os_bsd.h#3 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_output.c#3 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_pcb.c#3 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_pcb.h#3 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_structs.h#3 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_timer.c#3 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_usrreq.c#3 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_var.h#2 integrate .. //depot/projects/vimage/src/sys/netinet/sctputil.c#3 integrate .. //depot/projects/vimage/src/sys/netinet/tcp_subr.c#7 integrate .. //depot/projects/vimage/src/sys/netinet/udp_usrreq.c#5 integrate .. //depot/projects/vimage/src/sys/netinet6/sctp6_usrreq.c#3 integrate .. //depot/projects/vimage/src/sys/nfsserver/nfs_srvsubs.c#2 integrate .. //depot/projects/vimage/src/sys/nfsserver/nfsm_subs.h#2 integrate .. //depot/projects/vimage/src/sys/pc98/pc98/machdep.c#3 integrate .. //depot/projects/vimage/src/sys/pci/agp_intel.c#2 integrate .. //depot/projects/vimage/src/sys/pci/agpreg.h#2 integrate .. //depot/projects/vimage/src/sys/powerpc/powerpc/vm_machdep.c#2 integrate .. //depot/projects/vimage/src/sys/security/audit/audit.c#2 integrate .. //depot/projects/vimage/src/sys/security/audit/audit_arg.c#2 integrate .. //depot/projects/vimage/src/sys/security/audit/audit_bsm_klib.c#2 integrate .. //depot/projects/vimage/src/sys/security/audit/audit_bsm_token.c#2 integrate .. //depot/projects/vimage/src/sys/security/audit/audit_syscalls.c#2 integrate .. //depot/projects/vimage/src/sys/security/audit/audit_trigger.c#2 integrate .. //depot/projects/vimage/src/sys/security/audit/audit_worker.c#2 integrate .. //depot/projects/vimage/src/sys/security/mac/mac_framework.c#1 branch .. //depot/projects/vimage/src/sys/security/mac/mac_inet.c#3 integrate .. //depot/projects/vimage/src/sys/security/mac/mac_internal.h#3 integrate .. //depot/projects/vimage/src/sys/security/mac/mac_label.c#3 integrate .. //depot/projects/vimage/src/sys/security/mac/mac_net.c#3 integrate .. //depot/projects/vimage/src/sys/security/mac/mac_policy.h#2 integrate .. //depot/projects/vimage/src/sys/security/mac/mac_syscalls.c#1 branch .. //depot/projects/vimage/src/sys/security/mac/mac_vfs.c#3 integrate .. //depot/projects/vimage/src/sys/security/mac_stub/mac_stub.c#3 integrate .. //depot/projects/vimage/src/sys/sun4v/sun4v/pmap.c#4 integrate .. //depot/projects/vimage/src/sys/sys/copyright.h#2 integrate .. //depot/projects/vimage/src/sys/sys/file.h#2 integrate .. //depot/projects/vimage/src/sys/sys/proc.h#5 integrate .. //depot/projects/vimage/src/sys/sys/runq.h#3 integrate .. //depot/projects/vimage/src/sys/sys/unpcb.h#2 integrate .. //depot/projects/vimage/src/sys/vm/swap_pager.c#2 integrate .. //depot/projects/vimage/src/sys/vm/uma.h#2 integrate .. //depot/projects/vimage/src/sys/vm/uma_core.c#2 integrate .. //depot/projects/vimage/src/sys/vm/vm_kern.c#2 integrate Differences ... ==== //depot/projects/vimage/src/sys/amd64/include/atomic.h#2 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/include/atomic.h,v 1.39 2005/09/27 17:39:10 jhb Exp $ + * $FreeBSD: src/sys/amd64/include/atomic.h,v 1.44 2006/12/29 15:29:49 bde Exp $ */ #ifndef _MACHINE_ATOMIC_H_ #define _MACHINE_ATOMIC_H_ @@ -33,30 +33,30 @@ #endif /* - * Various simple arithmetic on memory which is atomic in the presence - * of interrupts and multiple processors. + * Various simple operations on memory, each of which is atomic in the + * presence of interrupts and multiple processors. * - * atomic_set_char(P, V) (*(u_char*)(P) |= (V)) - * atomic_clear_char(P, V) (*(u_char*)(P) &= ~(V)) - * atomic_add_char(P, V) (*(u_char*)(P) += (V)) - * atomic_subtract_char(P, V) (*(u_char*)(P) -= (V)) + * atomic_set_char(P, V) (*(u_char *)(P) |= (V)) + * atomic_clear_char(P, V) (*(u_char *)(P) &= ~(V)) + * atomic_add_char(P, V) (*(u_char *)(P) += (V)) + * atomic_subtract_char(P, V) (*(u_char *)(P) -= (V)) * - * atomic_set_short(P, V) (*(u_short*)(P) |= (V)) - * atomic_clear_short(P, V) (*(u_short*)(P) &= ~(V)) - * atomic_add_short(P, V) (*(u_short*)(P) += (V)) - * atomic_subtract_short(P, V) (*(u_short*)(P) -= (V)) + * atomic_set_short(P, V) (*(u_short *)(P) |= (V)) + * atomic_clear_short(P, V) (*(u_short *)(P) &= ~(V)) + * atomic_add_short(P, V) (*(u_short *)(P) += (V)) + * atomic_subtract_short(P, V) (*(u_short *)(P) -= (V)) * - * atomic_set_int(P, V) (*(u_int*)(P) |= (V)) - * atomic_clear_int(P, V) (*(u_int*)(P) &= ~(V)) - * atomic_add_int(P, V) (*(u_int*)(P) += (V)) - * atomic_subtract_int(P, V) (*(u_int*)(P) -= (V)) - * atomic_readandclear_int(P) (return *(u_int*)P; *(u_int*)P = 0;) + * atomic_set_int(P, V) (*(u_int *)(P) |= (V)) + * atomic_clear_int(P, V) (*(u_int *)(P) &= ~(V)) + * atomic_add_int(P, V) (*(u_int *)(P) += (V)) + * atomic_subtract_int(P, V) (*(u_int *)(P) -= (V)) + * atomic_readandclear_int(P) (return (*(u_int *)(P)); *(u_int *)(P) = 0;) * - * atomic_set_long(P, V) (*(u_long*)(P) |= (V)) - * atomic_clear_long(P, V) (*(u_long*)(P) &= ~(V)) - * atomic_add_long(P, V) (*(u_long*)(P) += (V)) - * atomic_subtract_long(P, V) (*(u_long*)(P) -= (V)) - * atomic_readandclear_long(P) (return *(u_long*)P; *(u_long*)P = 0;) + * atomic_set_long(P, V) (*(u_long *)(P) |= (V)) + * atomic_clear_long(P, V) (*(u_long *)(P) &= ~(V)) + * atomic_add_long(P, V) (*(u_long *)(P) += (V)) + * atomic_subtract_long(P, V) (*(u_long *)(P) -= (V)) + * atomic_readandclear_long(P) (return (*(u_long *)(P)); *(u_long *)(P) = 0;) */ /* @@ -67,26 +67,26 @@ * Kernel modules call real functions which are built into the kernel. * This allows kernel modules to be portable between UP and SMP systems. */ -#if defined(KLD_MODULE) || !(defined(__GNUCLIKE_ASM) && defined(__CC_SUPPORTS___INLINE)) +#if defined(KLD_MODULE) || !defined(__GNUCLIKE_ASM) #define ATOMIC_ASM(NAME, TYPE, OP, CONS, V) \ void atomic_##NAME##_##TYPE(volatile u_##TYPE *p, u_##TYPE v) -int atomic_cmpset_int(volatile u_int *dst, u_int exp, u_int src); -int atomic_cmpset_long(volatile u_long *dst, u_long exp, u_long src); -u_int atomic_fetchadd_int(volatile u_int *p, u_int v); +int atomic_cmpset_int(volatile u_int *dst, u_int exp, u_int src); +int atomic_cmpset_long(volatile u_long *dst, u_long exp, u_long src); +u_int atomic_fetchadd_int(volatile u_int *p, u_int v); #define ATOMIC_STORE_LOAD(TYPE, LOP, SOP) \ u_##TYPE atomic_load_acq_##TYPE(volatile u_##TYPE *p); \ void atomic_store_rel_##TYPE(volatile u_##TYPE *p, u_##TYPE v) -#else /* !KLD_MODULE && __GNUCLIKE_ASM && __CC_SUPPORTS___INLINE */ +#else /* !KLD_MODULE && __GNUCLIKE_ASM */ /* - * For userland, assume the SMP case and use lock prefixes so that - * the binaries will run on both types of systems. + * For userland, always use lock prefixes so that the binaries will run + * on both SMP and !SMP systems. */ #if defined(SMP) || !defined(_KERNEL) -#define MPLOCKED lock ; +#define MPLOCKED "lock ; " #else #define MPLOCKED #endif @@ -99,9 +99,9 @@ static __inline void \ atomic_##NAME##_##TYPE(volatile u_##TYPE *p, u_##TYPE v)\ { \ - __asm __volatile(__XSTRING(MPLOCKED) OP \ - : "=m" (*p) \ - : CONS (V), "m" (*p)); \ + __asm __volatile(MPLOCKED OP \ + : "=m" (*p) \ + : CONS (V), "m" (*p)); \ } \ struct __hack @@ -116,19 +116,19 @@ static __inline int atomic_cmpset_int(volatile u_int *dst, u_int exp, u_int src) { - int res = exp; + u_char res; - __asm __volatile ( - " " __XSTRING(MPLOCKED) " " + __asm __volatile( + " " MPLOCKED " " " cmpxchgl %2,%1 ; " - " setz %%al ; " - " movzbl %%al,%0 ; " + " sete %0 ; " "1: " "# atomic_cmpset_int" - : "+a" (res), /* 0 (result) */ + : "=a" (res), /* 0 */ "=m" (*dst) /* 1 */ : "r" (src), /* 2 */ - "m" (*dst) /* 3 */ + "a" (exp), /* 3 */ + "m" (*dst) /* 4 */ : "memory"); return (res); @@ -137,19 +137,19 @@ static __inline int atomic_cmpset_long(volatile u_long *dst, u_long exp, u_long src) { - long res = exp; + u_char res; - __asm __volatile ( - " " __XSTRING(MPLOCKED) " " + __asm __volatile( + " " MPLOCKED " " " cmpxchgq %2,%1 ; " - " setz %%al ; " - " movzbq %%al,%0 ; " + " sete %0 ; " "1: " "# atomic_cmpset_long" - : "+a" (res), /* 0 (result) */ + : "=a" (res), /* 0 */ "=m" (*dst) /* 1 */ : "r" (src), /* 2 */ - "m" (*dst) /* 3 */ + "a" (exp), /* 3 */ + "m" (*dst) /* 4 */ : "memory"); return (res); @@ -163,8 +163,8 @@ atomic_fetchadd_int(volatile u_int *p, u_int v) { - __asm __volatile ( - " " __XSTRING(MPLOCKED) " " + __asm __volatile( + " " MPLOCKED " " " xaddl %0, %1 ; " "# atomic_fetchadd_int" : "+r" (v), /* 0 (result) */ @@ -197,7 +197,7 @@ } \ struct __hack -#else /* defined(SMP) */ +#else /* !(_KERNEL && !SMP) */ #define ATOMIC_STORE_LOAD(TYPE, LOP, SOP) \ static __inline u_##TYPE \ @@ -205,11 +205,11 @@ { \ u_##TYPE res; \ \ - __asm __volatile(__XSTRING(MPLOCKED) LOP \ - : "=a" (res), /* 0 (result) */\ + __asm __volatile(MPLOCKED LOP \ + : "=a" (res), /* 0 */ \ "=m" (*p) /* 1 */ \ : "m" (*p) /* 2 */ \ - : "memory"); \ + : "memory"); \ \ return (res); \ } \ @@ -227,9 +227,9 @@ } \ struct __hack -#endif /* SMP */ +#endif /* _KERNEL && !SMP */ -#endif /* KLD_MODULE || !(__GNUCLIKE_ASM && __CC_SUPPORTS___INLINE) */ +#endif /* KLD_MODULE || !__GNUCLIKE_ASM */ ATOMIC_ASM(set, char, "orb %b1,%0", "iq", v); ATOMIC_ASM(clear, char, "andb %b1,%0", "iq", ~v); @@ -259,49 +259,49 @@ #undef ATOMIC_ASM #undef ATOMIC_STORE_LOAD -#if !defined(WANT_FUNCTIONS) +#ifndef WANT_FUNCTIONS /* Read the current value and store a zero in the destination. */ -#if defined(__GNUCLIKE_ASM) && defined(__CC_SUPPORTS___INLINE) +#ifdef __GNUCLIKE_ASM static __inline u_int atomic_readandclear_int(volatile u_int *addr) { - u_int result; + u_int res; - result = 0; - __asm __volatile ( + res = 0; + __asm __volatile( " xchgl %1,%0 ; " "# atomic_readandclear_int" - : "+r" (result), /* 0 (result) */ - "=m" (*addr) /* 1 (addr) */ + : "+r" (res), /* 0 */ + "=m" (*addr) /* 1 */ : "m" (*addr)); - return (result); + return (res); } static __inline u_long atomic_readandclear_long(volatile u_long *addr) { - u_long result; + u_long res; - result = 0; - __asm __volatile ( + res = 0; + __asm __volatile( " xchgq %1,%0 ; " "# atomic_readandclear_long" - : "+r" (result), /* 0 (result) */ - "=m" (*addr) /* 1 (addr) */ + : "+r" (res), /* 0 */ + "=m" (*addr) /* 1 */ : "m" (*addr)); - return (result); + return (res); } -#else /* !(__GNUCLIKE_ASM && __CC_SUPPORTS___INLINE) */ +#else /* !__GNUCLIKE_ASM */ -u_int atomic_readandclear_int(volatile u_int *); -u_long atomic_readandclear_long(volatile u_long *); +u_int atomic_readandclear_int(volatile u_int *addr); +u_long atomic_readandclear_long(volatile u_long *addr); -#endif /* __GNUCLIKE_ASM && __CC_SUPPORTS___INLINE */ +#endif /* __GNUCLIKE_ASM */ /* Acquire and release variants are identical to the normal ones. */ #define atomic_set_acq_char atomic_set_char @@ -437,5 +437,6 @@ #define atomic_cmpset_rel_ptr atomic_cmpset_rel_long #define atomic_readandclear_ptr atomic_readandclear_long -#endif /* !defined(WANT_FUNCTIONS) */ -#endif /* ! _MACHINE_ATOMIC_H_ */ +#endif /* !WANT_FUNCTIONS */ + +#endif /* !_MACHINE_ATOMIC_H_ */ ==== //depot/projects/vimage/src/sys/amd64/linux32/linux32_dummy.c#2 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_dummy.c,v 1.6 2006/10/28 10:59:59 netchild Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_dummy.c,v 1.7 2006/12/31 13:16:00 netchild Exp $"); #include #include @@ -53,7 +53,6 @@ DUMMY(sysfs); DUMMY(query_module); DUMMY(nfsservctl); -DUMMY(rt_sigtimedwait); DUMMY(rt_sigqueueinfo); DUMMY(capget); DUMMY(capset); @@ -77,7 +76,6 @@ DUMMY(timer_getoverrun); DUMMY(timer_delete); DUMMY(fstatfs64); -DUMMY(utimes); DUMMY(fadvise64_64); DUMMY(mbind); DUMMY(get_mempolicy); ==== //depot/projects/vimage/src/sys/amd64/linux32/linux32_machdep.c#3 (text+ko) ==== @@ -29,11 +29,13 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_machdep.c,v 1.23 2006/12/20 20:17:34 jkim Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_machdep.c,v 1.24 2007/01/06 15:58:34 netchild Exp $"); #include #include #include +#include +#include #include #include #include @@ -728,9 +730,20 @@ off_t pos; } */ bsd_args; int error; + struct file *fp; error = 0; bsd_args.flags = 0; + fp = NULL; + + /* + * Linux mmap(2): + * You must specify exactly one of MAP_SHARED and MAP_PRIVATE + */ + if (! ((linux_args->flags & LINUX_MAP_SHARED) ^ + (linux_args->flags & LINUX_MAP_PRIVATE))) + return (EINVAL); + if (linux_args->flags & LINUX_MAP_SHARED) bsd_args.flags |= MAP_SHARED; if (linux_args->flags & LINUX_MAP_PRIVATE) @@ -813,17 +826,44 @@ bsd_args.addr = (caddr_t)PTRIN(linux_args->addr); bsd_args.len = linux_args->len; } + /* - * XXX i386 Linux always emulator forces PROT_READ on (why?) - * so we do the same. We add PROT_EXEC to work around buggy - * applications (e.g. Java) that take advantage of the fact - * that execute permissions are not enforced by x86 CPUs. + * We add PROT_EXEC to work around buggy applications (e.g. Java) + * that take advantage of the fact that execute permissions are not + * enforced by x86 CPUs. */ - bsd_args.prot = linux_args->prot | PROT_EXEC | PROT_READ; + bsd_args.prot = linux_args->prot | PROT_EXEC; if (linux_args->flags & LINUX_MAP_ANON) bsd_args.fd = -1; - else + else { + /* + * Linux follows Solaris mmap(2) description: + * The file descriptor fildes is opened with + * read permission, regardless of the + * protection options specified. + * If PROT_WRITE is specified, the application + * must have opened the file descriptor + * fildes with write permission unless + * MAP_PRIVATE is specified in the flag + * argument as described below. + */ + + if ((error = fget(td, linux_args->fd, &fp)) != 0) + return (error); + if (fp->f_type != DTYPE_VNODE) { + fdrop(fp, td); + return (EINVAL); + } + + /* Linux mmap() just fails for O_WRONLY files */ + if (! (fp->f_flag & FREAD)) { + fdrop(fp, td); + return (EACCES); + } + bsd_args.fd = linux_args->fd; + fdrop(fp, td); + } bsd_args.pos = (off_t)linux_args->pgoff * PAGE_SIZE; bsd_args.pad = 0; ==== //depot/projects/vimage/src/sys/amd64/linux32/linux32_proto.h#2 (text+ko) ==== @@ -2,8 +2,8 @@ * System call prototypes. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/amd64/linux32/linux32_proto.h,v 1.26 2006/11/11 21:49:07 ru Exp $ - * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.23 2006/10/29 14:02:38 netchild Exp + * $FreeBSD: src/sys/amd64/linux32/linux32_proto.h,v 1.28 2006/12/31 13:20:30 netchild Exp $ + * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.25 2006/12/31 13:16:00 netchild Exp */ #ifndef _LINUX_SYSPROTO_H_ @@ -547,7 +547,10 @@ char sigsetsize_l_[PADL_(l_size_t)]; l_size_t sigsetsize; char sigsetsize_r_[PADR_(l_size_t)]; }; struct linux_rt_sigtimedwait_args { - register_t dummy; + char mask_l_[PADL_(l_sigset_t *)]; l_sigset_t * mask; char mask_r_[PADR_(l_sigset_t *)]; + char ptr_l_[PADL_(l_siginfo_t *)]; l_siginfo_t * ptr; char ptr_r_[PADR_(l_siginfo_t *)]; + char timeout_l_[PADL_(struct l_timeval *)]; struct l_timeval * timeout; char timeout_r_[PADR_(struct l_timeval *)]; + char sigsetsize_l_[PADL_(l_size_t)]; l_size_t sigsetsize; char sigsetsize_r_[PADR_(l_size_t)]; }; struct linux_rt_sigqueueinfo_args { register_t dummy; @@ -798,7 +801,8 @@ char sig_l_[PADL_(int)]; int sig; char sig_r_[PADR_(int)]; }; struct linux_utimes_args { - register_t dummy; + char fname_l_[PADL_(char *)]; char * fname; char fname_r_[PADR_(char *)]; + char tptr_l_[PADL_(struct l_timeval *)]; struct l_timeval * tptr; char tptr_r_[PADR_(struct l_timeval *)]; }; struct linux_fadvise64_64_args { register_t dummy; @@ -1160,7 +1164,7 @@ #define LINUX_SYS_AUE_linux_fork AUE_FORK #define LINUX_SYS_AUE_linux_open AUE_OPEN_RWTC #define LINUX_SYS_AUE_linux_waitpid AUE_WAIT4 -#define LINUX_SYS_AUE_linux_creat AUE_O_CREAT +#define LINUX_SYS_AUE_linux_creat AUE_CREAT #define LINUX_SYS_AUE_linux_link AUE_LINK #define LINUX_SYS_AUE_linux_unlink AUE_UNLINK #define LINUX_SYS_AUE_linux_execve AUE_EXECVE @@ -1221,7 +1225,7 @@ #define LINUX_SYS_AUE_linux_lstat AUE_LSTAT #define LINUX_SYS_AUE_linux_readlink AUE_READLINK #define LINUX_SYS_AUE_linux_reboot AUE_REBOOT -#define LINUX_SYS_AUE_linux_readdir AUE_O_GETDENTS +#define LINUX_SYS_AUE_linux_readdir AUE_GETDIRENTRIES #define LINUX_SYS_AUE_linux_mmap AUE_MMAP #define LINUX_SYS_AUE_linux_truncate AUE_TRUNCATE #define LINUX_SYS_AUE_linux_ftruncate AUE_FTRUNCATE @@ -1258,7 +1262,7 @@ #define LINUX_SYS_AUE_linux_setfsuid16 AUE_SETFSUID #define LINUX_SYS_AUE_linux_setfsgid16 AUE_SETFSGID #define LINUX_SYS_AUE_linux_llseek AUE_LSEEK -#define LINUX_SYS_AUE_linux_getdents AUE_O_GETDENTS +#define LINUX_SYS_AUE_linux_getdents AUE_GETDIRENTRIES #define LINUX_SYS_AUE_linux_select AUE_SELECT #define LINUX_SYS_AUE_linux_msync AUE_MSYNC #define LINUX_SYS_AUE_linux_readv AUE_READV @@ -1313,7 +1317,7 @@ #define LINUX_SYS_AUE_linux_setfsgid AUE_SETFSGID #define LINUX_SYS_AUE_linux_pivot_root AUE_PIVOT_ROOT #define LINUX_SYS_AUE_linux_mincore AUE_MINCORE -#define LINUX_SYS_AUE_linux_getdents64 AUE_O_GETDENTS +#define LINUX_SYS_AUE_linux_getdents64 AUE_GETDIRENTRIES #define LINUX_SYS_AUE_linux_fcntl64 AUE_FCNTL #define LINUX_SYS_AUE_linux_gettid AUE_NULL #define LINUX_SYS_AUE_linux_setxattr AUE_NULL @@ -1347,10 +1351,10 @@ #define LINUX_SYS_AUE_linux_clock_gettime AUE_NULL #define LINUX_SYS_AUE_linux_clock_getres AUE_NULL #define LINUX_SYS_AUE_linux_clock_nanosleep AUE_NULL -#define LINUX_SYS_AUE_linux_statfs64 AUE_NULL -#define LINUX_SYS_AUE_linux_fstatfs64 AUE_NULL +#define LINUX_SYS_AUE_linux_statfs64 AUE_STATFS +#define LINUX_SYS_AUE_linux_fstatfs64 AUE_FSTATFS #define LINUX_SYS_AUE_linux_tgkill AUE_NULL -#define LINUX_SYS_AUE_linux_utimes AUE_NULL +#define LINUX_SYS_AUE_linux_utimes AUE_UTIMES #define LINUX_SYS_AUE_linux_fadvise64_64 AUE_NULL #define LINUX_SYS_AUE_linux_mbind AUE_NULL #define LINUX_SYS_AUE_linux_get_mempolicy AUE_NULL ==== //depot/projects/vimage/src/sys/amd64/linux32/linux32_syscall.h#2 (text+ko) ==== @@ -2,8 +2,8 @@ * System call numbers. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/amd64/linux32/linux32_syscall.h,v 1.26 2006/11/11 21:49:07 ru Exp $ - * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.23 2006/10/29 14:02:38 netchild Exp + * $FreeBSD: src/sys/amd64/linux32/linux32_syscall.h,v 1.28 2006/12/31 13:20:30 netchild Exp $ + * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.25 2006/12/31 13:16:00 netchild Exp */ #define LINUX_SYS_exit 1 ==== //depot/projects/vimage/src/sys/amd64/linux32/linux32_sysent.c#2 (text+ko) ==== @@ -2,8 +2,8 @@ * System call switch table. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/amd64/linux32/linux32_sysent.c,v 1.26 2006/11/11 21:49:07 ru Exp $ - * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.23 2006/10/29 14:02:38 netchild Exp + * $FreeBSD: src/sys/amd64/linux32/linux32_sysent.c,v 1.28 2006/12/31 13:20:30 netchild Exp $ + * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.25 2006/12/31 13:16:00 netchild Exp */ #include @@ -28,7 +28,7 @@ { AS(linux_open_args), (sy_call_t *)linux_open, AUE_OPEN_RWTC, NULL, 0, 0 }, /* 5 = linux_open */ { AS(close_args), (sy_call_t *)close, AUE_CLOSE, NULL, 0, 0 }, /* 6 = close */ { AS(linux_waitpid_args), (sy_call_t *)linux_waitpid, AUE_WAIT4, NULL, 0, 0 }, /* 7 = linux_waitpid */ - { AS(linux_creat_args), (sy_call_t *)linux_creat, AUE_O_CREAT, NULL, 0, 0 }, /* 8 = linux_creat */ + { AS(linux_creat_args), (sy_call_t *)linux_creat, AUE_CREAT, NULL, 0, 0 }, /* 8 = linux_creat */ { AS(linux_link_args), (sy_call_t *)linux_link, AUE_LINK, NULL, 0, 0 }, /* 9 = linux_link */ { AS(linux_unlink_args), (sy_call_t *)linux_unlink, AUE_UNLINK, NULL, 0, 0 }, /* 10 = linux_unlink */ { AS(linux_execve_args), (sy_call_t *)linux_execve, AUE_EXECVE, NULL, 0, 0 }, /* 11 = linux_execve */ @@ -109,7 +109,7 @@ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 86 = linux_uselib */ { AS(swapon_args), (sy_call_t *)swapon, AUE_SWAPON, NULL, 0, 0 }, /* 87 = swapon */ { AS(linux_reboot_args), (sy_call_t *)linux_reboot, AUE_REBOOT, NULL, 0, 0 }, /* 88 = linux_reboot */ - { AS(linux_readdir_args), (sy_call_t *)linux_readdir, AUE_O_GETDENTS, NULL, 0, 0 }, /* 89 = linux_readdir */ + { AS(linux_readdir_args), (sy_call_t *)linux_readdir, AUE_GETDIRENTRIES, NULL, 0, 0 }, /* 89 = linux_readdir */ { AS(linux_mmap_args), (sy_call_t *)linux_mmap, AUE_MMAP, NULL, 0, 0 }, /* 90 = linux_mmap */ { AS(munmap_args), (sy_call_t *)munmap, AUE_MUNMAP, NULL, 0, 0 }, /* 91 = munmap */ { AS(linux_truncate_args), (sy_call_t *)linux_truncate, AUE_TRUNCATE, NULL, 0, 0 }, /* 92 = linux_truncate */ @@ -161,7 +161,7 @@ { AS(linux_setfsuid16_args), (sy_call_t *)linux_setfsuid16, AUE_SETFSUID, NULL, 0, 0 }, /* 138 = linux_setfsuid16 */ { AS(linux_setfsgid16_args), (sy_call_t *)linux_setfsgid16, AUE_SETFSGID, NULL, 0, 0 }, /* 139 = linux_setfsgid16 */ { AS(linux_llseek_args), (sy_call_t *)linux_llseek, AUE_LSEEK, NULL, 0, 0 }, /* 140 = linux_llseek */ - { AS(linux_getdents_args), (sy_call_t *)linux_getdents, AUE_O_GETDENTS, NULL, 0, 0 }, /* 141 = linux_getdents */ + { AS(linux_getdents_args), (sy_call_t *)linux_getdents, AUE_GETDIRENTRIES, NULL, 0, 0 }, /* 141 = linux_getdents */ { AS(linux_select_args), (sy_call_t *)linux_select, AUE_SELECT, NULL, 0, 0 }, /* 142 = linux_select */ { AS(flock_args), (sy_call_t *)flock, AUE_FLOCK, NULL, 0, 0 }, /* 143 = flock */ { AS(linux_msync_args), (sy_call_t *)linux_msync, AUE_MSYNC, NULL, 0, 0 }, /* 144 = linux_msync */ @@ -197,7 +197,7 @@ { AS(linux_rt_sigaction_args), (sy_call_t *)linux_rt_sigaction, AUE_NULL, NULL, 0, 0 }, /* 174 = linux_rt_sigaction */ { AS(linux_rt_sigprocmask_args), (sy_call_t *)linux_rt_sigprocmask, AUE_NULL, NULL, 0, 0 }, /* 175 = linux_rt_sigprocmask */ { AS(linux_rt_sigpending_args), (sy_call_t *)linux_rt_sigpending, AUE_NULL, NULL, 0, 0 }, /* 176 = linux_rt_sigpending */ - { 0, (sy_call_t *)linux_rt_sigtimedwait, AUE_NULL, NULL, 0, 0 }, /* 177 = linux_rt_sigtimedwait */ + { AS(linux_rt_sigtimedwait_args), (sy_call_t *)linux_rt_sigtimedwait, AUE_NULL, NULL, 0, 0 }, /* 177 = linux_rt_sigtimedwait */ { 0, (sy_call_t *)linux_rt_sigqueueinfo, AUE_NULL, NULL, 0, 0 }, /* 178 = linux_rt_sigqueueinfo */ { AS(linux_rt_sigsuspend_args), (sy_call_t *)linux_rt_sigsuspend, AUE_NULL, NULL, 0, 0 }, /* 179 = linux_rt_sigsuspend */ { AS(linux_pread_args), (sy_call_t *)linux_pread, AUE_PREAD, NULL, 0, 0 }, /* 180 = linux_pread */ @@ -240,7 +240,7 @@ { AS(linux_pivot_root_args), (sy_call_t *)linux_pivot_root, AUE_PIVOT_ROOT, NULL, 0, 0 }, /* 217 = linux_pivot_root */ { AS(linux_mincore_args), (sy_call_t *)linux_mincore, AUE_MINCORE, NULL, 0, 0 }, /* 218 = linux_mincore */ { AS(madvise_args), (sy_call_t *)madvise, AUE_MADVISE, NULL, 0, 0 }, /* 219 = madvise */ - { AS(linux_getdents64_args), (sy_call_t *)linux_getdents64, AUE_O_GETDENTS, NULL, 0, 0 }, /* 220 = linux_getdents64 */ + { AS(linux_getdents64_args), (sy_call_t *)linux_getdents64, AUE_GETDIRENTRIES, NULL, 0, 0 }, /* 220 = linux_getdents64 */ { AS(linux_fcntl64_args), (sy_call_t *)linux_fcntl64, AUE_FCNTL, NULL, 0, 0 }, /* 221 = linux_fcntl64 */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 222 = */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 223 = */ @@ -288,10 +288,10 @@ { AS(linux_clock_gettime_args), (sy_call_t *)linux_clock_gettime, AUE_NULL, NULL, 0, 0 }, /* 265 = linux_clock_gettime */ { AS(linux_clock_getres_args), (sy_call_t *)linux_clock_getres, AUE_NULL, NULL, 0, 0 }, /* 266 = linux_clock_getres */ { AS(linux_clock_nanosleep_args), (sy_call_t *)linux_clock_nanosleep, AUE_NULL, NULL, 0, 0 }, /* 267 = linux_clock_nanosleep */ - { AS(linux_statfs64_args), (sy_call_t *)linux_statfs64, AUE_NULL, NULL, 0, 0 }, /* 268 = linux_statfs64 */ - { 0, (sy_call_t *)linux_fstatfs64, AUE_NULL, NULL, 0, 0 }, /* 269 = linux_fstatfs64 */ + { AS(linux_statfs64_args), (sy_call_t *)linux_statfs64, AUE_STATFS, NULL, 0, 0 }, /* 268 = linux_statfs64 */ + { 0, (sy_call_t *)linux_fstatfs64, AUE_FSTATFS, NULL, 0, 0 }, /* 269 = linux_fstatfs64 */ { AS(linux_tgkill_args), (sy_call_t *)linux_tgkill, AUE_NULL, NULL, 0, 0 }, /* 270 = linux_tgkill */ - { 0, (sy_call_t *)linux_utimes, AUE_NULL, NULL, 0, 0 }, /* 271 = linux_utimes */ + { AS(linux_utimes_args), (sy_call_t *)linux_utimes, AUE_UTIMES, NULL, 0, 0 }, /* 271 = linux_utimes */ { 0, (sy_call_t *)linux_fadvise64_64, AUE_NULL, NULL, 0, 0 }, /* 272 = linux_fadvise64_64 */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 273 = */ { 0, (sy_call_t *)linux_mbind, AUE_NULL, NULL, 0, 0 }, /* 274 = linux_mbind */ ==== //depot/projects/vimage/src/sys/amd64/linux32/syscalls.master#2 (text+ko) ==== @@ -1,4 +1,4 @@ - $FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.23 2006/10/29 14:02:38 netchild Exp $ + $FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.25 2006/12/31 13:16:00 netchild Exp $ ; @(#)syscalls.master 8.1 (Berkeley) 7/19/93 ; System call name/number master file (or rather, slave, from LINUX). @@ -50,7 +50,7 @@ 6 AUE_CLOSE NOPROTO { int close(int fd); } 7 AUE_WAIT4 STD { int linux_waitpid(l_pid_t pid, \ l_int *status, l_int options); } -8 AUE_O_CREAT STD { int linux_creat(char *path, \ +8 AUE_CREAT STD { int linux_creat(char *path, \ l_int mode); } 9 AUE_LINK STD { int linux_link(char *path, char *to); } 10 AUE_UNLINK STD { int linux_unlink(char *path); } @@ -80,7 +80,7 @@ 26 AUE_PTRACE STD { int linux_ptrace(l_long req, l_long pid, \ l_long addr, l_long data); } 27 AUE_NULL STD { int linux_alarm(l_uint secs); } -28 AUE_NULL UNIMPL fstat +28 AUE_FSTAT UNIMPL fstat 29 AUE_NULL STD { int linux_pause(void); } 30 AUE_UTIME STD { int linux_utime(char *fname, \ struct l_utimbuf *times); } @@ -160,11 +160,11 @@ 84 AUE_LSTAT STD { int linux_lstat(char *path, struct linux_lstat *up); } 85 AUE_READLINK STD { int linux_readlink(char *name, char *buf, \ l_int count); } -86 AUE_NULL UNIMPL linux_uselib +86 AUE_USELIB UNIMPL linux_uselib 87 AUE_SWAPON NOPROTO { int swapon(char *name); } 88 AUE_REBOOT STD { int linux_reboot(l_int magic1, \ l_int magic2, l_uint cmd, void *arg); } -89 AUE_O_GETDENTS STD { int linux_readdir(l_uint fd, \ +89 AUE_GETDIRENTRIES STD { int linux_readdir(l_uint fd, \ struct l_dirent *dent, l_uint count); } 90 AUE_MMAP STD { int linux_mmap(struct l_mmap_argv *ptr); } 91 AUE_MUNMAP NOPROTO { int munmap(caddr_t addr, int len); } @@ -176,7 +176,7 @@ 96 AUE_GETPRIORITY STD { int linux_getpriority(int which, int who); } 97 AUE_SETPRIORITY NOPROTO { int setpriority(int which, int who, \ int prio); } -98 AUE_AUE_PROFILE UNIMPL profil +98 AUE_PROFILE UNIMPL profil 99 AUE_STATFS STD { int linux_statfs(char *path, \ struct l_statfs_buf *buf); } 100 AUE_FSTATFS STD { int linux_fstatfs(l_uint fd, \ @@ -243,7 +243,7 @@ 140 AUE_LSEEK STD { int linux_llseek(l_int fd, l_ulong ohigh, \ l_ulong olow, l_loff_t *res, \ l_uint whence); } -141 AUE_O_GETDENTS STD { int linux_getdents(l_uint fd, void *dent, \ +141 AUE_GETDIRENTRIES STD { int linux_getdents(l_uint fd, void *dent, \ l_uint count); } 142 AUE_SELECT STD { int linux_select(l_int nfds, \ l_fd_set *readfds, l_fd_set *writefds, \ @@ -252,9 +252,9 @@ 143 AUE_FLOCK NOPROTO { int flock(int fd, int how); } 144 AUE_MSYNC STD { int linux_msync(l_ulong addr, \ l_size_t len, l_int fl); } -145 AUE_READV STD { int linux_readv(int fd, struct iovec32 *iovp, \ +145 AUE_READV STD { int linux_readv(int fd, struct iovec32 *iovp, \ u_int iovcnt); } -146 AUE_WRITEV STD { int linux_writev(int fd, struct iovec32 *iovp, \ +146 AUE_WRITEV STD { int linux_writev(int fd, struct iovec32 *iovp, \ u_int iovcnt); } 147 AUE_GETSID STD { int linux_getsid(l_pid_t pid); } 148 AUE_NULL STD { int linux_fdatasync(l_uint fd); } @@ -268,16 +268,17 @@ const struct sched_param *param); } 155 AUE_SCHED_GETPARAM NOPROTO { int sched_getparam(pid_t pid, \ struct sched_param *param); } -156 AUE_SCHED_SETSCHEDULER STD { int linux_sched_setscheduler(l_pid_t pid, \ - l_int policy, \ +156 AUE_SCHED_SETSCHEDULER STD { int linux_sched_setscheduler( \ + l_pid_t pid, l_int policy, \ struct l_sched_param *param); } -157 AUE_SCHED_GETSCHEDULER STD { int linux_sched_getscheduler(l_pid_t pid); } +157 AUE_SCHED_GETSCHEDULER STD { int linux_sched_getscheduler( \ + l_pid_t pid); } 158 AUE_NULL NOPROTO { int sched_yield(void); } -159 AUE_SCHED_GET_PRIORITY_MAX STD { int linux_sched_get_priority_max( \ +159 AUE_SCHED_GET_PRIORITY_MAX STD { int linux_sched_get_priority_max( \ l_int policy); } -160 AUE_SCHED_GET_PRIORITY_MIN STD { int linux_sched_get_priority_min( \ +160 AUE_SCHED_GET_PRIORITY_MIN STD { int linux_sched_get_priority_min( \ l_int policy); } -161 AUE_SCHED_RR_GET_INTERVAL STD { int linux_sched_rr_get_interval(l_pid_t pid, \ +161 AUE_SCHED_RR_GET_INTERVAL STD { int linux_sched_rr_get_interval(l_pid_t pid, \ struct l_timespec *interval); } 162 AUE_NULL STD { int linux_nanosleep( \ const struct l_timespec *rqtp, \ @@ -310,7 +311,10 @@ l_size_t sigsetsize); } 176 AUE_NULL STD { int linux_rt_sigpending(l_sigset_t *set, \ l_size_t sigsetsize); } -177 AUE_NULL STD { int linux_rt_sigtimedwait(void); } +177 AUE_NULL STD { int linux_rt_sigtimedwait(l_sigset_t *mask, \ + l_siginfo_t *ptr, \ + struct l_timeval *timeout, \ + l_size_t sigsetsize); } 178 AUE_NULL STD { int linux_rt_sigqueueinfo(void); } 179 AUE_NULL STD { int linux_rt_sigsuspend( \ l_sigset_t *newset, \ @@ -379,7 +383,7 @@ l_size_t len, u_char *vec); } 219 AUE_MADVISE NOPROTO { int madvise(void *addr, size_t len, \ int behav); } -220 AUE_O_GETDENTS STD { int linux_getdents64(l_uint fd, \ +220 AUE_GETDIRENTRIES STD { int linux_getdents64(l_uint fd, \ void *dirent, l_uint count); } 221 AUE_FCNTL STD { int linux_fcntl64(l_uint fd, l_uint cmd, \ uintptr_t arg); } @@ -431,10 +435,11 @@ 266 AUE_NULL STD { int linux_clock_getres(clockid_t which, struct l_timespec *tp); } 267 AUE_NULL STD { int linux_clock_nanosleep(clockid_t which, int flags, \ struct l_timespec *rqtp, struct l_timespec *rmtp); } -268 AUE_NULL STD { int linux_statfs64(char *path, struct l_statfs64_buf *buf); } -269 AUE_NULL STD { int linux_fstatfs64(void); } +268 AUE_STATFS STD { int linux_statfs64(char *path, struct l_statfs64_buf *buf); } +269 AUE_FSTATFS STD { int linux_fstatfs64(void); } 270 AUE_NULL STD { int linux_tgkill(int tgid, int pid, int sig); } -271 AUE_NULL STD { int linux_utimes(void); } +271 AUE_UTIMES STD { int linux_utimes(char *fname, \ + struct l_timeval *tptr); } 272 AUE_NULL STD { int linux_fadvise64_64(void); } 273 AUE_NULL UNIMPL 274 AUE_NULL STD { int linux_mbind(void); } ==== //depot/projects/vimage/src/sys/arm/at91/at91_mci.c#2 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/at91/at91_mci.c,v 1.1 2006/10/20 06:44:04 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/at91/at91_mci.c,v 1.2 2007/01/05 01:18:32 ticso Exp $"); #include #include @@ -403,12 +403,14 @@ } // printf("CMDR %x ARGR %x with data\n", cmdr, cmd->arg); WR4(sc, MCI_ARGR, cmd->arg); - WR4(sc, MCI_CMDR, cmdr); if (cmdr & MCI_CMDR_TRCMD_START) { - if (cmdr & MCI_CMDR_TRDIR) + if (cmdr & MCI_CMDR_TRDIR) { WR4(sc, PDC_PTCR, PDC_PTCR_RXTEN); - else + WR4(sc, MCI_CMDR, cmdr); + } else { + WR4(sc, MCI_CMDR, cmdr); WR4(sc, PDC_PTCR, PDC_PTCR_TXTEN); + } } WR4(sc, MCI_IER, MCI_SR_ERROR | ier); } ==== //depot/projects/vimage/src/sys/arm/at91/at91_pioreg.h#2 (text) ==== @@ -22,7 +22,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -/* $FreeBSD: src/sys/arm/at91/at91_pioreg.h,v 1.1 2006/03/24 07:39:29 imp Exp $ */ +/* $FreeBSD: src/sys/arm/at91/at91_pioreg.h,v 1.2 2007/01/01 00:46:54 imp Exp $ */ #ifndef ARM_AT91_AT91_PIOREG_H #define ARM_AT91_AT91_PIOREG_H @@ -52,8 +52,8 @@ #define PIO_MDDR 0x54 /* PIO Multi-Driver Disable Register */ #define PIO_MDSR 0x58 /* PIO Multi-Driver Status Register */ /* 0x5c reserved */ -#define PIO_PUER 0x60 /* PIO Pull-up Enable Register */ -#define PIO_PUDR 0x64 /* PIO Pull-up Disable Register */ +#define PIO_PUDR 0x60 /* PIO Pull-up Disable Register */ +#define PIO_PUER 0x64 /* PIO Pull-up Enable Register */ #define PIO_PUSR 0x68 /* PIO Pull-up Status Register */ /* 0x6c reserved */ #define PIO_ASR 0x70 /* PIO Peripheral A Select Register */ ==== //depot/projects/vimage/src/sys/arm/at91/at91_pmc.c#2 (text) ==== @@ -25,7 +25,7 @@ #include "opt_at91.h" #include -__FBSDID("$FreeBSD: src/sys/arm/at91/at91_pmc.c,v 1.3 2006/07/14 22:01:51 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/at91/at91_pmc.c,v 1.4 2007/01/05 01:14:14 ticso Exp $"); #include #include @@ -399,7 +399,7 @@ pmc_softc->dev = dev; if ((err = at91_pmc_activate(dev)) != 0) return err; -#ifdef AT91_TSC +#if defined(AT91_TSC) | defined (AT91_BWCT) at91_pmc_init_clock(pmc_softc, 16000000); #else at91_pmc_init_clock(pmc_softc, 10000000); ==== //depot/projects/vimage/src/sys/arm/at91/at91_spireg.h#2 (text) ==== @@ -22,7 +22,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -/* $FreeBSD: src/sys/arm/at91/at91_spireg.h,v 1.2 2006/07/14 21:35:59 imp Exp $ */ +/* $FreeBSD: src/sys/arm/at91/at91_spireg.h,v 1.3 2007/01/01 00:50:25 imp Exp $ */ #ifndef ARM_AT91_AT91_SPIREG_H #define ARM_AT91_AT91_SPIREG_H @@ -51,7 +51,7 @@ #define SPI_SR_OVRES 0x00008 #define SPI_SR_ENDRX 0x00010 #define SPI_SR_ENDTX 0x00020 -#define SPI_SR_RXBUFE 0x00040 +#define SPI_SR_RXBUFF 0x00040 #define SPI_SR_TXBUFE 0x00080 #define SPI_SR_SPIENS 0x10000 #define SPI_IER 0x14 /* IER: Interrupt Enable Regsiter */ ==== //depot/projects/vimage/src/sys/arm/at91/at91_st.c#3 (text) ==== @@ -23,7 +23,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/at91/at91_st.c,v 1.6 2006/12/15 21:44:48 n_hibma Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/at91/at91_st.c,v 1.7 2007/01/05 02:52:06 ticso Exp $"); >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Jan 10 12:12:30 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 6F97616A407; Wed, 10 Jan 2007 12:12:30 +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 2B1F416A416 for ; Wed, 10 Jan 2007 12:12:30 +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 1DA5B13C45D for ; Wed, 10 Jan 2007 12:12:30 +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 l0ACCTeV028425 for ; Wed, 10 Jan 2007 12:12:30 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0ACCT1L028422 for perforce@freebsd.org; Wed, 10 Jan 2007 12:12:29 GMT (envelope-from rdivacky@FreeBSD.org) Date: Wed, 10 Jan 2007 12:12:29 GMT Message-Id: <200701101212.l0ACCT1L028422@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 112705 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 10 Jan 2007 12:12:30 -0000 http://perforce.freebsd.org/chv.cgi?CH=112705 Change 112705 by rdivacky@rdivacky_witten on 2007/01/10 12:11:59 Inherit setting of the default emulation version to the jails. Pointed out by: jhb Affected files ... .. //depot/projects/linuxolator/src/sys/compat/linux/linux_mib.c#7 edit Differences ... ==== //depot/projects/linuxolator/src/sys/compat/linux/linux_mib.c#7 (text+ko) ==== @@ -233,7 +233,7 @@ { struct prison *pr; struct linux_prison *lpr; - int use26 = 0; /* defaults to off */ + int use26 = linux_use_linux26; pr = td->td_ucred->cr_prison; if (pr != NULL) { @@ -241,8 +241,7 @@ lpr = (struct linux_prison *)pr->pr_linux; use26 = lpr->pr_use_linux26; } - } else - use26 = linux_use_linux26; + } return (use26); } From owner-p4-projects@FreeBSD.ORG Wed Jan 10 12:47:13 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 815C716A49E; Wed, 10 Jan 2007 12:47:13 +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 5C7F716A492 for ; Wed, 10 Jan 2007 12:47:13 +0000 (UTC) (envelope-from zec@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 4DE7013C441 for ; Wed, 10 Jan 2007 12:47:13 +0000 (UTC) (envelope-from zec@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l0AClCeP041221 for ; Wed, 10 Jan 2007 12:47:12 GMT (envelope-from zec@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0AClCnr041218 for perforce@freebsd.org; Wed, 10 Jan 2007 12:47:12 GMT (envelope-from zec@FreeBSD.org) Date: Wed, 10 Jan 2007 12:47:12 GMT Message-Id: <200701101247.l0AClCnr041218@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@FreeBSD.org using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 112706 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 10 Jan 2007 12:47:13 -0000 http://perforce.freebsd.org/chv.cgi?CH=112706 Change 112706 by zec@zec_tca51 on 2007/01/10 12:46:48 Whitespace cleanup. Pointed out by: julian Affected files ... .. //depot/projects/vimage/src/sys/kern/init_main.c#4 edit .. //depot/projects/vimage/src/sys/kern/kern_linker.c#3 edit .. //depot/projects/vimage/src/sys/kern/kern_vimage.c#11 edit .. //depot/projects/vimage/src/sys/net/if_loop.c#7 edit .. //depot/projects/vimage/src/sys/net/route.c#4 edit .. //depot/projects/vimage/src/sys/netgraph/ng_base.c#4 edit .. //depot/projects/vimage/src/sys/netinet/in_var.h#4 edit .. //depot/projects/vimage/src/sys/netinet/ip_fastfwd.c#4 edit .. //depot/projects/vimage/src/sys/netinet/ip_icmp.c#3 edit .. //depot/projects/vimage/src/sys/netinet/ip_input.c#7 edit .. //depot/projects/vimage/src/sys/netinet/ip_options.c#3 edit .. //depot/projects/vimage/src/sys/netinet/tcp_hostcache.c#7 edit .. //depot/projects/vimage/src/sys/netinet/tcp_syncache.h#3 edit .. //depot/projects/vimage/src/sys/netinet/udp_usrreq.c#6 edit .. //depot/projects/vimage/src/sys/netinet6/ip6_input.c#5 edit .. //depot/projects/vimage/src/sys/netinet6/ip6_output.c#3 edit .. //depot/projects/vimage/src/sys/netinet6/vinet6.h#3 edit .. //depot/projects/vimage/src/sys/sys/sockio.h#3 edit .. //depot/projects/vimage/src/sys/sys/vimage.h#9 edit Differences ... ==== //depot/projects/vimage/src/sys/kern/init_main.c#4 (text+ko) ==== @@ -451,8 +451,8 @@ td->td_ucred = crhold(p->p_ucred); #ifdef VIMAGE - /* Init lives in the default vimage */ - td->td_vimage = &vimage_0; + /* Init lives in the default vimage */ + td->td_vimage = &vimage_0; #endif /* Create sigacts. */ ==== //depot/projects/vimage/src/sys/kern/kern_linker.c#3 (text+ko) ==== @@ -1199,7 +1199,7 @@ lookup.symvalue = (uintptr_t)symval.value; lookup.symsize = symval.size; error = copyout(&lookup, uap->data, - sizeof(lookup)); + sizeof(lookup)); break; } } @@ -1210,7 +1210,7 @@ CURVNETB_RESTORE(); if (error == 0) { error = copyout(&lookup, uap->data, - sizeof(lookup)); + sizeof(lookup)); } } #else ==== //depot/projects/vimage/src/sys/kern/kern_vimage.c#11 (text+ko) ==== @@ -182,12 +182,12 @@ } if (new_vnetb == NULL) - return (ENXIO); + return (ENXIO); if (ifp == NULL) - ifp = ifunit(vi_req->vi_chroot); + ifp = ifunit(vi_req->vi_chroot); if (ifp == NULL) - return (ENXIO); + return (ENXIO); if (vi_req != NULL) { struct ifnet *t_ifp; @@ -209,15 +209,15 @@ * that, we reassing the interface unit number to look nice * in the target vnetb. */ - switch (ifp->if_type) { - case IFT_ETHER: + switch (ifp->if_type) { + case IFT_ETHER: bcopy(IF_LLADDR(ifp), eaddr, 6); ether_ifdetach(ifp); break; - default: + default: panic("don't know yet how to handle iftype %d", ifp->if_type); /* if_detach(ifp); */ - } + } ifp->if_bpf = NULL; CURVNETB_SET(new_vnetb); @@ -242,14 +242,14 @@ if_grow(); ifnet_byindex(ifp->if_index) = ifp; - switch (ifp->if_type) { - case IFT_ETHER: + switch (ifp->if_type) { + case IFT_ETHER: ether_ifattach(ifp, eaddr); break; - default: + default: panic("don't know yet how to handle iftype %d", ifp->if_type); /* if_attach(ifp); */ - } + } getmicrotime(&ifp->if_lastchange); if (vi_req != NULL) @@ -283,10 +283,10 @@ break; } if (vip_r == NULL && !(vi_req->req_action & VI_CREATE)) { - return (ESRCH); + return (ESRCH); } if (vip_r != NULL && vi_req->req_action & VI_CREATE) { - return (EADDRINUSE); + return (EADDRINUSE); } if (vi_req->req_action == VI_GETNEXT) { vi_getnext_loop: @@ -344,7 +344,7 @@ } if (vip == vip_r && vip != &vimage_0) { - return (EPERM); + return (EPERM); } } @@ -388,28 +388,28 @@ int maxsock, tsc_hashs, tsc_buckl; { struct vimage *vip; - struct vnet_base *vnetb; - struct vprocg *vprocg; - struct vcpu *vcpu; + struct vnet_base *vnetb; + struct vprocg *vprocg; + struct vcpu *vcpu; struct domain *dp; int i; printf("vi_alloc: %s\n", name); /* A brute force check whether there's enough mem for a new vimage */ - vip = malloc(127*1024, M_VIMAGE, M_NOWAIT); /* XXX aaaargh... */ - if (vip == NULL) + vip = malloc(127*1024, M_VIMAGE, M_NOWAIT); /* XXX aaaargh... */ + if (vip == NULL) return NULL; - vip = realloc(vip, sizeof(struct vimage), M_VIMAGE, M_NOWAIT); - if (vip == NULL) - panic("vi_alloc: malloc failed for vimage \"%s\"\n", name); - bzero(vip, sizeof(struct vimage)); - vip->vi_id = last_vi_id++; + vip = realloc(vip, sizeof(struct vimage), M_VIMAGE, M_NOWAIT); + if (vip == NULL) + panic("vi_alloc: malloc failed for vimage \"%s\"\n", name); + bzero(vip, sizeof(struct vimage)); + vip->vi_id = last_vi_id++; - vnetb = malloc(sizeof(struct vnet_base), M_VNET, M_NOWAIT); - if (vnetb == NULL) - panic("vi_alloc: malloc failed for vnetb \"%s\"\n", name); - bzero(vnetb, sizeof(struct vnet_base)); + vnetb = malloc(sizeof(struct vnet_base), M_VNET, M_NOWAIT); + if (vnetb == NULL) + panic("vi_alloc: malloc failed for vnetb \"%s\"\n", name); + bzero(vnetb, sizeof(struct vnet_base)); vip->v_vnetb = vnetb; vnetb->vnet_magic_n = VNET_MAGIC_N; for (i = 0; i < 100; i++) /* XXX !!! */ @@ -419,19 +419,19 @@ break; } - vprocg = malloc(sizeof(struct vprocg), M_VPROCG, M_NOWAIT); - if (vprocg == NULL) - panic("vi_alloc: malloc failed for vprocg \"%s\"\n", name); - bzero(vprocg, sizeof(struct vprocg)); + vprocg = malloc(sizeof(struct vprocg), M_VPROCG, M_NOWAIT); + if (vprocg == NULL) + panic("vi_alloc: malloc failed for vprocg \"%s\"\n", name); + bzero(vprocg, sizeof(struct vprocg)); vip->v_procg = vprocg; - vcpu = malloc(sizeof(struct vcpu), M_VCPU, M_NOWAIT); - if (vcpu == NULL) - panic ("vi_alloc: malloc failed for vcpu \"%s\"\n", name); - bzero (vcpu, sizeof(struct vcpu)); + vcpu = malloc(sizeof(struct vcpu), M_VCPU, M_NOWAIT); + if (vcpu == NULL) + panic ("vi_alloc: malloc failed for vcpu \"%s\"\n", name); + bzero (vcpu, sizeof(struct vcpu)); vip->v_cpu = vcpu; - /* Some initialization stuff... */ + /* Some initialization stuff... */ sprintf(vip->vi_name, "%s", name); /* @@ -535,16 +535,16 @@ /* hopefully, we are finally OK to free the vnetb container itself! */ LIST_REMOVE(vnetb, vnetb_le); vnetb->vnet_magic_n = -1; - free(vnetb, M_VNET); + free(vnetb, M_VNET); LIST_REMOVE(vprocg, vprocg_le); - free(vprocg, M_VPROCG); + free(vprocg, M_VPROCG); LIST_REMOVE(vcpu, vcpu_le); - free(vcpu, M_VCPU); + free(vcpu, M_VCPU); LIST_REMOVE(vip, vi_le); - free(vip, M_VIMAGE); + free(vip, M_VIMAGE); } ==== //depot/projects/vimage/src/sys/net/if_loop.c#7 (text+ko) ==== @@ -124,7 +124,7 @@ lo_clone_destroy(ifp) struct ifnet *ifp; { - INIT_VNET_NET(ifp->if_vnetb); + INIT_VNET_NET(ifp->if_vnetb); struct lo_softc *sc; sc = ifp->if_softc; @@ -147,7 +147,7 @@ int unit; caddr_t params; { - INIT_VNET_NET(curvnetb); + INIT_VNET_NET(curvnetb); struct ifnet *ifp; struct lo_softc *sc; @@ -181,12 +181,12 @@ #ifdef VIMAGE static struct vnet_modinfo vnet_loif_modinfo = { - .id = VNET_MOD_LOIF, + .id = VNET_MOD_LOIF, .flags = VNET_MFLAG_ORDER_2ND, - .name = "loif", - .symmap = NULL, - .i_attach = vnet_loif_iattach, - .i_detach = NULL, + .name = "loif", + .symmap = NULL, + .i_attach = vnet_loif_iattach, + .i_detach = NULL, }; #endif @@ -213,9 +213,9 @@ case MOD_LOAD: mtx_init(&lo_mtx, "lo_mtx", NULL, MTX_DEF); #ifdef VIMAGE - vnet_mod_register(&vnet_loif_modinfo); + vnet_mod_register(&vnet_loif_modinfo); #else - vnet_loif_iattach(); + vnet_loif_iattach(); #endif break; case MOD_UNLOAD: @@ -249,7 +249,7 @@ if (rt && rt->rt_flags & (RTF_REJECT|RTF_BLACKHOLE)) { m_freem(m); return (rt->rt_flags & RTF_BLACKHOLE ? 0 : - rt->rt_flags & RTF_HOST ? EHOSTUNREACH : ENETUNREACH); + rt->rt_flags & RTF_HOST ? EHOSTUNREACH : ENETUNREACH); } ifp->if_opackets++; @@ -295,7 +295,7 @@ int af; int hlen; { - INIT_VNET_NET(ifp->if_vnetb); + INIT_VNET_NET(ifp->if_vnetb); int isr; M_ASSERTPKTHDR(m); ==== //depot/projects/vimage/src/sys/net/route.c#4 (text+ko) ==== @@ -79,10 +79,10 @@ #ifdef VIMAGE static struct vnet_modinfo vnet_rtable_modinfo = { - .id = VNET_MOD_RTABLE, + .id = VNET_MOD_RTABLE, .flags = VNET_MFLAG_ORDER_2ND, - .name = "rtable", - .i_attach = rtable_init + .name = "rtable", + .i_attach = rtable_init }; #endif @@ -108,7 +108,7 @@ NULL, NULL, UMA_ALIGN_PTR, 0); rn_init(); /* initialize all zeroes, all ones, mask table */ #ifdef VIMAGE - vnet_mod_register(&vnet_rtable_modinfo); + vnet_mod_register(&vnet_rtable_modinfo); #else rtable_init(); #endif ==== //depot/projects/vimage/src/sys/netgraph/ng_base.c#4 (text+ko) ==== @@ -242,12 +242,12 @@ struct vnet_netgraph vnet_netgraph_0; static struct vnet_modinfo vnet_netgraph_modinfo = { - .id = VNET_MOD_NETGRAPH, + .id = VNET_MOD_NETGRAPH, .flags = VNET_MFLAG_ORDER_2ND, - .name = "netgraph", - .symmap = NULL, - .i_attach = vnet_netgraph_iattach, - .i_detach = NULL, + .name = "netgraph", + .symmap = NULL, + .i_attach = vnet_netgraph_iattach, + .i_detach = NULL, }; #endif ==== //depot/projects/vimage/src/sys/netinet/in_var.h#4 (text+ko) ==== @@ -95,17 +95,17 @@ /* * IP datagram reassembly. */ -#define IPREASS_NHASH_LOG2 6 -#define IPREASS_NHASH (1 << IPREASS_NHASH_LOG2) -#define IPREASS_HMASK (IPREASS_NHASH - 1) +#define IPREASS_NHASH_LOG2 6 +#define IPREASS_NHASH (1 << IPREASS_NHASH_LOG2) +#define IPREASS_HMASK (IPREASS_NHASH - 1) #define IPREASS_HASH(x,y) \ - (((((x) & 0xF) | ((((x) >> 8) & 0xF) << 4)) ^ (y)) & IPREASS_HMASK) + (((((x) & 0xF) | ((((x) >> 8) & 0xF) << 4)) ^ (y)) & IPREASS_HMASK) /* * Macro for finding the internet address structure (in_ifaddr) * corresponding to one of our IP addresses (in_addr). */ -#define INADDR_NHASH_LOG2 9 +#define INADDR_NHASH_LOG2 9 #define INADDR_NHASH (1 << INADDR_NHASH_LOG2) #define INADDR_HASHVAL(x) fnv_32_buf((&(x)), sizeof(x), FNV1_32_INIT) #define INADDR_HASH(x) \ ==== //depot/projects/vimage/src/sys/netinet/ip_fastfwd.c#4 (text+ko) ==== @@ -159,7 +159,7 @@ struct mbuf * ip_fastforward(struct mbuf *m) { - INIT_VNET_INET(curvnetb); + INIT_VNET_INET(curvnetb); struct ip *ip; struct mbuf *m0 = NULL; struct route ro; ==== //depot/projects/vimage/src/sys/netinet/ip_icmp.c#3 (text+ko) ==== @@ -304,7 +304,7 @@ struct mbuf *m; int off; { - INIT_VNET_INET(curvnetb); + INIT_VNET_INET(curvnetb); struct icmp *icp; struct in_ifaddr *ia; struct ip *ip = mtod(m, struct ip *); ==== //depot/projects/vimage/src/sys/netinet/ip_input.c#7 (text+ko) ==== @@ -212,7 +212,7 @@ struct vnet_inet vnet_inet_0; struct vnet_symmap vnet_inet_symmap[] = { - VNET_SYMMAP_END + VNET_SYMMAP_END }; static struct vnet_modinfo vnet_inet_modinfo = { @@ -221,7 +221,7 @@ .symmap = vnet_inet_symmap, .i_attach = NULL, .i_detach = NULL, -}; +}; MALLOC_DEFINE(M_INET, "inet", "INET domain instance"); #endif /* VIMAGE */ @@ -239,17 +239,17 @@ #ifdef VIMAGE struct vnet_inet *vnet_inet; - if (curvnetb == &vnetb_0) { + if (curvnetb == &vnetb_0) { vnet_mod_register(&vnet_inet_modinfo); vnet_inet = &vnet_inet_0; - } else { + } else { vnet_inet = malloc(sizeof(struct vnet_inet), M_INET, M_NOWAIT | M_ZERO); if (vnet_inet == NULL) panic("couldn't allocate memory for vnet_inet"); - } + } curvnetb->mod_data[vnet_inet_modinfo.id] = vnet_inet; - vnet_inet->parent_vnetb = curvnetb; + vnet_inet->parent_vnetb = curvnetb; #endif TAILQ_INIT(&V_in_ifaddrhead); @@ -258,7 +258,7 @@ /* Initialize IP reassembly queue. */ for (i = 0; i < IPREASS_NHASH; i++) - TAILQ_INIT(&V_ipq[i]); + TAILQ_INIT(&V_ipq[i]); V_maxnipq = nmbclusters / 32; V_maxfragsperpacket = 16; V_ipq_zone = uma_zcreate("ipq", sizeof(struct ipq), NULL, NULL, NULL, @@ -270,7 +270,7 @@ * Skip global initialization stuff * for non-default instances. */ - if (curvnetb != &vnetb_0) + if (curvnetb != &vnetb_0) return; #endif ==== //depot/projects/vimage/src/sys/netinet/ip_options.c#3 (text+ko) ==== @@ -101,7 +101,7 @@ int ip_dooptions(struct mbuf *m, int pass) { - INIT_VNET_INET(curvnetb); + INIT_VNET_INET(curvnetb); struct ip *ip = mtod(m, struct ip *); u_char *cp; struct in_ifaddr *ia; ==== //depot/projects/vimage/src/sys/netinet/tcp_hostcache.c#7 (text+ko) ==== @@ -176,15 +176,15 @@ V_tcp_hostcache.hashsize = TCP_HOSTCACHE_HASHSIZE; V_tcp_hostcache.bucket_limit = TCP_HOSTCACHE_BUCKETLIMIT; V_tcp_hostcache.cache_limit = - V_tcp_hostcache.hashsize * V_tcp_hostcache.bucket_limit; + V_tcp_hostcache.hashsize * V_tcp_hostcache.bucket_limit; V_tcp_hostcache.expire = TCP_HOSTCACHE_EXPIRE; TUNABLE_INT_FETCH("net.inet.tcp.hostcache.hashsize", - &V_tcp_hostcache.hashsize); + &V_tcp_hostcache.hashsize); TUNABLE_INT_FETCH("net.inet.tcp.hostcache.cachelimit", - &V_tcp_hostcache.cache_limit); + &V_tcp_hostcache.cache_limit); TUNABLE_INT_FETCH("net.inet.tcp.hostcache.bucketlimit", - &V_tcp_hostcache.bucket_limit); + &V_tcp_hostcache.bucket_limit); if (!powerof2(V_tcp_hostcache.hashsize)) { printf("WARNING: hostcache hash size is not a power of 2.\n"); V_tcp_hostcache.hashsize = 512; /* safe default */ @@ -214,7 +214,7 @@ * XXX don't need a separate zone for each hc instance - revisit!!! */ V_tcp_hostcache.zone = - uma_zcreate("hostcache", sizeof(struct hc_metrics), + uma_zcreate("hostcache", sizeof(struct hc_metrics), NULL, NULL, NULL, NULL, UMA_ALIGN_PTR, 0); uma_zone_set_max(V_tcp_hostcache.zone, V_tcp_hostcache.cache_limit); ==== //depot/projects/vimage/src/sys/netinet/tcp_syncache.h#3 (text+ko) ==== @@ -67,8 +67,8 @@ struct label *sc_label; /* MAC label reference */ }; -#define SYNCOOKIE_SECRET_SIZE 8 /* dwords */ -#define SYNCOOKIE_LIFETIME 16 /* seconds */ +#define SYNCOOKIE_SECRET_SIZE 8 /* dwords */ +#define SYNCOOKIE_LIFETIME 16 /* seconds */ struct syncache_head { struct mtx sch_mtx; ==== //depot/projects/vimage/src/sys/netinet/udp_usrreq.c#6 (text+ko) ==== @@ -170,7 +170,7 @@ INIT_VNET_INET(curvnetb); #ifdef VIMAGE - if (curvnetb == &vnetb_0) { + if (curvnetb == &vnetb_0) { #endif udp_ipi_zone = uma_zcreate("udpcb", sizeof(struct inpcb), NULL, NULL, udp_inpcb_init, NULL, UMA_ALIGN_PTR, UMA_ZONE_NOFREE); @@ -178,7 +178,7 @@ EVENTHANDLER_REGISTER(maxsockets_change, udp_zone_change, NULL, EVENTHANDLER_PRI_ANY); #ifdef VIMAGE - } + } #endif INP_INFO_LOCK_INIT(&V_udbinfo, "udp"); ==== //depot/projects/vimage/src/sys/netinet6/ip6_input.c#5 (text+ko) ==== @@ -150,17 +150,17 @@ #ifdef VIMAGE struct vnet_inet6 vnet_inet6_0; - + struct vnet_symmap vnet_inet6_symmap[] = { - VNET_SYMMAP_END + VNET_SYMMAP_END }; static struct vnet_modinfo vnet_inet6_modinfo = { - .id = VNET_MOD_INET6, - .name = "inet6", - .symmap = vnet_inet6_symmap, - .i_attach = NULL, - .i_detach = NULL, + .id = VNET_MOD_INET6, + .name = "inet6", + .symmap = vnet_inet6_symmap, + .i_attach = NULL, + .i_detach = NULL, }; MALLOC_DEFINE(M_INET6, "inet", "INET6 domain instance"); @@ -177,25 +177,25 @@ int i; #ifdef VIMAGE - struct vnet_inet6 *vnet_inet6; + struct vnet_inet6 *vnet_inet6; - if (curvnetb == &vnetb_0) { - vnet_mod_register(&vnet_inet6_modinfo); - vnet_inet6 = &vnet_inet6_0; - } else { - vnet_inet6 = malloc(sizeof(struct vnet_inet6), - M_INET6, M_NOWAIT | M_ZERO); - if (vnet_inet6 == NULL) - panic("couldn't allocate memory for vnet_inet6"); - } - curvnetb->mod_data[vnet_inet6_modinfo.id] = vnet_inet6; - vnet_inet6->parent_vnetb = curvnetb; + if (curvnetb == &vnetb_0) { + vnet_mod_register(&vnet_inet6_modinfo); + vnet_inet6 = &vnet_inet6_0; + } else { + vnet_inet6 = malloc(sizeof(struct vnet_inet6), + M_INET6, M_NOWAIT | M_ZERO); + if (vnet_inet6 == NULL) + panic("couldn't allocate memory for vnet_inet6"); + } + curvnetb->mod_data[vnet_inet6_modinfo.id] = vnet_inet6; + vnet_inet6->parent_vnetb = curvnetb; /* * Skip global initialization stuff * for non-default instances. */ - if (curvnetb != &vnetb_0) + if (curvnetb != &vnetb_0) return; #endif @@ -267,7 +267,7 @@ ip6_input(m) struct mbuf *m; { - INIT_VNET_NET(curvnetb); + INIT_VNET_NET(curvnetb); struct ip6_hdr *ip6; int off = sizeof(struct ip6_hdr), nest; u_int32_t plen; ==== //depot/projects/vimage/src/sys/netinet6/ip6_output.c#3 (text+ko) ==== @@ -2524,7 +2524,7 @@ struct ip6_moptions **im6op; struct mbuf *m; { - INIT_VNET_NET(curvnetb); + INIT_VNET_NET(curvnetb); int error = 0; u_int loop, ifindex; struct ipv6_mreq *mreq; @@ -2964,7 +2964,7 @@ u_char *buf; struct ip6_pktopts *opt; { - INIT_VNET_NET(curvnetb); + INIT_VNET_NET(curvnetb); int minmtupolicy, preftemp; if (!sticky && !cmsg) { ==== //depot/projects/vimage/src/sys/netinet6/vinet6.h#3 (text+ko) ==== @@ -43,7 +43,7 @@ #ifdef VIMAGE struct vnet_inet6 { - struct vnet_base *parent_vnetb; + struct vnet_base *parent_vnetb; }; #endif ==== //depot/projects/vimage/src/sys/sys/sockio.h#3 (text+ko) ==== @@ -108,9 +108,9 @@ #define SIOCGPRIVATE_0 _IOWR('i', 80, struct ifreq) /* device private 0 */ #define SIOCGPRIVATE_1 _IOWR('i', 81, struct ifreq) /* device private 1 */ -#define SIOCSPVIMAGE _IOW('i', 101, struct vi_req) /* set proc vimage */ -#define SIOCGPVIMAGE _IOWR('i', 102, struct vi_req) /* get proc vimage */ -#define SIOCSIFVIMAGE _IOWR('i', 103, struct vi_req) /* set ifc vi/net */ +#define SIOCSPVIMAGE _IOW('i', 101, struct vi_req) /* set proc vimage */ +#define SIOCGPVIMAGE _IOWR('i', 102, struct vi_req) /* get proc vimage */ +#define SIOCSIFVIMAGE _IOWR('i', 103, struct vi_req) /* set ifc vi/net */ #define SIOCSDRVSPEC _IOW('i', 123, struct ifdrv) /* set driver-specific parameters */ ==== //depot/projects/vimage/src/sys/sys/vimage.h#9 (text+ko) ==== @@ -67,7 +67,7 @@ #define VNET_MOD_RTABLE 30 #define VNET_MOD_LOIF 31 #define VNET_MOD_DYNAMIC_START 32 -#define VNET_MOD_MAX 64 +#define VNET_MOD_MAX 64 /* Needed for ugly sysctl virtualization macros */ #define V_MOD_vnet_net VNET_MOD_NET @@ -76,12 +76,12 @@ #define V_MOD_vnet_inet6 VNET_MOD_INET6 struct vnet_base { - LIST_ENTRY(vnet_base) vnetb_le; + LIST_ENTRY(vnet_base) vnetb_le; - void *mod_data[VNET_MOD_MAX]; + void *mod_data[VNET_MOD_MAX]; - int ifccnt; - int sockcnt; + int ifccnt; + int sockcnt; int vnet_id; /* index to vnetb_tbl */ @@ -131,7 +131,7 @@ struct vnet_base *saved_vnetb = curvnetb; \ const char *saved_vnet_lpush = curthread->td_vnet_lpush; \ curvnetb = arg; \ - curthread->td_vnet_lpush = __FUNCTION__ ; + curthread->td_vnet_lpush = __FUNCTION__; #define CURVNETB_SET_VERBOSE(arg) \ CURVNETB_SET_QUIET(arg) \ @@ -199,7 +199,7 @@ struct vimage *vi_alloc(char *, int, int, int); void vi_cpu_acct(void *); int vi_td_ioctl(u_long, struct vi_req *, struct thread *); -int vi_if_move(struct vi_req *, struct ifnet *, struct vimage *); +int vi_if_move(struct vi_req *, struct ifnet *, struct vimage *); int vi_child_of(struct vimage *, struct vimage *); int vi_symlookup(struct kld_sym_lookup *, char *); struct vimage *vnetb2vimage(struct vnet_base *); @@ -230,7 +230,7 @@ struct vimage { LIST_ENTRY(vimage) vi_le; - struct vimage *vi_parent; /* ptr to parent vimage */ + struct vimage *vi_parent; /* ptr to parent vimage */ u_int vi_id; /* ID num */ char vi_name[MAXHOSTNAMELEN]; /* assigned by parent */ @@ -246,8 +246,8 @@ #if 0 int cp_time[CPUSTATES]; /* from kern/clock.c */ - struct loadavg averunnable; /* from kern/kern_synch.c */ - int nrun; + struct loadavg averunnable; /* from kern/kern_synch.c */ + int nrun; u_int proc_count; /* current number of processes */ u_int proc_limit; /* max. number of processes */ @@ -281,8 +281,8 @@ LIST_ENTRY(vcpu) vcpu_le; #if 0 - u_int cp_time_avg[CPUSTATES]; - u_int cp_time_avg1[CPUSTATES]; + u_int cp_time_avg[CPUSTATES]; + u_int cp_time_avg1[CPUSTATES]; u_int cpu_min; /* Guaranteed CPU share */ u_int cpu_max; /* Maximum average CPU usage */ @@ -297,46 +297,46 @@ #endif /* VIMAGE */ struct vi_req { - int req_action; /* What to do with this reqest? */ - u_int vi_cpu_min; /* Guaranteed CPU share */ - u_int vi_cpu_max; /* Maximum average CPU usage */ - u_int vi_cpu_weight; /* Prop. share scheduling priority */ - int vi_intr_limit; /* Limit on CPU usage in intr ctx */ - int vi_maxsockets; - int vi_tsc_hashs; - int vi_tsc_buckl; - u_short vi_id; /* IDnum - but do we need it at all? */ - u_short vi_proc_limit; /* max. number of processes */ - u_short vi_proc_count; /* current number of processes */ - u_short vi_child_limit; /* max. number of child vnets */ - u_short vi_child_count; /* current number of child vnets */ - int vi_if_count; /* current number network interfaces */ - int vi_sock_count; - char vi_name[MAXHOSTNAMELEN]; - char vi_parent_name[MAXHOSTNAMELEN]; - char vi_chroot[MAXPATHLEN]; - int cp_time_avg[CPUSTATES]; - struct loadavg averunnable; + int req_action; /* What to do with this reqest? */ + u_int vi_cpu_min; /* Guaranteed CPU share */ + u_int vi_cpu_max; /* Maximum average CPU usage */ + u_int vi_cpu_weight; /* Prop. share scheduling priority */ + int vi_intr_limit; /* Limit on CPU usage in intr ctx */ + int vi_maxsockets; + int vi_tsc_hashs; + int vi_tsc_buckl; + u_short vi_id; /* IDnum - but do we need it at all? */ + u_short vi_proc_limit; /* max. number of processes */ + u_short vi_proc_count; /* current number of processes */ + u_short vi_child_limit; /* max. number of child vnets */ + u_short vi_child_count; /* current number of child vnets */ + int vi_if_count; /* current number network interfaces */ + int vi_sock_count; + char vi_name[MAXHOSTNAMELEN]; + char vi_parent_name[MAXHOSTNAMELEN]; + char vi_chroot[MAXPATHLEN]; + int cp_time_avg[CPUSTATES]; + struct loadavg averunnable; }; -#define VI_CREATE 0x00000001 -#define VI_DESTROY 0x00000002 -#define VI_MODIFY 0x00000004 -#define VI_SWITCHTO 0x00000008 -#define VI_IFACE 0x00000010 +#define VI_CREATE 0x00000001 +#define VI_DESTROY 0x00000002 +#define VI_MODIFY 0x00000004 +#define VI_SWITCHTO 0x00000008 +#define VI_IFACE 0x00000010 -#define VI_GET 0x00000100 -#define VI_GETNEXT 0x00000200 +#define VI_GET 0x00000100 +#define VI_GETNEXT 0x00000200 -#define VI_SET_CPU_MIN 0x00001000 -#define VI_SET_CPU_MAX 0x00002000 -#define VI_SET_CPU_WEIGHT 0x00004000 -#define VI_SET_INTR_LIMIT 0x00008000 -#define VI_SET_PROC_LIMIT 0x00010000 -#define VI_SET_CHILD_LIMIT 0x00020000 -#define VI_SET_SOCK_LIMIT 0x00040000 -#define VI_SET_NAME 0x00100000 -#define VI_SET_CHROOT 0x00200000 +#define VI_SET_CPU_MIN 0x00001000 +#define VI_SET_CPU_MAX 0x00002000 +#define VI_SET_CPU_WEIGHT 0x00004000 +#define VI_SET_INTR_LIMIT 0x00008000 +#define VI_SET_PROC_LIMIT 0x00010000 +#define VI_SET_CHILD_LIMIT 0x00020000 +#define VI_SET_SOCK_LIMIT 0x00040000 +#define VI_SET_NAME 0x00100000 +#define VI_SET_CHROOT 0x00200000 #endif /* _NET_VIMAGE_H_ */ From owner-p4-projects@FreeBSD.ORG Wed Jan 10 16:23: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 EF6DD16A416; Wed, 10 Jan 2007 16:23: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 B3E9A16A407 for ; Wed, 10 Jan 2007 16:23:39 +0000 (UTC) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id A4FCE13C471 for ; Wed, 10 Jan 2007 16:23:39 +0000 (UTC) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l0AGNd5b090072 for ; Wed, 10 Jan 2007 16:23:39 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0AGNcGG090069 for perforce@freebsd.org; Wed, 10 Jan 2007 16:23:38 GMT (envelope-from peter@freebsd.org) Date: Wed, 10 Jan 2007 16:23:38 GMT Message-Id: <200701101623.l0AGNcGG090069@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Cc: Subject: PERFORCE change 112708 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 10 Jan 2007 16:23:40 -0000 http://perforce.freebsd.org/chv.cgi?CH=112708 Change 112708 by peter@peter_overcee on 2007/01/10 16:23:25 IFC @112657 Affected files ... .. //depot/projects/hammer/contrib/ipfilter/todo#3 branch .. //depot/projects/hammer/lib/libc/sys/open.2#9 integrate .. //depot/projects/hammer/lib/msun/Makefile#33 integrate .. //depot/projects/hammer/lib/msun/Symbol.map#3 integrate .. //depot/projects/hammer/lib/msun/src/math.h#31 integrate .. //depot/projects/hammer/lib/msun/src/s_copysignl.c#2 integrate .. //depot/projects/hammer/lib/msun/src/s_fmal.c#3 integrate .. //depot/projects/hammer/lib/msun/src/s_modfl.c#1 branch .. //depot/projects/hammer/sbin/ipfw/ipfw2.c#53 integrate .. //depot/projects/hammer/sys/bsm/audit.h#6 integrate .. //depot/projects/hammer/sys/bsm/audit_internal.h#3 integrate .. //depot/projects/hammer/sys/bsm/audit_kevents.h#7 integrate .. //depot/projects/hammer/sys/bsm/audit_record.h#4 integrate .. //depot/projects/hammer/sys/dev/mfi/mfi.c#5 integrate .. //depot/projects/hammer/sys/pc98/pc98/machdep.c#14 integrate .. //depot/projects/hammer/sys/vm/vm_kern.c#24 integrate .. //depot/projects/hammer/tools/regression/lib/msun/test-rem.c#2 integrate .. //depot/projects/hammer/usr.sbin/pcvt/ispcvt/Makefile#4 delete Differences ... ==== //depot/projects/hammer/lib/libc/sys/open.2#9 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)open.2 8.2 (Berkeley) 11/16/93 -.\" $FreeBSD: src/lib/libc/sys/open.2,v 1.33 2006/09/17 21:27:34 ru Exp $ +.\" $FreeBSD: src/lib/libc/sys/open.2,v 1.34 2007/01/07 17:32:16 pjd Exp $ .\" .Dd January 10, 2006 .Dt OPEN 2 @@ -238,7 +238,7 @@ Too many symbolic links were encountered in translating the pathname. .It Bq Er EISDIR The named file is a directory, and the arguments specify -it is to be opened for writing. +it is to be modified. .It Bq Er EROFS The named file resides on a read-only file system, and the file is to be modified. ==== //depot/projects/hammer/lib/msun/Makefile#33 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 5.1beta 93/09/24 -# $FreeBSD: src/lib/msun/Makefile,v 1.75 2006/03/27 23:59:44 deischen Exp $ +# $FreeBSD: src/lib/msun/Makefile,v 1.76 2007/01/07 07:54:20 das Exp $ # # ==================================================== # Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved. @@ -69,7 +69,7 @@ .endif # C99 long double functions -COMMON_SRCS+= s_copysignl.c s_fabsl.c +COMMON_SRCS+= s_copysignl.c s_fabsl.c s_modfl.c .if ${LDBL_PREC} != 53 # If long double != double use these; otherwise, we alias the double versions. COMMON_SRCS+= s_fmal.c s_frexpl.c s_nextafterl.c s_nexttoward.c s_scalbnl.c ==== //depot/projects/hammer/lib/msun/Symbol.map#3 (text) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/msun/Symbol.map,v 1.2 2007/01/06 21:18:17 das Exp $ +# $FreeBSD: src/lib/msun/Symbol.map,v 1.3 2007/01/07 07:54:21 das Exp $ FBSD_1.0 { __fe_dfl_env; tgamma; @@ -134,6 +134,7 @@ lroundf; lroundl; modff; + modfl; nearbyint; nearbyintf; nextafter; ==== //depot/projects/hammer/lib/msun/src/math.h#31 (text+ko) ==== @@ -11,7 +11,7 @@ /* * from: @(#)fdlibm.h 5.1 93/09/24 - * $FreeBSD: src/lib/msun/src/math.h,v 1.61 2005/04/16 21:12:47 das Exp $ + * $FreeBSD: src/lib/msun/src/math.h,v 1.62 2007/01/07 07:54:21 das Exp $ */ #ifndef _MATH_H_ @@ -439,8 +439,8 @@ long lrintl(long double); #endif long lroundl(long double); +long double modfl(long double, long double *); /* fundamentally !__pure2 */ #if 0 -long double modfl(long double, long double *); /* fundamentally !__pure2 */ long double nanl(const char *) __pure2; long double nearbyintl(long double); #endif ==== //depot/projects/hammer/lib/msun/src/s_copysignl.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/msun/src/s_copysignl.c,v 1.1 2004/05/07 18:56:31 stefanf Exp $ + * $FreeBSD: src/lib/msun/src/s_copysignl.c,v 1.2 2007/01/07 07:54:21 das Exp $ */ #include ==== //depot/projects/hammer/lib/msun/src/s_fmal.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/msun/src/s_fmal.c,v 1.2 2005/03/18 02:27:59 das Exp $"); +__FBSDID("$FreeBSD: src/lib/msun/src/s_fmal.c,v 1.3 2007/01/07 07:54:21 das Exp $"); #include #include ==== //depot/projects/hammer/sbin/ipfw/ipfw2.c#53 (text+ko) ==== @@ -17,7 +17,7 @@ * * NEW command line interface for IP firewall facility * - * $FreeBSD: src/sbin/ipfw/ipfw2.c,v 1.100 2006/12/29 21:59:17 piso Exp $ + * $FreeBSD: src/sbin/ipfw/ipfw2.c,v 1.101 2007/01/07 03:02:02 mlaier Exp $ */ #include @@ -2763,13 +2763,17 @@ * ',' indicating another address follows, '{' indicating a * set of addresses of unspecified size. */ - char *p = strpbrk(av, "/:,{"); + char *t = NULL, *p = strpbrk(av, "/:,{"); int masklen; - char md; + char md, nd; if (p) { md = *p; *p++ = '\0'; + if ((t = strpbrk(p, ",{")) != NULL) { + nd = *t; + *t = '\0'; + } } else md = '\0'; @@ -2803,6 +2807,8 @@ break; } d[0] &= d[1]; /* mask base address with mask */ + if (t) + *t = nd; /* find next separator */ if (p) p = strpbrk(p, ",{"); ==== //depot/projects/hammer/sys/bsm/audit.h#6 (text) ==== ==== //depot/projects/hammer/sys/bsm/audit_internal.h#3 (text) ==== ==== //depot/projects/hammer/sys/bsm/audit_kevents.h#7 (text) ==== ==== //depot/projects/hammer/sys/bsm/audit_record.h#4 (text) ==== ==== //depot/projects/hammer/sys/dev/mfi/mfi.c#5 (text) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/mfi/mfi.c,v 1.25 2007/01/02 04:12:34 scottl Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/mfi/mfi.c,v 1.26 2007/01/07 06:43:25 scottl Exp $"); #include "opt_mfi.h" @@ -90,7 +90,7 @@ SYSCTL_INT(_hw_mfi, OID_AUTO, event_locale, CTLFLAG_RW, &mfi_event_locale, 0, "event message locale"); -static int mfi_event_class = 10; +static int mfi_event_class = MFI_EVT_CLASS_INFO; TUNABLE_INT("hw.mfi.event_class", &mfi_event_class); SYSCTL_INT(_hw_mfi, OID_AUTO, event_class, CTLFLAG_RW, &mfi_event_class, 0, "event message class"); ==== //depot/projects/hammer/sys/pc98/pc98/machdep.c#14 (text+ko) ==== @@ -38,7 +38,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/pc98/pc98/machdep.c,v 1.385 2006/12/06 18:27:17 sobomax Exp $"); +__FBSDID("$FreeBSD: src/sys/pc98/pc98/machdep.c,v 1.386 2007/01/07 12:13:10 nyan Exp $"); #include "opt_atalk.h" #include "opt_compat.h" @@ -1960,6 +1960,7 @@ PCPU_SET(prvspace, pc); PCPU_SET(curthread, &thread0); PCPU_SET(curpcb, thread0.td_pcb); + PCPU_SET(curtid, thread0.td_tid); /* * Initialize mutexes. ==== //depot/projects/hammer/sys/vm/vm_kern.c#24 (text+ko) ==== @@ -63,7 +63,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/vm/vm_kern.c,v 1.125 2006/11/13 00:27:02 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/vm/vm_kern.c,v 1.126 2007/01/07 07:32:04 alc Exp $"); #include #include @@ -487,7 +487,8 @@ /* N.B.: cannot use kgdb to debug, starting with this assignment ... */ kernel_map = m; (void) vm_map_insert(m, NULL, (vm_ooffset_t) 0, - VM_MIN_KERNEL_ADDRESS, start, VM_PROT_ALL, VM_PROT_ALL, 0); + VM_MIN_KERNEL_ADDRESS, start, VM_PROT_ALL, VM_PROT_ALL, + MAP_NOFAULT); /* ... and ending with the completion of the above `insert' */ vm_map_unlock(m); } ==== //depot/projects/hammer/tools/regression/lib/msun/test-rem.c#2 (text+ko) ==== @@ -30,7 +30,7 @@ */ #include -__FBSDID("$FreeBSD: src/tools/regression/lib/msun/test-rem.c,v 1.1 2005/03/25 06:24:46 das Exp $"); +__FBSDID("$FreeBSD: src/tools/regression/lib/msun/test-rem.c,v 1.2 2007/01/07 09:25:22 das Exp $"); #include #include @@ -100,11 +100,15 @@ assert(isnan(remainder(x, y))); assert(isnan(remquo(x, y, &q))); +#ifdef STRICT assert(q == 0xdeadbeef); +#endif assert(isnan(remainderf(x, y))); assert(isnan(remquof(x, y, &q))); +#ifdef STRICT assert(q == 0xdeadbeef); +#endif } /* 0x012345 ==> 0x01ffff */ @@ -123,9 +127,11 @@ assert(remainder(x, y) == expected_rem); assert(remquo(x, y, &q) == expected_rem); assert((q & 0x7) == (expected_quo & 0x7)); - assert((q > 0) ^ !(expected_quo > 0)); - q = abs(q); - assert((q & mask(q)) == (abs(expected_quo) & mask(q))); + if (q != 0) { + assert((q > 0) ^ !(expected_quo > 0)); + q = abs(q); + assert(q == (abs(expected_quo) & mask(q))); + } } static void @@ -137,7 +143,9 @@ assert(remainderf(x, y) == expected_rem); assert(remquof(x, y, &q) == expected_rem); assert((q & 0x7) == (expected_quo & 0x7)); - assert((q > 0) ^ !(expected_quo > 0)); - q = abs(q); - assert((q & mask(q)) == (abs(expected_quo) & mask(q))); + if (q != 0) { + assert((q > 0) ^ !(expected_quo > 0)); + q = abs(q); + assert((q & mask(q)) == (abs(expected_quo) & mask(q))); + } } From owner-p4-projects@FreeBSD.ORG Wed Jan 10 16:24:41 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B037D16A416; Wed, 10 Jan 2007 16:24: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 8EF0116A412 for ; Wed, 10 Jan 2007 16:24:41 +0000 (UTC) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 68FE513C461 for ; Wed, 10 Jan 2007 16:24:41 +0000 (UTC) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l0AGOfAn090333 for ; Wed, 10 Jan 2007 16:24:41 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0AGOf82090330 for perforce@freebsd.org; Wed, 10 Jan 2007 16:24:41 GMT (envelope-from peter@freebsd.org) Date: Wed, 10 Jan 2007 16:24:41 GMT Message-Id: <200701101624.l0AGOf82090330@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Cc: Subject: PERFORCE change 112709 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 10 Jan 2007 16:24:41 -0000 http://perforce.freebsd.org/chv.cgi?CH=112709 Change 112709 by peter@peter_overcee on 2007/01/10 16:24:10 IFC @112657 Affected files ... .. //depot/projects/hammer/sys/dev/sound/midi/midi.c#5 branch .. //depot/projects/hammer/sys/dev/sound/midi/midi.h#5 branch .. //depot/projects/hammer/sys/dev/sound/midi/sequencer.c#5 branch .. //depot/projects/hammer/sys/dev/sound/midi/sequencer.h#3 branch Differences ... From owner-p4-projects@FreeBSD.ORG Wed Jan 10 17:47:12 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7EC1416A417; Wed, 10 Jan 2007 17:47:12 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 3C2E116A415 for ; Wed, 10 Jan 2007 17:47:12 +0000 (UTC) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 2A50713C45A for ; Wed, 10 Jan 2007 17:47:12 +0000 (UTC) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l0AHlC0K014956 for ; Wed, 10 Jan 2007 17:47:12 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0AHkmem014946 for perforce@freebsd.org; Wed, 10 Jan 2007 17:46:48 GMT (envelope-from peter@freebsd.org) Date: Wed, 10 Jan 2007 17:46:48 GMT Message-Id: <200701101746.l0AHkmem014946@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Cc: Subject: PERFORCE change 112720 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 10 Jan 2007 17:47:12 -0000 http://perforce.freebsd.org/chv.cgi?CH=112720 Change 112720 by peter@peter_overcee on 2007/01/10 17:46:36 IFC @112719 Affected files ... .. //depot/projects/hammer/etc/rc.d/power_profile#9 integrate .. //depot/projects/hammer/lib/libarchive/COPYING#3 integrate .. //depot/projects/hammer/lib/libarchive/archive.h.in#13 integrate .. //depot/projects/hammer/lib/libarchive/archive_check_magic.c#6 integrate .. //depot/projects/hammer/lib/libarchive/archive_entry.3#11 integrate .. //depot/projects/hammer/lib/libarchive/archive_entry.c#26 integrate .. //depot/projects/hammer/lib/libarchive/archive_entry.h#17 integrate .. //depot/projects/hammer/lib/libarchive/archive_platform.h#16 integrate .. //depot/projects/hammer/lib/libarchive/archive_private.h#22 integrate .. //depot/projects/hammer/lib/libarchive/archive_read.3#20 integrate .. //depot/projects/hammer/lib/libarchive/archive_read.c#17 integrate .. //depot/projects/hammer/lib/libarchive/archive_read_data_into_buffer.c#6 integrate .. //depot/projects/hammer/lib/libarchive/archive_read_data_into_fd.c#12 integrate .. //depot/projects/hammer/lib/libarchive/archive_read_extract.c#30 integrate .. //depot/projects/hammer/lib/libarchive/archive_read_open_fd.c#7 integrate .. //depot/projects/hammer/lib/libarchive/archive_read_open_file.c#11 integrate .. //depot/projects/hammer/lib/libarchive/archive_read_open_filename.c#2 integrate .. //depot/projects/hammer/lib/libarchive/archive_read_open_memory.c#2 integrate .. //depot/projects/hammer/lib/libarchive/archive_read_support_compression_all.c#6 integrate .. //depot/projects/hammer/lib/libarchive/archive_read_support_compression_bzip2.c#9 integrate .. //depot/projects/hammer/lib/libarchive/archive_read_support_compression_compress.c#6 integrate .. //depot/projects/hammer/lib/libarchive/archive_read_support_compression_gzip.c#10 integrate .. //depot/projects/hammer/lib/libarchive/archive_read_support_compression_none.c#8 integrate .. //depot/projects/hammer/lib/libarchive/archive_read_support_format_all.c#7 integrate .. //depot/projects/hammer/lib/libarchive/archive_read_support_format_cpio.c#17 integrate .. //depot/projects/hammer/lib/libarchive/archive_read_support_format_iso9660.c#11 integrate .. //depot/projects/hammer/lib/libarchive/archive_read_support_format_tar.c#29 integrate .. //depot/projects/hammer/lib/libarchive/archive_read_support_format_zip.c#8 integrate .. //depot/projects/hammer/lib/libarchive/archive_string.c#8 integrate .. //depot/projects/hammer/lib/libarchive/archive_string.h#8 integrate .. //depot/projects/hammer/lib/libarchive/archive_string_sprintf.c#8 integrate .. //depot/projects/hammer/lib/libarchive/archive_util.3#5 integrate .. //depot/projects/hammer/lib/libarchive/archive_util.c#11 integrate .. //depot/projects/hammer/lib/libarchive/archive_write.3#12 integrate .. //depot/projects/hammer/lib/libarchive/archive_write.c#15 integrate .. //depot/projects/hammer/lib/libarchive/archive_write_open_fd.c#6 integrate .. //depot/projects/hammer/lib/libarchive/archive_write_open_file.c#12 integrate .. //depot/projects/hammer/lib/libarchive/archive_write_open_filename.c#2 integrate .. //depot/projects/hammer/lib/libarchive/archive_write_open_memory.c#2 integrate .. //depot/projects/hammer/lib/libarchive/archive_write_set_compression_bzip2.c#11 integrate .. //depot/projects/hammer/lib/libarchive/archive_write_set_compression_gzip.c#12 integrate .. //depot/projects/hammer/lib/libarchive/archive_write_set_compression_none.c#11 integrate .. //depot/projects/hammer/lib/libarchive/archive_write_set_format.c#4 integrate .. //depot/projects/hammer/lib/libarchive/archive_write_set_format_by_name.c#5 integrate .. //depot/projects/hammer/lib/libarchive/archive_write_set_format_cpio.c#8 integrate .. //depot/projects/hammer/lib/libarchive/archive_write_set_format_pax.c#28 integrate .. //depot/projects/hammer/lib/libarchive/archive_write_set_format_shar.c#10 integrate .. //depot/projects/hammer/lib/libarchive/archive_write_set_format_ustar.c#13 integrate .. //depot/projects/hammer/lib/libarchive/config_freebsd.h#2 integrate .. //depot/projects/hammer/lib/libarchive/libarchive-formats.5#12 integrate .. //depot/projects/hammer/lib/libarchive/libarchive.3#9 integrate .. //depot/projects/hammer/lib/libarchive/tar.5#14 integrate .. //depot/projects/hammer/lib/libc/amd64/SYS.h#7 integrate .. //depot/projects/hammer/lib/libc/amd64/gen/_setjmp.S#7 integrate .. //depot/projects/hammer/lib/libc/amd64/gen/ldexp.c#8 integrate .. //depot/projects/hammer/lib/libc/amd64/gen/modf.S#7 integrate .. //depot/projects/hammer/lib/libc/amd64/gen/setjmp.S#9 integrate .. //depot/projects/hammer/lib/libc/amd64/gen/sigsetjmp.S#10 integrate .. //depot/projects/hammer/lib/libc/amd64/sys/brk.S#9 integrate .. //depot/projects/hammer/lib/libc/amd64/sys/cerror.S#6 integrate .. //depot/projects/hammer/lib/libc/amd64/sys/exect.S#8 integrate .. //depot/projects/hammer/lib/libc/amd64/sys/pipe.S#8 integrate .. //depot/projects/hammer/lib/libc/amd64/sys/ptrace.S#7 integrate .. //depot/projects/hammer/lib/libc/amd64/sys/reboot.S#6 integrate .. //depot/projects/hammer/lib/libc/amd64/sys/sbrk.S#7 integrate .. //depot/projects/hammer/lib/libc/amd64/sys/setlogin.S#8 integrate .. //depot/projects/hammer/lib/libc/amd64/sys/sigreturn.S#5 integrate .. //depot/projects/hammer/lib/libc/amd64/sys/vfork.S#7 integrate .. //depot/projects/hammer/lib/libc/compat-43/creat.2#3 integrate .. //depot/projects/hammer/lib/libc/compat-43/creat.c#2 integrate .. //depot/projects/hammer/lib/libc/compat-43/gethostid.3#5 integrate .. //depot/projects/hammer/lib/libc/compat-43/gethostid.c#3 integrate .. //depot/projects/hammer/lib/libc/compat-43/getwd.c#3 integrate .. //depot/projects/hammer/lib/libc/compat-43/killpg.2#4 integrate .. //depot/projects/hammer/lib/libc/compat-43/killpg.c#2 integrate .. //depot/projects/hammer/lib/libc/compat-43/sethostid.c#3 integrate .. //depot/projects/hammer/lib/libc/compat-43/setpgrp.c#2 integrate .. //depot/projects/hammer/lib/libc/compat-43/setrgid.c#2 integrate .. //depot/projects/hammer/lib/libc/compat-43/setruid.3#3 integrate .. //depot/projects/hammer/lib/libc/compat-43/setruid.c#2 integrate .. //depot/projects/hammer/lib/libc/compat-43/sigcompat.c#2 integrate .. //depot/projects/hammer/lib/libc/compat-43/sigpause.2#4 integrate .. //depot/projects/hammer/lib/libc/compat-43/sigsetmask.2#3 integrate .. //depot/projects/hammer/lib/libc/compat-43/sigvec.2#6 integrate .. //depot/projects/hammer/lib/libc/db/btree/bt_close.c#2 integrate .. //depot/projects/hammer/lib/libc/db/btree/bt_conv.c#2 integrate .. //depot/projects/hammer/lib/libc/db/btree/bt_debug.c#3 integrate .. //depot/projects/hammer/lib/libc/db/btree/bt_delete.c#2 integrate .. //depot/projects/hammer/lib/libc/db/btree/bt_get.c#2 integrate .. //depot/projects/hammer/lib/libc/db/btree/bt_open.c#2 integrate .. //depot/projects/hammer/lib/libc/db/btree/bt_overflow.c#2 integrate .. //depot/projects/hammer/lib/libc/db/btree/bt_page.c#2 integrate .. //depot/projects/hammer/lib/libc/db/btree/bt_put.c#4 integrate .. //depot/projects/hammer/lib/libc/db/btree/bt_search.c#2 integrate .. //depot/projects/hammer/lib/libc/db/btree/bt_seq.c#2 integrate .. //depot/projects/hammer/lib/libc/db/btree/bt_split.c#5 integrate .. //depot/projects/hammer/lib/libc/db/btree/bt_utils.c#3 integrate .. //depot/projects/hammer/lib/libc/db/btree/btree.h#2 integrate .. //depot/projects/hammer/lib/libc/db/btree/extern.h#2 integrate .. //depot/projects/hammer/lib/libc/db/db/db.c#2 integrate .. //depot/projects/hammer/lib/libc/db/hash/extern.h#2 integrate .. //depot/projects/hammer/lib/libc/db/hash/hash.c#3 integrate .. //depot/projects/hammer/lib/libc/db/hash/hash.h#2 integrate .. //depot/projects/hammer/lib/libc/db/hash/hash_bigkey.c#3 integrate .. //depot/projects/hammer/lib/libc/db/hash/hash_buf.c#2 integrate .. //depot/projects/hammer/lib/libc/db/hash/hash_func.c#3 integrate .. //depot/projects/hammer/lib/libc/db/hash/hash_log2.c#2 integrate .. //depot/projects/hammer/lib/libc/db/hash/hash_page.c#2 integrate .. //depot/projects/hammer/lib/libc/db/hash/ndbm.c#2 integrate .. //depot/projects/hammer/lib/libc/db/hash/page.h#2 integrate .. //depot/projects/hammer/lib/libc/db/man/btree.3#5 integrate .. //depot/projects/hammer/lib/libc/db/man/dbopen.3#8 integrate .. //depot/projects/hammer/lib/libc/db/man/hash.3#4 integrate .. //depot/projects/hammer/lib/libc/db/man/mpool.3#5 integrate .. //depot/projects/hammer/lib/libc/db/man/recno.3#4 integrate .. //depot/projects/hammer/lib/libc/db/mpool/mpool.c#4 integrate .. //depot/projects/hammer/lib/libc/db/recno/extern.h#2 integrate .. //depot/projects/hammer/lib/libc/db/recno/rec_close.c#3 integrate .. //depot/projects/hammer/lib/libc/db/recno/rec_delete.c#2 integrate .. //depot/projects/hammer/lib/libc/db/recno/rec_get.c#2 integrate .. //depot/projects/hammer/lib/libc/db/recno/rec_open.c#2 integrate .. //depot/projects/hammer/lib/libc/db/recno/rec_put.c#2 integrate .. //depot/projects/hammer/lib/libc/db/recno/rec_search.c#2 integrate .. //depot/projects/hammer/lib/libc/db/recno/rec_seq.c#3 integrate .. //depot/projects/hammer/lib/libc/db/recno/rec_utils.c#2 integrate .. //depot/projects/hammer/lib/libc/db/recno/recno.h#2 integrate .. //depot/projects/hammer/lib/libc/db/test/btree.tests/main.c#2 integrate .. //depot/projects/hammer/lib/libc/db/test/dbtest.c#2 integrate .. //depot/projects/hammer/lib/libc/db/test/hash.tests/driver2.c#2 integrate .. //depot/projects/hammer/lib/libc/db/test/hash.tests/tcreat3.c#2 integrate .. //depot/projects/hammer/lib/libc/db/test/hash.tests/tdel.c#2 integrate .. //depot/projects/hammer/lib/libc/db/test/hash.tests/thash4.c#2 integrate .. //depot/projects/hammer/lib/libc/db/test/hash.tests/tread2.c#2 integrate .. //depot/projects/hammer/lib/libc/db/test/hash.tests/tseq.c#2 integrate .. //depot/projects/hammer/lib/libc/db/test/hash.tests/tverify.c#2 integrate .. //depot/projects/hammer/lib/libc/gen/__xuname.c#3 integrate .. //depot/projects/hammer/lib/libc/gen/alarm.3#3 integrate .. //depot/projects/hammer/lib/libc/gen/alarm.c#2 integrate .. //depot/projects/hammer/lib/libc/gen/assert.c#2 integrate .. //depot/projects/hammer/lib/libc/gen/clock.3#2 integrate .. //depot/projects/hammer/lib/libc/gen/clock.c#2 integrate .. //depot/projects/hammer/lib/libc/gen/closedir.c#2 integrate .. //depot/projects/hammer/lib/libc/gen/confstr.3#4 integrate .. //depot/projects/hammer/lib/libc/gen/confstr.c#5 integrate .. //depot/projects/hammer/lib/libc/gen/crypt.c#3 integrate .. //depot/projects/hammer/lib/libc/gen/ctermid.3#4 integrate .. //depot/projects/hammer/lib/libc/gen/ctermid.c#2 integrate .. //depot/projects/hammer/lib/libc/gen/daemon.3#3 integrate .. //depot/projects/hammer/lib/libc/gen/daemon.c#4 integrate .. //depot/projects/hammer/lib/libc/gen/devname.3#6 integrate .. //depot/projects/hammer/lib/libc/gen/devname.c#4 integrate .. //depot/projects/hammer/lib/libc/gen/directory.3#4 integrate .. //depot/projects/hammer/lib/libc/gen/disklabel.c#3 integrate .. //depot/projects/hammer/lib/libc/gen/err.3#4 integrate .. //depot/projects/hammer/lib/libc/gen/err.c#2 integrate .. //depot/projects/hammer/lib/libc/gen/errlst.c#5 integrate .. //depot/projects/hammer/lib/libc/gen/exec.3#9 integrate .. //depot/projects/hammer/lib/libc/gen/exec.c#4 integrate .. //depot/projects/hammer/lib/libc/gen/fnmatch.3#7 integrate .. //depot/projects/hammer/lib/libc/gen/fnmatch.c#4 integrate .. //depot/projects/hammer/lib/libc/gen/frexp.3#5 integrate .. //depot/projects/hammer/lib/libc/gen/fstab.c#3 integrate .. //depot/projects/hammer/lib/libc/gen/fts.3#9 integrate .. //depot/projects/hammer/lib/libc/gen/fts.c#8 integrate .. //depot/projects/hammer/lib/libc/gen/getbootfile.3#5 integrate .. //depot/projects/hammer/lib/libc/gen/getbootfile.c#4 integrate .. //depot/projects/hammer/lib/libc/gen/getbsize.3#4 integrate .. //depot/projects/hammer/lib/libc/gen/getbsize.c#4 integrate .. //depot/projects/hammer/lib/libc/gen/getcap.3#6 integrate .. //depot/projects/hammer/lib/libc/gen/getcap.c#3 integrate .. //depot/projects/hammer/lib/libc/gen/getcwd.3#3 integrate .. //depot/projects/hammer/lib/libc/gen/getcwd.c#6 integrate .. //depot/projects/hammer/lib/libc/gen/getdiskbyname.3#3 integrate .. //depot/projects/hammer/lib/libc/gen/getdomainname.3#6 integrate .. //depot/projects/hammer/lib/libc/gen/getdomainname.c#2 integrate .. //depot/projects/hammer/lib/libc/gen/getfsent.3#7 integrate .. //depot/projects/hammer/lib/libc/gen/getgrent.3#9 integrate .. //depot/projects/hammer/lib/libc/gen/getgrouplist.3#2 integrate .. //depot/projects/hammer/lib/libc/gen/getgrouplist.c#5 integrate .. //depot/projects/hammer/lib/libc/gen/gethostname.3#5 integrate .. //depot/projects/hammer/lib/libc/gen/gethostname.c#5 integrate .. //depot/projects/hammer/lib/libc/gen/getloadavg.3#2 integrate .. //depot/projects/hammer/lib/libc/gen/getloadavg.c#2 integrate .. //depot/projects/hammer/lib/libc/gen/getlogin.c#3 integrate .. //depot/projects/hammer/lib/libc/gen/getmntinfo.3#3 integrate .. //depot/projects/hammer/lib/libc/gen/getmntinfo.c#2 integrate .. //depot/projects/hammer/lib/libc/gen/getnetgrent.3#4 integrate .. //depot/projects/hammer/lib/libc/gen/getnetgrent.c#7 integrate .. //depot/projects/hammer/lib/libc/gen/getosreldate.c#4 integrate .. //depot/projects/hammer/lib/libc/gen/getpagesize.3#3 integrate .. //depot/projects/hammer/lib/libc/gen/getpagesize.c#3 integrate .. //depot/projects/hammer/lib/libc/gen/getpass.3#2 integrate .. //depot/projects/hammer/lib/libc/gen/getpwent.3#11 integrate .. //depot/projects/hammer/lib/libc/gen/getttyent.3#4 integrate .. //depot/projects/hammer/lib/libc/gen/getttyent.c#4 integrate .. //depot/projects/hammer/lib/libc/gen/getusershell.3#3 integrate .. //depot/projects/hammer/lib/libc/gen/getusershell.c#4 integrate .. //depot/projects/hammer/lib/libc/gen/getvfsbyname.3#4 integrate .. //depot/projects/hammer/lib/libc/gen/getvfsbyname.c#4 integrate .. //depot/projects/hammer/lib/libc/gen/glob.3#9 integrate .. //depot/projects/hammer/lib/libc/gen/glob.c#6 integrate .. //depot/projects/hammer/lib/libc/gen/initgroups.3#2 integrate .. //depot/projects/hammer/lib/libc/gen/initgroups.c#3 integrate .. //depot/projects/hammer/lib/libc/gen/isatty.c#2 integrate .. //depot/projects/hammer/lib/libc/gen/ldexp.3#4 integrate .. //depot/projects/hammer/lib/libc/gen/modf.3#3 integrate .. //depot/projects/hammer/lib/libc/gen/nice.3#2 integrate .. //depot/projects/hammer/lib/libc/gen/nice.c#2 integrate .. //depot/projects/hammer/lib/libc/gen/nlist.3#2 integrate .. //depot/projects/hammer/lib/libc/gen/nlist.c#4 integrate .. //depot/projects/hammer/lib/libc/gen/opendir.c#6 integrate .. //depot/projects/hammer/lib/libc/gen/pause.3#2 integrate .. //depot/projects/hammer/lib/libc/gen/pause.c#2 integrate .. //depot/projects/hammer/lib/libc/gen/popen.3#5 integrate .. //depot/projects/hammer/lib/libc/gen/popen.c#3 integrate .. //depot/projects/hammer/lib/libc/gen/psignal.3#3 integrate .. //depot/projects/hammer/lib/libc/gen/psignal.c#2 integrate .. //depot/projects/hammer/lib/libc/gen/pw_scan.c#6 integrate .. //depot/projects/hammer/lib/libc/gen/pw_scan.h#2 integrate .. //depot/projects/hammer/lib/libc/gen/pwcache.3#4 integrate .. //depot/projects/hammer/lib/libc/gen/pwcache.c#2 integrate .. //depot/projects/hammer/lib/libc/gen/raise.3#2 integrate .. //depot/projects/hammer/lib/libc/gen/raise.c#3 integrate .. //depot/projects/hammer/lib/libc/gen/readdir.c#3 integrate .. //depot/projects/hammer/lib/libc/gen/rewinddir.c#2 integrate .. //depot/projects/hammer/lib/libc/gen/scandir.3#3 integrate .. //depot/projects/hammer/lib/libc/gen/scandir.c#2 integrate .. //depot/projects/hammer/lib/libc/gen/seekdir.c#2 integrate .. //depot/projects/hammer/lib/libc/gen/setdomainname.c#2 integrate .. //depot/projects/hammer/lib/libc/gen/sethostname.c#3 integrate .. //depot/projects/hammer/lib/libc/gen/setjmp.3#4 integrate .. //depot/projects/hammer/lib/libc/gen/setjmperr.c#2 integrate .. //depot/projects/hammer/lib/libc/gen/setmode.3#2 integrate .. //depot/projects/hammer/lib/libc/gen/setmode.c#4 integrate .. //depot/projects/hammer/lib/libc/gen/siginterrupt.3#3 integrate .. //depot/projects/hammer/lib/libc/gen/siginterrupt.c#2 integrate .. //depot/projects/hammer/lib/libc/gen/siglist.c#3 integrate .. //depot/projects/hammer/lib/libc/gen/signal.3#11 integrate .. //depot/projects/hammer/lib/libc/gen/signal.c#2 integrate .. //depot/projects/hammer/lib/libc/gen/sigsetops.3#5 integrate .. //depot/projects/hammer/lib/libc/gen/sigsetops.c#2 integrate .. //depot/projects/hammer/lib/libc/gen/sleep.3#3 integrate .. //depot/projects/hammer/lib/libc/gen/sleep.c#2 integrate .. //depot/projects/hammer/lib/libc/gen/stringlist.c#3 integrate .. //depot/projects/hammer/lib/libc/gen/strtofflags.3#2 integrate .. //depot/projects/hammer/lib/libc/gen/strtofflags.c#3 integrate .. //depot/projects/hammer/lib/libc/gen/sysconf.3#6 integrate .. //depot/projects/hammer/lib/libc/gen/sysconf.c#6 integrate .. //depot/projects/hammer/lib/libc/gen/sysctl.3#10 integrate .. //depot/projects/hammer/lib/libc/gen/sysctl.c#3 integrate .. //depot/projects/hammer/lib/libc/gen/syslog.3#4 integrate .. //depot/projects/hammer/lib/libc/gen/syslog.c#13 integrate .. //depot/projects/hammer/lib/libc/gen/tcgetpgrp.3#2 integrate .. //depot/projects/hammer/lib/libc/gen/tcsendbreak.3#3 integrate .. //depot/projects/hammer/lib/libc/gen/tcsetattr.3#4 integrate .. //depot/projects/hammer/lib/libc/gen/tcsetpgrp.3#2 integrate .. //depot/projects/hammer/lib/libc/gen/telldir.c#2 integrate .. //depot/projects/hammer/lib/libc/gen/termios.c#2 integrate .. //depot/projects/hammer/lib/libc/gen/time.3#5 integrate .. //depot/projects/hammer/lib/libc/gen/time.c#3 integrate .. //depot/projects/hammer/lib/libc/gen/times.3#2 integrate .. //depot/projects/hammer/lib/libc/gen/times.c#3 integrate .. //depot/projects/hammer/lib/libc/gen/timezone.3#3 integrate .. //depot/projects/hammer/lib/libc/gen/timezone.c#2 integrate .. //depot/projects/hammer/lib/libc/gen/ttyname.3#6 integrate .. //depot/projects/hammer/lib/libc/gen/ttyname.c#7 integrate .. //depot/projects/hammer/lib/libc/gen/ttyslot.c#2 integrate .. //depot/projects/hammer/lib/libc/gen/tzset.3#4 integrate .. //depot/projects/hammer/lib/libc/gen/ualarm.3#5 integrate .. //depot/projects/hammer/lib/libc/gen/ualarm.c#3 integrate .. //depot/projects/hammer/lib/libc/gen/uname.3#5 integrate .. //depot/projects/hammer/lib/libc/gen/uname.c#2 integrate .. //depot/projects/hammer/lib/libc/gen/unvis.3#4 integrate .. //depot/projects/hammer/lib/libc/gen/unvis.c#4 integrate .. //depot/projects/hammer/lib/libc/gen/usleep.3#3 integrate .. //depot/projects/hammer/lib/libc/gen/usleep.c#4 integrate .. //depot/projects/hammer/lib/libc/gen/utime.3#5 integrate .. //depot/projects/hammer/lib/libc/gen/utime.c#2 integrate .. //depot/projects/hammer/lib/libc/gen/valloc.3#4 integrate .. //depot/projects/hammer/lib/libc/gen/valloc.c#3 integrate .. //depot/projects/hammer/lib/libc/gen/vis.3#10 integrate .. //depot/projects/hammer/lib/libc/gen/vis.c#4 integrate .. //depot/projects/hammer/lib/libc/gen/wait.c#2 integrate .. //depot/projects/hammer/lib/libc/gen/wait3.c#2 integrate .. //depot/projects/hammer/lib/libc/gen/waitpid.c#2 integrate .. //depot/projects/hammer/lib/libc/gmon/gmon.c#9 integrate .. //depot/projects/hammer/lib/libc/gmon/mcount.c#5 integrate .. //depot/projects/hammer/lib/libc/gmon/moncontrol.3#5 integrate .. //depot/projects/hammer/lib/libc/i386/SYS.h#3 integrate .. //depot/projects/hammer/lib/libc/i386/gen/_setjmp.S#2 integrate .. //depot/projects/hammer/lib/libc/i386/gen/fabs.S#2 integrate .. //depot/projects/hammer/lib/libc/i386/gen/ldexp.c#5 integrate .. //depot/projects/hammer/lib/libc/i386/gen/modf.S#3 integrate .. //depot/projects/hammer/lib/libc/i386/gen/setjmp.S#2 integrate .. //depot/projects/hammer/lib/libc/i386/gen/sigsetjmp.S#2 integrate .. //depot/projects/hammer/lib/libc/i386/stdlib/abs.S#2 integrate .. //depot/projects/hammer/lib/libc/i386/stdlib/div.S#3 integrate .. //depot/projects/hammer/lib/libc/i386/stdlib/labs.S#2 integrate .. //depot/projects/hammer/lib/libc/i386/string/bcopy.S#3 integrate .. //depot/projects/hammer/lib/libc/i386/sys/Ovfork.S#2 integrate .. //depot/projects/hammer/lib/libc/i386/sys/brk.S#2 integrate .. //depot/projects/hammer/lib/libc/i386/sys/cerror.S#2 integrate .. //depot/projects/hammer/lib/libc/i386/sys/exect.S#2 integrate .. //depot/projects/hammer/lib/libc/i386/sys/i386_get_ldt.2#7 integrate .. //depot/projects/hammer/lib/libc/i386/sys/pipe.S#2 integrate .. //depot/projects/hammer/lib/libc/i386/sys/ptrace.S#2 integrate .. //depot/projects/hammer/lib/libc/i386/sys/reboot.S#2 integrate .. //depot/projects/hammer/lib/libc/i386/sys/sbrk.S#2 integrate .. //depot/projects/hammer/lib/libc/i386/sys/setlogin.S#2 integrate .. //depot/projects/hammer/lib/libc/i386/sys/sigreturn.S#2 integrate .. //depot/projects/hammer/lib/libc/i386/sys/syscall.S#2 integrate .. //depot/projects/hammer/lib/libc/inet/inet_addr.c#2 integrate .. //depot/projects/hammer/lib/libc/inet/inet_lnaof.c#2 integrate .. //depot/projects/hammer/lib/libc/inet/inet_makeaddr.c#2 integrate .. //depot/projects/hammer/lib/libc/inet/inet_netof.c#2 integrate .. //depot/projects/hammer/lib/libc/inet/inet_network.c#2 integrate .. //depot/projects/hammer/lib/libc/inet/inet_ntoa.c#2 integrate .. //depot/projects/hammer/lib/libc/locale/ctype.3#6 integrate .. //depot/projects/hammer/lib/libc/locale/digittoint.3#3 integrate .. //depot/projects/hammer/lib/libc/locale/euc.5#3 integrate .. //depot/projects/hammer/lib/libc/locale/gbk.c#10 integrate .. //depot/projects/hammer/lib/libc/locale/isalnum.3#7 integrate .. //depot/projects/hammer/lib/libc/locale/isalpha.3#7 integrate .. //depot/projects/hammer/lib/libc/locale/isascii.3#3 integrate .. //depot/projects/hammer/lib/libc/locale/isblank.3#9 integrate .. //depot/projects/hammer/lib/libc/locale/iscntrl.3#8 integrate .. //depot/projects/hammer/lib/libc/locale/isctype.c#3 integrate .. //depot/projects/hammer/lib/libc/locale/isdigit.3#8 integrate .. //depot/projects/hammer/lib/libc/locale/isgraph.3#7 integrate .. //depot/projects/hammer/lib/libc/locale/islower.3#7 integrate .. //depot/projects/hammer/lib/libc/locale/isprint.3#7 integrate .. //depot/projects/hammer/lib/libc/locale/ispunct.3#7 integrate .. //depot/projects/hammer/lib/libc/locale/isspace.3#7 integrate .. //depot/projects/hammer/lib/libc/locale/isupper.3#7 integrate .. //depot/projects/hammer/lib/libc/locale/iswalnum.3#4 integrate .. //depot/projects/hammer/lib/libc/locale/iswctype.c#3 integrate .. //depot/projects/hammer/lib/libc/locale/isxdigit.3#9 integrate .. //depot/projects/hammer/lib/libc/locale/localeconv.3#3 integrate .. //depot/projects/hammer/lib/libc/locale/mblen.3#4 integrate .. //depot/projects/hammer/lib/libc/locale/mbstowcs.3#4 integrate .. //depot/projects/hammer/lib/libc/locale/mbtowc.3#4 integrate .. //depot/projects/hammer/lib/libc/locale/multibyte.3#12 integrate .. //depot/projects/hammer/lib/libc/locale/none.c#10 integrate .. //depot/projects/hammer/lib/libc/locale/rune.c#6 integrate .. //depot/projects/hammer/lib/libc/locale/runetype.c#8 integrate .. //depot/projects/hammer/lib/libc/locale/setlocale.3#11 integrate .. //depot/projects/hammer/lib/libc/locale/setlocale.c#9 integrate .. //depot/projects/hammer/lib/libc/locale/setrunelocale.c#19 integrate .. //depot/projects/hammer/lib/libc/locale/table.c#13 integrate .. //depot/projects/hammer/lib/libc/locale/toascii.3#2 integrate .. //depot/projects/hammer/lib/libc/locale/tolower.3#6 integrate .. //depot/projects/hammer/lib/libc/locale/tolower.c#7 integrate .. //depot/projects/hammer/lib/libc/locale/toupper.3#6 integrate .. //depot/projects/hammer/lib/libc/locale/toupper.c#7 integrate .. //depot/projects/hammer/lib/libc/locale/towlower.3#4 integrate .. //depot/projects/hammer/lib/libc/locale/towupper.3#3 integrate .. //depot/projects/hammer/lib/libc/locale/utf8.5#7 integrate .. //depot/projects/hammer/lib/libc/locale/wcstoimax.c#3 integrate .. //depot/projects/hammer/lib/libc/locale/wcstol.c#2 integrate .. //depot/projects/hammer/lib/libc/locale/wcstoll.c#2 integrate .. //depot/projects/hammer/lib/libc/locale/wcstombs.3#5 integrate .. //depot/projects/hammer/lib/libc/locale/wcstoul.c#2 integrate .. //depot/projects/hammer/lib/libc/locale/wcstoull.c#2 integrate .. //depot/projects/hammer/lib/libc/locale/wcstoumax.c#2 integrate .. //depot/projects/hammer/lib/libc/locale/wctomb.3#4 integrate .. //depot/projects/hammer/lib/libc/locale/wcwidth.c#4 integrate .. //depot/projects/hammer/lib/libc/net/byteorder.3#4 integrate .. //depot/projects/hammer/lib/libc/net/gethostbydns.c#15 integrate .. //depot/projects/hammer/lib/libc/net/gethostbyht.c#7 integrate .. //depot/projects/hammer/lib/libc/net/gethostbyname.3#9 integrate .. //depot/projects/hammer/lib/libc/net/getipnodebyname.3#8 integrate .. //depot/projects/hammer/lib/libc/net/getnetbydns.c#10 integrate .. //depot/projects/hammer/lib/libc/net/getnetbyht.c#8 integrate .. //depot/projects/hammer/lib/libc/net/getnetent.3#7 integrate .. //depot/projects/hammer/lib/libc/net/getproto.c#4 integrate .. //depot/projects/hammer/lib/libc/net/getprotoent.3#5 integrate .. //depot/projects/hammer/lib/libc/net/getprotoent.c#6 integrate .. //depot/projects/hammer/lib/libc/net/getprotoname.c#4 integrate .. //depot/projects/hammer/lib/libc/net/getservent.3#4 integrate .. //depot/projects/hammer/lib/libc/net/getservent.c#9 integrate .. //depot/projects/hammer/lib/libc/net/inet.3#7 integrate .. //depot/projects/hammer/lib/libc/net/inet_net.3#4 integrate .. //depot/projects/hammer/lib/libc/net/linkaddr.3#4 integrate .. //depot/projects/hammer/lib/libc/net/linkaddr.c#2 integrate .. //depot/projects/hammer/lib/libc/net/map_v4v6.c#3 integrate .. //depot/projects/hammer/lib/libc/net/nsdispatch.3#7 integrate .. //depot/projects/hammer/lib/libc/net/rcmd.3#5 integrate .. //depot/projects/hammer/lib/libc/net/rcmd.c#7 integrate .. //depot/projects/hammer/lib/libc/net/rcmdsh.3#4 integrate .. //depot/projects/hammer/lib/libc/net/recv.c#2 integrate .. //depot/projects/hammer/lib/libc/net/resolver.3#9 integrate .. //depot/projects/hammer/lib/libc/net/send.c#2 integrate .. //depot/projects/hammer/lib/libc/quad/TESTS/divrem.c#2 integrate .. //depot/projects/hammer/lib/libc/quad/TESTS/mul.c#2 integrate .. //depot/projects/hammer/lib/libc/quad/adddi3.c#2 integrate .. //depot/projects/hammer/lib/libc/quad/anddi3.c#2 integrate .. //depot/projects/hammer/lib/libc/quad/ashldi3.c#2 integrate .. //depot/projects/hammer/lib/libc/quad/ashrdi3.c#2 integrate .. //depot/projects/hammer/lib/libc/quad/cmpdi2.c#2 integrate .. //depot/projects/hammer/lib/libc/quad/divdi3.c#2 integrate .. //depot/projects/hammer/lib/libc/quad/fixdfdi.c#2 integrate .. //depot/projects/hammer/lib/libc/quad/fixsfdi.c#2 integrate .. //depot/projects/hammer/lib/libc/quad/fixunsdfdi.c#2 integrate .. //depot/projects/hammer/lib/libc/quad/fixunssfdi.c#2 integrate .. //depot/projects/hammer/lib/libc/quad/floatdidf.c#2 integrate .. //depot/projects/hammer/lib/libc/quad/floatdisf.c#2 integrate .. //depot/projects/hammer/lib/libc/quad/floatunsdidf.c#2 integrate .. //depot/projects/hammer/lib/libc/quad/iordi3.c#2 integrate .. //depot/projects/hammer/lib/libc/quad/lshldi3.c#2 integrate .. //depot/projects/hammer/lib/libc/quad/lshrdi3.c#2 integrate .. //depot/projects/hammer/lib/libc/quad/moddi3.c#2 integrate .. //depot/projects/hammer/lib/libc/quad/muldi3.c#2 integrate .. //depot/projects/hammer/lib/libc/quad/negdi2.c#2 integrate .. //depot/projects/hammer/lib/libc/quad/notdi2.c#2 integrate .. //depot/projects/hammer/lib/libc/quad/qdivrem.c#2 integrate .. //depot/projects/hammer/lib/libc/quad/quad.h#3 integrate .. //depot/projects/hammer/lib/libc/quad/subdi3.c#2 integrate .. //depot/projects/hammer/lib/libc/quad/ucmpdi2.c#2 integrate .. //depot/projects/hammer/lib/libc/quad/udivdi3.c#2 integrate .. //depot/projects/hammer/lib/libc/quad/umoddi3.c#2 integrate .. //depot/projects/hammer/lib/libc/quad/xordi3.c#2 integrate .. //depot/projects/hammer/lib/libc/regex/cname.h#2 integrate .. //depot/projects/hammer/lib/libc/regex/engine.c#7 integrate .. //depot/projects/hammer/lib/libc/regex/regcomp.c#8 integrate .. //depot/projects/hammer/lib/libc/regex/regerror.c#4 integrate .. //depot/projects/hammer/lib/libc/regex/regex.3#11 integrate .. //depot/projects/hammer/lib/libc/regex/regex2.h#5 integrate .. //depot/projects/hammer/lib/libc/regex/regexec.c#5 integrate .. //depot/projects/hammer/lib/libc/regex/regfree.c#3 integrate .. //depot/projects/hammer/lib/libc/regex/utils.h#2 integrate .. //depot/projects/hammer/lib/libc/resolv/herror.c#2 integrate .. //depot/projects/hammer/lib/libc/resolv/res_comp.c#2 integrate .. //depot/projects/hammer/lib/libc/resolv/res_debug.c#2 integrate .. //depot/projects/hammer/lib/libc/resolv/res_init.c#3 integrate .. //depot/projects/hammer/lib/libc/resolv/res_mkquery.c#2 integrate .. //depot/projects/hammer/lib/libc/resolv/res_query.c#3 integrate .. //depot/projects/hammer/lib/libc/resolv/res_send.c#3 integrate .. //depot/projects/hammer/lib/libc/sparc64/SYS.h#2 integrate .. //depot/projects/hammer/lib/libc/sparc64/fpu/fpu.c#3 integrate .. //depot/projects/hammer/lib/libc/sparc64/fpu/fpu_add.c#2 integrate .. //depot/projects/hammer/lib/libc/sparc64/fpu/fpu_arith.h#2 integrate .. //depot/projects/hammer/lib/libc/sparc64/fpu/fpu_compare.c#2 integrate .. //depot/projects/hammer/lib/libc/sparc64/fpu/fpu_div.c#2 integrate .. //depot/projects/hammer/lib/libc/sparc64/fpu/fpu_emu.h#3 integrate .. //depot/projects/hammer/lib/libc/sparc64/fpu/fpu_explode.c#3 integrate .. //depot/projects/hammer/lib/libc/sparc64/fpu/fpu_implode.c#4 integrate .. //depot/projects/hammer/lib/libc/sparc64/fpu/fpu_mul.c#2 integrate .. //depot/projects/hammer/lib/libc/sparc64/fpu/fpu_sqrt.c#2 integrate .. //depot/projects/hammer/lib/libc/sparc64/fpu/fpu_subr.c#2 integrate .. //depot/projects/hammer/lib/libc/sparc64/gen/_setjmp.S#3 integrate .. //depot/projects/hammer/lib/libc/sparc64/gen/fixunsdfsi.S#2 integrate .. //depot/projects/hammer/lib/libc/sparc64/gen/modf.S#2 integrate .. //depot/projects/hammer/lib/libc/sparc64/gen/setjmp.S#3 integrate .. //depot/projects/hammer/lib/libc/sparc64/sys/brk.S#2 integrate .. //depot/projects/hammer/lib/libc/sparc64/sys/cerror.S#2 integrate .. //depot/projects/hammer/lib/libc/sparc64/sys/exect.S#2 integrate .. //depot/projects/hammer/lib/libc/sparc64/sys/pipe.S#2 integrate .. //depot/projects/hammer/lib/libc/sparc64/sys/ptrace.S#2 integrate .. //depot/projects/hammer/lib/libc/sparc64/sys/sbrk.S#2 integrate .. //depot/projects/hammer/lib/libc/sparc64/sys/setlogin.S#2 integrate .. //depot/projects/hammer/lib/libc/stdio/clrerr.c#2 integrate .. //depot/projects/hammer/lib/libc/stdio/fclose.3#5 integrate .. //depot/projects/hammer/lib/libc/stdio/fclose.c#2 integrate .. //depot/projects/hammer/lib/libc/stdio/fdopen.c#2 integrate .. //depot/projects/hammer/lib/libc/stdio/feof.c#3 integrate .. //depot/projects/hammer/lib/libc/stdio/ferror.3#3 integrate .. //depot/projects/hammer/lib/libc/stdio/ferror.c#3 integrate .. //depot/projects/hammer/lib/libc/stdio/fflush.3#4 integrate .. //depot/projects/hammer/lib/libc/stdio/fflush.c#3 integrate .. //depot/projects/hammer/lib/libc/stdio/fgetc.c#4 integrate .. //depot/projects/hammer/lib/libc/stdio/fgetln.3#3 integrate .. //depot/projects/hammer/lib/libc/stdio/fgetln.c#4 integrate .. //depot/projects/hammer/lib/libc/stdio/fgetpos.c#3 integrate .. //depot/projects/hammer/lib/libc/stdio/fgets.3#5 integrate .. //depot/projects/hammer/lib/libc/stdio/fgets.c#3 integrate .. //depot/projects/hammer/lib/libc/stdio/fgetwln.3#3 integrate .. //depot/projects/hammer/lib/libc/stdio/fgetws.3#3 integrate .. //depot/projects/hammer/lib/libc/stdio/fileno.c#4 integrate .. //depot/projects/hammer/lib/libc/stdio/findfp.c#9 integrate .. //depot/projects/hammer/lib/libc/stdio/flags.c#2 integrate .. //depot/projects/hammer/lib/libc/stdio/floatio.h#4 integrate .. //depot/projects/hammer/lib/libc/stdio/fopen.3#5 integrate .. //depot/projects/hammer/lib/libc/stdio/fopen.c#3 integrate .. //depot/projects/hammer/lib/libc/stdio/fprintf.c#3 integrate .. //depot/projects/hammer/lib/libc/stdio/fpurge.c#2 integrate .. //depot/projects/hammer/lib/libc/stdio/fputc.c#5 integrate .. //depot/projects/hammer/lib/libc/stdio/fputs.3#4 integrate .. //depot/projects/hammer/lib/libc/stdio/fputs.c#4 integrate .. //depot/projects/hammer/lib/libc/stdio/fputws.3#4 integrate .. //depot/projects/hammer/lib/libc/stdio/fread.3#3 integrate .. //depot/projects/hammer/lib/libc/stdio/fread.c#5 integrate .. //depot/projects/hammer/lib/libc/stdio/freopen.c#6 integrate .. //depot/projects/hammer/lib/libc/stdio/fscanf.c#4 integrate .. //depot/projects/hammer/lib/libc/stdio/fseek.3#5 integrate .. //depot/projects/hammer/lib/libc/stdio/fseek.c#3 integrate .. //depot/projects/hammer/lib/libc/stdio/fsetpos.c#2 integrate .. //depot/projects/hammer/lib/libc/stdio/ftell.c#2 integrate .. //depot/projects/hammer/lib/libc/stdio/funopen.3#5 integrate .. //depot/projects/hammer/lib/libc/stdio/funopen.c#2 integrate .. //depot/projects/hammer/lib/libc/stdio/fvwrite.c#4 integrate .. //depot/projects/hammer/lib/libc/stdio/fvwrite.h#2 integrate .. //depot/projects/hammer/lib/libc/stdio/fwalk.c#2 integrate .. //depot/projects/hammer/lib/libc/stdio/fwrite.c#4 integrate .. //depot/projects/hammer/lib/libc/stdio/getc.3#7 integrate .. //depot/projects/hammer/lib/libc/stdio/getc.c#5 integrate .. //depot/projects/hammer/lib/libc/stdio/getchar.c#5 integrate .. //depot/projects/hammer/lib/libc/stdio/gets.c#4 integrate .. //depot/projects/hammer/lib/libc/stdio/getw.c#2 integrate .. //depot/projects/hammer/lib/libc/stdio/getwc.3#6 integrate .. //depot/projects/hammer/lib/libc/stdio/glue.h#3 integrate .. //depot/projects/hammer/lib/libc/stdio/local.h#16 integrate .. //depot/projects/hammer/lib/libc/stdio/makebuf.c#3 integrate .. //depot/projects/hammer/lib/libc/stdio/mktemp.3#5 integrate .. //depot/projects/hammer/lib/libc/stdio/mktemp.c#3 integrate .. //depot/projects/hammer/lib/libc/stdio/perror.c#3 integrate .. //depot/projects/hammer/lib/libc/stdio/printf.3#11 integrate .. //depot/projects/hammer/lib/libc/stdio/printf.c#3 integrate .. //depot/projects/hammer/lib/libc/stdio/putc.3#5 integrate .. //depot/projects/hammer/lib/libc/stdio/putc.c#5 integrate .. //depot/projects/hammer/lib/libc/stdio/putchar.c#5 integrate .. //depot/projects/hammer/lib/libc/stdio/puts.c#3 integrate .. //depot/projects/hammer/lib/libc/stdio/putw.c#2 integrate .. //depot/projects/hammer/lib/libc/stdio/putwc.3#6 integrate .. //depot/projects/hammer/lib/libc/stdio/refill.c#3 integrate .. //depot/projects/hammer/lib/libc/stdio/remove.3#2 integrate .. //depot/projects/hammer/lib/libc/stdio/remove.c#2 integrate .. //depot/projects/hammer/lib/libc/stdio/rewind.c#2 integrate .. //depot/projects/hammer/lib/libc/stdio/rget.c#2 integrate .. //depot/projects/hammer/lib/libc/stdio/scanf.3#6 integrate .. //depot/projects/hammer/lib/libc/stdio/scanf.c#4 integrate .. //depot/projects/hammer/lib/libc/stdio/setbuf.3#6 integrate .. //depot/projects/hammer/lib/libc/stdio/setbuf.c#3 integrate .. //depot/projects/hammer/lib/libc/stdio/setbuffer.c#2 integrate .. //depot/projects/hammer/lib/libc/stdio/setvbuf.c#3 integrate .. //depot/projects/hammer/lib/libc/stdio/snprintf.c#3 integrate .. //depot/projects/hammer/lib/libc/stdio/sprintf.c#3 integrate .. //depot/projects/hammer/lib/libc/stdio/sscanf.c#3 integrate .. //depot/projects/hammer/lib/libc/stdio/stdio.3#8 integrate .. //depot/projects/hammer/lib/libc/stdio/stdio.c#3 integrate .. //depot/projects/hammer/lib/libc/stdio/tempnam.c#2 integrate .. //depot/projects/hammer/lib/libc/stdio/tmpfile.c#4 integrate .. //depot/projects/hammer/lib/libc/stdio/tmpnam.3#7 integrate .. //depot/projects/hammer/lib/libc/stdio/tmpnam.c#2 integrate .. //depot/projects/hammer/lib/libc/stdio/ungetc.3#3 integrate .. //depot/projects/hammer/lib/libc/stdio/ungetc.c#4 integrate .. //depot/projects/hammer/lib/libc/stdio/ungetwc.3#4 integrate .. //depot/projects/hammer/lib/libc/stdio/vfprintf.c#23 integrate .. //depot/projects/hammer/lib/libc/stdio/vfscanf.c#15 integrate .. //depot/projects/hammer/lib/libc/stdio/vfwprintf.c#19 integrate .. //depot/projects/hammer/lib/libc/stdio/vfwscanf.c#12 integrate .. //depot/projects/hammer/lib/libc/stdio/vprintf.c#3 integrate .. //depot/projects/hammer/lib/libc/stdio/vscanf.c#5 integrate .. //depot/projects/hammer/lib/libc/stdio/vsnprintf.c#5 integrate .. //depot/projects/hammer/lib/libc/stdio/vsprintf.c#3 integrate .. //depot/projects/hammer/lib/libc/stdio/vsscanf.c#4 integrate .. //depot/projects/hammer/lib/libc/stdio/vswscanf.c#4 integrate .. //depot/projects/hammer/lib/libc/stdio/wbuf.c#4 integrate .. //depot/projects/hammer/lib/libc/stdio/wprintf.3#4 integrate .. //depot/projects/hammer/lib/libc/stdio/wscanf.3#4 integrate .. //depot/projects/hammer/lib/libc/stdio/wsetup.c#3 integrate .. //depot/projects/hammer/lib/libc/stdlib/abort.3#2 integrate .. //depot/projects/hammer/lib/libc/stdlib/abort.c#4 integrate .. //depot/projects/hammer/lib/libc/stdlib/abs.3#3 integrate .. //depot/projects/hammer/lib/libc/stdlib/abs.c#2 integrate .. //depot/projects/hammer/lib/libc/stdlib/alloca.3#6 integrate .. //depot/projects/hammer/lib/libc/stdlib/atexit.3#4 integrate .. //depot/projects/hammer/lib/libc/stdlib/atexit.c#3 integrate .. //depot/projects/hammer/lib/libc/stdlib/atexit.h#3 integrate .. //depot/projects/hammer/lib/libc/stdlib/atof.3#3 integrate .. //depot/projects/hammer/lib/libc/stdlib/atof.c#3 integrate .. //depot/projects/hammer/lib/libc/stdlib/atoi.3#3 integrate .. //depot/projects/hammer/lib/libc/stdlib/atoi.c#2 integrate .. //depot/projects/hammer/lib/libc/stdlib/atol.3#2 integrate .. //depot/projects/hammer/lib/libc/stdlib/atol.c#2 integrate .. //depot/projects/hammer/lib/libc/stdlib/atoll.c#2 integrate .. //depot/projects/hammer/lib/libc/stdlib/bsearch.3#2 integrate .. //depot/projects/hammer/lib/libc/stdlib/bsearch.c#2 integrate .. //depot/projects/hammer/lib/libc/stdlib/div.3#3 integrate .. //depot/projects/hammer/lib/libc/stdlib/div.c#2 integrate .. //depot/projects/hammer/lib/libc/stdlib/exit.3#7 integrate .. //depot/projects/hammer/lib/libc/stdlib/exit.c#4 integrate .. //depot/projects/hammer/lib/libc/stdlib/getenv.3#8 integrate .. //depot/projects/hammer/lib/libc/stdlib/getenv.c#2 integrate .. //depot/projects/hammer/lib/libc/stdlib/getopt.3#7 integrate .. //depot/projects/hammer/lib/libc/stdlib/getopt.c#3 integrate .. //depot/projects/hammer/lib/libc/stdlib/getsubopt.3#3 integrate .. //depot/projects/hammer/lib/libc/stdlib/getsubopt.c#4 integrate .. //depot/projects/hammer/lib/libc/stdlib/heapsort.c#2 integrate .. //depot/projects/hammer/lib/libc/stdlib/labs.3#3 integrate .. //depot/projects/hammer/lib/libc/stdlib/labs.c#2 integrate .. //depot/projects/hammer/lib/libc/stdlib/ldiv.3#3 integrate .. //depot/projects/hammer/lib/libc/stdlib/ldiv.c#2 integrate .. //depot/projects/hammer/lib/libc/stdlib/memory.3#2 integrate .. //depot/projects/hammer/lib/libc/stdlib/merge.c#3 integrate .. //depot/projects/hammer/lib/libc/stdlib/putenv.c#2 integrate .. //depot/projects/hammer/lib/libc/stdlib/qsort.3#7 integrate .. //depot/projects/hammer/lib/libc/stdlib/qsort.c#3 integrate .. //depot/projects/hammer/lib/libc/stdlib/radixsort.3#4 integrate .. //depot/projects/hammer/lib/libc/stdlib/radixsort.c#3 integrate .. //depot/projects/hammer/lib/libc/stdlib/rand.3#5 integrate .. //depot/projects/hammer/lib/libc/stdlib/rand.c#3 integrate .. //depot/projects/hammer/lib/libc/stdlib/random.3#6 integrate .. //depot/projects/hammer/lib/libc/stdlib/random.c#5 integrate .. //depot/projects/hammer/lib/libc/stdlib/realpath.3#4 integrate .. //depot/projects/hammer/lib/libc/stdlib/setenv.c#2 integrate .. //depot/projects/hammer/lib/libc/stdlib/strtod.3#7 integrate .. //depot/projects/hammer/lib/libc/stdlib/strtoimax.c#6 integrate .. //depot/projects/hammer/lib/libc/stdlib/strtol.3#6 integrate .. //depot/projects/hammer/lib/libc/stdlib/strtol.c#5 integrate .. //depot/projects/hammer/lib/libc/stdlib/strtoll.c#5 integrate .. //depot/projects/hammer/lib/libc/stdlib/strtoq.c#3 integrate .. //depot/projects/hammer/lib/libc/stdlib/strtoul.3#6 integrate .. //depot/projects/hammer/lib/libc/stdlib/strtoul.c#5 integrate .. //depot/projects/hammer/lib/libc/stdlib/strtoull.c#5 integrate .. //depot/projects/hammer/lib/libc/stdlib/strtoumax.c#5 integrate .. //depot/projects/hammer/lib/libc/stdlib/strtouq.c#3 integrate .. //depot/projects/hammer/lib/libc/stdlib/system.3#2 integrate .. //depot/projects/hammer/lib/libc/stdlib/system.c#2 integrate .. //depot/projects/hammer/lib/libc/stdtime/ctime.3#6 integrate .. //depot/projects/hammer/lib/libc/stdtime/strftime.3#10 integrate .. //depot/projects/hammer/lib/libc/string/bcmp.3#4 integrate .. //depot/projects/hammer/lib/libc/string/bcmp.c#3 integrate .. //depot/projects/hammer/lib/libc/string/bcopy.3#4 integrate .. //depot/projects/hammer/lib/libc/string/bcopy.c#4 integrate .. //depot/projects/hammer/lib/libc/string/bstring.3#2 integrate .. //depot/projects/hammer/lib/libc/string/bzero.3#4 integrate .. //depot/projects/hammer/lib/libc/string/ffs.3#7 integrate .. //depot/projects/hammer/lib/libc/string/ffs.c#4 integrate .. //depot/projects/hammer/lib/libc/string/ffsl.c#2 integrate .. //depot/projects/hammer/lib/libc/string/fls.c#2 integrate .. //depot/projects/hammer/lib/libc/string/flsl.c#2 integrate .. //depot/projects/hammer/lib/libc/string/index.3#5 integrate .. //depot/projects/hammer/lib/libc/string/index.c#4 integrate .. //depot/projects/hammer/lib/libc/string/memccpy.3#2 integrate .. //depot/projects/hammer/lib/libc/string/memccpy.c#2 integrate .. //depot/projects/hammer/lib/libc/string/memchr.3#3 integrate .. //depot/projects/hammer/lib/libc/string/memchr.c#2 integrate .. //depot/projects/hammer/lib/libc/string/memcmp.3#2 integrate .. //depot/projects/hammer/lib/libc/string/memcmp.c#2 integrate .. //depot/projects/hammer/lib/libc/string/memcpy.3#2 integrate .. //depot/projects/hammer/lib/libc/string/memmove.3#2 integrate .. //depot/projects/hammer/lib/libc/string/memset.3#2 integrate .. //depot/projects/hammer/lib/libc/string/memset.c#3 integrate .. //depot/projects/hammer/lib/libc/string/rindex.c#4 integrate .. //depot/projects/hammer/lib/libc/string/strcasecmp.3#4 integrate .. //depot/projects/hammer/lib/libc/string/strcasecmp.c#3 integrate .. //depot/projects/hammer/lib/libc/string/strcasestr.c#2 integrate .. //depot/projects/hammer/lib/libc/string/strcat.3#4 integrate .. //depot/projects/hammer/lib/libc/string/strcat.c#3 integrate .. //depot/projects/hammer/lib/libc/string/strchr.3#5 integrate .. //depot/projects/hammer/lib/libc/string/strcmp.3#2 integrate .. //depot/projects/hammer/lib/libc/string/strcmp.c#2 integrate .. //depot/projects/hammer/lib/libc/string/strcoll.3#4 integrate .. //depot/projects/hammer/lib/libc/string/strcpy.3#8 integrate .. //depot/projects/hammer/lib/libc/string/strcpy.c#3 integrate .. //depot/projects/hammer/lib/libc/string/strcspn.3#3 integrate .. //depot/projects/hammer/lib/libc/string/strdup.3#2 integrate .. //depot/projects/hammer/lib/libc/string/strdup.c#2 integrate .. //depot/projects/hammer/lib/libc/string/strerror.3#5 integrate .. //depot/projects/hammer/lib/libc/string/strerror.c#6 integrate .. //depot/projects/hammer/lib/libc/string/string.3#4 integrate .. //depot/projects/hammer/lib/libc/string/strlen.3#2 integrate .. //depot/projects/hammer/lib/libc/string/strlen.c#2 integrate .. //depot/projects/hammer/lib/libc/string/strmode.3#3 integrate .. //depot/projects/hammer/lib/libc/string/strmode.c#2 integrate .. //depot/projects/hammer/lib/libc/string/strncat.c#3 integrate .. //depot/projects/hammer/lib/libc/string/strncmp.c#2 integrate .. //depot/projects/hammer/lib/libc/string/strncpy.c#3 integrate .. //depot/projects/hammer/lib/libc/string/strnstr.c#3 integrate .. //depot/projects/hammer/lib/libc/string/strpbrk.3#2 integrate .. //depot/projects/hammer/lib/libc/string/strpbrk.c#2 integrate .. //depot/projects/hammer/lib/libc/string/strsep.3#4 integrate .. //depot/projects/hammer/lib/libc/string/strsep.c#2 integrate .. //depot/projects/hammer/lib/libc/string/strsignal.c#4 integrate .. //depot/projects/hammer/lib/libc/string/strspn.3#3 integrate .. //depot/projects/hammer/lib/libc/string/strstr.3#3 integrate .. //depot/projects/hammer/lib/libc/string/strstr.c#2 integrate .. //depot/projects/hammer/lib/libc/string/strxfrm.3#4 integrate .. //depot/projects/hammer/lib/libc/string/swab.3#4 integrate .. //depot/projects/hammer/lib/libc/string/swab.c#4 integrate .. //depot/projects/hammer/lib/libc/string/wcscmp.c#4 integrate .. //depot/projects/hammer/lib/libc/string/wcscoll.3#3 integrate .. //depot/projects/hammer/lib/libc/string/wcsncmp.c#4 integrate .. //depot/projects/hammer/lib/libc/string/wcsncpy.c#5 integrate .. //depot/projects/hammer/lib/libc/string/wcsstr.c#5 integrate .. //depot/projects/hammer/lib/libc/string/wcswidth.c#3 integrate .. //depot/projects/hammer/lib/libc/string/wcsxfrm.3#3 integrate .. //depot/projects/hammer/lib/libc/string/wmemchr.3#4 integrate .. //depot/projects/hammer/lib/libc/sys/_exit.2#4 integrate .. //depot/projects/hammer/lib/libc/sys/accept.2#8 integrate .. //depot/projects/hammer/lib/libc/sys/access.2#3 integrate .. //depot/projects/hammer/lib/libc/sys/acct.2#7 integrate .. //depot/projects/hammer/lib/libc/sys/adjtime.2#4 integrate .. //depot/projects/hammer/lib/libc/sys/bind.2#3 integrate .. //depot/projects/hammer/lib/libc/sys/brk.2#4 integrate .. //depot/projects/hammer/lib/libc/sys/chdir.2#3 integrate .. //depot/projects/hammer/lib/libc/sys/chflags.2#6 integrate .. //depot/projects/hammer/lib/libc/sys/chmod.2#7 integrate .. //depot/projects/hammer/lib/libc/sys/chown.2#4 integrate .. //depot/projects/hammer/lib/libc/sys/chroot.2#4 integrate .. //depot/projects/hammer/lib/libc/sys/clock_gettime.2#9 integrate .. //depot/projects/hammer/lib/libc/sys/close.2#6 integrate .. //depot/projects/hammer/lib/libc/sys/connect.2#8 integrate .. //depot/projects/hammer/lib/libc/sys/dup.2#4 integrate .. //depot/projects/hammer/lib/libc/sys/execve.2#4 integrate .. //depot/projects/hammer/lib/libc/sys/fcntl.2#5 integrate .. //depot/projects/hammer/lib/libc/sys/flock.2#6 integrate .. //depot/projects/hammer/lib/libc/sys/fork.2#4 integrate .. //depot/projects/hammer/lib/libc/sys/fsync.2#3 integrate .. //depot/projects/hammer/lib/libc/sys/ftruncate.c#2 integrate .. //depot/projects/hammer/lib/libc/sys/getdirentries.2#3 integrate .. //depot/projects/hammer/lib/libc/sys/getdtablesize.2#4 integrate .. //depot/projects/hammer/lib/libc/sys/getfh.2#5 integrate .. //depot/projects/hammer/lib/libc/sys/getfsstat.2#7 integrate .. //depot/projects/hammer/lib/libc/sys/getgid.2#3 integrate .. //depot/projects/hammer/lib/libc/sys/getgroups.2#3 integrate .. //depot/projects/hammer/lib/libc/sys/getitimer.2#6 integrate .. //depot/projects/hammer/lib/libc/sys/getlogin.2#6 integrate .. //depot/projects/hammer/lib/libc/sys/getpeername.2#4 integrate .. //depot/projects/hammer/lib/libc/sys/getpgrp.2#4 integrate .. //depot/projects/hammer/lib/libc/sys/getpid.2#4 integrate .. //depot/projects/hammer/lib/libc/sys/getpriority.2#4 integrate .. //depot/projects/hammer/lib/libc/sys/getrlimit.2#5 integrate .. //depot/projects/hammer/lib/libc/sys/getrusage.2#6 integrate .. //depot/projects/hammer/lib/libc/sys/getsockname.2#7 integrate .. //depot/projects/hammer/lib/libc/sys/getsockopt.2#9 integrate .. //depot/projects/hammer/lib/libc/sys/gettimeofday.2#9 integrate .. //depot/projects/hammer/lib/libc/sys/getuid.2#3 integrate .. //depot/projects/hammer/lib/libc/sys/intro.2#13 integrate .. //depot/projects/hammer/lib/libc/sys/ioctl.2#7 integrate .. //depot/projects/hammer/lib/libc/sys/issetugid.2#4 integrate .. //depot/projects/hammer/lib/libc/sys/kill.2#4 integrate .. //depot/projects/hammer/lib/libc/sys/ktrace.2#7 integrate .. //depot/projects/hammer/lib/libc/sys/link.2#5 integrate .. //depot/projects/hammer/lib/libc/sys/listen.2#5 integrate .. //depot/projects/hammer/lib/libc/sys/lseek.2#5 integrate .. //depot/projects/hammer/lib/libc/sys/lseek.c#2 integrate .. //depot/projects/hammer/lib/libc/sys/madvise.2#7 integrate .. //depot/projects/hammer/lib/libc/sys/mincore.2#6 integrate .. //depot/projects/hammer/lib/libc/sys/minherit.2#5 integrate .. //depot/projects/hammer/lib/libc/sys/mkdir.2#4 integrate .. //depot/projects/hammer/lib/libc/sys/mkfifo.2#4 integrate .. //depot/projects/hammer/lib/libc/sys/mknod.2#3 integrate .. //depot/projects/hammer/lib/libc/sys/mlock.2#10 integrate .. //depot/projects/hammer/lib/libc/sys/mmap.2#11 integrate .. //depot/projects/hammer/lib/libc/sys/mmap.c#3 integrate .. //depot/projects/hammer/lib/libc/sys/mount.2#11 integrate .. //depot/projects/hammer/lib/libc/sys/mprotect.2#4 integrate .. //depot/projects/hammer/lib/libc/sys/msync.2#7 integrate .. //depot/projects/hammer/lib/libc/sys/munmap.2#5 integrate .. //depot/projects/hammer/lib/libc/sys/nanosleep.2#4 integrate .. //depot/projects/hammer/lib/libc/sys/nfssvc.2#5 integrate .. //depot/projects/hammer/lib/libc/sys/open.2#10 integrate .. //depot/projects/hammer/lib/libc/sys/pathconf.2#7 integrate .. //depot/projects/hammer/lib/libc/sys/pipe.2#5 integrate .. //depot/projects/hammer/lib/libc/sys/pread.c#2 integrate .. //depot/projects/hammer/lib/libc/sys/profil.2#3 integrate .. //depot/projects/hammer/lib/libc/sys/pwrite.c#2 integrate .. //depot/projects/hammer/lib/libc/sys/quotactl.2#5 integrate .. //depot/projects/hammer/lib/libc/sys/read.2#15 integrate .. //depot/projects/hammer/lib/libc/sys/readlink.2#3 integrate .. //depot/projects/hammer/lib/libc/sys/reboot.2#5 integrate .. //depot/projects/hammer/lib/libc/sys/recv.2#14 integrate .. //depot/projects/hammer/lib/libc/sys/rename.2#6 integrate .. //depot/projects/hammer/lib/libc/sys/revoke.2#3 integrate .. //depot/projects/hammer/lib/libc/sys/rmdir.2#5 integrate .. //depot/projects/hammer/lib/libc/sys/select.2#11 integrate .. //depot/projects/hammer/lib/libc/sys/send.2#14 integrate .. //depot/projects/hammer/lib/libc/sys/setgroups.2#5 integrate .. //depot/projects/hammer/lib/libc/sys/setpgid.2#5 integrate .. //depot/projects/hammer/lib/libc/sys/setregid.2#3 integrate .. //depot/projects/hammer/lib/libc/sys/setreuid.2#3 integrate .. //depot/projects/hammer/lib/libc/sys/setsid.2#3 integrate .. //depot/projects/hammer/lib/libc/sys/setuid.2#4 integrate .. //depot/projects/hammer/lib/libc/sys/shutdown.2#3 integrate .. //depot/projects/hammer/lib/libc/sys/sigaction.2#14 integrate .. //depot/projects/hammer/lib/libc/sys/sigaltstack.2#5 integrate .. //depot/projects/hammer/lib/libc/sys/sigpending.2#4 integrate .. //depot/projects/hammer/lib/libc/sys/sigprocmask.2#7 integrate .. //depot/projects/hammer/lib/libc/sys/sigreturn.2#5 integrate .. //depot/projects/hammer/lib/libc/sys/sigstack.2#3 integrate .. //depot/projects/hammer/lib/libc/sys/sigsuspend.2#4 integrate .. //depot/projects/hammer/lib/libc/sys/socket.2#6 integrate .. //depot/projects/hammer/lib/libc/sys/socketpair.2#4 integrate .. //depot/projects/hammer/lib/libc/sys/stat.2#14 integrate .. //depot/projects/hammer/lib/libc/sys/statfs.2#9 integrate .. //depot/projects/hammer/lib/libc/sys/swapon.2#4 integrate .. //depot/projects/hammer/lib/libc/sys/symlink.2#4 integrate .. //depot/projects/hammer/lib/libc/sys/sync.2#4 integrate .. //depot/projects/hammer/lib/libc/sys/sysarch.2#5 integrate .. //depot/projects/hammer/lib/libc/sys/syscall.2#5 integrate .. //depot/projects/hammer/lib/libc/sys/truncate.2#7 integrate .. //depot/projects/hammer/lib/libc/sys/truncate.c#2 integrate .. //depot/projects/hammer/lib/libc/sys/umask.2#5 integrate .. //depot/projects/hammer/lib/libc/sys/undelete.2#4 integrate .. //depot/projects/hammer/lib/libc/sys/unlink.2#6 integrate .. //depot/projects/hammer/lib/libc/sys/utimes.2#5 integrate .. //depot/projects/hammer/lib/libc/sys/vfork.2#7 integrate .. //depot/projects/hammer/lib/libc/sys/wait.2#10 integrate .. //depot/projects/hammer/lib/libc/sys/write.2#13 integrate .. //depot/projects/hammer/lib/libcompat/4.1/ftime.3#3 integrate .. //depot/projects/hammer/lib/libcompat/4.1/getpw.3#2 integrate .. //depot/projects/hammer/lib/libcompat/4.1/stty.3#2 integrate .. //depot/projects/hammer/lib/libcompat/4.3/cfree.c#2 integrate .. //depot/projects/hammer/lib/libcompat/4.3/re_comp.3#2 integrate .. //depot/projects/hammer/lib/libcompat/4.3/regex.c#2 integrate .. //depot/projects/hammer/lib/libcompat/4.3/rexec.3#4 integrate .. //depot/projects/hammer/lib/libcompat/4.3/rexec.c#2 integrate .. //depot/projects/hammer/lib/libcompat/4.4/cuserid.c#2 integrate .. //depot/projects/hammer/lib/libcompat/regexp/regexp.3#5 integrate .. //depot/projects/hammer/lib/libipx/ipx.3#5 integrate .. //depot/projects/hammer/lib/libipx/ipx_addr.c#3 integrate .. //depot/projects/hammer/lib/libipx/ipx_ntoa.c#3 integrate .. //depot/projects/hammer/lib/libkvm/kvm.3#6 integrate .. //depot/projects/hammer/lib/libkvm/kvm.c#10 integrate .. //depot/projects/hammer/lib/libkvm/kvm.h#5 integrate .. //depot/projects/hammer/lib/libkvm/kvm_amd64.c#21 integrate .. //depot/projects/hammer/lib/libkvm/kvm_arm.c#6 integrate .. //depot/projects/hammer/lib/libkvm/kvm_file.c#3 integrate .. //depot/projects/hammer/lib/libkvm/kvm_geterr.3#3 integrate .. //depot/projects/hammer/lib/libkvm/kvm_getfiles.3#5 integrate .. //depot/projects/hammer/lib/libkvm/kvm_getloadavg.3#2 integrate .. //depot/projects/hammer/lib/libkvm/kvm_getloadavg.c#2 integrate .. //depot/projects/hammer/lib/libkvm/kvm_getprocs.3#9 integrate .. //depot/projects/hammer/lib/libkvm/kvm_i386.c#14 integrate .. //depot/projects/hammer/lib/libkvm/kvm_nlist.3#4 integrate .. //depot/projects/hammer/lib/libkvm/kvm_open.3#7 integrate .. //depot/projects/hammer/lib/libkvm/kvm_private.h#6 integrate .. //depot/projects/hammer/lib/libkvm/kvm_proc.c#33 integrate .. //depot/projects/hammer/lib/libkvm/kvm_read.3#3 integrate .. //depot/projects/hammer/lib/libkvm/kvm_sparc.c#4 integrate .. //depot/projects/hammer/lib/libkvm/kvm_sparc64.c#9 integrate .. //depot/projects/hammer/lib/libncp/ipx.c#2 integrate .. //depot/projects/hammer/lib/libncp/ipxsap.h#2 integrate .. //depot/projects/hammer/lib/libncp/ncpl_bind.c#2 integrate .. //depot/projects/hammer/lib/libncp/ncpl_conn.c#7 integrate .. //depot/projects/hammer/lib/libncp/ncpl_file.c#3 integrate .. //depot/projects/hammer/lib/libncp/ncpl_misc.c#3 integrate .. //depot/projects/hammer/lib/libncp/ncpl_msg.c#3 integrate .. //depot/projects/hammer/lib/libncp/ncpl_net.c#3 integrate .. //depot/projects/hammer/lib/libncp/ncpl_nls.c#4 integrate .. //depot/projects/hammer/lib/libncp/ncpl_queue.c#3 integrate .. //depot/projects/hammer/lib/libncp/ncpl_rcfile.c#2 integrate .. //depot/projects/hammer/lib/libncp/ncpl_rpc.c#3 integrate .. //depot/projects/hammer/lib/libncp/ncpl_subr.c#8 integrate .. //depot/projects/hammer/lib/libncp/sap.c#2 integrate .. //depot/projects/hammer/lib/libncurses/pathnames.h#2 integrate .. //depot/projects/hammer/lib/libncurses/termcap.c#3 integrate .. //depot/projects/hammer/lib/libstand/arp.c#2 integrate .. //depot/projects/hammer/lib/libstand/bootp.c#2 integrate .. //depot/projects/hammer/lib/libstand/close.c#2 integrate .. //depot/projects/hammer/lib/libstand/closeall.c#2 integrate .. //depot/projects/hammer/lib/libstand/dev.c#2 integrate .. //depot/projects/hammer/lib/libstand/ether.c#2 integrate .. //depot/projects/hammer/lib/libstand/fstat.c#3 integrate .. //depot/projects/hammer/lib/libstand/getopt.c#2 integrate .. //depot/projects/hammer/lib/libstand/gets.c#2 integrate .. //depot/projects/hammer/lib/libstand/i386/_setjmp.S#2 integrate .. //depot/projects/hammer/lib/libstand/if_ether.h#2 integrate .. //depot/projects/hammer/lib/libstand/in_cksum.c#2 integrate .. //depot/projects/hammer/lib/libstand/inet_ntoa.c#2 integrate .. //depot/projects/hammer/lib/libstand/ioctl.c#2 integrate .. //depot/projects/hammer/lib/libstand/iodesc.h#2 integrate .. //depot/projects/hammer/lib/libstand/lseek.c#2 integrate .. //depot/projects/hammer/lib/libstand/net.c#3 integrate .. //depot/projects/hammer/lib/libstand/net.h#2 integrate .. //depot/projects/hammer/lib/libstand/nfsv2.h#2 integrate .. //depot/projects/hammer/lib/libstand/nullfs.c#3 integrate .. //depot/projects/hammer/lib/libstand/open.c#2 integrate .. //depot/projects/hammer/lib/libstand/printf.c#7 integrate .. //depot/projects/hammer/lib/libstand/qdivrem.c#2 integrate .. //depot/projects/hammer/lib/libstand/quad.h#2 integrate .. //depot/projects/hammer/lib/libstand/random.c#2 integrate .. //depot/projects/hammer/lib/libstand/rarp.c#2 integrate .. //depot/projects/hammer/lib/libstand/read.c#4 integrate .. //depot/projects/hammer/lib/libstand/rpc.c#2 integrate .. //depot/projects/hammer/lib/libstand/rpc.h#2 integrate .. //depot/projects/hammer/lib/libstand/rpcv2.h#2 integrate .. //depot/projects/hammer/lib/libstand/saioctl.h#2 integrate .. //depot/projects/hammer/lib/libstand/sparc64/_setjmp.S#2 integrate .. //depot/projects/hammer/lib/libstand/stand.h#8 integrate .. //depot/projects/hammer/lib/libstand/stat.c#2 integrate .. //depot/projects/hammer/lib/libstand/strcasecmp.c#2 integrate .. //depot/projects/hammer/lib/libstand/strdup.c#2 integrate .. //depot/projects/hammer/lib/libstand/strerror.c#2 integrate .. //depot/projects/hammer/lib/libstand/strtol.c#2 integrate .. //depot/projects/hammer/lib/libstand/twiddle.c#2 integrate .. //depot/projects/hammer/lib/libstand/udp.c#3 integrate .. //depot/projects/hammer/lib/libstand/ufs.c#5 integrate .. //depot/projects/hammer/lib/libstand/write.c#2 integrate .. //depot/projects/hammer/lib/libutil/login.c#3 integrate .. //depot/projects/hammer/lib/libutil/login_tty.c#4 integrate .. //depot/projects/hammer/lib/libutil/logout.c#5 integrate .. //depot/projects/hammer/lib/libutil/logwtmp.c#5 integrate .. //depot/projects/hammer/lib/libutil/pty.c#5 integrate .. //depot/projects/hammer/lib/libutil/pw_util.c#10 integrate .. //depot/projects/hammer/lib/libutil/uucplock.c#4 integrate .. //depot/projects/hammer/lib/liby/main.c#3 integrate .. //depot/projects/hammer/lib/liby/yyerror.c#2 integrate .. //depot/projects/hammer/lib/msun/man/acos.3#3 integrate .. //depot/projects/hammer/lib/msun/man/acosh.3#3 integrate .. //depot/projects/hammer/lib/msun/man/asin.3#4 integrate .. //depot/projects/hammer/lib/msun/man/asinh.3#2 integrate .. //depot/projects/hammer/lib/msun/man/atan.3#2 integrate .. //depot/projects/hammer/lib/msun/man/atan2.3#5 integrate .. //depot/projects/hammer/lib/msun/man/atanh.3#5 integrate .. //depot/projects/hammer/lib/msun/man/ceil.3#4 integrate .. //depot/projects/hammer/lib/msun/man/copysign.3#2 integrate .. //depot/projects/hammer/lib/msun/man/cos.3#2 integrate .. //depot/projects/hammer/lib/msun/man/cosh.3#3 integrate .. //depot/projects/hammer/lib/msun/man/erf.3#3 integrate .. //depot/projects/hammer/lib/msun/man/exp.3#7 integrate .. //depot/projects/hammer/lib/msun/man/fabs.3#4 integrate .. //depot/projects/hammer/lib/msun/man/floor.3#4 integrate .. //depot/projects/hammer/lib/msun/man/fmod.3#2 integrate .. //depot/projects/hammer/lib/msun/man/hypot.3#6 integrate .. //depot/projects/hammer/lib/msun/man/ieee.3#12 integrate .. //depot/projects/hammer/lib/msun/man/ieee_test.3#5 integrate .. //depot/projects/hammer/lib/msun/man/ilogb.3#4 integrate .. //depot/projects/hammer/lib/msun/man/j0.3#3 integrate .. //depot/projects/hammer/lib/msun/man/lgamma.3#5 integrate .. //depot/projects/hammer/lib/msun/man/math.3#15 integrate .. //depot/projects/hammer/lib/msun/man/nextafter.3#3 integrate .. //depot/projects/hammer/lib/msun/man/remainder.3#5 integrate .. //depot/projects/hammer/lib/msun/man/rint.3#4 integrate .. //depot/projects/hammer/lib/msun/man/scalbn.3#4 integrate .. //depot/projects/hammer/lib/msun/man/sin.3#2 integrate .. //depot/projects/hammer/lib/msun/man/sinh.3#4 integrate .. //depot/projects/hammer/lib/msun/man/sqrt.3#3 integrate .. //depot/projects/hammer/lib/msun/man/tan.3#2 integrate .. //depot/projects/hammer/lib/msun/man/tanh.3#2 integrate .. //depot/projects/hammer/libexec/rtld-elf/rtld.c#36 integrate .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/hardware/common/hw.ent#4 integrate .. //depot/projects/hammer/share/man/man4/arcmsr.4#3 integrate .. //depot/projects/hammer/share/man/man4/fxp.4#14 integrate .. //depot/projects/hammer/share/man/man4/ng_ppp.4#7 integrate .. //depot/projects/hammer/share/man/man9/suser.9#11 integrate .. //depot/projects/hammer/sys/amd64/amd64/identcpu.c#53 integrate .. //depot/projects/hammer/sys/amd64/include/specialreg.h#21 integrate .. //depot/projects/hammer/sys/amd64/linux32/linux32_machdep.c#12 integrate .. //depot/projects/hammer/sys/boot/common/pnp.c#3 integrate .. //depot/projects/hammer/sys/boot/common/pnpdata#2 delete .. //depot/projects/hammer/sys/compat/linux/linux_emul.c#2 integrate .. //depot/projects/hammer/sys/compat/linux/linux_emul.h#2 integrate .. //depot/projects/hammer/sys/compat/linux/linux_mib.c#10 integrate .. //depot/projects/hammer/sys/compat/linux/linux_misc.c#37 integrate .. //depot/projects/hammer/sys/compat/linux/linux_signal.c#16 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi.c#71 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi_cpu.c#34 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi_package.c#8 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi_perf.c#12 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi_throttle.c#9 integrate .. //depot/projects/hammer/sys/dev/acpica/acpivar.h#51 integrate .. //depot/projects/hammer/sys/dev/fb/boot_font.c#7 integrate .. //depot/projects/hammer/sys/dev/fb/gfb.c#8 delete .. //depot/projects/hammer/sys/dev/fb/gfb.h#4 integrate .. //depot/projects/hammer/sys/dev/gfb/gfb_pci.c#14 delete .. //depot/projects/hammer/sys/dev/gfb/gfb_pci.h#3 delete .. //depot/projects/hammer/sys/dev/idt/idtreg.h#3 integrate .. //depot/projects/hammer/sys/dev/msk/if_msk.c#2 integrate .. //depot/projects/hammer/sys/dev/usb/if_aue.c#31 integrate .. //depot/projects/hammer/sys/dev/usb/if_auereg.h#9 integrate .. //depot/projects/hammer/sys/dev/usb/usb_ethersubr.c#11 integrate .. //depot/projects/hammer/sys/dev/usb/usb_ethersubr.h#6 integrate .. //depot/projects/hammer/sys/fs/udf/udf_vfsops.c#28 integrate .. //depot/projects/hammer/sys/i386/i386/identcpu.c#35 integrate .. //depot/projects/hammer/sys/i386/include/specialreg.h#10 integrate .. //depot/projects/hammer/sys/i386/linux/linux_machdep.c#21 integrate .. //depot/projects/hammer/sys/kern/kern_acct.c#25 integrate .. //depot/projects/hammer/sys/kern/kern_prot.c#28 integrate .. //depot/projects/hammer/sys/kern/tty_pts.c#5 integrate .. //depot/projects/hammer/sys/kern/uipc_socket.c#70 integrate .. //depot/projects/hammer/sys/kern/uipc_usrreq.c#45 integrate .. //depot/projects/hammer/sys/modules/sound/driver/emu10kx/Makefile#2 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_freebsd.c#10 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_freebsd.h#7 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_input.c#33 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_node.c#36 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_proto.c#25 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_proto.h#14 integrate .. //depot/projects/hammer/sys/netatalk/COPYRIGHT#4 integrate .. //depot/projects/hammer/sys/netatalk/aarp.c#19 integrate .. //depot/projects/hammer/sys/netatalk/ddp_input.c#12 integrate .. //depot/projects/hammer/sys/netatalk/ddp_pcb.c#9 integrate .. //depot/projects/hammer/sys/netatalk/ddp_pcb.h#4 integrate .. //depot/projects/hammer/sys/netatalk/ddp_usrreq.c#18 integrate .. //depot/projects/hammer/sys/netgraph/ng_deflate.c#2 integrate .. //depot/projects/hammer/sys/netinet/ip_fw2.c#77 integrate .. //depot/projects/hammer/sys/netipx/ipx.c#6 integrate .. //depot/projects/hammer/sys/netipx/ipx.h#5 integrate .. //depot/projects/hammer/sys/netipx/ipx_cksum.c#5 integrate .. //depot/projects/hammer/sys/netipx/ipx_if.h#4 integrate .. //depot/projects/hammer/sys/netipx/ipx_input.c#11 integrate .. //depot/projects/hammer/sys/netipx/ipx_ip.c#13 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Jan 10 20:24: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 5D1D816A494; Wed, 10 Jan 2007 20:24: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 2391416A501 for ; Wed, 10 Jan 2007 20:24:29 +0000 (UTC) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 14B2713C465 for ; Wed, 10 Jan 2007 20:24:29 +0000 (UTC) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l0AKOSh5044160 for ; Wed, 10 Jan 2007 20:24:28 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0AKOSHF044155 for perforce@freebsd.org; Wed, 10 Jan 2007 20:24:28 GMT (envelope-from peter@freebsd.org) Date: Wed, 10 Jan 2007 20:24:28 GMT Message-Id: <200701102024.l0AKOSHF044155@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Cc: Subject: PERFORCE change 112726 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 10 Jan 2007 20:24:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=112726 Change 112726 by peter@peter_overcee on 2007/01/10 20:24:01 IFC @112724 Affected files ... .. //depot/projects/hammer/sys/conf/NOTES#112 integrate .. //depot/projects/hammer/sys/conf/options#99 integrate .. //depot/projects/hammer/sys/dev/syscons/scvesactl.c#8 integrate .. //depot/projects/hammer/sys/powerpc/conf/NOTES#3 integrate Differences ... ==== //depot/projects/hammer/sys/conf/NOTES#112 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/NOTES,v 1.1405 2007/01/03 11:12:54 piso Exp $ +# $FreeBSD: src/sys/conf/NOTES,v 1.1406 2007/01/10 18:45:17 marius Exp $ # # NOTES -- Lines that can be cut/pasted into kernel and hints configs. # @@ -1398,6 +1398,7 @@ options SC_NO_CUTPASTE options SC_NO_FONT_LOADING options SC_NO_HISTORY +options SC_NO_MODE_CHANGE options SC_NO_SYSMOUSE options SC_NO_SUSPEND_VTYSWITCH ==== //depot/projects/hammer/sys/conf/options#99 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options,v 1.571 2007/01/03 11:12:54 piso Exp $ +# $FreeBSD: src/sys/conf/options,v 1.572 2007/01/10 18:45:17 marius Exp $ # # On the handling of kernel options # @@ -707,6 +707,7 @@ SC_NO_CUTPASTE opt_syscons.h SC_NO_FONT_LOADING opt_syscons.h SC_NO_HISTORY opt_syscons.h +SC_NO_MODE_CHANGE opt_syscons.h SC_NO_SUSPEND_VTYSWITCH opt_syscons.h SC_NO_SYSMOUSE opt_syscons.h SC_NORM_ATTR opt_syscons.h ==== //depot/projects/hammer/sys/dev/syscons/scvesactl.c#8 (text+ko) ==== @@ -29,7 +29,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/syscons/scvesactl.c,v 1.24 2006/05/17 09:33:07 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/syscons/scvesactl.c,v 1.25 2007/01/10 19:04:00 marius Exp $"); #include "opt_vga.h" @@ -148,4 +148,4 @@ return 0; } -#endif /* SC_NO_MODE_CHANGE */ +#endif /* VGA_NO_MODE_CHANGE */ ==== //depot/projects/hammer/sys/powerpc/conf/NOTES#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/powerpc/conf/NOTES,v 1.6 2006/10/23 13:23:13 ru Exp $ +# $FreeBSD: src/sys/powerpc/conf/NOTES,v 1.7 2007/01/10 18:45:18 marius Exp $ # # This file contains machine dependent kernel configuration notes. For # machine independent notes, look in /sys/conf/NOTES. @@ -60,4 +60,5 @@ nooption GDB nooption PPC_DEBUG nooption PPC_PROBE_CHIPSET +nooption SC_NO_MODE_CHANGE nooption UKBD_DFLT_KEYMAP From owner-p4-projects@FreeBSD.ORG Wed Jan 10 21:49: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 2D97B16A415; Wed, 10 Jan 2007 21:49: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 D452A16A412 for ; Wed, 10 Jan 2007 21:49:15 +0000 (UTC) (envelope-from adamartin@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id C4F5D13C428 for ; Wed, 10 Jan 2007 21:49:15 +0000 (UTC) (envelope-from adamartin@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l0ALnFH7066966 for ; Wed, 10 Jan 2007 21:49:15 GMT (envelope-from adamartin@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0ALnFr5066963 for perforce@freebsd.org; Wed, 10 Jan 2007 21:49:15 GMT (envelope-from adamartin@FreeBSD.org) Date: Wed, 10 Jan 2007 21:49:15 GMT Message-Id: <200701102149.l0ALnFr5066963@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to adamartin@FreeBSD.org using -f From: Adam Martin To: Perforce Change Reviews Cc: Subject: PERFORCE change 112729 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 10 Jan 2007 21:49:16 -0000 http://perforce.freebsd.org/chv.cgi?CH=112729 Change 112729 by adamartin@adamartin_hobbes on 2007/01/10 21:49:13 Partially completed the move to uniform "instance" object private pointers. Readying for fork of pseudofs to templatefs. Affected files ... .. //depot/projects/soc2006/adamartin_autofs/autofs/autofs.h#9 edit .. //depot/projects/soc2006/adamartin_autofs/autofs/autofs_ctl.c#8 edit .. //depot/projects/soc2006/adamartin_autofs/autofs/autofs_ctl.h#7 edit .. //depot/projects/soc2006/adamartin_autofs/autofs/autofs_dev.c#8 edit .. //depot/projects/soc2006/adamartin_autofs/autofs/autofs_dev.h#6 edit .. //depot/projects/soc2006/adamartin_autofs/autofs/autofs_pfsops.c#8 edit .. //depot/projects/soc2006/adamartin_autofs/autofs/autofs_subr.h#3 edit .. //depot/projects/soc2006/adamartin_autofs/autofs/autofs_tfsops.c#1 branch .. //depot/projects/soc2006/adamartin_autofs/autofs/autofs_types.h#2 edit .. //depot/projects/soc2006/adamartin_autofs/autofs/protocol.c#7 edit .. //depot/projects/soc2006/adamartin_autofs/autofs/protocol.h#7 edit .. //depot/projects/soc2006/adamartin_autofs/pseudofs/pseudofs.c#2 edit .. //depot/projects/soc2006/adamartin_autofs/pseudofs/pseudofs.h#4 edit Differences ... ==== //depot/projects/soc2006/adamartin_autofs/autofs/autofs.h#9 (text+ko) ==== @@ -64,89 +64,6 @@ #define KPRINTF EPRINTF - -/** TODO: move this to autofs_types.h **/ - -/**************** FORWARD DEFINITIONS ******************/ -struct autofs_instance; -struct autofs_dev_bufs; -struct autofs_mount; -struct vnode; -struct pfs_node; -struct autofs_transaction; - -struct proc; - -typedef struct autofs_transaction autofs_transaction_t; -typedef struct proc kthread_t; -typedef struct autofs_instance autofs_instance_t; -typedef struct autofs_mount autofs_mount_t; - -/************** END FORWARD DEFINITIONS *****************/ - - -//typedef struct autofs_dev_bufs autofs_dev_bufs_t; - - - -/* This is needed as there's no true private field on pfs_node */ -#define pn_priv pn_data - - -struct autofs_instance -{ - struct autofs_dev_bufs *device; - kthread_t *controller_thread; - - autofs_mounts_t *mount_list; /** This will be a hash **/ - autofs_transaction_t *in_flight; /** A hash of inflight - transactions **/ - - void *extensions; -}; - - -/*** TODO: store in a hash, not a linked list. ***/ -struct autofs_mount -{ - /** FIXME: Not ANSI C, but I'll fix it later. **/ - union - { - autofs_mounts_t *next; /** This field is deprecated **/ - uint32_t hash_code; - }; - - autofs_instance_t *instance_p; - char *mountpoint; - - int state; - unsigned long long int flags; - - struct pfs_node *mount_file; /* The pn_priv field points to - the autofs mount structure */ - - int timeout; /* Timeout in seconds */ - int time_remaining; /* Time remaining until next - timeout event */ -}; - - -struct autofs_transaction -{ - uint32_t hash_code; - uint32_t transaction_id; - int32_t next_expected_command; - struct message_header last_message; /** This must be freed, after a successful command, with the expected transaction ID **/ -} - -#define AUTOFS_NODE_GET_PRIVATE( p_node )\ - ( (autofs_mount_t *) ( ( p_node )->pn_priv ) ) - -#define AUTOFS_NODE_GET_INSTANCE( p_node )\ - ( (autofs_instance_t *)\ - ( AUTOFS_NODE_GET_PRIVATE( p_node )->instance_p ) ) - -#define AUTOFS_NODE_GET_BUFFERS( p_node )\ - ( (autofs_instance_t *) ( AUTOFS_GET_INSTANCE( p_node )->device ) ) +#include "autofs_types.h" #endif /*** __AUTOFS_MAIN_HEADER__ ***/ ==== //depot/projects/soc2006/adamartin_autofs/autofs/autofs_ctl.c#8 (text+ko) ==== @@ -151,6 +151,9 @@ int error= 0; int *argp; int arg; + autofs_instance_t *instance; + + instance= AUTOFS_GET_INSTANCE( DEV, i_dev ); //argp= NULL; argp= (int *) arg_c; @@ -170,7 +173,7 @@ ) */ arg= autofs_ctl_state.next_assignable_node++; - error= create_autofs_node( arg ); + error= create_autofs_node( arg, instance ); $do_cleanup; ==== //depot/projects/soc2006/adamartin_autofs/autofs/autofs_ctl.h#7 (text+ko) ==== ==== //depot/projects/soc2006/adamartin_autofs/autofs/autofs_dev.c#8 (text+ko) ==== @@ -74,9 +74,14 @@ { int error; int *inst_p; + autofs_instance_t *instance; + autofs_dev_bufs_t *buffers; + error= 0; - inst_p= & ( AUTOFS_DEV_GET_PRIVATE( dev )->instances ); + instance= AUTOFS_GET_INSTANCE( DEV, dev ); + buffers= AUTOFS_GET_BUFFERS( DEV, dev ); + inst_p= &( buffers->instances ); if( *inst_p == 0 ) { @@ -96,9 +101,14 @@ { int error; int *inst_p; + autofs_instance_t *instance; + autofs_dev_bufs_t *buffers; + error= 0; - inst_p= &( AUTOFS_DEV_GET_PRIVATE( dev )->instances ); + instance= AUTOFS_GET_INSTANCE( DEV, dev ); + buffers= AUTOFS_GET_BUFFERS( DEV, dev ); + inst_p= &( buffers->instances ); if( *inst_p == 0 ) { @@ -123,7 +133,7 @@ autofs_dev_read( struct cdev *dev, struct uio *uio, int ioflag ) { int remains; - struct autofs_dev_bufs *bufs; + autofs_dev_bufs_t *bufs; queue *q; int amt; int error; @@ -132,7 +142,7 @@ error= 0; amt= MIN( uio->uio_resid, AUTOFS_IO_BUF_SIZE ); - bufs= AUTOFS_DEV_GET_BUFFERS( dev ); + bufs= AUTOFS_GET_BUFFERS( DEV, dev ); q= bufs->output; @@ -145,7 +155,7 @@ * right now. */ } - while( remains > 0 ); + while( remains > 0 ); /** FIXME: Shouldn't this be == **/ amt= MIN( remains, amt ); autofs_queue_read( q, out_buf, amt ); @@ -168,7 +178,7 @@ error= 0; amt= MIN( uio->uio_resid, AUTOFS_IO_BUF_SIZE ); - bufs= AUTOFS_DEV_GET_BUFFERS( dev ); + bufs= AUTOFS_GET_BUFFERS( DEV, dev ); q= bufs->input; @@ -192,7 +202,7 @@ struct autofs_dev_bufs *bufs; queue *q; - bufs= AUTOFS_DEV_GET_BUFFERS( dev ); + bufs= AUTOFS_GET_BUFFERS( DEV, dev ); q= bufs->output; ==== //depot/projects/soc2006/adamartin_autofs/autofs/autofs_dev.h#6 (text+ko) ==== @@ -48,43 +48,4 @@ int autofs_dev_poll( struct cdev *dev, int events, struct thread *td ); -struct autofs_dev_bufs; -typedef struct autofs_dev_bufs autofs_dev_bufs_t; -typedef struct autofs_dev_bufs autofs_info_t; - -struct autofs_dev_bufs -{ - queue *input; - queue *output; - int instances; - struct mtx *autofs_dev_lock; - autofs_instance_t *this_instance; -}; - - - - -#define AUTOFS_GET_PRIVATE( p_info )\ - ( (autofs_info_t *) AUTOFS_GET_BUFFERS( p_info ) ) - -#define AUTOFS_GET_BUFFERS( p_info )\ - ( AUTOFS_DEV_GET_BUFFERS( AUTOFS_GET_DEV( ( p_info ) ) ) ) - -#define AUTOFS_DEV_GET_PRIVATE AUTOFS_DEV_GET_BUFFERS -#define AUTOFS_DEV_GET_BUFFERS( afs_dev )\ - ( (struct autofs_dev_bufs *) ( ( afs_dev )->si_priv ) ) - - -#define AUTOFS_DEV_GET_INSTANCE( afs_dev )\ - ( (autofs_instance_t *) ( AUTOFS_DEV_GET_PRIVATE( \ - afs_dev )->this_instance ) ) - -#define AUTOFS_DEV_GET_TXNS( afs_dev )\ - ( (autofs_transaction_t *) ( AUTOFS_DEV_GET_INSTANCE( \ - afs_dev )->in_flight ) ) - -#define AUTOFS_GET_DEV( p_info )\ - ( (struct cdev *) ( ( p_info )->pi_priv ) ) - - #endif /*** __AUTOFS_DEVICE_HEADER__ ***/ ==== //depot/projects/soc2006/adamartin_autofs/autofs/autofs_pfsops.c#8 (text+ko) ==== @@ -54,7 +54,7 @@ #include #include "cleanup.h" -#include +#include "../templatefs/templatefs.h" #include @@ -67,7 +67,7 @@ MALLOC_DEFINE( M_AUTOFS_MOUNTBUF, "AutoFS mntbuf", "AutoFS mountpoint data, to simulate filesystem contents."); -struct pfs_node *foo; +struct tfs_node *foo; static int autofs_vis(PFS_VIS_ARGS) @@ -100,18 +100,20 @@ static int -autofs_lookup( PFS_LOOKUP_ARGS ) +autofs_lookup( TFS_LOOKUP_ARGS ) { struct componentname c= *cnp; struct message_header msg; struct mount_request mr; - struct pfs_info *pi; - autofs_info_t *instance; + struct tfs_info *ti; + autofs_instance_t *instance; + autofs_dev_bufs_t *buffers; - pi= pn->pn_info; + instance= AUTOFS_GET_INSTANCE( NODE, tn ); + buffers= AUTOFS_GET_BUFFERS( NODE, tn ); - instance= AUTOFS_GET_PRIVATE( pi ); + ti= tn->tn_info; DEBUG1 KPRINTF( "autofs lookup called\n" ); DEBUG7 KPRINTF( "cn_nameptr= %s, cn_pnbuf= %s\n", c.cn_nameptr, @@ -133,14 +135,14 @@ //if( take_autofs_lock( instance, node ) ) //{ - send_mount_request( &msg, instance->output ); + send_mount_request( &msg, buffers->output ); //} return 1; } static int -autofs_init(struct pfs_info *pi, struct vfsconf *vfc) +autofs_init(struct tfs_info *ti, struct vfsconf *vfc) { struct vnode *devvp; struct cdev *dev; @@ -153,7 +155,7 @@ /** Get the fake device vnode from name **/ - NDINIT( ndp, LOOKUP, FOLLOW | LOCKLEAF, UIO_SYSSPACE, pi->pi_name, td ); + NDINIT( ndp, LOOKUP, FOLLOW | LOCKLEAF, UIO_SYSSPACE, ti->ti_name, td ); if( ( error= namei( ndp ) ) != 0 ) { return error; @@ -168,26 +170,26 @@ } /* Get out the cdev object, and store in the private field for the - pfs_info object (I think we need to release the vnode too!)*/ + tfs_info object (I think we need to release the vnode too!)*/ dev= devvp->v_rdev; - pi->pi_priv= (void *) dev; + ti->ti_priv= (void *) dev; VOP_UNLOCK( devvp, LK_RELEASE, td ); /** Make some fake files... **/ - foo= pfs_create_dir( pi->pi_root, "foo", autofs_attr, autofs_vis, 0 ); - foo->pn_lookup= autofs_lookup; + foo= tfs_create_dir( ti->ti_root, "foo", autofs_attr, autofs_vis, 0 ); + foo->tn_lookup= autofs_lookup; return 0; } static int -autofs_uninit(struct pfs_info *pi, struct vfsconf *vfc) +autofs_uninit(struct tfs_info *ti, struct vfsconf *vfc) { return 0; } -PSEUDOFS( autofs, AUTOFS_VERSION ); +TEMPLATEFS( autofs, AUTOFS_VERSION, NULL ); ==== //depot/projects/soc2006/adamartin_autofs/autofs/autofs_subr.h#3 (text+ko) ==== @@ -4,17 +4,16 @@ #include #include #include - +#include "autofs_types.h" -typedef struct mbuf queue; - queue *autofs_queue_init( void ); int autofs_queue_write( queue *q, void *buf, int len ); int autofs_queue_read( queue *q, void *buf, int len ); /* Removes from head */ +int autofs_queue_remaining( queue *q ); ==== //depot/projects/soc2006/adamartin_autofs/autofs/autofs_types.h#2 (text+ko) ==== @@ -1,0 +1,153 @@ +#ifndef __AUTOFS_TYPES_H__ +#define __AUTOFS_TYPES_H__ +#include +#include + +/**************** FORWARD DEFINITIONS ******************/ + +/** Kernel forward definitions **/ + +struct vnode; +struct pfs_node; +struct proc; +struct cdev; +struct mbuf; + + + +typedef struct proc kthread_t; + + + +struct autofs_instance; +struct autofs_transaction; +struct autofs_dev_bufs; +struct autofs_mount; + +struct message_header; + + +typedef struct mbuf queue; + +typedef struct autofs_instance autofs_instance_t; +typedef struct autofs_transaction autofs_transaction_t; +typedef struct autofs_dev_bufs autofs_dev_bufs_t; +typedef struct autofs_mount autofs_mount_t; + +/************** END FORWARD DEFINITIONS *****************/ + + +//typedef struct autofs_dev_bufs autofs_dev_bufs_t; + + + +/* This is needed as there's no true private field on pfs_node */ +#define pn_priv pn_data + + +struct autofs_instance +{ + autofs_dev_bufs_t *dev_buffers; + struct cdevsw *device_struct; + kthread_t *controller_thread; + + autofs_mount_t *mount_list; /** This will be a hash **/ + autofs_transaction_t *in_flight; /** A hash of inflight + transactions **/ + + void *extensions; +}; + + +/*** TODO: store in a hash, not a linked list. ***/ +struct autofs_mount +{ + /** FIXME: Not ANSI C, but I'll fix it later. **/ + uint32_t hash_code; + + autofs_instance_t *this_instance; + char *mountpoint; + + int state; + unsigned long long int flags; + + struct pfs_node *mount_file; /* The pn_priv field points to + the autofs mount structure */ + + int timeout; /* Timeout in seconds */ + int time_remaining; /* Time remaining until next + timeout event */ +}; + + +struct autofs_transaction +{ + uint32_t hash_code; + uint32_t transaction_id; + int32_t next_expected_command; + struct message_header *last_message; /** This must be freed, after a + successful command, with the + expected transaction ID **/ +}; + + + + +struct autofs_dev_bufs +{ + queue *input; + queue *output; + int instances; + struct mtx *autofs_dev_lock; + autofs_instance_t *this_instance; +}; + + + +/*************************************************************************** +The GET* macros get a piece of autofs state, from a "holder", where +holder is DEV, NODE, INSTANCE or ROOT: + + DEV - the input/output device of the AutoFS system + NODE - a node (mountpoint) within the AutoFS system + INSTANCE - the instance descriptor of an AutoFS system + ROOT - the pfs_info (vfs_info) descriptor of the underlying pseudofs + +E.G.: AUTOFS_GET_BUFFERS( ROOT, autofs_pfs_info ) +E.G.: AUTOFS_GET_TXNS( DEV, autofs_cdevsw ) + +one can get: + BUFFERS, DEV, TXNS, INSTANCE + +****************************************************************************/ + +#define AUTOFS_GET_INSTANCE( TYPE, __datum__ )\ + ( (autofs_instance_t *) ( __CONCAT( AUTOFS_, __CONCAT( TYPE,\ + _GET_INSTANCE( __datum__ ) ) ) ) ) + +#define AUTOFS_GET_BUFFERS( TYPE, __datum__ )\ + ( (autofs_dev_bufs_t *) ( AUTOFS_GET_INSTANCE( TYPE, __datum__ )->\ + dev_buffers ) ) + +#define AUTOFS_GET_TXNS( TYPE, __datum__ )\ + ( (autofs_transaction_t *) ( AUTOFS_GET_INSTANCE( TYPE, __datum__ )->\ + in_flight ) ) + +#define AUTOFS_GET_DEV( TYPE, __datum__ )\ + ( (struct cdev *) ( AUTOFS_GET_INSTANCE( TYPE, __datum__ )->\ + device_struct ) ) + + +#define AUTOFS_DEV_GET_INSTANCE( dev )\ + ( ( dev )->si_priv ) + +#define AUTOFS_NODE_GET_INSTANCE( node )\ + ( ( node )->pn_priv ) + +#define AUTOFS_ROOT_GET_INSTANCE( p_info )\ + ( ( p_info )->pi_priv ) + +#define AUTOFS_INSTANCE_GET_INSTANCE( instance )\ + ( ( instance ) ) + +#endif /*** __AUTOFS_TYPES_H__ ***/ ==== //depot/projects/soc2006/adamartin_autofs/autofs/protocol.c#7 (text+ko) ==== @@ -36,6 +36,8 @@ #include "autofs_subr.h" #include "autofs_dev.h" +#include "autofs_types.h" + int process_mount_complete( struct message_header *, autofs_instance_t * ); ==== //depot/projects/soc2006/adamartin_autofs/autofs/protocol.h#7 (text+ko) ==== ==== //depot/projects/soc2006/adamartin_autofs/pseudofs/pseudofs.c#2 (text+ko) ==== @@ -282,6 +282,10 @@ sbp->f_files = 1; sbp->f_ffree = 0; + /** Mount intercept handler, by ADAM **/ + if( pi->pi_mount_handler != NULL ) + pi->pi_mount_handler( pi, mp, td ); + return (0); } @@ -308,6 +312,8 @@ int pfs_root(struct mount *mp, int flags, struct vnode **vpp, struct thread *td) { + + /** ADAM: TODO: Make this handle multiple clients of the same type **/ struct pfs_info *pi; pi = (struct pfs_info *)mp->mnt_data; @@ -325,7 +331,7 @@ } /* - * Initialize a pseudofs instance + * Initialize a (static) pseudofs instance */ int pfs_init(struct pfs_info *pi, struct vfsconf *vfc) ==== //depot/projects/soc2006/adamartin_autofs/pseudofs/pseudofs.h#4 (text+ko) ==== @@ -92,6 +92,15 @@ typedef int (*pfs_init_t)(PFS_INIT_ARGS); /* + * Mount callback (ADAM) + */ +#define PFS_MOUNT_HANDLER_ARGS \ + struct pfs_info *pi, struct mount *mp, struct thread *td +#define PFS_MOUNT_HANDLER_PROTO(name) \ + int name(PFS_MOUNT_HANDLER_ARGS); +typedef int (*pfs_mount_handler_t)(PFS_MOUNT_HANDLER_ARGS); + +/* * Filler callback */ #define PFS_FILL_ARGS \ @@ -172,6 +181,7 @@ pfs_init_t pi_init; pfs_init_t pi_uninit; /* members below this line aren't initialized */ + pfs_mount_handler_t pi_mount; struct pfs_node *pi_root; /* currently, the mutex is only used to protect the bitmap */ struct mtx pi_mutex; @@ -275,4 +285,45 @@ MODULE_VERSION(name, version); \ MODULE_DEPEND(name, pseudofs, 1, 1, 1); + +/* + * Dynamic pseudofs initialization by ADAM... + */ +#define PSEUDOFS_DYNAMIC(name, version) \ + \ +static struct pfs_info name##_info = { \ + #name, \ + name##_init, \ + name##_uninit, \ +}; \ + \ +static int \ +_##name##_mount(struct mount *mp, struct thread *td) { \ + return pfs_mount(&name##_info, mp, td); \ +} \ + \ +static int \ +_##name##_init(struct vfsconf *vfc) { \ + return pfs_init(&name##_info, vfc); \ +} \ + \ +static int \ +_##name##_uninit(struct vfsconf *vfc) { \ + return pfs_uninit(&name##_info, vfc); \ +} \ + \ +static struct vfsops name##_vfsops = { \ + .vfs_init = _##name##_init, \ + .vfs_mount = _##name##_mount, \ + .vfs_root = pfs_root, \ + .vfs_statfs = pfs_statfs, \ + .vfs_uninit = _##name##_uninit, \ + .vfs_unmount = pfs_unmount, \ +}; \ +VFS_SET(name##_vfsops, name, VFCF_SYNTHETIC); \ +MODULE_VERSION(name, version); \ +MODULE_DEPEND(name, pseudofs, 1, 1, 1); + + + #endif From owner-p4-projects@FreeBSD.ORG Wed Jan 10 21:50:18 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D91B416A415; Wed, 10 Jan 2007 21:50:17 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id B6D7316A40F for ; Wed, 10 Jan 2007 21:50:17 +0000 (UTC) (envelope-from adamartin@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 8FBF813C43E for ; Wed, 10 Jan 2007 21:50:17 +0000 (UTC) (envelope-from adamartin@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l0ALoHdu067063 for ; Wed, 10 Jan 2007 21:50:17 GMT (envelope-from adamartin@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0ALoHdF067060 for perforce@freebsd.org; Wed, 10 Jan 2007 21:50:17 GMT (envelope-from adamartin@FreeBSD.org) Date: Wed, 10 Jan 2007 21:50:17 GMT Message-Id: <200701102150.l0ALoHdF067060@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to adamartin@FreeBSD.org using -f From: Adam Martin To: Perforce Change Reviews Cc: Subject: PERFORCE change 112730 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 10 Jan 2007 21:50:18 -0000 http://perforce.freebsd.org/chv.cgi?CH=112730 Change 112730 by adamartin@adamartin_hobbes on 2007/01/10 21:49:40 rename of autofs_pfsops.c to autofs_tfsops.c in honor of "templatefs" Affected files ... .. //depot/projects/soc2006/adamartin_autofs/autofs/autofs_pfsops.c#9 delete Differences ... From owner-p4-projects@FreeBSD.ORG Wed Jan 10 21:50:18 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 401F016A56B; Wed, 10 Jan 2007 21:50:18 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 01BDF16A505 for ; Wed, 10 Jan 2007 21:50:17 +0000 (UTC) (envelope-from adamartin@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id DFD1513C441 for ; Wed, 10 Jan 2007 21:50:17 +0000 (UTC) (envelope-from adamartin@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l0ALoH4t067070 for ; Wed, 10 Jan 2007 21:50:17 GMT (envelope-from adamartin@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0ALoHLV067066 for perforce@freebsd.org; Wed, 10 Jan 2007 21:50:17 GMT (envelope-from adamartin@FreeBSD.org) Date: Wed, 10 Jan 2007 21:50:17 GMT Message-Id: <200701102150.l0ALoHLV067066@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to adamartin@FreeBSD.org using -f From: Adam Martin To: Perforce Change Reviews Cc: Subject: PERFORCE change 112731 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 10 Jan 2007 21:50:18 -0000 http://perforce.freebsd.org/chv.cgi?CH=112731 Change 112731 by adamartin@adamartin_hobbes on 2007/01/10 21:50:10 Initial templatefs fork of pseudofs Affected files ... .. //depot/projects/soc2006/adamartin_autofs/templatefs/Makefile#1 add .. //depot/projects/soc2006/adamartin_autofs/templatefs/templatefs.c#1 add .. //depot/projects/soc2006/adamartin_autofs/templatefs/templatefs.h#1 add .. //depot/projects/soc2006/adamartin_autofs/templatefs/templatefs_fileno.c#1 add .. //depot/projects/soc2006/adamartin_autofs/templatefs/templatefs_internal.h#1 add .. //depot/projects/soc2006/adamartin_autofs/templatefs/templatefs_vncache.c#1 add .. //depot/projects/soc2006/adamartin_autofs/templatefs/templatefs_vnops.c#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Thu Jan 11 00:58: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 82C3016A416; Thu, 11 Jan 2007 00:58: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 5BD4D16A415 for ; Thu, 11 Jan 2007 00:58:26 +0000 (UTC) (envelope-from adamartin@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 4AFB013C441 for ; Thu, 11 Jan 2007 00:58:26 +0000 (UTC) (envelope-from adamartin@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l0B0wQjS009791 for ; Thu, 11 Jan 2007 00:58:26 GMT (envelope-from adamartin@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0B0wPVi009788 for perforce@freebsd.org; Thu, 11 Jan 2007 00:58:25 GMT (envelope-from adamartin@FreeBSD.org) Date: Thu, 11 Jan 2007 00:58:25 GMT Message-Id: <200701110058.l0B0wPVi009788@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to adamartin@FreeBSD.org using -f From: Adam Martin To: Perforce Change Reviews Cc: Subject: PERFORCE change 112747 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 11 Jan 2007 00:58:26 -0000 http://perforce.freebsd.org/chv.cgi?CH=112747 Change 112747 by adamartin@adamartin_hobbes on 2007/01/11 00:57:34 Autofs working on templatefs now. Need to make templatefs non-static in creation time now. Affected files ... .. //depot/projects/soc2006/adamartin_autofs/autofs/Makefile#7 edit .. //depot/projects/soc2006/adamartin_autofs/autofs/autofs.c#9 edit .. //depot/projects/soc2006/adamartin_autofs/autofs/autofs_tfsops.c#2 edit .. //depot/projects/soc2006/adamartin_autofs/autofs/autofs_types.h#3 edit .. //depot/projects/soc2006/adamartin_autofs/templatefs/templatefs.c#2 edit Differences ... ==== //depot/projects/soc2006/adamartin_autofs/autofs/Makefile#7 (text+ko) ==== @@ -27,7 +27,7 @@ AUTOFS_DEV_SOURCE=autofs_ctl.c autofs_dev.c -AUTOFS_FS_SOURCE=autofs_pfsops.c vnode_if.h +AUTOFS_FS_SOURCE=autofs_tfsops.c vnode_if.h AUTOFS_CORE_SOURCE=autofs.c protocol.c AUTOFS_SUPPORT_SOURCE=autofs_subr.c SRCS=$(AUTOFS_CORE_SOURCE) $(AUTOFS_FS_SOURCE) $(AUTOFS_DEV_SOURCE) $(AUTOFS_SUPPORT_SOURCE) ==== //depot/projects/soc2006/adamartin_autofs/autofs/autofs.c#9 (text+ko) ==== @@ -111,7 +111,7 @@ -#if 0 +#if NEVER_DEFINED static int vn_iscdev( struct vnode *vp, int *errp ) { @@ -146,3 +146,4 @@ DEV_MODULE( AutoFS, autofs_handle_loader, NULL ); +MODULE_DEPEND( AutoFS, templatefs, 1, 1, 1 ); ==== //depot/projects/soc2006/adamartin_autofs/autofs/autofs_tfsops.c#2 (text+ko) ==== @@ -54,7 +54,7 @@ #include #include "cleanup.h" -#include +#include "../templatefs/templatefs.h" #include @@ -67,17 +67,17 @@ MALLOC_DEFINE( M_AUTOFS_MOUNTBUF, "AutoFS mntbuf", "AutoFS mountpoint data, to simulate filesystem contents."); -struct pfs_node *foo; +struct tfs_node *foo; static int -autofs_vis(PFS_VIS_ARGS) +autofs_vis( TFS_VIS_ARGS ) { KPRINTF( "autofs visibility called\n" ); return 0; } static int -autofs_attr( PFS_ATTR_ARGS ) +autofs_attr( TFS_ATTR_ARGS ) { KPRINTF( "autofs attr called\n" ); return 0; @@ -100,18 +100,21 @@ static int -autofs_lookup( PFS_LOOKUP_ARGS ) +autofs_lookup( TFS_LOOKUP_ARGS ) { struct componentname c= *cnp; struct message_header msg; struct mount_request mr; - struct pfs_info *pi; - autofs_info_t *instance; + struct tfs_info *ti; + + autofs_instance_t *instance; + autofs_dev_bufs_t *buffers; - pi= pn->pn_info; + ti= tn->tn_info; - instance= AUTOFS_GET_PRIVATE( pi ); + instance= AUTOFS_GET_INSTANCE( NODE, tn ); + buffers= AUTOFS_GET_BUFFERS( NODE, tn ); DEBUG1 KPRINTF( "autofs lookup called\n" ); DEBUG7 KPRINTF( "cn_nameptr= %s, cn_pnbuf= %s\n", c.cn_nameptr, @@ -133,14 +136,60 @@ //if( take_autofs_lock( instance, node ) ) //{ - send_mount_request( &msg, instance->output ); + send_mount_request( &msg, buffers->output ); //} return 1; } + static int -autofs_init(struct pfs_info *pi, struct vfsconf *vfc) +autofs_mount_handler( TFS_MOUNT_HANDLER_ARGS ) +{ + struct vnode *devvp; + struct cdev *dev; + struct nameidata nd; + struct nameidata *ndp; + int error; + char *dev_name; + int dev_name_len; + struct vfsoptlist *opts; + + error= 0; + + ndp= &nd; + opts= mp->mnt_optnew; + + error= vfs_getopt( opts, MNT_DEVICE, (void **) &dev_name, + &dev_name_len ); + + if( !error && dev_name[ dev_name_len - 1 ] != '\0' ) + { + return ( EINVAL ); + } + + NDINIT( ndp, LOOKUP, FOLLOW | LOCKLEAF, UIO_SYSSPACE, dev_name, td ); + if( ( error= namei( ndp ) ) ) + { + return ( error ); + } + NDFREE( ndp, NDF_ONLY_PNBUF ); + devvp= ndp->ni_vp; + + /** Take the lock here, and get the struct cdev out of it, and use the + private data there, to assign the instance. **/ + + dev= devvp->v_rdev; + + /** Now we have the dev object. Work with it. **/ + + ti->ti_priv= (void *) AUTOFS_GET_INSTANCE( DEV, dev ); + + return error; +} + +static int +autofs_init(struct tfs_info *ti, struct vfsconf *vfc) { struct vnode *devvp; struct cdev *dev; @@ -153,7 +202,7 @@ /** Get the fake device vnode from name **/ - NDINIT( ndp, LOOKUP, FOLLOW | LOCKLEAF, UIO_SYSSPACE, pi->pi_name, td ); + NDINIT( ndp, LOOKUP, FOLLOW | LOCKLEAF, UIO_SYSSPACE, ti->ti_name, td ); if( ( error= namei( ndp ) ) != 0 ) { return error; @@ -171,23 +220,23 @@ pfs_info object (I think we need to release the vnode too!)*/ dev= devvp->v_rdev; - pi->pi_priv= (void *) dev; + ti->ti_priv= (void *) dev; VOP_UNLOCK( devvp, LK_RELEASE, td ); /** Make some fake files... **/ - foo= pfs_create_dir( pi->pi_root, "foo", autofs_attr, autofs_vis, 0 ); - foo->pn_lookup= autofs_lookup; + foo= tfs_create_dir( ti->ti_root, "foo", autofs_attr, autofs_vis, 0 ); + foo->tn_lookup= autofs_lookup; return 0; } static int -autofs_uninit(struct pfs_info *pi, struct vfsconf *vfc) +autofs_uninit(struct tfs_info *ti, struct vfsconf *vfc) { return 0; } -PSEUDOFS( autofs, AUTOFS_VERSION ); +TEMPLATEFS( autofs, AUTOFS_VERSION, autofs_mount_handler ); ==== //depot/projects/soc2006/adamartin_autofs/autofs/autofs_types.h#3 (text+ko) ==== @@ -8,7 +8,7 @@ /** Kernel forward definitions **/ struct vnode; -struct pfs_node; +struct tfs_node; struct proc; struct cdev; struct mbuf; @@ -111,9 +111,9 @@ DEV - the input/output device of the AutoFS system NODE - a node (mountpoint) within the AutoFS system INSTANCE - the instance descriptor of an AutoFS system - ROOT - the pfs_info (vfs_info) descriptor of the underlying pseudofs + ROOT - the tfs_info (vfs_info) descriptor of the underlying templatefs -E.G.: AUTOFS_GET_BUFFERS( ROOT, autofs_pfs_info ) +E.G.: AUTOFS_GET_BUFFERS( ROOT, autofs_tfs_info ) E.G.: AUTOFS_GET_TXNS( DEV, autofs_cdevsw ) one can get: @@ -142,10 +142,10 @@ ( ( dev )->si_priv ) #define AUTOFS_NODE_GET_INSTANCE( node )\ - ( ( node )->pn_priv ) + ( ( node )->tn_data ) -#define AUTOFS_ROOT_GET_INSTANCE( p_info )\ - ( ( p_info )->pi_priv ) +#define AUTOFS_ROOT_GET_INSTANCE( t_info )\ + ( ( t_info )->ti_priv ) #define AUTOFS_INSTANCE_GET_INSTANCE( instance )\ ( ( instance ) ) ==== //depot/projects/soc2006/adamartin_autofs/templatefs/templatefs.c#2 (text+ko) ==== @@ -360,6 +360,7 @@ /* * Initialize a (static) pseudofs instance + * ADAM -- if it's static, then this is bad... we need it at dynamic time. */ int tfs_init(struct tfs_info *ti, struct vfsconf *vfc) @@ -369,6 +370,7 @@ mtx_init(&ti->ti_mutex, "pseudofs", NULL, MTX_DEF); + /** TODO, should this be moved to mount? How much of it? **/ /* set up the root diretory */ MALLOC(root, struct tfs_node *, sizeof *root, M_TFSNODES, M_WAITOK|M_ZERO); From owner-p4-projects@FreeBSD.ORG Thu Jan 11 01:21: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 EAA9816A415; Thu, 11 Jan 2007 01:21:55 +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 C482916A403 for ; Thu, 11 Jan 2007 01:21:55 +0000 (UTC) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id B418913C448 for ; Thu, 11 Jan 2007 01:21:55 +0000 (UTC) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l0B1LtOG014828 for ; Thu, 11 Jan 2007 01:21:55 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0B1LtrM014825 for perforce@freebsd.org; Thu, 11 Jan 2007 01:21:55 GMT (envelope-from peter@freebsd.org) Date: Thu, 11 Jan 2007 01:21:55 GMT Message-Id: <200701110121.l0B1LtrM014825@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Cc: Subject: PERFORCE change 112748 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 11 Jan 2007 01:21:56 -0000 http://perforce.freebsd.org/chv.cgi?CH=112748 Change 112748 by peter@peter_overcee on 2007/01/11 01:21:41 Grrr. Fix bug in pci id match code in puc. Affected files ... .. //depot/projects/hammer/sys/dev/puc/puc_pci.c#12 edit Differences ... ==== //depot/projects/hammer/sys/dev/puc/puc_pci.c#12 (text+ko) ==== @@ -94,7 +94,8 @@ return (desc); subven = pci_get_subvendor(dev); subdev = pci_get_subdevice(dev); - while (desc->vendor == vendor && desc->device == device && + while (desc->subvendor != 0xffff && + desc->vendor == vendor && desc->device == device && (desc->subvendor != subven || desc->subdevice != subdev)) desc++; return ((desc->vendor == vendor && desc->device == device) From owner-p4-projects@FreeBSD.ORG Thu Jan 11 02:11: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 A431016A504; Thu, 11 Jan 2007 02:11: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 6702C16A501 for ; Thu, 11 Jan 2007 02:11:01 +0000 (UTC) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 54B1013C44B for ; Thu, 11 Jan 2007 02:11:01 +0000 (UTC) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l0B2B1EE023600 for ; Thu, 11 Jan 2007 02:11:01 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0B2B1sl023597 for perforce@freebsd.org; Thu, 11 Jan 2007 02:11:01 GMT (envelope-from peter@freebsd.org) Date: Thu, 11 Jan 2007 02:11:01 GMT Message-Id: <200701110211.l0B2B1sl023597@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Cc: Subject: PERFORCE change 112755 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 11 Jan 2007 02:11:01 -0000 http://perforce.freebsd.org/chv.cgi?CH=112755 Change 112755 by peter@peter_overcee on 2007/01/11 02:10:31 Ignore the warnings and copy this bit of necessary code to avoid sio unit numbers from sio_pci to sio_puc. Marcel left this out in the great puc rewrite. Affected files ... .. //depot/projects/hammer/sys/dev/sio/sio_puc.c#8 edit Differences ... ==== //depot/projects/hammer/sys/dev/sio/sio_puc.c#8 (text+ko) ==== @@ -62,6 +62,34 @@ 0, }; +/* + * Don't cut and paste this to other drivers. It is a horrible kludge + * which will fail to work and also be unnecessary in future versions. + */ +static void +sio_puc_kludge_unit(device_t dev) +{ + devclass_t dc; + int err; + int start; + int unit; + + unit = 0; + start = 0; + while (resource_int_value("sio", unit, "port", &start) == 0 && + start > 0) + unit++; + if (device_get_unit(dev) < unit) { + dc = device_get_devclass(dev); + while (devclass_get_device(dc, unit)) + unit++; + device_printf(dev, "moving to sio%d\n", unit); + err = device_set_unit(dev, unit); /* EVIL DO NOT COPY */ + if (err) + device_printf(dev, "error moving device %d\n", err); + } +} + static int sio_puc_attach(device_t dev) { @@ -70,6 +98,7 @@ if (BUS_READ_IVAR(device_get_parent(dev), dev, PUC_IVAR_CLOCK, &rclk) != 0) rclk = DEFAULT_RCLK; + sio_puc_kludge_unit(dev); return (sioattach(dev, 0, rclk)); } From owner-p4-projects@FreeBSD.ORG Thu Jan 11 04:49:06 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4785C16A412; Thu, 11 Jan 2007 04:49:06 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 1F8C416A403 for ; Thu, 11 Jan 2007 04:49:06 +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 B451613C428 for ; Thu, 11 Jan 2007 04:49:05 +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 l0B4mgBf061814; Wed, 10 Jan 2007 21:48:43 -0700 (MST) (envelope-from imp@bsdimp.com) Date: Wed, 10 Jan 2007 21:48:55 -0700 (MST) Message-Id: <20070110.214855.-267228456.imp@bsdimp.com> To: ticso@cicely.de, ticso@cicely12.cicely.de From: "M. Warner Losh" In-Reply-To: <20070110092251.GG80390@cicely12.cicely.de> References: <200701100703.l0A734xi068010@repoman.freebsd.org> <20070110092251.GG80390@cicely12.cicely.de> 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]); Wed, 10 Jan 2007 21:48:43 -0700 (MST) Cc: perforce@freebsd.org Subject: Re: PERFORCE change 112701 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 11 Jan 2007 04:49:06 -0000 In message: <20070110092251.GG80390@cicely12.cicely.de> Bernd Walter writes: : On Wed, Jan 10, 2007 at 07:03:04AM +0000, Warner Losh wrote: : > http://perforce.freebsd.org/chv.cgi?CH=112701 : > : > Change 112701 by imp@imp_lighthouse on 2007/01/10 07:02:04 : > : > Add a comment about why we need to do the dance we do with enabling : > the PDC, along with a simplified version of the code. : > : > Affected files ... : > : > .. //depot/projects/arm/src/sys/arm/at91/at91_mci.c#30 edit : > : > Differences ... : > : > ==== //depot/projects/arm/src/sys/arm/at91/at91_mci.c#30 (text+ko) ==== : > : > @@ -402,16 +402,27 @@ : > } : > } : > // printf("CMDR %x ARGR %x with data\n", cmdr, cmd->arg); : > + /* : > + * For Reads, we need to enable the DMA buffer before we send : > + * the command. For writes, alas, it has to be enabled after : > + * we send the command. If enabled after the CMDR write for : > + * reads, fast SD parts could win the race that's present and : > + * the result would be corrupted data because the ENDRX bit : > + * would be set, but the dma wouldn't have started yet. When : > + * that interrupt returned, we'd enable DMA. We'd then get a : > + * RXBUFF interrupt and then a CMDRDY interrupt. We'd process : > + * things int he ISR. But since the DMA started after we got : > + * the ENDRX and RXBUFF interrupts, when we got the CMDRDY : > + * interrupt the data would still be in flight, leading to : > + * corruption. This race was 'hard' to trigger for slow parts, : > + * but easy to trigger for faster ones. : > + */ : > WR4(sc, MCI_ARGR, cmd->arg); : > - if (cmdr & MCI_CMDR_TRCMD_START) { : > - if (cmdr & MCI_CMDR_TRDIR) { : > - WR4(sc, PDC_PTCR, PDC_PTCR_RXTEN); : > - WR4(sc, MCI_CMDR, cmdr); : > - } else { : > - WR4(sc, MCI_CMDR, cmdr); : > - WR4(sc, PDC_PTCR, PDC_PTCR_TXTEN); : > - } : > - } : > + if ((cmdr & MCI_CMDR_TRCMD_START) && (cmdr & MCI_CMDR_TRDIR)) : > + WR4(sc, PDC_PTCR, PDC_PTCR_RXTEN); : > + WR4(sc, MCI_CMDR, cmdr); : > + if ((cmdr & MCI_CMDR_TRCMD_START) && !(cmdr & MCI_CMDR_TRDIR)) : > + WR4(sc, PDC_PTCR, PDC_PTCR_TXTEN); : > WR4(sc, MCI_IER, MCI_SR_ERROR | ier); : > } : > : : This moves MCI_CMDR writing out of the (cmdr & MCI_CMDR_TRCMD_START) : check. why would we write the ARGR if we weren't going to also write the CMDR? You moved the CMDR write under the start in the last round of commits, iirc. Warner From owner-p4-projects@FreeBSD.ORG Thu Jan 11 04:52: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 5575216A415; Thu, 11 Jan 2007 04:52: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 DE16416A407; Thu, 11 Jan 2007 04:52:07 +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 99DC613C45A; Thu, 11 Jan 2007 04:52:07 +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 l0B4p670061821; Wed, 10 Jan 2007 21:51:06 -0700 (MST) (envelope-from imp@bsdimp.com) Date: Wed, 10 Jan 2007 21:51:19 -0700 (MST) Message-Id: <20070110.215119.1021576971.imp@bsdimp.com> To: peter@freebsd.org From: "M. Warner Losh" In-Reply-To: <200701110211.l0B2B1sl023597@repoman.freebsd.org> References: <200701110211.l0B2B1sl023597@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]); Wed, 10 Jan 2007 21:51:06 -0700 (MST) Cc: perforce@freebsd.org Subject: Re: PERFORCE change 112755 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 11 Jan 2007 04:52:08 -0000 In message: <200701110211.l0B2B1sl023597@repoman.freebsd.org> Peter Wemm writes: : http://perforce.freebsd.org/chv.cgi?CH=112755 : : Change 112755 by peter@peter_overcee on 2007/01/11 02:10:31 : : Ignore the warnings and copy this bit of necessary code to avoid : sio unit numbers from sio_pci to sio_puc. Marcel left this out in : the great puc rewrite. I have some changes that I'm working on in my tree that should obviate the need for this entirely... But until they are in, you are going to need to do this... Warner : Affected files ... : : .. //depot/projects/hammer/sys/dev/sio/sio_puc.c#8 edit : : Differences ... : : ==== //depot/projects/hammer/sys/dev/sio/sio_puc.c#8 (text+ko) ==== : : @@ -62,6 +62,34 @@ : 0, : }; : : +/* : + * Don't cut and paste this to other drivers. It is a horrible kludge : + * which will fail to work and also be unnecessary in future versions. : + */ : +static void : +sio_puc_kludge_unit(device_t dev) : +{ : + devclass_t dc; : + int err; : + int start; : + int unit; : + : + unit = 0; : + start = 0; : + while (resource_int_value("sio", unit, "port", &start) == 0 && : + start > 0) : + unit++; : + if (device_get_unit(dev) < unit) { : + dc = device_get_devclass(dev); : + while (devclass_get_device(dc, unit)) : + unit++; : + device_printf(dev, "moving to sio%d\n", unit); : + err = device_set_unit(dev, unit); /* EVIL DO NOT COPY */ : + if (err) : + device_printf(dev, "error moving device %d\n", err); : + } : +} : + : static int : sio_puc_attach(device_t dev) : { : @@ -70,6 +98,7 @@ : if (BUS_READ_IVAR(device_get_parent(dev), dev, PUC_IVAR_CLOCK, : &rclk) != 0) : rclk = DEFAULT_RCLK; : + sio_puc_kludge_unit(dev); : return (sioattach(dev, 0, rclk)); : } : : From owner-p4-projects@FreeBSD.ORG Thu Jan 11 04:52:11 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 250F116A47C; Thu, 11 Jan 2007 04:52:11 +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 03BA916A417 for ; Thu, 11 Jan 2007 04:52:11 +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 B3F1113C455 for ; Thu, 11 Jan 2007 04:52:10 +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 l0B4nArF061817; Wed, 10 Jan 2007 21:49:10 -0700 (MST) (envelope-from imp@bsdimp.com) Date: Wed, 10 Jan 2007 21:49:23 -0700 (MST) Message-Id: <20070110.214923.-311943684.imp@bsdimp.com> To: ticso@cicely.de, ticso@cicely12.cicely.de From: "M. Warner Losh" In-Reply-To: <20070110091917.GF80390@cicely12.cicely.de> References: <200701100656.l0A6uuTm065800@repoman.freebsd.org> <20070110091917.GF80390@cicely12.cicely.de> 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]); Wed, 10 Jan 2007 21:49:10 -0700 (MST) Cc: perforce@freebsd.org Subject: Re: PERFORCE change 112700 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 11 Jan 2007 04:52:11 -0000 In message: <20070110091917.GF80390@cicely12.cicely.de> Bernd Walter writes: : On Wed, Jan 10, 2007 at 06:56:56AM +0000, Warner Losh wrote: : > http://perforce.freebsd.org/chv.cgi?CH=112700 : > : > Change 112700 by imp@imp_lighthouse on 2007/01/10 06:56:33 : > : > MF FreeBSD-tsc-6: slow down spi bus enough to make the dataflash : > parts reliable on read. MCK / 2 is too fast. I think MCK / 4 : > would work too, but MCK / 20 was rock solid. : > : > I think this works in the boot loader because we're running with : > the caches off, slowing things down, but I am actually a bit : > baffled. Maybe I just have a bad board... : : Mmm - you have a 'D' type flash, which allows 33MHz in low frequency : mode. : My 'C' type allows 33MHz as well. : So in theory MCK/2 (30MHz) should work. : Older 'B' type max out at 20MHz. : I've just used flash access in the bootloader however. Hmmm, MCK is 60MHz? I thought it was 200MHz.... Warner : > Affected files ... : > : > .. //depot/projects/arm/src/sys/arm/at91/at91_spi.c#16 edit : > : > Differences ... : > : > ==== //depot/projects/arm/src/sys/arm/at91/at91_spi.c#16 (text+ko) ==== : > : > @@ -115,7 +115,7 @@ : > WR4(sc, SPI_MR, (0xf << 24) | SPI_MR_MSTR | SPI_MR_MODFDIS | : > (0xE << 16)); : > : > - WR4(sc, SPI_CSR0, SPI_CSR_CPOL | (4 << 16) | (2 << 8)); : > + WR4(sc, SPI_CSR0, SPI_CSR_CPOL | (4 << 16) | (20 << 8)); : > WR4(sc, SPI_CR, SPI_CR_SPIEN); : > : > WR4(sc, PDC_PTCR, PDC_PTCR_TXTDIS); : : -- : B.Walter http://www.bwct.de http://www.fizon.de : bernd@bwct.de info@bwct.de support@fizon.de : From owner-p4-projects@FreeBSD.ORG Thu Jan 11 07:27: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 E437616A415; Thu, 11 Jan 2007 07:27: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 BE1B916A403 for ; Thu, 11 Jan 2007 07:27:41 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id AE41513C448 for ; Thu, 11 Jan 2007 07:27:41 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l0B7RfOr089583 for ; Thu, 11 Jan 2007 07:27:41 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0B7Rfhv089580 for perforce@freebsd.org; Thu, 11 Jan 2007 07:27:41 GMT (envelope-from kmacy@freebsd.org) Date: Thu, 11 Jan 2007 07:27:41 GMT Message-Id: <200701110727.l0B7Rfhv089580@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 112766 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 11 Jan 2007 07:27:42 -0000 http://perforce.freebsd.org/chv.cgi?CH=112766 Change 112766 by kmacy@kmacy_netherworld:sam_wifi on 2007/01/11 07:26:57 don't send beacon update if the bss channel is not set Affected files ... .. //depot/projects/wifi/sys/dev/ral/rt2560.c#11 edit Differences ... ==== //depot/projects/wifi/sys/dev/ral/rt2560.c#11 (text) ==== @@ -1266,9 +1266,14 @@ if (ic->ic_opmode != IEEE80211_M_IBSS && ic->ic_opmode != IEEE80211_M_HOSTAP) - return; + return; data = &sc->bcnq.data[sc->bcnq.next]; + /* + * Don't send beacon if bsschan isn't set + */ + if (data->ni == NULL) + return; bus_dmamap_sync(sc->bcnq.data_dmat, data->map, BUS_DMASYNC_POSTWRITE); bus_dmamap_unload(sc->bcnq.data_dmat, data->map); From owner-p4-projects@FreeBSD.ORG Thu Jan 11 09:47: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 9758916A415; Thu, 11 Jan 2007 09:47: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 5A95016A407 for ; Thu, 11 Jan 2007 09:47:52 +0000 (UTC) (envelope-from ticso@cicely12.cicely.de) Received: from raven.bwct.de (raven.bwct.de [85.159.14.73]) by mx1.freebsd.org (Postfix) with ESMTP id C806213C448 for ; Thu, 11 Jan 2007 09:47:51 +0000 (UTC) (envelope-from ticso@cicely12.cicely.de) Received: from cicely5.cicely.de ([10.1.1.7]) by raven.bwct.de (8.13.4/8.13.4) with ESMTP id l0B9ljBA080804; Thu, 11 Jan 2007 10:47:45 +0100 (CET) (envelope-from ticso@cicely12.cicely.de) Received: from cicely12.cicely.de (cicely12.cicely.de [10.1.1.14]) by cicely5.cicely.de (8.13.4/8.13.4) with ESMTP id l0B9la21031534 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Thu, 11 Jan 2007 10:47:37 +0100 (CET) (envelope-from ticso@cicely12.cicely.de) Received: from cicely12.cicely.de (localhost [127.0.0.1]) by cicely12.cicely.de (8.13.4/8.13.3) with ESMTP id l0B9la95090871; Thu, 11 Jan 2007 10:47:36 +0100 (CET) (envelope-from ticso@cicely12.cicely.de) Received: (from ticso@localhost) by cicely12.cicely.de (8.13.4/8.13.3/Submit) id l0B9lZZO090870; Thu, 11 Jan 2007 10:47:35 +0100 (CET) (envelope-from ticso) Date: Thu, 11 Jan 2007 10:47:35 +0100 From: Bernd Walter To: "M. Warner Losh" Message-ID: <20070111094735.GU80390@cicely12.cicely.de> References: <200701100656.l0A6uuTm065800@repoman.freebsd.org> <20070110091917.GF80390@cicely12.cicely.de> <20070110.214923.-311943684.imp@bsdimp.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20070110.214923.-311943684.imp@bsdimp.com> X-Operating-System: FreeBSD cicely12.cicely.de 5.4-STABLE alpha User-Agent: Mutt/1.5.9i X-Spam-Status: No, score=-4.4 required=5.0 tests=ALL_TRUSTED=-1.8, BAYES_00=-2.599 autolearn=ham version=3.1.7 X-Spam-Checker-Version: SpamAssassin 3.1.7 (2006-10-05) on cicely12.cicely.de Cc: ticso@cicely12.cicely.de, perforce@freebsd.org, ticso@cicely.de Subject: Re: PERFORCE change 112700 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: ticso@cicely.de List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 11 Jan 2007 09:47:52 -0000 On Wed, Jan 10, 2007 at 09:49:23PM -0700, M. Warner Losh wrote: > In message: <20070110091917.GF80390@cicely12.cicely.de> > Bernd Walter writes: > : On Wed, Jan 10, 2007 at 06:56:56AM +0000, Warner Losh wrote: > : > http://perforce.freebsd.org/chv.cgi?CH=112700 > : > > : > Change 112700 by imp@imp_lighthouse on 2007/01/10 06:56:33 > : > > : > MF FreeBSD-tsc-6: slow down spi bus enough to make the dataflash > : > parts reliable on read. MCK / 2 is too fast. I think MCK / 4 > : > would work too, but MCK / 20 was rock solid. > : > > : > I think this works in the boot loader because we're running with > : > the caches off, slowing things down, but I am actually a bit > : > baffled. Maybe I just have a bad board... > : > : Mmm - you have a 'D' type flash, which allows 33MHz in low frequency > : mode. > : My 'C' type allows 33MHz as well. > : So in theory MCK/2 (30MHz) should work. > : Older 'B' type max out at 20MHz. > : I've just used flash access in the bootloader however. > > Hmmm, MCK is 60MHz? I thought it was 200MHz.... PCK to the processor is 180MHz. MCK to the peripherals is divided PCK. > : > Affected files ... > : > > : > .. //depot/projects/arm/src/sys/arm/at91/at91_spi.c#16 edit > : > > : > Differences ... > : > > : > ==== //depot/projects/arm/src/sys/arm/at91/at91_spi.c#16 (text+ko) ==== > : > > : > @@ -115,7 +115,7 @@ > : > WR4(sc, SPI_MR, (0xf << 24) | SPI_MR_MSTR | SPI_MR_MODFDIS | > : > (0xE << 16)); > : > > : > - WR4(sc, SPI_CSR0, SPI_CSR_CPOL | (4 << 16) | (2 << 8)); > : > + WR4(sc, SPI_CSR0, SPI_CSR_CPOL | (4 << 16) | (20 << 8)); > : > WR4(sc, SPI_CR, SPI_CR_SPIEN); > : > > : > WR4(sc, PDC_PTCR, PDC_PTCR_TXTDIS); -- B.Walter http://www.bwct.de http://www.fizon.de bernd@bwct.de info@bwct.de support@fizon.de From owner-p4-projects@FreeBSD.ORG Thu Jan 11 11:48: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 A337D16A417; Thu, 11 Jan 2007 11:48: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 5FACE16A412 for ; Thu, 11 Jan 2007 11:48:03 +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 398FC13C459 for ; Thu, 11 Jan 2007 11:48:03 +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 l0BBm3L8043697 for ; Thu, 11 Jan 2007 11:48:03 GMT (envelope-from gonzo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0BBm3Kx043694 for perforce@freebsd.org; Thu, 11 Jan 2007 11:48:03 GMT (envelope-from gonzo@FreeBSD.org) Date: Thu, 11 Jan 2007 11:48:03 GMT Message-Id: <200701111148.l0BBm3Kx043694@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 112768 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 11 Jan 2007 11:48:03 -0000 http://perforce.freebsd.org/chv.cgi?CH=112768 Change 112768 by gonzo@gonzo_hq on 2007/01/11 11:47:29 o Remove unused files derived from NetBSD. Affected files ... .. //depot/projects/mips2/src/lib/libc/mips/sys/__clone.S#2 delete .. //depot/projects/mips2/src/lib/libc/mips/sys/__vfork14.S#2 delete .. //depot/projects/mips2/src/lib/libc/mips/sys/getcontext.S#3 delete Differences ... From owner-p4-projects@FreeBSD.ORG Thu Jan 11 15:19:32 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5689416A416; Thu, 11 Jan 2007 15:19: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 30E5F16A412 for ; Thu, 11 Jan 2007 15:19:32 +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 211CD13C43E for ; Thu, 11 Jan 2007 15:19:32 +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 l0BFJWSF089148 for ; Thu, 11 Jan 2007 15:19:32 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 l0BFJVZD089145 for perforce@freebsd.org; Thu, 11 Jan 2007 15:19:31 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Thu, 11 Jan 2007 15:19:31 GMT Message-Id: <200701111519.l0BFJVZD089145@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 112773 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 11 Jan 2007 15:19:32 -0000 http://perforce.freebsd.org/chv.cgi?CH=112773 Change 112773 by rwatson@rwatson_zoo on 2007/01/11 15:18:32 Fix compile nits due to merging. Affected files ... .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit_bsm.c#26 edit Differences ... ==== //depot/projects/trustedbsd/audit3/sys/security/audit/audit_bsm.c#26 (text+ko) ==== @@ -440,6 +440,16 @@ case AUE_RECVMSG: case AUE_SEND: case AUE_SENDFILE: + /* + * XXXRW: While sendfile() is effectively a combination of + * read() and write(), it is useful to audit if only because + * it performs IPC/network I/O. We will need to eventually + * audit the following information to be complete: + * + * - socket information + * - file descriptor information for two file descriptors + * - file information + */ case AUE_SENDMSG: case AUE_SENDTO: /* @@ -486,19 +496,6 @@ } break; - case AUE_SENDFILE: - /* - * XXXRW: While sendfile() is effectively a combination of - * read() and write(), it is useful to audit if only because - * it performs IPC/network I/O. We will need to eventually - * audit the following information to be complete: - * - * - socket information - * - file descriptor information for two file descriptors - * - file information - */ - break; - case AUE_ACCT: if (ARG_IS_VALID(kar, ARG_UPATH1)) { UPATH1_VNODE1_TOKENS; @@ -948,7 +945,6 @@ break; case AUE_MOUNT: - case AUE_NMOUNT: /* XXX Need to handle NFS mounts */ if (ARG_IS_VALID(kar, ARG_FFLAGS)) { tok = au_to_arg32(3, "flags", ar->ar_arg_fflags); From owner-p4-projects@FreeBSD.ORG Thu Jan 11 17:35: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 2D42716A47B; Thu, 11 Jan 2007 17:35: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 0AFDE16A416 for ; Thu, 11 Jan 2007 17:35:09 +0000 (UTC) (envelope-from zec@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id D7F4E13C45D for ; Thu, 11 Jan 2007 17:35:08 +0000 (UTC) (envelope-from zec@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l0BHZ8nw021799 for ; Thu, 11 Jan 2007 17:35:08 GMT (envelope-from zec@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0BHZ8EQ021784 for perforce@freebsd.org; Thu, 11 Jan 2007 17:35:08 GMT (envelope-from zec@FreeBSD.org) Date: Thu, 11 Jan 2007 17:35:08 GMT Message-Id: <200701111735.l0BHZ8EQ021784@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@FreeBSD.org using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 112777 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 11 Jan 2007 17:35:09 -0000 http://perforce.freebsd.org/chv.cgi?CH=112777 Change 112777 by zec@zec_tca51 on 2007/01/11 17:34:05 curvnet must be set when sending packets through bpf. Affected files ... .. //depot/projects/vimage/src/sys/net/bpf.c#5 edit Differences ... ==== //depot/projects/vimage/src/sys/net/bpf.c#5 (text+ko) ==== @@ -641,7 +641,9 @@ BPFD_UNLOCK(d); #endif NET_LOCK_GIANT(); + CURVNETB_SET(ifp->if_vnetb); error = (*ifp->if_output)(ifp, m, &dst, NULL); + CURVNETB_RESTORE(); NET_UNLOCK_GIANT(); /* * The driver frees the mbuf. From owner-p4-projects@FreeBSD.ORG Thu Jan 11 18:01: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 A76E116A416; Thu, 11 Jan 2007 18:01: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 7D2CE16A407 for ; Thu, 11 Jan 2007 18:01:42 +0000 (UTC) (envelope-from zec@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 6E45A13C442 for ; Thu, 11 Jan 2007 18:01:42 +0000 (UTC) (envelope-from zec@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l0BI1ged025794 for ; Thu, 11 Jan 2007 18:01:42 GMT (envelope-from zec@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0BI1gYZ025791 for perforce@freebsd.org; Thu, 11 Jan 2007 18:01:42 GMT (envelope-from zec@FreeBSD.org) Date: Thu, 11 Jan 2007 18:01:42 GMT Message-Id: <200701111801.l0BI1gYZ025791@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@FreeBSD.org using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 112778 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 11 Jan 2007 18:01:43 -0000 http://perforce.freebsd.org/chv.cgi?CH=112778 Change 112778 by zec@zec_tca51 on 2007/01/11 18:00:56 Introduce a macro for resolving pointers to virtualized symbols. Introduce the SYSCTL_V_PROC macro, to be used for accessing virtualized symbols in handler functions. Affected files ... .. //depot/projects/vimage/src/sys/sys/sysctl.h#3 edit Differences ... ==== //depot/projects/vimage/src/sys/sys/sysctl.h#3 (text+ko) ==== @@ -373,10 +373,36 @@ SYSCTL_OID(parent, nbr, name, (access), \ ptr, arg, handler, fmt, descr) +#ifdef VIMAGE +#define SYSCTL_V_PROC(subs, mod, parent, nbr, name, access, sym, arg, \ + handler, fmt, descr) \ + SYSCTL_V_OID(subs, mod, parent, nbr, name, (access), \ + sym, arg, handler, fmt, descr) +#else +#define SYSCTL_V_PROC(subs, mod, parent, nbr, name, access, sym, arg, \ + handler, fmt, descr) \ + SYSCTL_OID(parent, nbr, name, (access), \ + &sym, arg, handler, fmt, descr) +#endif + #define SYSCTL_ADD_PROC(ctx, parent, nbr, name, access, ptr, arg, handler, fmt, descr) \ sysctl_add_oid(ctx, parent, nbr, name, (access), \ ptr, arg, handler, fmt, __DESCR(descr)) +#ifdef VIMAGE +#define SYSCTL_RESOLVE_V_ARG1() do { \ + void *ptr; \ + switch (subs) { \ + case V_NET: \ + ptr = curthread->td_vimage->v_vnetb->mod_data[mod]; \ + arg1 = (void *) ((int) ptr + (int) arg1); \ + break; \ + default: \ + panic("unsupported module id %d", subs); \ + } \ +} while (0) +#endif + #endif /* _KERNEL */ /* From owner-p4-projects@FreeBSD.ORG Thu Jan 11 18:02:44 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 65CC116A415; Thu, 11 Jan 2007 18:02:44 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 446B816A412 for ; Thu, 11 Jan 2007 18:02:44 +0000 (UTC) (envelope-from zec@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 3574813C455 for ; Thu, 11 Jan 2007 18:02:44 +0000 (UTC) (envelope-from zec@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l0BI2iXV026173 for ; Thu, 11 Jan 2007 18:02:44 GMT (envelope-from zec@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0BI2hws026170 for perforce@freebsd.org; Thu, 11 Jan 2007 18:02:43 GMT (envelope-from zec@FreeBSD.org) Date: Thu, 11 Jan 2007 18:02:43 GMT Message-Id: <200701111802.l0BI2hws026170@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@FreeBSD.org using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 112779 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 11 Jan 2007 18:02:44 -0000 http://perforce.freebsd.org/chv.cgi?CH=112779 Change 112779 by zec@zec_tca51 on 2007/01/11 18:02:15 Convert virtualized sysctl handlers to use the new SYSCTL_RESOLVE_V_ARG1() macro. Affected files ... .. //depot/projects/vimage/src/sys/kern/kern_sysctl.c#3 edit Differences ... ==== //depot/projects/vimage/src/sys/kern/kern_sysctl.c#3 (text+ko) ==== @@ -833,32 +833,22 @@ sysctl_handle_v_int(SYSCTL_HANDLER_V_ARGS) { int error = 0; - void *ptr; + + SYSCTL_RESOLVE_V_ARG1(); /* * Attempt to get a coherent snapshot by making a copy of the data. */ - - switch (subs) { - case V_NET: - ptr = curthread->td_vimage->v_vnetb->mod_data[mod]; - ptr = (void *) ((int) ptr + (int) arg1); - break; - - default: - panic("unsupported module id %d", subs); - } + error = SYSCTL_OUT(req, arg1, sizeof(int)); - error = SYSCTL_OUT(req, ptr, sizeof(int)); - if (error || !req->newptr) return (error); - if (!ptr) + if (!arg1) error = EPERM; else - error = SYSCTL_IN(req, ptr, sizeof(int)); + error = SYSCTL_IN(req, arg1, sizeof(int)); return (error); } #endif @@ -1017,24 +1007,14 @@ int error, tries; u_int generation; struct sysctl_req req2; - void *ptr; - switch (subs) { - - case V_NET: - ptr = curthread->td_vimage->v_vnetb->mod_data[mod]; - ptr = (void *) ((int) ptr + (int) arg1); - break; - - default: - panic("unsupported module id %d", subs); - } + SYSCTL_RESOLVE_V_ARG1(); tries = 0; req2 = *req; retry: generation = curthread->td_generation; - error = SYSCTL_OUT(req, ptr, arg2); + error = SYSCTL_OUT(req, arg1, arg2); if (error) return (error); tries++; @@ -1043,7 +1023,7 @@ goto retry; } - error = SYSCTL_IN(req, ptr, arg2); + error = SYSCTL_IN(req, arg1, arg2); return (error); } From owner-p4-projects@FreeBSD.ORG Thu Jan 11 18:11:58 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 3A15516A4B3; Thu, 11 Jan 2007 18:11:58 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id EACAF16A4A0 for ; Thu, 11 Jan 2007 18:11:57 +0000 (UTC) (envelope-from zec@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id DB34D13C44C for ; Thu, 11 Jan 2007 18:11:57 +0000 (UTC) (envelope-from zec@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l0BIBvld028818 for ; Thu, 11 Jan 2007 18:11:57 GMT (envelope-from zec@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0BIBv7w028815 for perforce@freebsd.org; Thu, 11 Jan 2007 18:11:57 GMT (envelope-from zec@FreeBSD.org) Date: Thu, 11 Jan 2007 18:11:57 GMT Message-Id: <200701111811.l0BIBv7w028815@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@FreeBSD.org using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 112781 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 11 Jan 2007 18:11:58 -0000 http://perforce.freebsd.org/chv.cgi?CH=112781 Change 112781 by zec@zec_tca51 on 2007/01/11 18:11:40 First pass at virtualizing ipfw. Affected files ... .. //depot/projects/vimage/src/sys/net/if_ethersubr.c#6 edit .. //depot/projects/vimage/src/sys/netinet/ip_fw.h#3 edit .. //depot/projects/vimage/src/sys/netinet/ip_fw2.c#5 edit .. //depot/projects/vimage/src/sys/netinet/ip_fw_pfil.c#3 edit .. //depot/projects/vimage/src/sys/sys/vimage.h#10 edit Differences ... ==== //depot/projects/vimage/src/sys/net/if_ethersubr.c#6 (text+ko) ==== @@ -131,8 +131,10 @@ int ether_ipfw_chk(struct mbuf **m0, struct ifnet *dst, struct ip_fw **rule, int shared); +#ifndef VIMAGE static int ether_ipfw; #endif +#endif /* * Ethernet output routine. @@ -380,9 +382,10 @@ { int error; #if defined(INET) || defined(INET6) + INIT_VNET_IPFW(ifp->if_vnetb); struct ip_fw *rule = ip_dn_claim_rule(m); - if (IPFW_LOADED && ether_ipfw != 0) { + if (IPFW_LOADED && V_ether_ipfw != 0) { if (ether_ipfw_chk(&m, ifp, &rule, 0) == 0) { if (m) { m_freem(m); @@ -411,13 +414,14 @@ ether_ipfw_chk(struct mbuf **m0, struct ifnet *dst, struct ip_fw **rule, int shared) { + INIT_VNET_IPFW(dst->if_vnetb); struct ether_header *eh; struct ether_header save_eh; struct mbuf *m; int i; struct ip_fw_args args; - if (*rule != NULL && fw_one_pass) + if (*rule != NULL && V_fw_one_pass) return 1; /* dummynet packet, already partially processed */ /* @@ -704,7 +708,8 @@ #if defined(INET) || defined(INET6) post_stats: - if (IPFW_LOADED && ether_ipfw != 0) { + INIT_VNET_IPFW(ifp->if_vnetb); + if (IPFW_LOADED && V_ether_ipfw != 0) { if (ether_ipfw_chk(&m, NULL, &rule, 0) == 0) { if (m) m_freem(m); @@ -930,8 +935,8 @@ SYSCTL_DECL(_net_link); SYSCTL_NODE(_net_link, IFT_ETHER, ether, CTLFLAG_RW, 0, "Ethernet"); #if defined(INET) || defined(INET6) -SYSCTL_INT(_net_link_ether, OID_AUTO, ipfw, CTLFLAG_RW, - ðer_ipfw,0,"Pass ether pkts through firewall"); +SYSCTL_V_INT(V_NET, vnet_ipfw, _net_link_ether, OID_AUTO, ipfw, CTLFLAG_RW, + ether_ipfw, 0, "Pass ether pkts through firewall"); #endif #if 0 ==== //depot/projects/vimage/src/sys/netinet/ip_fw.h#3 (text+ko) ==== @@ -28,6 +28,9 @@ #ifndef _IPFW2_H #define _IPFW2_H +#include +#include + /* * The kernel representation of ipfw rules is made of a list of * 'instructions' (for all practical purposes equivalent to BPF @@ -533,6 +536,34 @@ */ #ifdef _KERNEL +/* + * Data structure to cache our ucred related + * information. This structure only gets used if + * the user specified UID/GID based constraints in + * a firewall rule. + */ +struct ip_fw_ugid { + gid_t fw_groups[NGROUPS]; + int fw_ngroups; + uid_t fw_uid; + int fw_prid; +}; + +#define IPFW_TABLES_MAX 128 +struct ip_fw_chain { + struct ip_fw *rules; /* list of rules */ + struct ip_fw *reap; /* list of rules to reap */ + LIST_HEAD(, cfg_nat) nat; /* list of nat entries */ + struct radix_node_head *tables[IPFW_TABLES_MAX]; + struct rwlock rwmtx; +}; + +struct table_entry { + struct radix_node rn[2]; + struct sockaddr_in addr, mask; + u_int32_t value; +}; + /* Return values from ipfw_chk() */ enum { IP_FW_PASS = 0, @@ -602,16 +633,109 @@ typedef int ip_fw_ctl_t(struct sockopt *); extern ip_fw_ctl_t *ip_fw_ctl_ptr; + +#ifndef VIMAGE extern int fw_one_pass; extern int fw_enable; #ifdef INET6 extern int fw6_enable; #endif +#endif /* For kernel ipfw_ether and ipfw_bridge. */ typedef int ip_fw_chk_t(struct ip_fw_args *args); extern ip_fw_chk_t *ip_fw_chk_ptr; #define IPFW_LOADED (ip_fw_chk_ptr != NULL) +/* + * Stack virtualization support. + */ + +#ifdef VIMAGE +struct vnet_ipfw { + struct vnet_base *parent_vnetb; + + int _fw_one_pass; + int _fw_enable; + int _fw6_enable; + int _ether_ipfw; + + u_int32_t _set_disable; + int _fw_deny_unknown_exthdrs; + int _fw_verbose; + int _verbose_limit; + int _fw_debug; + int _autoinc_step; + + ipfw_dyn_rule **_ipfw_dyn_v; + struct ip_fw_chain _layer3_chain; + u_int32_t _dyn_buckets; + u_int32_t _curr_dyn_buckets; + + u_int32_t _dyn_ack_lifetime; + u_int32_t _dyn_syn_lifetime; + u_int32_t _dyn_fin_lifetime; + u_int32_t _dyn_rst_lifetime; + u_int32_t _dyn_udp_lifetime; + u_int32_t _dyn_short_lifetime; + u_int32_t _dyn_keepalive_interval; + u_int32_t _dyn_keepalive_period; + u_int32_t _dyn_keepalive; + u_int32_t _static_count; + u_int32_t _static_len; + u_int32_t _dyn_count; + u_int32_t _dyn_max; + + u_int64_t _norule_counter; + + struct callout _ipfw_timeout; +}; +#endif + +/* + * Symbol translation macros + */ + +#define INIT_VNET_IPFW(vnetb) \ + INIT_FROM_VNET_BASE(vnetb, VNET_MOD_IPFW, \ + struct vnet_ipfw, vnet_ipfw) + +#define VNET_IPFW(sym) VSYM(vnet_ipfw, sym) + +#define V_fw_one_pass VNET_IPFW(fw_one_pass) +#define V_fw_enable VNET_IPFW(fw_enable) +#define V_fw6_enable VNET_IPFW(fw6_enable) +#define V_ether_ipfw VNET_IPFW(ether_ipfw) + +#define V_set_disable VNET_IPFW(set_disable) +#define V_fw_deny_unknown_exthdrs VNET_IPFW(fw_deny_unknown_exthdrs) +#define V_fw_verbose VNET_IPFW(fw_verbose) +#define V_verbose_limit VNET_IPFW(verbose_limit) + +#define V_fw_debug VNET_IPFW(fw_debug) +#define V_autoinc_step VNET_IPFW(autoinc_step) + +#define V_ipfw_dyn_v VNET_IPFW(ipfw_dyn_v) +#define V_layer3_chain VNET_IPFW(layer3_chain) +#define V_dyn_buckets VNET_IPFW(dyn_buckets) +#define V_curr_dyn_buckets VNET_IPFW(curr_dyn_buckets) + +#define V_dyn_ack_lifetime VNET_IPFW(dyn_ack_lifetime) +#define V_dyn_syn_lifetime VNET_IPFW(dyn_syn_lifetime) +#define V_dyn_fin_lifetime VNET_IPFW(dyn_fin_lifetime) +#define V_dyn_rst_lifetime VNET_IPFW(dyn_rst_lifetime) +#define V_dyn_udp_lifetime VNET_IPFW(dyn_udp_lifetime) +#define V_dyn_short_lifetime VNET_IPFW(dyn_short_lifetime) +#define V_dyn_keepalive_interval VNET_IPFW(dyn_keepalive_interval) +#define V_dyn_keepalive_period VNET_IPFW(dyn_keepalive_period) +#define V_dyn_keepalive VNET_IPFW(dyn_keepalive) +#define V_static_count VNET_IPFW(static_count) +#define V_static_len VNET_IPFW(static_len) +#define V_dyn_count VNET_IPFW(dyn_count) +#define V_dyn_max VNET_IPFW(dyn_max) + +#define V_norule_counter VNET_IPFW(norule_counter) +#define V_ipfw_timeout VNET_IPFW(ipfw_timeout) + #endif /* _KERNEL */ #endif /* _IPFW2_H */ ==== //depot/projects/vimage/src/sys/netinet/ip_fw2.c#5 (text+ko) ==== @@ -114,6 +114,19 @@ #include +static int vnet_ipfw_iattach(void); + +#ifdef VIMAGE +static struct vnet_modinfo vnet_ipfw_modinfo = { + .id = VNET_MOD_IPFW, + .flags = VNET_MFLAG_ORDER_2ND, + .name = "ipfw", + .symmap = NULL, + .i_attach = vnet_ipfw_iattach, + .i_detach = NULL, +}; +#endif + /* * set_disable contains one bit per set value (0..31). * If the bit is set, all rules with the corresponding set @@ -122,41 +135,23 @@ * and CANNOT be disabled. * Rules in set RESVD_SET can only be deleted explicitly. */ +#ifndef VIMAGE static u_int32_t set_disable; static int fw_verbose; static int verbose_limit; static struct callout ipfw_timeout; +#endif + static uma_zone_t ipfw_dyn_rule_zone; #define IPFW_DEFAULT_RULE 65535 -/* - * Data structure to cache our ucred related - * information. This structure only gets used if - * the user specified UID/GID based constraints in - * a firewall rule. - */ -struct ip_fw_ugid { - gid_t fw_groups[NGROUPS]; - int fw_ngroups; - uid_t fw_uid; - int fw_prid; -}; - -#define IPFW_TABLES_MAX 128 -struct ip_fw_chain { - struct ip_fw *rules; /* list of rules */ - struct ip_fw *reap; /* list of rules to reap */ - LIST_HEAD(, cfg_nat) nat; /* list of nat entries */ - struct radix_node_head *tables[IPFW_TABLES_MAX]; - struct rwlock rwmtx; -}; #define IPFW_LOCK_INIT(_chain) \ rw_init(&(_chain)->rwmtx, "IPFW static rules") #define IPFW_LOCK_DESTROY(_chain) rw_destroy(&(_chain)->rwmtx) #define IPFW_WLOCK_ASSERT(_chain) do { \ - rw_assert(&(_chain)->rwmtx, RA_WLOCKED); \ + rw_assert(&(_chain)->rwmtx, RA_WLOCKED); \ NET_ASSERT_GIANT(); \ } while (0) @@ -168,40 +163,42 @@ /* * list of rules for layer 3 */ +#ifndef VIMAGE static struct ip_fw_chain layer3_chain; +#endif MALLOC_DEFINE(M_IPFW, "IpFw/IpAcct", "IpFw/IpAcct chain's"); MALLOC_DEFINE(M_IPFW_TBL, "ipfw_tbl", "IpFw tables"); -struct table_entry { - struct radix_node rn[2]; - struct sockaddr_in addr, mask; - u_int32_t value; -}; +#ifndef VIMAGE +static int fw_debug; +static int autoinc_step; +#endif -static int fw_debug = 1; -static int autoinc_step = 100; /* bounded to 1..1000 in add_rule() */ - +#ifdef VIMAGE +extern int ipfw_chg_hook(SYSCTL_HANDLER_V_ARGS); +#else extern int ipfw_chg_hook(SYSCTL_HANDLER_ARGS); +#endif #ifdef SYSCTL_NODE SYSCTL_NODE(_net_inet_ip, OID_AUTO, fw, CTLFLAG_RW, 0, "Firewall"); -SYSCTL_PROC(_net_inet_ip_fw, OID_AUTO, enable, - CTLTYPE_INT | CTLFLAG_RW | CTLFLAG_SECURE3, &fw_enable, 0, +SYSCTL_V_PROC(V_NET, vnet_ipfw, _net_inet_ip_fw, OID_AUTO, enable, + CTLTYPE_INT | CTLFLAG_RW | CTLFLAG_SECURE3, fw_enable, 0, ipfw_chg_hook, "I", "Enable ipfw"); -SYSCTL_INT(_net_inet_ip_fw, OID_AUTO, autoinc_step, CTLFLAG_RW, - &autoinc_step, 0, "Rule number autincrement step"); -SYSCTL_INT(_net_inet_ip_fw, OID_AUTO, one_pass, - CTLFLAG_RW | CTLFLAG_SECURE3, - &fw_one_pass, 0, +SYSCTL_V_INT(V_NET, vnet_ipfw, _net_inet_ip_fw, OID_AUTO, autoinc_step, + CTLFLAG_RW, autoinc_step, 0, "Rule number autincrement step"); +SYSCTL_V_INT(V_NET, vnet_ipfw, _net_inet_ip_fw, OID_AUTO, one_pass, + CTLFLAG_RW | CTLFLAG_SECURE3, fw_one_pass, 0, "Only do a single pass through ipfw when using dummynet(4)"); -SYSCTL_INT(_net_inet_ip_fw, OID_AUTO, debug, CTLFLAG_RW, - &fw_debug, 0, "Enable printing of debug ip_fw statements"); -SYSCTL_INT(_net_inet_ip_fw, OID_AUTO, verbose, +SYSCTL_V_INT(V_NET, vnet_ipfw, _net_inet_ip_fw, OID_AUTO, debug, CTLFLAG_RW, + fw_debug, 0, "Enable printing of debug ip_fw statements"); +SYSCTL_V_INT(V_NET, vnet_ipfw, _net_inet_ip_fw, OID_AUTO, verbose, CTLFLAG_RW | CTLFLAG_SECURE3, - &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"); + fw_verbose, 0, "Log matches to ipfw rules"); +SYSCTL_V_INT(V_NET, vnet_ipfw, _net_inet_ip_fw, OID_AUTO, verbose_limit, + CTLFLAG_RW, + verbose_limit, 0, "Set upper limit of matches of ipfw rules logged"); /* * Description of dynamic rules. @@ -239,9 +236,11 @@ * obey the 'randomized match', and we do not do multiple * passes through the firewall. XXX check the latter!!! */ +#ifndef VIMAGE static ipfw_dyn_rule **ipfw_dyn_v = NULL; -static u_int32_t dyn_buckets = 256; /* must be power of 2 */ -static u_int32_t curr_dyn_buckets = 256; /* must be power of 2 */ +static u_int32_t dyn_buckets; +static u_int32_t curr_dyn_buckets; +#endif static struct mtx ipfw_dyn_mtx; /* mutex guarding dynamic rules */ #define IPFW_DYN_LOCK_INIT() \ @@ -254,12 +253,14 @@ /* * Timeouts for various events in handing dynamic rules. */ -static u_int32_t dyn_ack_lifetime = 300; -static u_int32_t dyn_syn_lifetime = 20; -static u_int32_t dyn_fin_lifetime = 1; -static u_int32_t dyn_rst_lifetime = 1; -static u_int32_t dyn_udp_lifetime = 10; -static u_int32_t dyn_short_lifetime = 5; +#ifndef VIMAGE +static u_int32_t dyn_ack_lifetime; +static u_int32_t dyn_syn_lifetime; +static u_int32_t dyn_fin_lifetime; +static u_int32_t dyn_rst_lifetime; +static u_int32_t dyn_udp_lifetime; +static u_int32_t dyn_short_lifetime; +#endif /* * Keepalives are sent if dyn_keepalive is set. They are sent every @@ -268,40 +269,42 @@ * dyn_rst_lifetime and dyn_fin_lifetime should be strictly lower * than dyn_keepalive_period. */ - -static u_int32_t dyn_keepalive_interval = 20; -static u_int32_t dyn_keepalive_period = 5; -static u_int32_t dyn_keepalive = 1; /* do send keepalives */ +#ifndef VIMAGE +static u_int32_t dyn_keepalive_interval; +static u_int32_t dyn_keepalive_period; +static u_int32_t dyn_keepalive; static u_int32_t static_count; /* # of static rules */ static u_int32_t static_len; /* size in bytes of static rules */ -static u_int32_t dyn_count; /* # of dynamic rules */ -static u_int32_t dyn_max = 4096; /* max # of dynamic rules */ +static u_int32_t dyn_count; /* # of dynamic rules */ +static u_int32_t dyn_max; /* max # of dynamic rules */ +#endif -SYSCTL_INT(_net_inet_ip_fw, OID_AUTO, dyn_buckets, CTLFLAG_RW, - &dyn_buckets, 0, "Number of dyn. buckets"); -SYSCTL_INT(_net_inet_ip_fw, OID_AUTO, curr_dyn_buckets, CTLFLAG_RD, - &curr_dyn_buckets, 0, "Current Number of dyn. buckets"); -SYSCTL_INT(_net_inet_ip_fw, OID_AUTO, dyn_count, CTLFLAG_RD, - &dyn_count, 0, "Number of dyn. rules"); -SYSCTL_INT(_net_inet_ip_fw, OID_AUTO, dyn_max, CTLFLAG_RW, - &dyn_max, 0, "Max number of dyn. rules"); -SYSCTL_INT(_net_inet_ip_fw, OID_AUTO, static_count, CTLFLAG_RD, - &static_count, 0, "Number of static rules"); -SYSCTL_INT(_net_inet_ip_fw, OID_AUTO, dyn_ack_lifetime, CTLFLAG_RW, - &dyn_ack_lifetime, 0, "Lifetime of dyn. rules for acks"); -SYSCTL_INT(_net_inet_ip_fw, OID_AUTO, dyn_syn_lifetime, CTLFLAG_RW, - &dyn_syn_lifetime, 0, "Lifetime of dyn. rules for syn"); -SYSCTL_INT(_net_inet_ip_fw, OID_AUTO, dyn_fin_lifetime, CTLFLAG_RW, - &dyn_fin_lifetime, 0, "Lifetime of dyn. rules for fin"); -SYSCTL_INT(_net_inet_ip_fw, OID_AUTO, dyn_rst_lifetime, CTLFLAG_RW, - &dyn_rst_lifetime, 0, "Lifetime of dyn. rules for rst"); -SYSCTL_INT(_net_inet_ip_fw, OID_AUTO, dyn_udp_lifetime, CTLFLAG_RW, - &dyn_udp_lifetime, 0, "Lifetime of dyn. rules for UDP"); -SYSCTL_INT(_net_inet_ip_fw, OID_AUTO, dyn_short_lifetime, CTLFLAG_RW, - &dyn_short_lifetime, 0, "Lifetime of dyn. rules for other situations"); -SYSCTL_INT(_net_inet_ip_fw, OID_AUTO, dyn_keepalive, CTLFLAG_RW, - &dyn_keepalive, 0, "Enable keepalives for dyn. rules"); +SYSCTL_V_INT(V_NET, vnet_ipfw, _net_inet_ip_fw, OID_AUTO, dyn_buckets, + CTLFLAG_RW, dyn_buckets, 0, "Number of dyn. buckets"); +SYSCTL_V_INT(V_NET, vnet_ipfw, _net_inet_ip_fw, OID_AUTO, curr_dyn_buckets, + CTLFLAG_RD, curr_dyn_buckets, 0, "Current Number of dyn. buckets"); +SYSCTL_V_INT(V_NET, vnet_ipfw, _net_inet_ip_fw, OID_AUTO, dyn_count, + CTLFLAG_RD, dyn_count, 0, "Number of dyn. rules"); +SYSCTL_V_INT(V_NET, vnet_ipfw, _net_inet_ip_fw, OID_AUTO, dyn_max, + CTLFLAG_RW, dyn_max, 0, "Max number of dyn. rules"); +SYSCTL_V_INT(V_NET, vnet_ipfw, _net_inet_ip_fw, OID_AUTO, static_count, + CTLFLAG_RD, static_count, 0, "Number of static rules"); +SYSCTL_V_INT(V_NET, vnet_ipfw, _net_inet_ip_fw, OID_AUTO, dyn_ack_lifetime, + CTLFLAG_RW, dyn_ack_lifetime, 0, "Lifetime of dyn. rules for acks"); +SYSCTL_V_INT(V_NET, vnet_ipfw, _net_inet_ip_fw, OID_AUTO, dyn_syn_lifetime, + CTLFLAG_RW, dyn_syn_lifetime, 0, "Lifetime of dyn. rules for syn"); +SYSCTL_V_INT(V_NET, vnet_ipfw, _net_inet_ip_fw, OID_AUTO, dyn_fin_lifetime, + CTLFLAG_RW, dyn_fin_lifetime, 0, "Lifetime of dyn. rules for fin"); +SYSCTL_V_INT(V_NET, vnet_ipfw, _net_inet_ip_fw, OID_AUTO, dyn_rst_lifetime, + CTLFLAG_RW, dyn_rst_lifetime, 0, "Lifetime of dyn. rules for rst"); +SYSCTL_V_INT(V_NET, vnet_ipfw, _net_inet_ip_fw, OID_AUTO, dyn_udp_lifetime, + CTLFLAG_RW, dyn_udp_lifetime, 0, "Lifetime of dyn. rules for UDP"); +SYSCTL_V_INT(V_NET, vnet_ipfw, _net_inet_ip_fw, OID_AUTO, dyn_short_lifetime, + CTLFLAG_RW, dyn_short_lifetime, 0, + "Lifetime of dyn. rules for other situations"); +SYSCTL_V_INT(V_NET, vnet_ipfw, _net_inet_ip_fw, OID_AUTO, dyn_keepalive, + CTLFLAG_RW, dyn_keepalive, 0, "Enable keepalives for dyn. rules"); #ifdef INET6 /* @@ -317,8 +320,9 @@ #ifdef IPFIREWALL_NAT MODULE_DEPEND(ipfw, libalias, 1, 1, 1); #endif -static int fw_deny_unknown_exthdrs = 1; - +#ifndef VIMAGE +static int fw_deny_unknown_exthdrs; +#endif /* * L3HDR maps an ipv4 pointer into a layer3 header pointer of type T @@ -655,6 +659,7 @@ return 1; } + static __inline int hash_packet6(struct ipfw_flow_id *id) { @@ -765,7 +770,9 @@ #endif /* INET6 */ +#ifndef VIMAGE static u_int64_t norule_counter; /* counter for ipfw_log(NULL...) */ +#endif #define SNPARGS(buf, len) buf + len, sizeof(buf) > len ? sizeof(buf) - len : 0 #define SNP(buf) buf, sizeof(buf) @@ -779,6 +786,7 @@ struct mbuf *m, struct ifnet *oif, u_short offset, uint32_t tablearg, struct ip *ip) { + INIT_VNET_IPFW(curvnetb); struct ether_header *eh = args->eh; char *action; int limit_reached = 0; @@ -788,11 +796,11 @@ proto[0] = '\0'; if (f == NULL) { /* bogus pkt */ - if (verbose_limit != 0 && norule_counter >= verbose_limit) + if (V_verbose_limit != 0 && V_norule_counter >= V_verbose_limit) return; - norule_counter++; - if (norule_counter == verbose_limit) - limit_reached = verbose_limit; + V_norule_counter++; + if (V_norule_counter == V_verbose_limit) + limit_reached = V_verbose_limit; action = "Refuse"; } else { /* O_LOG is the first action, find the real one */ ipfw_insn *cmd = ACTION_PTR(f); @@ -1047,6 +1055,7 @@ static __inline int hash_packet(struct ipfw_flow_id *id) { + INIT_VNET_IPFW(curvnetb); u_int32_t i; #ifdef INET6 @@ -1055,7 +1064,7 @@ else #endif /* INET6 */ i = (id->dst_ip) ^ (id->src_ip) ^ (id->dst_port) ^ (id->src_port); - i &= (curr_dyn_buckets - 1); + i &= (V_curr_dyn_buckets - 1); return i; } @@ -1073,12 +1082,12 @@ q->parent->count--; \ DEB(printf("ipfw: unlink entry 0x%08x %d -> 0x%08x %d, %d left\n",\ (q->id.src_ip), (q->id.src_port), \ - (q->id.dst_ip), (q->id.dst_port), dyn_count-1 ); ) \ + (q->id.dst_ip), (q->id.dst_port), V_dyn_count-1 ); ) \ if (prev != NULL) \ prev->next = q = q->next; \ else \ head = q = q->next; \ - dyn_count--; \ + V_dyn_count--; \ uma_zfree(ipfw_dyn_rule_zone, old_q); } #define TIME_LEQ(a,b) ((int)((a)-(b)) <= 0) @@ -1098,6 +1107,7 @@ static void remove_dyn_rule(struct ip_fw *rule, ipfw_dyn_rule *keep_me) { + INIT_VNET_IPFW(curvnetb); static u_int32_t last_remove = 0; #define FORCE (keep_me == NULL) @@ -1107,7 +1117,7 @@ IPFW_DYN_LOCK_ASSERT(); - if (ipfw_dyn_v == NULL || dyn_count == 0) + if (V_ipfw_dyn_v == NULL || V_dyn_count == 0) return; /* do not expire more than once per second, it is useless */ if (!FORCE && last_remove == time_uptime) @@ -1120,8 +1130,8 @@ * them in a second pass. */ next_pass: - for (i = 0 ; i < curr_dyn_buckets ; i++) { - for (prev=NULL, q = ipfw_dyn_v[i] ; q ; ) { + for (i = 0 ; i < V_curr_dyn_buckets ; i++) { + for (prev=NULL, q = V_ipfw_dyn_v[i] ; q ; ) { /* * Logic can become complex here, so we split tests. */ @@ -1148,7 +1158,7 @@ goto next; } if (q->dyn_type != O_LIMIT_PARENT || !q->count) { - UNLINK_DYN_RULE(prev, ipfw_dyn_v[i], q); + UNLINK_DYN_RULE(prev, V_ipfw_dyn_v[i], q); continue; } next: @@ -1168,6 +1178,7 @@ lookup_dyn_rule_locked(struct ipfw_flow_id *pkt, int *match_direction, struct tcphdr *tcp) { + INIT_VNET_IPFW(curvnetb); /* * stateful ipfw extensions. * Lookup into dynamic session queue @@ -1181,14 +1192,14 @@ IPFW_DYN_LOCK_ASSERT(); - if (ipfw_dyn_v == NULL) + if (V_ipfw_dyn_v == NULL) goto done; /* not found */ i = hash_packet( pkt ); - for (prev=NULL, q = ipfw_dyn_v[i] ; q != NULL ; ) { + for (prev=NULL, q = V_ipfw_dyn_v[i] ; q != NULL ; ) { if (q->dyn_type == O_LIMIT_PARENT && q->count) goto next; if (TIME_LEQ( q->expire, time_uptime)) { /* expire entry */ - UNLINK_DYN_RULE(prev, ipfw_dyn_v[i], q); + UNLINK_DYN_RULE(prev, V_ipfw_dyn_v[i], q); continue; } if (pkt->proto == q->id.proto && @@ -1238,8 +1249,8 @@ if ( prev != NULL) { /* found and not in front */ prev->next = q->next; - q->next = ipfw_dyn_v[i]; - ipfw_dyn_v[i] = q; + q->next = V_ipfw_dyn_v[i]; + V_ipfw_dyn_v[i] = q; } if (pkt->proto == IPPROTO_TCP) { /* update state according to flags */ u_char flags = pkt->flags & (TH_FIN|TH_SYN|TH_RST); @@ -1249,7 +1260,7 @@ q->state |= (dir == MATCH_FORWARD ) ? flags : (flags << 8); switch (q->state) { case TH_SYN: /* opening */ - q->expire = time_uptime + dyn_syn_lifetime; + q->expire = time_uptime + V_dyn_syn_lifetime; break; case BOTH_SYN: /* move to established */ @@ -1272,13 +1283,13 @@ } } } - q->expire = time_uptime + dyn_ack_lifetime; + q->expire = time_uptime + V_dyn_ack_lifetime; break; case BOTH_SYN | BOTH_FIN: /* both sides closed */ - if (dyn_fin_lifetime >= dyn_keepalive_period) - dyn_fin_lifetime = dyn_keepalive_period - 1; - q->expire = time_uptime + dyn_fin_lifetime; + if (V_dyn_fin_lifetime >= V_dyn_keepalive_period) + V_dyn_fin_lifetime = V_dyn_keepalive_period - 1; + q->expire = time_uptime + V_dyn_fin_lifetime; break; default: @@ -1290,16 +1301,16 @@ if ( (q->state & ((TH_RST << 8)|TH_RST)) == 0) printf("invalid state: 0x%x\n", q->state); #endif - if (dyn_rst_lifetime >= dyn_keepalive_period) - dyn_rst_lifetime = dyn_keepalive_period - 1; - q->expire = time_uptime + dyn_rst_lifetime; + if (V_dyn_rst_lifetime >= V_dyn_keepalive_period) + V_dyn_rst_lifetime = V_dyn_keepalive_period - 1; + q->expire = time_uptime + V_dyn_rst_lifetime; break; } } else if (pkt->proto == IPPROTO_UDP) { - q->expire = time_uptime + dyn_udp_lifetime; + q->expire = time_uptime + V_dyn_udp_lifetime; } else { /* other protocols */ - q->expire = time_uptime + dyn_short_lifetime; + q->expire = time_uptime + V_dyn_short_lifetime; } done: if (match_direction) @@ -1324,6 +1335,7 @@ static void realloc_dynamic_table(void) { + INIT_VNET_IPFW(curvnetb); IPFW_DYN_LOCK_ASSERT(); /* @@ -1332,21 +1344,21 @@ * default to 1024. */ - if (dyn_buckets > 65536) - dyn_buckets = 1024; - if ((dyn_buckets & (dyn_buckets-1)) != 0) { /* not a power of 2 */ - dyn_buckets = curr_dyn_buckets; /* reset */ + if (V_dyn_buckets > 65536) + V_dyn_buckets = 1024; + if ((V_dyn_buckets & (V_dyn_buckets-1)) != 0) { /* not a power of 2 */ + V_dyn_buckets = V_curr_dyn_buckets; /* reset */ return; } - curr_dyn_buckets = dyn_buckets; - if (ipfw_dyn_v != NULL) - free(ipfw_dyn_v, M_IPFW); + V_curr_dyn_buckets = V_dyn_buckets; + if (V_ipfw_dyn_v != NULL) + free(V_ipfw_dyn_v, M_IPFW); for (;;) { - ipfw_dyn_v = malloc(curr_dyn_buckets * sizeof(ipfw_dyn_rule *), + V_ipfw_dyn_v = malloc(V_curr_dyn_buckets * sizeof(ipfw_dyn_rule *), M_IPFW, M_NOWAIT | M_ZERO); - if (ipfw_dyn_v != NULL || curr_dyn_buckets <= 2) + if (V_ipfw_dyn_v != NULL || V_curr_dyn_buckets <= 2) break; - curr_dyn_buckets /= 2; + V_curr_dyn_buckets /= 2; } } @@ -1363,15 +1375,16 @@ static ipfw_dyn_rule * add_dyn_rule(struct ipfw_flow_id *id, u_int8_t dyn_type, struct ip_fw *rule) { + INIT_VNET_IPFW(curvnetb); ipfw_dyn_rule *r; int i; IPFW_DYN_LOCK_ASSERT(); - if (ipfw_dyn_v == NULL || - (dyn_count == 0 && dyn_buckets != curr_dyn_buckets)) { + if (V_ipfw_dyn_v == NULL || + (V_dyn_count == 0 && V_dyn_buckets != V_curr_dyn_buckets)) { realloc_dynamic_table(); - if (ipfw_dyn_v == NULL) + if (V_ipfw_dyn_v == NULL) return NULL; /* failed ! */ } i = hash_packet(id); @@ -1393,21 +1406,21 @@ } r->id = *id; - r->expire = time_uptime + dyn_syn_lifetime; + r->expire = time_uptime + V_dyn_syn_lifetime; r->rule = rule; r->dyn_type = dyn_type; r->pcnt = r->bcnt = 0; r->count = 0; r->bucket = i; - r->next = ipfw_dyn_v[i]; - ipfw_dyn_v[i] = r; - dyn_count++; + r->next = V_ipfw_dyn_v[i]; + V_ipfw_dyn_v[i] = r; + V_dyn_count++; DEB(printf("ipfw: add dyn entry ty %d 0x%08x %d -> 0x%08x %d, total %d\n", dyn_type, (r->id.src_ip), (r->id.src_port), (r->id.dst_ip), (r->id.dst_port), - dyn_count ); ) + V_dyn_count ); ) return r; } @@ -1418,15 +1431,16 @@ static ipfw_dyn_rule * lookup_dyn_parent(struct ipfw_flow_id *pkt, struct ip_fw *rule) { + INIT_VNET_IPFW(curvnetb); ipfw_dyn_rule *q; int i; IPFW_DYN_LOCK_ASSERT(); - if (ipfw_dyn_v) { + if (V_ipfw_dyn_v) { int is_v6 = IS_IP6_FLOW_ID(pkt); i = hash_packet( pkt ); - for (q = ipfw_dyn_v[i] ; q != NULL ; q=q->next) + for (q = V_ipfw_dyn_v[i] ; q != NULL ; q=q->next) if (q->dyn_type == O_LIMIT_PARENT && rule== q->rule && pkt->proto == q->id.proto && @@ -1443,7 +1457,7 @@ pkt->dst_ip == q->id.dst_ip) ) ) { - q->expire = time_uptime + dyn_short_lifetime; + q->expire = time_uptime + V_dyn_short_lifetime; DEB(printf("ipfw: lookup_dyn_parent found 0x%p\n",q);) return q; } @@ -1461,6 +1475,7 @@ install_state(struct ip_fw *rule, ipfw_insn_limit *cmd, struct ip_fw_args *args, uint32_t tablearg) { + INIT_VNET_IPFW(curvnetb); static int last_log; ipfw_dyn_rule *q; struct in_addr da; @@ -1490,11 +1505,11 @@ return (0); } - if (dyn_count >= dyn_max) + if (V_dyn_count >= V_dyn_max) /* Run out of slots, try to remove any expired rule. */ remove_dyn_rule(NULL, (ipfw_dyn_rule *)1); - if (dyn_count >= dyn_max) { + if (V_dyn_count >= V_dyn_max) { if (last_log != time_uptime) { last_log = time_uptime; printf("ipfw: %s: Too many dynamic rules\n", __func__); @@ -1555,7 +1570,7 @@ /* See if we can remove some expired rule. */ remove_dyn_rule(rule, parent); if (parent->count >= conn_limit) { - if (fw_verbose && last_log != time_uptime) { + if (V_fw_verbose && last_log != time_uptime) { last_log = time_uptime; #ifdef INET6 /* @@ -1786,6 +1801,7 @@ add_table_entry(struct ip_fw_chain *ch, uint16_t tbl, in_addr_t addr, uint8_t mlen, uint32_t value) { + INIT_VNET_IPFW(curvnetb); struct radix_node_head *rnh; struct table_entry *ent; @@ -1799,14 +1815,14 @@ ent->addr.sin_len = ent->mask.sin_len = 8; ent->mask.sin_addr.s_addr = htonl(mlen ? ~((1 << (32 - mlen)) - 1) : 0); ent->addr.sin_addr.s_addr = addr & ent->mask.sin_addr.s_addr; - IPFW_WLOCK(&layer3_chain); + IPFW_WLOCK(&V_layer3_chain); if (rnh->rnh_addaddr(&ent->addr, &ent->mask, rnh, (void *)ent) == NULL) { - IPFW_WUNLOCK(&layer3_chain); + IPFW_WUNLOCK(&V_layer3_chain); free(ent, M_IPFW_TBL); return (EEXIST); } - IPFW_WUNLOCK(&layer3_chain); + IPFW_WUNLOCK(&V_layer3_chain); return (0); } @@ -2079,9 +2095,9 @@ struct cfg_nat *ptr; struct ifaddr *ifa; - IPFW_WLOCK(&layer3_chain); + IPFW_WLOCK(&V_layer3_chain); /* Check every nat entry... */ - LIST_FOREACH(ptr, &layer3_chain.nat, _next) { + LIST_FOREACH(ptr, &V_layer3_chain.nat, _next) { /* ...using nic 'ifp->if_xname' as dynamic alias address. */ if (strncmp(ptr->if_name, ifp->if_xname, IF_NAMESIZE) == 0) { mtx_lock(&ifp->if_addr_mtx); @@ -2097,15 +2113,15 @@ mtx_unlock(&ifp->if_addr_mtx); } } - IPFW_WUNLOCK(&layer3_chain); + IPFW_WUNLOCK(&V_layer3_chain); } static void flush_nat_ptrs(const int i) { struct ip_fw *rule; - IPFW_WLOCK_ASSERT(&layer3_chain); - for (rule = layer3_chain.rules; rule; rule = rule->next) { + IPFW_WLOCK_ASSERT(&V_layer3_chain); + for (rule = V_layer3_chain.rules; rule; rule = rule->next) { ipfw_insn_nat *cmd = (ipfw_insn_nat *)ACTION_PTR(rule); if (cmd->o.opcode != O_NAT) continue; @@ -2118,19 +2134,19 @@ lookup_nat(const int i) { struct cfg_nat *ptr; - LIST_FOREACH(ptr, &layer3_chain.nat, _next) + LIST_FOREACH(ptr, &V_layer3_chain.nat, _next) if (ptr->id == i) return(ptr); return (NULL); } #define HOOK_NAT(b, p) do { \ - IPFW_WLOCK_ASSERT(&layer3_chain); \ + IPFW_WLOCK_ASSERT(&V_layer3_chain); \ LIST_INSERT_HEAD(b, p, _next); \ } while (0) #define UNHOOK_NAT(p) do { \ - IPFW_WLOCK_ASSERT(&layer3_chain); \ + IPFW_WLOCK_ASSERT(&V_layer3_chain); \ LIST_REMOVE(p, _next); \ } while (0) @@ -2283,6 +2299,7 @@ ipfw_chk(struct ip_fw_args *args) { INIT_VNET_INET(curvnetb); + INIT_VNET_IPFW(curvnetb); /* * Local variables holding state during the processing of a packet: @@ -2386,7 +2403,7 @@ */ int dyn_dir = MATCH_UNKNOWN; ipfw_dyn_rule *q = NULL; - struct ip_fw_chain *chain = &layer3_chain; + struct ip_fw_chain *chain = &V_layer3_chain; struct m_tag *mtag; /* @@ -2485,7 +2502,7 @@ printf("IPFW2: IPV6 - Unknown Routing " "Header type(%d)\n", ((struct ip6_rthdr *)ulp)->ip6r_type); - if (fw_deny_unknown_exthdrs) + if (V_fw_deny_unknown_exthdrs) return (IP_FW_DENY); break; } @@ -2509,7 +2526,7 @@ if (offset == 0) { printf("IPFW2: IPV6 - Invalid Fragment " "Header\n"); - if (fw_deny_unknown_exthdrs) + if (V_fw_deny_unknown_exthdrs) return (IP_FW_DENY); break; } @@ -2578,7 +2595,7 @@ default: printf("IPFW2: IPV6 - Unknown Extension " "Header(%d), ext_hd=%x\n", proto, ext_hd); - if (fw_deny_unknown_exthdrs) + if (V_fw_deny_unknown_exthdrs) return (IP_FW_DENY); PULLUP_TO(hlen, ulp, struct ip6_ext); break; @@ -2659,7 +2676,7 @@ * XXX should not happen here, but optimized out in * the caller. */ - if (fw_one_pass) { + if (V_fw_one_pass) { IPFW_RUNLOCK(chain); return (IP_FW_PASS); } @@ -2704,7 +2721,7 @@ int l, cmdlen, skip_or; /* skip rest of OR block */ again: - if (set_disable & (1 << f->set) ) + if (V_set_disable & (1 << f->set) ) continue; skip_or = 0; @@ -3094,7 +3111,7 @@ } case O_LOG: - if (fw_verbose) + if (V_fw_verbose) ipfw_log(f, hlen, args, m, oif, offset, tablearg, ip); match = 1; @@ -3695,7 +3712,7 @@ return (retval); pullup_failed: - if (fw_verbose) + if (V_fw_verbose) printf("ipfw: pullup failed\n"); return (IP_FW_DENY); } @@ -3723,6 +3740,7 @@ static int add_rule(struct ip_fw_chain *chain, struct ip_fw *input_rule) { + INIT_VNET_IPFW(curvnetb); struct ip_fw *rule, *f, *prev; int l = RULESIZE(input_rule); @@ -3753,10 +3771,10 @@ * If rulenum is 0, find highest numbered rule before the >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Jan 11 21:47: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 CB7B016A512; Thu, 11 Jan 2007 21:47: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 8A0D116A509 for ; Thu, 11 Jan 2007 21:47:49 +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 7817313C45E for ; Thu, 11 Jan 2007 21:47:49 +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 l0BLlmgg075600 for ; Thu, 11 Jan 2007 21:47:48 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0BLliJ5075594 for perforce@freebsd.org; Thu, 11 Jan 2007 21:47:44 GMT (envelope-from jhb@freebsd.org) Date: Thu, 11 Jan 2007 21:47:44 GMT Message-Id: <200701112147.l0BLliJ5075594@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 112799 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 11 Jan 2007 21:47:50 -0000 http://perforce.freebsd.org/chv.cgi?CH=112799 Change 112799 by jhb@jhb_mutex on 2007/01/11 21:47:23 IFC @112795. Affected files ... .. //depot/projects/smpng/sys/amd64/amd64/identcpu.c#21 integrate .. //depot/projects/smpng/sys/amd64/amd64/mp_machdep.c#39 integrate .. //depot/projects/smpng/sys/amd64/amd64/nexus.c#21 integrate .. //depot/projects/smpng/sys/amd64/include/atomic.h#30 integrate .. //depot/projects/smpng/sys/amd64/include/specialreg.h#11 integrate .. //depot/projects/smpng/sys/amd64/linux32/linux32_dummy.c#7 integrate .. //depot/projects/smpng/sys/amd64/linux32/linux32_machdep.c#15 integrate .. //depot/projects/smpng/sys/amd64/linux32/linux32_proto.h#19 integrate .. //depot/projects/smpng/sys/amd64/linux32/linux32_syscall.h#19 integrate .. //depot/projects/smpng/sys/amd64/linux32/linux32_sysent.c#19 integrate .. //depot/projects/smpng/sys/amd64/linux32/syscalls.master#23 integrate .. //depot/projects/smpng/sys/arm/at91/at91_mci.c#2 integrate .. //depot/projects/smpng/sys/arm/at91/at91_pioreg.h#2 integrate .. //depot/projects/smpng/sys/arm/at91/at91_pmc.c#4 integrate .. //depot/projects/smpng/sys/arm/at91/at91_spireg.h#3 integrate .. //depot/projects/smpng/sys/arm/at91/at91_st.c#7 integrate .. //depot/projects/smpng/sys/arm/at91/files.at91#5 integrate .. //depot/projects/smpng/sys/arm/at91/if_ate.c#10 integrate .. //depot/projects/smpng/sys/arm/conf/BWCT#1 branch .. //depot/projects/smpng/sys/arm/conf/BWCT.hints#1 branch .. //depot/projects/smpng/sys/arm/include/atomic.h#27 integrate .. //depot/projects/smpng/sys/boot/common/pnp.c#3 integrate .. //depot/projects/smpng/sys/boot/common/pnpdata#2 delete .. //depot/projects/smpng/sys/bsm/audit.h#7 integrate .. //depot/projects/smpng/sys/bsm/audit_internal.h#5 integrate .. //depot/projects/smpng/sys/bsm/audit_kevents.h#7 integrate .. //depot/projects/smpng/sys/bsm/audit_record.h#7 integrate .. //depot/projects/smpng/sys/compat/linux/linux_emul.c#5 integrate .. //depot/projects/smpng/sys/compat/linux/linux_emul.h#4 integrate .. //depot/projects/smpng/sys/compat/linux/linux_mib.c#15 integrate .. //depot/projects/smpng/sys/compat/linux/linux_mib.h#9 integrate .. //depot/projects/smpng/sys/compat/linux/linux_misc.c#77 integrate .. //depot/projects/smpng/sys/compat/linux/linux_misc.h#2 integrate .. //depot/projects/smpng/sys/compat/linux/linux_signal.c#24 integrate .. //depot/projects/smpng/sys/conf/NOTES#134 integrate .. //depot/projects/smpng/sys/conf/files#195 integrate .. //depot/projects/smpng/sys/conf/kern.post.mk#58 integrate .. //depot/projects/smpng/sys/conf/options#132 integrate .. //depot/projects/smpng/sys/conf/options.arm#13 integrate .. //depot/projects/smpng/sys/contrib/pf/net/if_pfsync.c#24 integrate .. //depot/projects/smpng/sys/contrib/pf/net/pf.c#25 integrate .. //depot/projects/smpng/sys/contrib/pf/net/pf_ioctl.c#21 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi.c#96 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_cpu.c#36 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_package.c#8 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_perf.c#10 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_throttle.c#7 integrate .. //depot/projects/smpng/sys/dev/acpica/acpivar.h#64 integrate .. //depot/projects/smpng/sys/dev/aic7xxx/aic7xxx.seq#12 integrate .. //depot/projects/smpng/sys/dev/aic7xxx/aicasm/aicasm_gram.y#11 integrate .. //depot/projects/smpng/sys/dev/aic7xxx/aicasm/aicasm_macro_gram.y#4 integrate .. //depot/projects/smpng/sys/dev/arl/if_arl.c#13 integrate .. //depot/projects/smpng/sys/dev/ata/ata-chipset.c#74 integrate .. //depot/projects/smpng/sys/dev/ata/ata-pci.h#48 integrate .. //depot/projects/smpng/sys/dev/bce/if_bce.c#11 integrate .. //depot/projects/smpng/sys/dev/bce/if_bcereg.h#6 integrate .. //depot/projects/smpng/sys/dev/bge/if_bgereg.h#50 integrate .. //depot/projects/smpng/sys/dev/bktr/bktr_i2c.c#10 integrate .. //depot/projects/smpng/sys/dev/ce/if_ce.c#5 integrate .. //depot/projects/smpng/sys/dev/cp/if_cp.c#18 integrate .. //depot/projects/smpng/sys/dev/ctau/if_ct.c#20 integrate .. //depot/projects/smpng/sys/dev/cx/if_cx.c#27 integrate .. //depot/projects/smpng/sys/dev/drm/drm_agpsupport.c#6 integrate .. //depot/projects/smpng/sys/dev/en/midway.c#31 integrate .. //depot/projects/smpng/sys/dev/fb/boot_font.c#7 integrate .. //depot/projects/smpng/sys/dev/fb/creatorreg.h#1 branch .. //depot/projects/smpng/sys/dev/fb/gallant12x22.c#1 branch .. //depot/projects/smpng/sys/dev/fb/gfb.c#9 delete .. //depot/projects/smpng/sys/dev/fb/gfb.h#4 integrate .. //depot/projects/smpng/sys/dev/firewire/if_fwip.c#9 integrate .. //depot/projects/smpng/sys/dev/gfb/gfb_pci.c#16 delete .. //depot/projects/smpng/sys/dev/gfb/gfb_pci.h#3 delete .. //depot/projects/smpng/sys/dev/hptmv/entry.c#11 integrate .. //depot/projects/smpng/sys/dev/ichsmb/ichsmb.c#13 integrate .. //depot/projects/smpng/sys/dev/ichsmb/ichsmb_pci.c#13 integrate .. //depot/projects/smpng/sys/dev/idt/idtreg.h#3 integrate .. //depot/projects/smpng/sys/dev/isp/isp.c#51 integrate .. //depot/projects/smpng/sys/dev/isp/isp_freebsd.h#35 integrate .. //depot/projects/smpng/sys/dev/isp/isp_pci.c#47 integrate .. //depot/projects/smpng/sys/dev/mfi/mfi.c#15 integrate .. //depot/projects/smpng/sys/dev/mii/miidevs#21 integrate .. //depot/projects/smpng/sys/dev/mii/rlswitch.c#1 branch .. //depot/projects/smpng/sys/dev/mpt/mpt.c#22 integrate .. //depot/projects/smpng/sys/dev/mpt/mpt.h#19 integrate .. //depot/projects/smpng/sys/dev/mpt/mpt_cam.c#19 integrate .. //depot/projects/smpng/sys/dev/mpt/mpt_pci.c#28 integrate .. //depot/projects/smpng/sys/dev/msk/if_msk.c#2 integrate .. //depot/projects/smpng/sys/dev/msk/if_mskreg.h#2 integrate .. //depot/projects/smpng/sys/dev/my/if_my.c#25 integrate .. //depot/projects/smpng/sys/dev/ppbus/if_plip.c#18 integrate .. //depot/projects/smpng/sys/dev/re/if_re.c#48 integrate .. //depot/projects/smpng/sys/dev/sound/pci/emu10kx-pcm.c#3 integrate .. //depot/projects/smpng/sys/dev/sound/pci/emu10kx.c#3 integrate .. //depot/projects/smpng/sys/dev/sound/pci/emu10kx.h#3 integrate .. //depot/projects/smpng/sys/dev/sound/pci/hda/hdac.c#6 integrate .. //depot/projects/smpng/sys/dev/sound/pcm/feeder.c#17 integrate .. //depot/projects/smpng/sys/dev/sound/usb/uaudio.c#15 integrate .. //depot/projects/smpng/sys/dev/syscons/scvesactl.c#8 integrate .. //depot/projects/smpng/sys/dev/usb/if_aue.c#47 integrate .. //depot/projects/smpng/sys/dev/usb/if_auereg.h#14 integrate .. //depot/projects/smpng/sys/dev/usb/usb_ethersubr.c#15 integrate .. //depot/projects/smpng/sys/dev/usb/usb_ethersubr.h#7 integrate .. //depot/projects/smpng/sys/dev/usb/usbdi_util.h#10 integrate .. //depot/projects/smpng/sys/fs/msdosfs/bpb.h#6 integrate .. //depot/projects/smpng/sys/fs/msdosfs/msdosfs_vfsops.c#51 integrate .. //depot/projects/smpng/sys/fs/pseudofs/pseudofs_vncache.c#24 integrate .. //depot/projects/smpng/sys/fs/udf/udf_vfsops.c#32 integrate .. //depot/projects/smpng/sys/fs/unionfs/union_subr.c#27 integrate .. //depot/projects/smpng/sys/fs/unionfs/union_vnops.c#33 integrate .. //depot/projects/smpng/sys/i386/i386/identcpu.c#50 integrate .. //depot/projects/smpng/sys/i386/i386/mp_machdep.c#104 integrate .. //depot/projects/smpng/sys/i386/i386/nexus.c#22 integrate .. //depot/projects/smpng/sys/i386/include/atomic.h#48 integrate .. //depot/projects/smpng/sys/i386/include/specialreg.h#13 integrate .. //depot/projects/smpng/sys/i386/linux/linux_dummy.c#18 integrate .. //depot/projects/smpng/sys/i386/linux/linux_machdep.c#39 integrate .. //depot/projects/smpng/sys/i386/linux/linux_proto.h#39 integrate .. //depot/projects/smpng/sys/i386/linux/linux_syscall.h#37 integrate .. //depot/projects/smpng/sys/i386/linux/linux_sysent.c#38 integrate .. //depot/projects/smpng/sys/i386/linux/syscalls.master#44 integrate .. //depot/projects/smpng/sys/i4b/driver/i4b_ipr.c#26 integrate .. //depot/projects/smpng/sys/isa/pnpparse.c#5 integrate .. //depot/projects/smpng/sys/kern/kern_acct.c#48 integrate .. //depot/projects/smpng/sys/kern/kern_descrip.c#99 integrate .. //depot/projects/smpng/sys/kern/kern_mac.c#48 delete .. //depot/projects/smpng/sys/kern/kern_prot.c#101 integrate .. //depot/projects/smpng/sys/kern/kern_switch.c#67 integrate .. //depot/projects/smpng/sys/kern/kern_synch.c#110 integrate .. //depot/projects/smpng/sys/kern/kern_thread.c#98 integrate .. //depot/projects/smpng/sys/kern/sched_4bsd.c#66 integrate .. //depot/projects/smpng/sys/kern/sched_core.c#5 integrate .. //depot/projects/smpng/sys/kern/sched_ule.c#72 integrate .. //depot/projects/smpng/sys/kern/subr_turnstile.c#35 integrate .. //depot/projects/smpng/sys/kern/tty_pts.c#6 integrate .. //depot/projects/smpng/sys/kern/uipc_socket.c#98 integrate .. //depot/projects/smpng/sys/kern/uipc_usrreq.c#69 integrate .. //depot/projects/smpng/sys/modules/netgraph/Makefile#25 integrate .. //depot/projects/smpng/sys/modules/netgraph/deflate/Makefile#1 branch .. //depot/projects/smpng/sys/modules/netgraph/pred1/Makefile#1 branch .. //depot/projects/smpng/sys/modules/sound/driver/emu10kx/Makefile#2 integrate .. //depot/projects/smpng/sys/net/ethernet.h#11 integrate .. //depot/projects/smpng/sys/net/if_enc.c#6 integrate .. //depot/projects/smpng/sys/net/if_vlan.c#55 integrate .. //depot/projects/smpng/sys/net80211/ieee80211.c#25 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_freebsd.c#11 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_freebsd.h#8 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_input.c#34 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_node.c#29 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_proto.c#22 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_proto.h#13 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_var.h#24 integrate .. //depot/projects/smpng/sys/netatalk/COPYRIGHT#4 integrate .. //depot/projects/smpng/sys/netatalk/aarp.c#21 integrate .. //depot/projects/smpng/sys/netatalk/ddp_input.c#16 integrate .. //depot/projects/smpng/sys/netatalk/ddp_pcb.c#10 integrate .. //depot/projects/smpng/sys/netatalk/ddp_pcb.h#4 integrate .. //depot/projects/smpng/sys/netatalk/ddp_usrreq.c#28 integrate .. //depot/projects/smpng/sys/netgraph/ng_deflate.c#1 branch .. //depot/projects/smpng/sys/netgraph/ng_deflate.h#1 branch .. //depot/projects/smpng/sys/netgraph/ng_pred1.c#1 branch .. //depot/projects/smpng/sys/netgraph/ng_pred1.h#1 branch .. //depot/projects/smpng/sys/netgraph/ng_sppp.c#11 integrate .. //depot/projects/smpng/sys/netinet/in.h#36 integrate .. //depot/projects/smpng/sys/netinet/in_pcb.c#71 integrate .. //depot/projects/smpng/sys/netinet/ip_divert.c#52 integrate .. //depot/projects/smpng/sys/netinet/ip_fw.h#36 integrate .. //depot/projects/smpng/sys/netinet/ip_fw2.c#82 integrate .. //depot/projects/smpng/sys/netinet/ip_fw_pfil.c#17 integrate .. //depot/projects/smpng/sys/netinet/raw_ip.c#63 integrate .. //depot/projects/smpng/sys/netinet/sctp_asconf.c#3 integrate .. //depot/projects/smpng/sys/netinet/sctp_asconf.h#2 integrate .. //depot/projects/smpng/sys/netinet/sctp_auth.c#2 integrate .. //depot/projects/smpng/sys/netinet/sctp_bsd_addr.c#2 integrate .. //depot/projects/smpng/sys/netinet/sctp_indata.c#4 integrate .. //depot/projects/smpng/sys/netinet/sctp_input.c#4 integrate .. //depot/projects/smpng/sys/netinet/sctp_os.h#2 integrate .. //depot/projects/smpng/sys/netinet/sctp_os_bsd.h#3 integrate .. //depot/projects/smpng/sys/netinet/sctp_output.c#4 integrate .. //depot/projects/smpng/sys/netinet/sctp_pcb.c#3 integrate .. //depot/projects/smpng/sys/netinet/sctp_pcb.h#3 integrate .. //depot/projects/smpng/sys/netinet/sctp_structs.h#3 integrate .. //depot/projects/smpng/sys/netinet/sctp_timer.c#3 integrate .. //depot/projects/smpng/sys/netinet/sctp_usrreq.c#4 integrate .. //depot/projects/smpng/sys/netinet/sctp_var.h#2 integrate .. //depot/projects/smpng/sys/netinet/sctputil.c#5 integrate .. //depot/projects/smpng/sys/netinet/tcp_subr.c#86 integrate .. //depot/projects/smpng/sys/netinet/udp_usrreq.c#73 integrate .. //depot/projects/smpng/sys/netinet6/sctp6_usrreq.c#3 integrate .. //depot/projects/smpng/sys/netipx/ipx.c#12 integrate .. //depot/projects/smpng/sys/netipx/ipx.h#8 integrate .. //depot/projects/smpng/sys/netipx/ipx_cksum.c#6 integrate .. //depot/projects/smpng/sys/netipx/ipx_if.h#6 integrate .. //depot/projects/smpng/sys/netipx/ipx_input.c#18 integrate .. //depot/projects/smpng/sys/netipx/ipx_ip.c#16 integrate .. //depot/projects/smpng/sys/netipx/ipx_ip.h#5 integrate .. //depot/projects/smpng/sys/netipx/ipx_outputfl.c#7 integrate .. //depot/projects/smpng/sys/netipx/ipx_pcb.c#20 integrate .. //depot/projects/smpng/sys/netipx/ipx_pcb.h#10 integrate .. //depot/projects/smpng/sys/netipx/ipx_proto.c#8 integrate .. //depot/projects/smpng/sys/netipx/ipx_usrreq.c#26 integrate .. //depot/projects/smpng/sys/netipx/ipx_var.h#9 integrate .. //depot/projects/smpng/sys/netipx/spx.h#5 integrate .. //depot/projects/smpng/sys/netipx/spx_debug.c#4 integrate .. //depot/projects/smpng/sys/netipx/spx_debug.h#5 integrate .. //depot/projects/smpng/sys/netipx/spx_timer.h#3 integrate .. //depot/projects/smpng/sys/netipx/spx_usrreq.c#28 integrate .. //depot/projects/smpng/sys/netipx/spx_var.h#3 integrate .. //depot/projects/smpng/sys/netnatm/natm.c#29 integrate .. //depot/projects/smpng/sys/netnatm/natm.h#7 integrate .. //depot/projects/smpng/sys/netnatm/natm_pcb.c#9 integrate .. //depot/projects/smpng/sys/netnatm/natm_proto.c#16 integrate .. //depot/projects/smpng/sys/nfsserver/nfs_srvsubs.c#36 integrate .. //depot/projects/smpng/sys/nfsserver/nfsm_subs.h#10 integrate .. //depot/projects/smpng/sys/pc98/pc98/machdep.c#20 integrate .. //depot/projects/smpng/sys/pci/agp_intel.c#23 integrate .. //depot/projects/smpng/sys/pci/agpreg.h#16 integrate .. //depot/projects/smpng/sys/pci/alpm.c#12 integrate .. //depot/projects/smpng/sys/pci/amdpm.c#19 integrate .. //depot/projects/smpng/sys/pci/amdsmb.c#4 integrate .. //depot/projects/smpng/sys/pci/intpm.c#13 integrate .. //depot/projects/smpng/sys/pci/intpmreg.h#3 integrate .. //depot/projects/smpng/sys/pci/nfsmb.c#5 integrate .. //depot/projects/smpng/sys/pci/viapm.c#14 integrate .. //depot/projects/smpng/sys/powerpc/conf/NOTES#6 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/vm_machdep.c#47 integrate .. //depot/projects/smpng/sys/security/audit/audit.c#7 integrate .. //depot/projects/smpng/sys/security/audit/audit_arg.c#7 integrate .. //depot/projects/smpng/sys/security/audit/audit_bsm_klib.c#4 integrate .. //depot/projects/smpng/sys/security/audit/audit_bsm_token.c#6 integrate .. //depot/projects/smpng/sys/security/audit/audit_syscalls.c#8 integrate .. //depot/projects/smpng/sys/security/audit/audit_trigger.c#4 integrate .. //depot/projects/smpng/sys/security/audit/audit_worker.c#4 integrate .. //depot/projects/smpng/sys/security/mac/mac_framework.c#1 branch .. //depot/projects/smpng/sys/security/mac/mac_inet.c#6 integrate .. //depot/projects/smpng/sys/security/mac/mac_internal.h#12 integrate .. //depot/projects/smpng/sys/security/mac/mac_label.c#6 integrate .. //depot/projects/smpng/sys/security/mac/mac_net.c#18 integrate .. //depot/projects/smpng/sys/security/mac/mac_policy.h#2 integrate .. //depot/projects/smpng/sys/security/mac/mac_syscalls.c#1 branch .. //depot/projects/smpng/sys/security/mac/mac_vfs.c#16 integrate .. //depot/projects/smpng/sys/security/mac_stub/mac_stub.c#20 integrate .. //depot/projects/smpng/sys/sparc64/include/ofw_nexus.h#1 branch .. //depot/projects/smpng/sys/sparc64/pci/ofw_pcibus.c#10 integrate .. //depot/projects/smpng/sys/sparc64/pci/psycho.c#39 integrate .. //depot/projects/smpng/sys/sparc64/pci/psychoreg.h#11 integrate .. //depot/projects/smpng/sys/sun4v/sun4v/pmap.c#10 integrate .. //depot/projects/smpng/sys/sys/copyright.h#10 integrate .. //depot/projects/smpng/sys/sys/file.h#26 integrate .. //depot/projects/smpng/sys/sys/priority.h#4 integrate .. //depot/projects/smpng/sys/sys/proc.h#176 integrate .. //depot/projects/smpng/sys/sys/rtprio.h#8 integrate .. //depot/projects/smpng/sys/sys/runq.h#8 integrate .. //depot/projects/smpng/sys/sys/unpcb.h#11 integrate .. //depot/projects/smpng/sys/ufs/ufs/ufs_acl.c#16 integrate .. //depot/projects/smpng/sys/vm/swap_pager.c#67 integrate .. //depot/projects/smpng/sys/vm/uma.h#19 integrate .. //depot/projects/smpng/sys/vm/uma_core.c#67 integrate .. //depot/projects/smpng/sys/vm/vm_kern.c#35 integrate Differences ... ==== //depot/projects/smpng/sys/amd64/amd64/identcpu.c#21 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/identcpu.c,v 1.148 2006/08/01 01:23:39 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/identcpu.c,v 1.149 2007/01/09 19:23:21 jkim Exp $"); #include "opt_cpu.h" @@ -228,8 +228,8 @@ "\007" "\010EST" /* Enhanced SpeedStep */ "\011TM2" /* Thermal Monitor 2 */ - "\012" - "\013CNTX-ID" /* L1 context ID available */ + "\012SSSE3" /* SSSE3 */ + "\013CNXT-ID" /* L1 context ID available */ "\014" "\015" "\016CX16" /* CMPXCHG16B Instruction */ ==== //depot/projects/smpng/sys/amd64/amd64/mp_machdep.c#39 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/mp_machdep.c,v 1.278 2006/10/10 23:23:11 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/mp_machdep.c,v 1.279 2007/01/11 00:17:02 jeff Exp $"); #include "opt_cpu.h" #include "opt_kstack_pages.h" @@ -948,11 +948,10 @@ ipi_bitmap = atomic_readandclear_int(&cpu_ipi_pending[cpu]); -#ifdef IPI_PREEMPTION - if (ipi_bitmap & IPI_PREEMPT) { + if (ipi_bitmap & (1 << IPI_PREEMPT)) { mtx_lock_spin(&sched_lock); /* Don't preempt the idle thread */ - if (curthread->td_priority < PRI_MIN_IDLE) { + if (curthread != PCPU_GET(idlethread)) { struct thread *running_thread = curthread; if (running_thread->td_critnest > 1) running_thread->td_owepreempt = 1; @@ -961,7 +960,6 @@ } mtx_unlock_spin(&sched_lock); } -#endif /* Nothing to do for AST */ } ==== //depot/projects/smpng/sys/amd64/amd64/nexus.c#21 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/nexus.c,v 1.70 2006/11/13 22:23:32 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/nexus.c,v 1.71 2007/01/11 19:40:19 jhb Exp $"); /* * This code implements a `root nexus' for Intel Architecture @@ -371,24 +371,9 @@ * If this is a memory resource, map it into the kernel. */ if (rman_get_bustag(r) == AMD64_BUS_SPACE_MEM) { - caddr_t vaddr = 0; + void *vaddr; - if (rman_get_end(r) < 1024 * 1024) { - /* - * The first 1Mb is mapped at KERNBASE. - */ - vaddr = (caddr_t)(uintptr_t)(KERNBASE + rman_get_start(r)); - } else { - u_int64_t paddr; - u_int64_t psize; - u_int32_t poffs; - - paddr = rman_get_start(r); - psize = rman_get_size(r); - - poffs = paddr - trunc_page(paddr); - vaddr = (caddr_t) pmap_mapdev(paddr-poffs, psize+poffs) + poffs; - } + vaddr = pmap_mapdev(rman_get_start(r), rman_get_size(r)); rman_set_virtual(r, vaddr); rman_set_bushandle(r, (bus_space_handle_t) vaddr); } @@ -402,12 +387,9 @@ /* * If this is a memory resource, unmap it. */ - if ((rman_get_bustag(r) == AMD64_BUS_SPACE_MEM) && - (rman_get_end(r) >= 1024 * 1024)) { - u_int32_t psize; - - psize = rman_get_size(r); - pmap_unmapdev((vm_offset_t)rman_get_virtual(r), psize); + if (rman_get_bustag(r) == AMD64_BUS_SPACE_MEM) { + pmap_unmapdev((vm_offset_t)rman_get_virtual(r), + rman_get_size(r)); } return (rman_deactivate_resource(r)); ==== //depot/projects/smpng/sys/amd64/include/atomic.h#30 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/include/atomic.h,v 1.41 2006/12/28 08:15:14 bde Exp $ + * $FreeBSD: src/sys/amd64/include/atomic.h,v 1.44 2006/12/29 15:29:49 bde Exp $ */ #ifndef _MACHINE_ATOMIC_H_ #define _MACHINE_ATOMIC_H_ @@ -33,30 +33,30 @@ #endif /* - * Various simple arithmetic on memory which is atomic in the presence - * of interrupts and multiple processors. + * Various simple operations on memory, each of which is atomic in the + * presence of interrupts and multiple processors. * - * atomic_set_char(P, V) (*(u_char*)(P) |= (V)) - * atomic_clear_char(P, V) (*(u_char*)(P) &= ~(V)) - * atomic_add_char(P, V) (*(u_char*)(P) += (V)) - * atomic_subtract_char(P, V) (*(u_char*)(P) -= (V)) + * atomic_set_char(P, V) (*(u_char *)(P) |= (V)) + * atomic_clear_char(P, V) (*(u_char *)(P) &= ~(V)) + * atomic_add_char(P, V) (*(u_char *)(P) += (V)) + * atomic_subtract_char(P, V) (*(u_char *)(P) -= (V)) * - * atomic_set_short(P, V) (*(u_short*)(P) |= (V)) - * atomic_clear_short(P, V) (*(u_short*)(P) &= ~(V)) - * atomic_add_short(P, V) (*(u_short*)(P) += (V)) - * atomic_subtract_short(P, V) (*(u_short*)(P) -= (V)) + * atomic_set_short(P, V) (*(u_short *)(P) |= (V)) + * atomic_clear_short(P, V) (*(u_short *)(P) &= ~(V)) + * atomic_add_short(P, V) (*(u_short *)(P) += (V)) + * atomic_subtract_short(P, V) (*(u_short *)(P) -= (V)) * - * atomic_set_int(P, V) (*(u_int*)(P) |= (V)) - * atomic_clear_int(P, V) (*(u_int*)(P) &= ~(V)) - * atomic_add_int(P, V) (*(u_int*)(P) += (V)) - * atomic_subtract_int(P, V) (*(u_int*)(P) -= (V)) - * atomic_readandclear_int(P) (return *(u_int*)P; *(u_int*)P = 0;) + * atomic_set_int(P, V) (*(u_int *)(P) |= (V)) + * atomic_clear_int(P, V) (*(u_int *)(P) &= ~(V)) + * atomic_add_int(P, V) (*(u_int *)(P) += (V)) + * atomic_subtract_int(P, V) (*(u_int *)(P) -= (V)) + * atomic_readandclear_int(P) (return (*(u_int *)(P)); *(u_int *)(P) = 0;) * - * atomic_set_long(P, V) (*(u_long*)(P) |= (V)) - * atomic_clear_long(P, V) (*(u_long*)(P) &= ~(V)) - * atomic_add_long(P, V) (*(u_long*)(P) += (V)) - * atomic_subtract_long(P, V) (*(u_long*)(P) -= (V)) - * atomic_readandclear_long(P) (return *(u_long*)P; *(u_long*)P = 0;) + * atomic_set_long(P, V) (*(u_long *)(P) |= (V)) + * atomic_clear_long(P, V) (*(u_long *)(P) &= ~(V)) + * atomic_add_long(P, V) (*(u_long *)(P) += (V)) + * atomic_subtract_long(P, V) (*(u_long *)(P) -= (V)) + * atomic_readandclear_long(P) (return (*(u_long *)(P)); *(u_long *)(P) = 0;) */ /* @@ -71,9 +71,9 @@ #define ATOMIC_ASM(NAME, TYPE, OP, CONS, V) \ void atomic_##NAME##_##TYPE(volatile u_##TYPE *p, u_##TYPE v) -int atomic_cmpset_int(volatile u_int *dst, u_int exp, u_int src); -int atomic_cmpset_long(volatile u_long *dst, u_long exp, u_long src); -u_int atomic_fetchadd_int(volatile u_int *p, u_int v); +int atomic_cmpset_int(volatile u_int *dst, u_int exp, u_int src); +int atomic_cmpset_long(volatile u_long *dst, u_long exp, u_long src); +u_int atomic_fetchadd_int(volatile u_int *p, u_int v); #define ATOMIC_STORE_LOAD(TYPE, LOP, SOP) \ u_##TYPE atomic_load_acq_##TYPE(volatile u_##TYPE *p); \ @@ -82,11 +82,11 @@ #else /* !KLD_MODULE && __GNUCLIKE_ASM */ /* - * For userland, assume the SMP case and use lock prefixes so that - * the binaries will run on both types of systems. + * For userland, always use lock prefixes so that the binaries will run + * on both SMP and !SMP systems. */ #if defined(SMP) || !defined(_KERNEL) -#define MPLOCKED lock ; +#define MPLOCKED "lock ; " #else #define MPLOCKED #endif @@ -99,9 +99,9 @@ static __inline void \ atomic_##NAME##_##TYPE(volatile u_##TYPE *p, u_##TYPE v)\ { \ - __asm __volatile(__XSTRING(MPLOCKED) OP \ - : "=m" (*p) \ - : CONS (V), "m" (*p)); \ + __asm __volatile(MPLOCKED OP \ + : "=m" (*p) \ + : CONS (V), "m" (*p)); \ } \ struct __hack @@ -118,8 +118,8 @@ { u_char res; - __asm __volatile ( - " " __XSTRING(MPLOCKED) " " + __asm __volatile( + " " MPLOCKED " " " cmpxchgl %2,%1 ; " " sete %0 ; " "1: " @@ -139,8 +139,8 @@ { u_char res; - __asm __volatile ( - " " __XSTRING(MPLOCKED) " " + __asm __volatile( + " " MPLOCKED " " " cmpxchgq %2,%1 ; " " sete %0 ; " "1: " @@ -163,8 +163,8 @@ atomic_fetchadd_int(volatile u_int *p, u_int v) { - __asm __volatile ( - " " __XSTRING(MPLOCKED) " " + __asm __volatile( + " " MPLOCKED " " " xaddl %0, %1 ; " "# atomic_fetchadd_int" : "+r" (v), /* 0 (result) */ @@ -197,7 +197,7 @@ } \ struct __hack -#else /* defined(SMP) */ +#else /* !(_KERNEL && !SMP) */ #define ATOMIC_STORE_LOAD(TYPE, LOP, SOP) \ static __inline u_##TYPE \ @@ -205,8 +205,8 @@ { \ u_##TYPE res; \ \ - __asm __volatile(__XSTRING(MPLOCKED) LOP \ - : "=a" (res), /* 0 (result) */\ + __asm __volatile(MPLOCKED LOP \ + : "=a" (res), /* 0 */ \ "=m" (*p) /* 1 */ \ : "m" (*p) /* 2 */ \ : "memory"); \ @@ -227,7 +227,7 @@ } \ struct __hack -#endif /* SMP */ +#endif /* _KERNEL && !SMP */ #endif /* KLD_MODULE || !__GNUCLIKE_ASM */ @@ -259,7 +259,7 @@ #undef ATOMIC_ASM #undef ATOMIC_STORE_LOAD -#if !defined(WANT_FUNCTIONS) +#ifndef WANT_FUNCTIONS /* Read the current value and store a zero in the destination. */ #ifdef __GNUCLIKE_ASM @@ -267,39 +267,39 @@ static __inline u_int atomic_readandclear_int(volatile u_int *addr) { - u_int result; + u_int res; - result = 0; - __asm __volatile ( + res = 0; + __asm __volatile( " xchgl %1,%0 ; " "# atomic_readandclear_int" - : "+r" (result), /* 0 (result) */ - "=m" (*addr) /* 1 (addr) */ + : "+r" (res), /* 0 */ + "=m" (*addr) /* 1 */ : "m" (*addr)); - return (result); + return (res); } static __inline u_long atomic_readandclear_long(volatile u_long *addr) { - u_long result; + u_long res; - result = 0; - __asm __volatile ( + res = 0; + __asm __volatile( " xchgq %1,%0 ; " "# atomic_readandclear_long" - : "+r" (result), /* 0 (result) */ - "=m" (*addr) /* 1 (addr) */ + : "+r" (res), /* 0 */ + "=m" (*addr) /* 1 */ : "m" (*addr)); - return (result); + return (res); } #else /* !__GNUCLIKE_ASM */ -u_int atomic_readandclear_int(volatile u_int *); -u_long atomic_readandclear_long(volatile u_long *); +u_int atomic_readandclear_int(volatile u_int *addr); +u_long atomic_readandclear_long(volatile u_long *addr); #endif /* __GNUCLIKE_ASM */ @@ -437,5 +437,6 @@ #define atomic_cmpset_rel_ptr atomic_cmpset_rel_long #define atomic_readandclear_ptr atomic_readandclear_long -#endif /* !defined(WANT_FUNCTIONS) */ -#endif /* ! _MACHINE_ATOMIC_H_ */ +#endif /* !WANT_FUNCTIONS */ + +#endif /* !_MACHINE_ATOMIC_H_ */ ==== //depot/projects/smpng/sys/amd64/include/specialreg.h#11 (text+ko) ==== @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * from: @(#)specialreg.h 7.1 (Berkeley) 5/9/91 - * $FreeBSD: src/sys/amd64/include/specialreg.h,v 1.35 2006/07/13 16:09:40 jkim Exp $ + * $FreeBSD: src/sys/amd64/include/specialreg.h,v 1.36 2007/01/09 19:23:21 jkim Exp $ */ #ifndef _MACHINE_SPECIALREG_H_ @@ -118,7 +118,8 @@ #define CPUID2_VMX 0x00000020 #define CPUID2_EST 0x00000080 #define CPUID2_TM2 0x00000100 -#define CPUID2_CNTXID 0x00000400 +#define CPUID2_SSSE3 0x00000200 +#define CPUID2_CNXTID 0x00000400 #define CPUID2_CX16 0x00002000 #define CPUID2_XTPR 0x00004000 ==== //depot/projects/smpng/sys/amd64/linux32/linux32_dummy.c#7 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_dummy.c,v 1.6 2006/10/28 10:59:59 netchild Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_dummy.c,v 1.7 2006/12/31 13:16:00 netchild Exp $"); #include #include @@ -53,7 +53,6 @@ DUMMY(sysfs); DUMMY(query_module); DUMMY(nfsservctl); -DUMMY(rt_sigtimedwait); DUMMY(rt_sigqueueinfo); DUMMY(capget); DUMMY(capset); @@ -77,7 +76,6 @@ DUMMY(timer_getoverrun); DUMMY(timer_delete); DUMMY(fstatfs64); -DUMMY(utimes); DUMMY(fadvise64_64); DUMMY(mbind); DUMMY(get_mempolicy); ==== //depot/projects/smpng/sys/amd64/linux32/linux32_machdep.c#15 (text+ko) ==== @@ -29,11 +29,13 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_machdep.c,v 1.23 2006/12/20 20:17:34 jkim Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_machdep.c,v 1.25 2007/01/07 19:00:38 netchild Exp $"); #include #include #include +#include +#include #include #include #include @@ -562,7 +564,7 @@ /* create the emuldata */ error = linux_proc_init(td, p2->p_pid, args->flags); /* reference it - no need to check this */ - em = em_find(p2, EMUL_UNLOCKED); + em = em_find(p2, EMUL_DOLOCK); KASSERT(em != NULL, ("clone: emuldata not found.\n")); /* and adjust it */ if (args->flags & CLONE_PARENT_SETTID) { @@ -728,9 +730,20 @@ off_t pos; } */ bsd_args; int error; + struct file *fp; error = 0; bsd_args.flags = 0; + fp = NULL; + + /* + * Linux mmap(2): + * You must specify exactly one of MAP_SHARED and MAP_PRIVATE + */ + if (! ((linux_args->flags & LINUX_MAP_SHARED) ^ + (linux_args->flags & LINUX_MAP_PRIVATE))) + return (EINVAL); + if (linux_args->flags & LINUX_MAP_SHARED) bsd_args.flags |= MAP_SHARED; if (linux_args->flags & LINUX_MAP_PRIVATE) @@ -813,17 +826,44 @@ bsd_args.addr = (caddr_t)PTRIN(linux_args->addr); bsd_args.len = linux_args->len; } + /* - * XXX i386 Linux always emulator forces PROT_READ on (why?) - * so we do the same. We add PROT_EXEC to work around buggy - * applications (e.g. Java) that take advantage of the fact - * that execute permissions are not enforced by x86 CPUs. + * We add PROT_EXEC to work around buggy applications (e.g. Java) + * that take advantage of the fact that execute permissions are not + * enforced by x86 CPUs. */ - bsd_args.prot = linux_args->prot | PROT_EXEC | PROT_READ; + bsd_args.prot = linux_args->prot | PROT_EXEC; if (linux_args->flags & LINUX_MAP_ANON) bsd_args.fd = -1; - else + else { + /* + * Linux follows Solaris mmap(2) description: + * The file descriptor fildes is opened with + * read permission, regardless of the + * protection options specified. + * If PROT_WRITE is specified, the application + * must have opened the file descriptor + * fildes with write permission unless + * MAP_PRIVATE is specified in the flag + * argument as described below. + */ + + if ((error = fget(td, linux_args->fd, &fp)) != 0) + return (error); + if (fp->f_type != DTYPE_VNODE) { + fdrop(fp, td); + return (EINVAL); + } + + /* Linux mmap() just fails for O_WRONLY files */ + if (! (fp->f_flag & FREAD)) { + fdrop(fp, td); + return (EACCES); + } + bsd_args.fd = linux_args->fd; + fdrop(fp, td); + } bsd_args.pos = (off_t)linux_args->pgoff * PAGE_SIZE; bsd_args.pad = 0; ==== //depot/projects/smpng/sys/amd64/linux32/linux32_proto.h#19 (text+ko) ==== @@ -2,8 +2,8 @@ * System call prototypes. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/amd64/linux32/linux32_proto.h,v 1.26 2006/11/11 21:49:07 ru Exp $ - * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.23 2006/10/29 14:02:38 netchild Exp + * $FreeBSD: src/sys/amd64/linux32/linux32_proto.h,v 1.28 2006/12/31 13:20:30 netchild Exp $ + * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.25 2006/12/31 13:16:00 netchild Exp */ #ifndef _LINUX_SYSPROTO_H_ @@ -547,7 +547,10 @@ char sigsetsize_l_[PADL_(l_size_t)]; l_size_t sigsetsize; char sigsetsize_r_[PADR_(l_size_t)]; }; struct linux_rt_sigtimedwait_args { - register_t dummy; + char mask_l_[PADL_(l_sigset_t *)]; l_sigset_t * mask; char mask_r_[PADR_(l_sigset_t *)]; + char ptr_l_[PADL_(l_siginfo_t *)]; l_siginfo_t * ptr; char ptr_r_[PADR_(l_siginfo_t *)]; + char timeout_l_[PADL_(struct l_timeval *)]; struct l_timeval * timeout; char timeout_r_[PADR_(struct l_timeval *)]; + char sigsetsize_l_[PADL_(l_size_t)]; l_size_t sigsetsize; char sigsetsize_r_[PADR_(l_size_t)]; }; struct linux_rt_sigqueueinfo_args { register_t dummy; @@ -798,7 +801,8 @@ char sig_l_[PADL_(int)]; int sig; char sig_r_[PADR_(int)]; }; struct linux_utimes_args { - register_t dummy; + char fname_l_[PADL_(char *)]; char * fname; char fname_r_[PADR_(char *)]; + char tptr_l_[PADL_(struct l_timeval *)]; struct l_timeval * tptr; char tptr_r_[PADR_(struct l_timeval *)]; }; struct linux_fadvise64_64_args { register_t dummy; @@ -1160,7 +1164,7 @@ #define LINUX_SYS_AUE_linux_fork AUE_FORK #define LINUX_SYS_AUE_linux_open AUE_OPEN_RWTC #define LINUX_SYS_AUE_linux_waitpid AUE_WAIT4 -#define LINUX_SYS_AUE_linux_creat AUE_O_CREAT +#define LINUX_SYS_AUE_linux_creat AUE_CREAT #define LINUX_SYS_AUE_linux_link AUE_LINK #define LINUX_SYS_AUE_linux_unlink AUE_UNLINK #define LINUX_SYS_AUE_linux_execve AUE_EXECVE @@ -1221,7 +1225,7 @@ #define LINUX_SYS_AUE_linux_lstat AUE_LSTAT #define LINUX_SYS_AUE_linux_readlink AUE_READLINK #define LINUX_SYS_AUE_linux_reboot AUE_REBOOT -#define LINUX_SYS_AUE_linux_readdir AUE_O_GETDENTS +#define LINUX_SYS_AUE_linux_readdir AUE_GETDIRENTRIES #define LINUX_SYS_AUE_linux_mmap AUE_MMAP #define LINUX_SYS_AUE_linux_truncate AUE_TRUNCATE #define LINUX_SYS_AUE_linux_ftruncate AUE_FTRUNCATE @@ -1258,7 +1262,7 @@ #define LINUX_SYS_AUE_linux_setfsuid16 AUE_SETFSUID #define LINUX_SYS_AUE_linux_setfsgid16 AUE_SETFSGID #define LINUX_SYS_AUE_linux_llseek AUE_LSEEK -#define LINUX_SYS_AUE_linux_getdents AUE_O_GETDENTS +#define LINUX_SYS_AUE_linux_getdents AUE_GETDIRENTRIES #define LINUX_SYS_AUE_linux_select AUE_SELECT #define LINUX_SYS_AUE_linux_msync AUE_MSYNC #define LINUX_SYS_AUE_linux_readv AUE_READV @@ -1313,7 +1317,7 @@ #define LINUX_SYS_AUE_linux_setfsgid AUE_SETFSGID #define LINUX_SYS_AUE_linux_pivot_root AUE_PIVOT_ROOT #define LINUX_SYS_AUE_linux_mincore AUE_MINCORE -#define LINUX_SYS_AUE_linux_getdents64 AUE_O_GETDENTS +#define LINUX_SYS_AUE_linux_getdents64 AUE_GETDIRENTRIES #define LINUX_SYS_AUE_linux_fcntl64 AUE_FCNTL #define LINUX_SYS_AUE_linux_gettid AUE_NULL #define LINUX_SYS_AUE_linux_setxattr AUE_NULL @@ -1347,10 +1351,10 @@ #define LINUX_SYS_AUE_linux_clock_gettime AUE_NULL #define LINUX_SYS_AUE_linux_clock_getres AUE_NULL #define LINUX_SYS_AUE_linux_clock_nanosleep AUE_NULL -#define LINUX_SYS_AUE_linux_statfs64 AUE_NULL -#define LINUX_SYS_AUE_linux_fstatfs64 AUE_NULL +#define LINUX_SYS_AUE_linux_statfs64 AUE_STATFS +#define LINUX_SYS_AUE_linux_fstatfs64 AUE_FSTATFS #define LINUX_SYS_AUE_linux_tgkill AUE_NULL -#define LINUX_SYS_AUE_linux_utimes AUE_NULL +#define LINUX_SYS_AUE_linux_utimes AUE_UTIMES #define LINUX_SYS_AUE_linux_fadvise64_64 AUE_NULL #define LINUX_SYS_AUE_linux_mbind AUE_NULL #define LINUX_SYS_AUE_linux_get_mempolicy AUE_NULL ==== //depot/projects/smpng/sys/amd64/linux32/linux32_syscall.h#19 (text+ko) ==== @@ -2,8 +2,8 @@ * System call numbers. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/amd64/linux32/linux32_syscall.h,v 1.26 2006/11/11 21:49:07 ru Exp $ - * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.23 2006/10/29 14:02:38 netchild Exp + * $FreeBSD: src/sys/amd64/linux32/linux32_syscall.h,v 1.28 2006/12/31 13:20:30 netchild Exp $ + * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.25 2006/12/31 13:16:00 netchild Exp */ #define LINUX_SYS_exit 1 ==== //depot/projects/smpng/sys/amd64/linux32/linux32_sysent.c#19 (text+ko) ==== @@ -2,8 +2,8 @@ * System call switch table. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/amd64/linux32/linux32_sysent.c,v 1.26 2006/11/11 21:49:07 ru Exp $ - * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.23 2006/10/29 14:02:38 netchild Exp + * $FreeBSD: src/sys/amd64/linux32/linux32_sysent.c,v 1.28 2006/12/31 13:20:30 netchild Exp $ + * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.25 2006/12/31 13:16:00 netchild Exp */ #include @@ -28,7 +28,7 @@ { AS(linux_open_args), (sy_call_t *)linux_open, AUE_OPEN_RWTC, NULL, 0, 0 }, /* 5 = linux_open */ { AS(close_args), (sy_call_t *)close, AUE_CLOSE, NULL, 0, 0 }, /* 6 = close */ { AS(linux_waitpid_args), (sy_call_t *)linux_waitpid, AUE_WAIT4, NULL, 0, 0 }, /* 7 = linux_waitpid */ - { AS(linux_creat_args), (sy_call_t *)linux_creat, AUE_O_CREAT, NULL, 0, 0 }, /* 8 = linux_creat */ + { AS(linux_creat_args), (sy_call_t *)linux_creat, AUE_CREAT, NULL, 0, 0 }, /* 8 = linux_creat */ { AS(linux_link_args), (sy_call_t *)linux_link, AUE_LINK, NULL, 0, 0 }, /* 9 = linux_link */ { AS(linux_unlink_args), (sy_call_t *)linux_unlink, AUE_UNLINK, NULL, 0, 0 }, /* 10 = linux_unlink */ { AS(linux_execve_args), (sy_call_t *)linux_execve, AUE_EXECVE, NULL, 0, 0 }, /* 11 = linux_execve */ @@ -109,7 +109,7 @@ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 86 = linux_uselib */ { AS(swapon_args), (sy_call_t *)swapon, AUE_SWAPON, NULL, 0, 0 }, /* 87 = swapon */ { AS(linux_reboot_args), (sy_call_t *)linux_reboot, AUE_REBOOT, NULL, 0, 0 }, /* 88 = linux_reboot */ - { AS(linux_readdir_args), (sy_call_t *)linux_readdir, AUE_O_GETDENTS, NULL, 0, 0 }, /* 89 = linux_readdir */ + { AS(linux_readdir_args), (sy_call_t *)linux_readdir, AUE_GETDIRENTRIES, NULL, 0, 0 }, /* 89 = linux_readdir */ { AS(linux_mmap_args), (sy_call_t *)linux_mmap, AUE_MMAP, NULL, 0, 0 }, /* 90 = linux_mmap */ { AS(munmap_args), (sy_call_t *)munmap, AUE_MUNMAP, NULL, 0, 0 }, /* 91 = munmap */ { AS(linux_truncate_args), (sy_call_t *)linux_truncate, AUE_TRUNCATE, NULL, 0, 0 }, /* 92 = linux_truncate */ @@ -161,7 +161,7 @@ { AS(linux_setfsuid16_args), (sy_call_t *)linux_setfsuid16, AUE_SETFSUID, NULL, 0, 0 }, /* 138 = linux_setfsuid16 */ { AS(linux_setfsgid16_args), (sy_call_t *)linux_setfsgid16, AUE_SETFSGID, NULL, 0, 0 }, /* 139 = linux_setfsgid16 */ { AS(linux_llseek_args), (sy_call_t *)linux_llseek, AUE_LSEEK, NULL, 0, 0 }, /* 140 = linux_llseek */ - { AS(linux_getdents_args), (sy_call_t *)linux_getdents, AUE_O_GETDENTS, NULL, 0, 0 }, /* 141 = linux_getdents */ + { AS(linux_getdents_args), (sy_call_t *)linux_getdents, AUE_GETDIRENTRIES, NULL, 0, 0 }, /* 141 = linux_getdents */ { AS(linux_select_args), (sy_call_t *)linux_select, AUE_SELECT, NULL, 0, 0 }, /* 142 = linux_select */ { AS(flock_args), (sy_call_t *)flock, AUE_FLOCK, NULL, 0, 0 }, /* 143 = flock */ { AS(linux_msync_args), (sy_call_t *)linux_msync, AUE_MSYNC, NULL, 0, 0 }, /* 144 = linux_msync */ @@ -197,7 +197,7 @@ { AS(linux_rt_sigaction_args), (sy_call_t *)linux_rt_sigaction, AUE_NULL, NULL, 0, 0 }, /* 174 = linux_rt_sigaction */ { AS(linux_rt_sigprocmask_args), (sy_call_t *)linux_rt_sigprocmask, AUE_NULL, NULL, 0, 0 }, /* 175 = linux_rt_sigprocmask */ { AS(linux_rt_sigpending_args), (sy_call_t *)linux_rt_sigpending, AUE_NULL, NULL, 0, 0 }, /* 176 = linux_rt_sigpending */ - { 0, (sy_call_t *)linux_rt_sigtimedwait, AUE_NULL, NULL, 0, 0 }, /* 177 = linux_rt_sigtimedwait */ + { AS(linux_rt_sigtimedwait_args), (sy_call_t *)linux_rt_sigtimedwait, AUE_NULL, NULL, 0, 0 }, /* 177 = linux_rt_sigtimedwait */ { 0, (sy_call_t *)linux_rt_sigqueueinfo, AUE_NULL, NULL, 0, 0 }, /* 178 = linux_rt_sigqueueinfo */ { AS(linux_rt_sigsuspend_args), (sy_call_t *)linux_rt_sigsuspend, AUE_NULL, NULL, 0, 0 }, /* 179 = linux_rt_sigsuspend */ { AS(linux_pread_args), (sy_call_t *)linux_pread, AUE_PREAD, NULL, 0, 0 }, /* 180 = linux_pread */ @@ -240,7 +240,7 @@ { AS(linux_pivot_root_args), (sy_call_t *)linux_pivot_root, AUE_PIVOT_ROOT, NULL, 0, 0 }, /* 217 = linux_pivot_root */ { AS(linux_mincore_args), (sy_call_t *)linux_mincore, AUE_MINCORE, NULL, 0, 0 }, /* 218 = linux_mincore */ { AS(madvise_args), (sy_call_t *)madvise, AUE_MADVISE, NULL, 0, 0 }, /* 219 = madvise */ - { AS(linux_getdents64_args), (sy_call_t *)linux_getdents64, AUE_O_GETDENTS, NULL, 0, 0 }, /* 220 = linux_getdents64 */ + { AS(linux_getdents64_args), (sy_call_t *)linux_getdents64, AUE_GETDIRENTRIES, NULL, 0, 0 }, /* 220 = linux_getdents64 */ { AS(linux_fcntl64_args), (sy_call_t *)linux_fcntl64, AUE_FCNTL, NULL, 0, 0 }, /* 221 = linux_fcntl64 */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 222 = */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 223 = */ @@ -288,10 +288,10 @@ { AS(linux_clock_gettime_args), (sy_call_t *)linux_clock_gettime, AUE_NULL, NULL, 0, 0 }, /* 265 = linux_clock_gettime */ { AS(linux_clock_getres_args), (sy_call_t *)linux_clock_getres, AUE_NULL, NULL, 0, 0 }, /* 266 = linux_clock_getres */ { AS(linux_clock_nanosleep_args), (sy_call_t *)linux_clock_nanosleep, AUE_NULL, NULL, 0, 0 }, /* 267 = linux_clock_nanosleep */ - { AS(linux_statfs64_args), (sy_call_t *)linux_statfs64, AUE_NULL, NULL, 0, 0 }, /* 268 = linux_statfs64 */ - { 0, (sy_call_t *)linux_fstatfs64, AUE_NULL, NULL, 0, 0 }, /* 269 = linux_fstatfs64 */ + { AS(linux_statfs64_args), (sy_call_t *)linux_statfs64, AUE_STATFS, NULL, 0, 0 }, /* 268 = linux_statfs64 */ + { 0, (sy_call_t *)linux_fstatfs64, AUE_FSTATFS, NULL, 0, 0 }, /* 269 = linux_fstatfs64 */ { AS(linux_tgkill_args), (sy_call_t *)linux_tgkill, AUE_NULL, NULL, 0, 0 }, /* 270 = linux_tgkill */ - { 0, (sy_call_t *)linux_utimes, AUE_NULL, NULL, 0, 0 }, /* 271 = linux_utimes */ + { AS(linux_utimes_args), (sy_call_t *)linux_utimes, AUE_UTIMES, NULL, 0, 0 }, /* 271 = linux_utimes */ { 0, (sy_call_t *)linux_fadvise64_64, AUE_NULL, NULL, 0, 0 }, /* 272 = linux_fadvise64_64 */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 273 = */ { 0, (sy_call_t *)linux_mbind, AUE_NULL, NULL, 0, 0 }, /* 274 = linux_mbind */ ==== //depot/projects/smpng/sys/amd64/linux32/syscalls.master#23 (text+ko) ==== @@ -1,4 +1,4 @@ - $FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.23 2006/10/29 14:02:38 netchild Exp $ + $FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.25 2006/12/31 13:16:00 netchild Exp $ ; @(#)syscalls.master 8.1 (Berkeley) 7/19/93 ; System call name/number master file (or rather, slave, from LINUX). @@ -50,7 +50,7 @@ 6 AUE_CLOSE NOPROTO { int close(int fd); } 7 AUE_WAIT4 STD { int linux_waitpid(l_pid_t pid, \ l_int *status, l_int options); } -8 AUE_O_CREAT STD { int linux_creat(char *path, \ +8 AUE_CREAT STD { int linux_creat(char *path, \ l_int mode); } 9 AUE_LINK STD { int linux_link(char *path, char *to); } 10 AUE_UNLINK STD { int linux_unlink(char *path); } @@ -80,7 +80,7 @@ 26 AUE_PTRACE STD { int linux_ptrace(l_long req, l_long pid, \ l_long addr, l_long data); } 27 AUE_NULL STD { int linux_alarm(l_uint secs); } -28 AUE_NULL UNIMPL fstat +28 AUE_FSTAT UNIMPL fstat 29 AUE_NULL STD { int linux_pause(void); } 30 AUE_UTIME STD { int linux_utime(char *fname, \ struct l_utimbuf *times); } @@ -160,11 +160,11 @@ 84 AUE_LSTAT STD { int linux_lstat(char *path, struct linux_lstat *up); } 85 AUE_READLINK STD { int linux_readlink(char *name, char *buf, \ l_int count); } -86 AUE_NULL UNIMPL linux_uselib +86 AUE_USELIB UNIMPL linux_uselib 87 AUE_SWAPON NOPROTO { int swapon(char *name); } 88 AUE_REBOOT STD { int linux_reboot(l_int magic1, \ l_int magic2, l_uint cmd, void *arg); } -89 AUE_O_GETDENTS STD { int linux_readdir(l_uint fd, \ +89 AUE_GETDIRENTRIES STD { int linux_readdir(l_uint fd, \ struct l_dirent *dent, l_uint count); } 90 AUE_MMAP STD { int linux_mmap(struct l_mmap_argv *ptr); } 91 AUE_MUNMAP NOPROTO { int munmap(caddr_t addr, int len); } @@ -176,7 +176,7 @@ 96 AUE_GETPRIORITY STD { int linux_getpriority(int which, int who); } 97 AUE_SETPRIORITY NOPROTO { int setpriority(int which, int who, \ int prio); } -98 AUE_AUE_PROFILE UNIMPL profil +98 AUE_PROFILE UNIMPL profil 99 AUE_STATFS STD { int linux_statfs(char *path, \ struct l_statfs_buf *buf); } 100 AUE_FSTATFS STD { int linux_fstatfs(l_uint fd, \ @@ -243,7 +243,7 @@ 140 AUE_LSEEK STD { int linux_llseek(l_int fd, l_ulong ohigh, \ l_ulong olow, l_loff_t *res, \ l_uint whence); } -141 AUE_O_GETDENTS STD { int linux_getdents(l_uint fd, void *dent, \ +141 AUE_GETDIRENTRIES STD { int linux_getdents(l_uint fd, void *dent, \ l_uint count); } 142 AUE_SELECT STD { int linux_select(l_int nfds, \ l_fd_set *readfds, l_fd_set *writefds, \ @@ -252,9 +252,9 @@ 143 AUE_FLOCK NOPROTO { int flock(int fd, int how); } 144 AUE_MSYNC STD { int linux_msync(l_ulong addr, \ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Jan 11 21:48:51 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AD4BC16A412; Thu, 11 Jan 2007 21:48:51 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 7378216A417 for ; Thu, 11 Jan 2007 21:48:51 +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 4B2C013C46B for ; Thu, 11 Jan 2007 21:48:51 +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 l0BLmooo075642 for ; Thu, 11 Jan 2007 21:48:50 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0BLmoQl075639 for perforce@freebsd.org; Thu, 11 Jan 2007 21:48:50 GMT (envelope-from jhb@freebsd.org) Date: Thu, 11 Jan 2007 21:48:50 GMT Message-Id: <200701112148.l0BLmoQl075639@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 112800 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 11 Jan 2007 21:48:51 -0000 http://perforce.freebsd.org/chv.cgi?CH=112800 Change 112800 by jhb@jhb_mutex on 2007/01/11 21:48:40 IFC @112798. Affected files ... .. //depot/projects/smpng/sys/dev/ichsmb/ichsmb_pci.c#14 integrate Differences ... ==== //depot/projects/smpng/sys/dev/ichsmb/ichsmb_pci.c#14 (text+ko) ==== @@ -37,7 +37,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ichsmb/ichsmb_pci.c,v 1.18 2007/01/11 19:56:24 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ichsmb/ichsmb_pci.c,v 1.19 2007/01/11 21:13:27 jhb Exp $"); /* * Support for the SMBus controller logical device which is part of the @@ -74,6 +74,7 @@ #define ID_82801DC 0x24C38086 #define ID_82801EB 0x24D38086 #define ID_6300ESB 0x25a48086 +#define ID_631xESB 0x269b8086 #define PCIS_SERIALBUS_SMBUS_PROGIF 0x00 @@ -146,6 +147,9 @@ case ID_6300ESB: device_set_desc(dev, "Intel 6300ESB (ICH) SMBus controller"); break; + case ID_631xESB: + device_set_desc(dev, "Intel 631xESB/6321ESB (ESB2) SMBus controller"); + break; default: if (pci_get_class(dev) == PCIC_SERIALBUS && pci_get_subclass(dev) == PCIS_SERIALBUS_SMBUS From owner-p4-projects@FreeBSD.ORG Fri Jan 12 03:16: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 08C6016A416; Fri, 12 Jan 2007 03:16: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 AB68716A412 for ; Fri, 12 Jan 2007 03:16:20 +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 9C16B13C44C for ; Fri, 12 Jan 2007 03:16:20 +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 l0C3GK6j066973 for ; Fri, 12 Jan 2007 03:16:20 GMT (envelope-from piso@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0C3GKab066970 for perforce@freebsd.org; Fri, 12 Jan 2007 03:16:20 GMT (envelope-from piso@freebsd.org) Date: Fri, 12 Jan 2007 03:16:20 GMT Message-Id: <200701120316.l0C3GKab066970@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 112803 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 12 Jan 2007 03:16:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=112803 Change 112803 by piso@piso_longino on 2007/01/12 03:15:31 o resurrect stray MD code lost during previous IFC o comment out old code (kept there as a reference) o fix compilation Affected files ... .. //depot/projects/soc2006/intr_filter/powerpc/powerpc/intr_machdep.c#25 edit Differences ... ==== //depot/projects/soc2006/intr_filter/powerpc/powerpc/intr_machdep.c#25 (text+ko) ==== @@ -97,6 +97,8 @@ static void (*irq_enable)(uintptr_t); static void intr_eoi_src(void *arg); +extern struct callout stray_callout_handle; +void intr_callout_reset(void); static void intrcnt_setname(const char *name, int index) @@ -134,7 +136,7 @@ } int -inthand_add(const char *name, u_int irq, void (*handler)(void *), void *arg, +inthand_add(const char *name, u_int irq, int (*filter)(void *), void (*handler)(void *), void *arg, int flags, void **cookiep) { struct ppc_intr *i, *orphan; @@ -155,7 +157,7 @@ return (ENOMEM); error = intr_event_create(&i->event, (void *)irq, 0, (void (*)(void *))irq_enable, NULL, intr_eoi_src, - intr_disab_eoi_src, "irq%d:", irq); + NULL, "irq%d:", irq); if (error) { free(i, M_INTR); return (error); @@ -180,7 +182,7 @@ } } - error = intr_event_add_handler(i->event, name, handler, arg, + error = intr_event_add_handler(i->event, name, filter, handler, arg, intr_priority(flags), flags, cookiep); if (!error) intrcnt_setname(i->event->ie_fullname, i->cntidx); @@ -194,7 +196,8 @@ return (intr_event_remove_handler(cookie)); } -__unused void +#if 0 +void intr_handle_old(u_int irq) { struct ppc_intr *i; @@ -249,9 +252,10 @@ } } } +#endif static void -stray_int(uint irq) +stray_int(u_int irq) { atomic_add_long(&intrcnt[0], 1); @@ -273,6 +277,33 @@ irq_enable(nb); } +static struct intr_event * +walk_intr_ppc(void) +{ + struct ppc_intr *intr; + static int i = 0; + int j; + + for (; i < ppc_nintrs; ) { + j = i++; + intr = ppc_intrs[j]; + if (intr != NULL && intr->event != NULL) + return (intr->event); + } + i = 0; + return (NULL); +} + +void +intr_callout_reset(void) +{ + + mtx_lock_spin(&ppc_intrs_lock); + callout_reset(&stray_callout_handle, hz, &stray_detection, + &walk_intr_ppc); + mtx_unlock_spin(&ppc_intrs_lock); +} + void intr_handle(u_int irq) { From owner-p4-projects@FreeBSD.ORG Fri Jan 12 04:05:24 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1225716A415; Fri, 12 Jan 2007 04:05:24 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id C760D16A412 for ; Fri, 12 Jan 2007 04:05:23 +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 B642313C458 for ; Fri, 12 Jan 2007 04:05:23 +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 l0C45NAL080186 for ; Fri, 12 Jan 2007 04:05:23 GMT (envelope-from piso@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0C45LLO080182 for perforce@freebsd.org; Fri, 12 Jan 2007 04:05:21 GMT (envelope-from piso@freebsd.org) Date: Fri, 12 Jan 2007 04:05:21 GMT Message-Id: <200701120405.l0C45LLO080182@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 112805 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 12 Jan 2007 04:05:24 -0000 http://perforce.freebsd.org/chv.cgi?CH=112805 Change 112805 by piso@piso_longino on 2007/01/12 04:04:39 IFC@112802 Affected files ... .. //depot/projects/soc2006/intr_filter/amd64/amd64/identcpu.c#3 integrate .. //depot/projects/soc2006/intr_filter/amd64/amd64/mp_machdep.c#4 integrate .. //depot/projects/soc2006/intr_filter/amd64/amd64/nexus.c#5 integrate .. //depot/projects/soc2006/intr_filter/amd64/include/specialreg.h#3 integrate .. //depot/projects/soc2006/intr_filter/amd64/linux32/linux32_machdep.c#6 integrate .. //depot/projects/soc2006/intr_filter/arm/at91/at91_mci.c#2 integrate .. //depot/projects/soc2006/intr_filter/arm/at91/at91_pmc.c#4 integrate .. //depot/projects/soc2006/intr_filter/arm/at91/at91_st.c#8 integrate .. //depot/projects/soc2006/intr_filter/arm/at91/files.at91#4 integrate .. //depot/projects/soc2006/intr_filter/arm/at91/if_ate.c#7 integrate .. //depot/projects/soc2006/intr_filter/arm/conf/BWCT#1 branch .. //depot/projects/soc2006/intr_filter/arm/conf/BWCT.hints#1 branch .. //depot/projects/soc2006/intr_filter/arm/include/atomic.h#3 integrate .. //depot/projects/soc2006/intr_filter/boot/common/pnp.c#2 integrate .. //depot/projects/soc2006/intr_filter/boot/common/pnpdata#2 delete .. //depot/projects/soc2006/intr_filter/bsm/audit.h#3 integrate .. //depot/projects/soc2006/intr_filter/bsm/audit_internal.h#3 integrate .. //depot/projects/soc2006/intr_filter/bsm/audit_kevents.h#4 integrate .. //depot/projects/soc2006/intr_filter/bsm/audit_record.h#4 integrate .. //depot/projects/soc2006/intr_filter/compat/linux/linux_emul.c#6 integrate .. //depot/projects/soc2006/intr_filter/compat/linux/linux_emul.h#4 integrate .. //depot/projects/soc2006/intr_filter/compat/linux/linux_mib.c#3 integrate .. //depot/projects/soc2006/intr_filter/compat/linux/linux_misc.c#10 integrate .. //depot/projects/soc2006/intr_filter/compat/linux/linux_signal.c#5 integrate .. //depot/projects/soc2006/intr_filter/conf/NOTES#13 integrate .. //depot/projects/soc2006/intr_filter/conf/files#12 integrate .. //depot/projects/soc2006/intr_filter/conf/options#11 integrate .. //depot/projects/soc2006/intr_filter/conf/options.arm#6 integrate .. //depot/projects/soc2006/intr_filter/dev/acpica/acpi.c#5 integrate .. //depot/projects/soc2006/intr_filter/dev/acpica/acpi_cpu.c#2 integrate .. //depot/projects/soc2006/intr_filter/dev/acpica/acpi_package.c#2 integrate .. //depot/projects/soc2006/intr_filter/dev/acpica/acpi_perf.c#3 integrate .. //depot/projects/soc2006/intr_filter/dev/acpica/acpi_throttle.c#2 integrate .. //depot/projects/soc2006/intr_filter/dev/acpica/acpivar.h#4 integrate .. //depot/projects/soc2006/intr_filter/dev/ata/ata-chipset.c#10 integrate .. //depot/projects/soc2006/intr_filter/dev/ata/ata-pci.h#8 integrate .. //depot/projects/soc2006/intr_filter/dev/bce/if_bce.c#9 integrate .. //depot/projects/soc2006/intr_filter/dev/bce/if_bcereg.h#4 integrate .. //depot/projects/soc2006/intr_filter/dev/bge/if_bgereg.h#9 integrate .. //depot/projects/soc2006/intr_filter/dev/fb/boot_font.c#2 integrate .. //depot/projects/soc2006/intr_filter/dev/fb/creatorreg.h#1 branch .. //depot/projects/soc2006/intr_filter/dev/fb/gallant12x22.c#1 branch .. //depot/projects/soc2006/intr_filter/dev/fb/gfb.c#2 delete .. //depot/projects/soc2006/intr_filter/dev/fb/gfb.h#2 integrate .. //depot/projects/soc2006/intr_filter/dev/gfb/gfb_pci.c#2 delete .. //depot/projects/soc2006/intr_filter/dev/gfb/gfb_pci.h#2 delete .. //depot/projects/soc2006/intr_filter/dev/hptmv/entry.c#3 integrate .. //depot/projects/soc2006/intr_filter/dev/ichsmb/ichsmb.c#3 integrate .. //depot/projects/soc2006/intr_filter/dev/ichsmb/ichsmb_pci.c#3 integrate .. //depot/projects/soc2006/intr_filter/dev/idt/idtreg.h#2 integrate .. //depot/projects/soc2006/intr_filter/dev/isp/isp.c#11 integrate .. //depot/projects/soc2006/intr_filter/dev/isp/isp_freebsd.h#6 integrate .. //depot/projects/soc2006/intr_filter/dev/isp/isp_pci.c#12 integrate .. //depot/projects/soc2006/intr_filter/dev/mfi/mfi.c#11 integrate .. //depot/projects/soc2006/intr_filter/dev/mii/miidevs#5 integrate .. //depot/projects/soc2006/intr_filter/dev/mii/rlswitch.c#1 branch .. //depot/projects/soc2006/intr_filter/dev/mpt/mpt.c#7 integrate .. //depot/projects/soc2006/intr_filter/dev/mpt/mpt.h#7 integrate .. //depot/projects/soc2006/intr_filter/dev/mpt/mpt_cam.c#10 integrate .. //depot/projects/soc2006/intr_filter/dev/mpt/mpt_pci.c#9 integrate .. //depot/projects/soc2006/intr_filter/dev/msk/if_msk.c#4 integrate .. //depot/projects/soc2006/intr_filter/dev/re/if_re.c#13 integrate .. //depot/projects/soc2006/intr_filter/dev/sound/pci/emu10kx-pcm.c#3 integrate .. //depot/projects/soc2006/intr_filter/dev/sound/pci/emu10kx.c#4 integrate .. //depot/projects/soc2006/intr_filter/dev/sound/pci/emu10kx.h#3 integrate .. //depot/projects/soc2006/intr_filter/dev/sound/pci/hda/hdac.c#6 integrate .. //depot/projects/soc2006/intr_filter/dev/sound/pcm/feeder.c#3 integrate .. //depot/projects/soc2006/intr_filter/dev/sound/usb/uaudio.c#4 integrate .. //depot/projects/soc2006/intr_filter/dev/syscons/scvesactl.c#2 integrate .. //depot/projects/soc2006/intr_filter/dev/usb/if_aue.c#7 integrate .. //depot/projects/soc2006/intr_filter/dev/usb/if_auereg.h#5 integrate .. //depot/projects/soc2006/intr_filter/dev/usb/usb_ethersubr.c#4 integrate .. //depot/projects/soc2006/intr_filter/dev/usb/usb_ethersubr.h#3 integrate .. //depot/projects/soc2006/intr_filter/fs/msdosfs/bpb.h#3 integrate .. //depot/projects/soc2006/intr_filter/fs/msdosfs/msdosfs_vfsops.c#6 integrate .. //depot/projects/soc2006/intr_filter/fs/udf/udf_vfsops.c#6 integrate .. //depot/projects/soc2006/intr_filter/fs/unionfs/union_subr.c#3 integrate .. //depot/projects/soc2006/intr_filter/fs/unionfs/union_vnops.c#4 integrate .. //depot/projects/soc2006/intr_filter/i386/i386/identcpu.c#5 integrate .. //depot/projects/soc2006/intr_filter/i386/i386/mp_machdep.c#4 integrate .. //depot/projects/soc2006/intr_filter/i386/i386/nexus.c#5 integrate .. //depot/projects/soc2006/intr_filter/i386/include/specialreg.h#4 integrate .. //depot/projects/soc2006/intr_filter/i386/linux/linux_machdep.c#5 integrate .. //depot/projects/soc2006/intr_filter/kern/kern_acct.c#4 integrate .. //depot/projects/soc2006/intr_filter/kern/kern_descrip.c#7 integrate .. //depot/projects/soc2006/intr_filter/kern/kern_prot.c#5 integrate .. //depot/projects/soc2006/intr_filter/kern/sched_ule.c#8 integrate .. //depot/projects/soc2006/intr_filter/kern/subr_turnstile.c#4 integrate .. //depot/projects/soc2006/intr_filter/kern/tty_pts.c#4 integrate .. //depot/projects/soc2006/intr_filter/kern/uipc_socket.c#10 integrate .. //depot/projects/soc2006/intr_filter/kern/uipc_usrreq.c#8 integrate .. //depot/projects/soc2006/intr_filter/modules/sound/driver/emu10kx/Makefile#2 integrate .. //depot/projects/soc2006/intr_filter/net80211/ieee80211.c#5 integrate .. //depot/projects/soc2006/intr_filter/net80211/ieee80211_freebsd.c#4 integrate .. //depot/projects/soc2006/intr_filter/net80211/ieee80211_freebsd.h#3 integrate .. //depot/projects/soc2006/intr_filter/net80211/ieee80211_input.c#7 integrate .. //depot/projects/soc2006/intr_filter/net80211/ieee80211_node.c#3 integrate .. //depot/projects/soc2006/intr_filter/net80211/ieee80211_proto.c#4 integrate .. //depot/projects/soc2006/intr_filter/net80211/ieee80211_proto.h#3 integrate .. //depot/projects/soc2006/intr_filter/net80211/ieee80211_var.h#5 integrate .. //depot/projects/soc2006/intr_filter/netatalk/COPYRIGHT#2 integrate .. //depot/projects/soc2006/intr_filter/netatalk/aarp.c#3 integrate .. //depot/projects/soc2006/intr_filter/netatalk/ddp_input.c#3 integrate .. //depot/projects/soc2006/intr_filter/netatalk/ddp_pcb.c#4 integrate .. //depot/projects/soc2006/intr_filter/netatalk/ddp_pcb.h#2 integrate .. //depot/projects/soc2006/intr_filter/netatalk/ddp_usrreq.c#3 integrate .. //depot/projects/soc2006/intr_filter/netgraph/ng_deflate.c#2 integrate .. //depot/projects/soc2006/intr_filter/netinet/ip_fw2.c#11 integrate .. //depot/projects/soc2006/intr_filter/netinet/udp_usrreq.c#6 integrate .. //depot/projects/soc2006/intr_filter/netipx/ipx.c#2 integrate .. //depot/projects/soc2006/intr_filter/netipx/ipx.h#2 integrate .. //depot/projects/soc2006/intr_filter/netipx/ipx_cksum.c#2 integrate .. //depot/projects/soc2006/intr_filter/netipx/ipx_if.h#2 integrate .. //depot/projects/soc2006/intr_filter/netipx/ipx_input.c#2 integrate .. //depot/projects/soc2006/intr_filter/netipx/ipx_ip.c#2 integrate .. //depot/projects/soc2006/intr_filter/netipx/ipx_ip.h#2 integrate .. //depot/projects/soc2006/intr_filter/netipx/ipx_outputfl.c#2 integrate .. //depot/projects/soc2006/intr_filter/netipx/ipx_pcb.c#3 integrate .. //depot/projects/soc2006/intr_filter/netipx/ipx_pcb.h#2 integrate .. //depot/projects/soc2006/intr_filter/netipx/ipx_proto.c#2 integrate .. //depot/projects/soc2006/intr_filter/netipx/ipx_usrreq.c#4 integrate .. //depot/projects/soc2006/intr_filter/netipx/ipx_var.h#2 integrate .. //depot/projects/soc2006/intr_filter/netipx/spx.h#2 integrate .. //depot/projects/soc2006/intr_filter/netipx/spx_debug.c#2 integrate .. //depot/projects/soc2006/intr_filter/netipx/spx_debug.h#2 integrate .. //depot/projects/soc2006/intr_filter/netipx/spx_timer.h#2 integrate .. //depot/projects/soc2006/intr_filter/netipx/spx_usrreq.c#3 integrate .. //depot/projects/soc2006/intr_filter/netipx/spx_var.h#2 integrate .. //depot/projects/soc2006/intr_filter/netnatm/natm.c#3 integrate .. //depot/projects/soc2006/intr_filter/netnatm/natm.h#2 integrate .. //depot/projects/soc2006/intr_filter/netnatm/natm_pcb.c#2 integrate .. //depot/projects/soc2006/intr_filter/netnatm/natm_proto.c#2 integrate .. //depot/projects/soc2006/intr_filter/pc98/pc98/machdep.c#7 integrate .. //depot/projects/soc2006/intr_filter/pci/agp_intel.c#2 integrate .. //depot/projects/soc2006/intr_filter/pci/agpreg.h#2 integrate .. //depot/projects/soc2006/intr_filter/pci/alpm.c#3 integrate .. //depot/projects/soc2006/intr_filter/pci/amdpm.c#3 integrate .. //depot/projects/soc2006/intr_filter/pci/amdsmb.c#3 integrate .. //depot/projects/soc2006/intr_filter/pci/intpm.c#5 integrate .. //depot/projects/soc2006/intr_filter/pci/intpmreg.h#3 integrate .. //depot/projects/soc2006/intr_filter/pci/nfsmb.c#5 integrate .. //depot/projects/soc2006/intr_filter/pci/viapm.c#3 integrate .. //depot/projects/soc2006/intr_filter/powerpc/conf/NOTES#4 integrate .. //depot/projects/soc2006/intr_filter/security/audit/audit_arg.c#6 integrate .. //depot/projects/soc2006/intr_filter/sparc64/include/ofw_nexus.h#1 branch .. //depot/projects/soc2006/intr_filter/sparc64/pci/ofw_pcibus.c#3 integrate .. //depot/projects/soc2006/intr_filter/sparc64/pci/psycho.c#8 integrate .. //depot/projects/soc2006/intr_filter/sparc64/pci/psychoreg.h#2 integrate .. //depot/projects/soc2006/intr_filter/sys/copyright.h#4 integrate .. //depot/projects/soc2006/intr_filter/sys/file.h#2 integrate .. //depot/projects/soc2006/intr_filter/sys/priority.h#2 integrate .. //depot/projects/soc2006/intr_filter/sys/rtprio.h#5 integrate .. //depot/projects/soc2006/intr_filter/sys/unpcb.h#3 integrate .. //depot/projects/soc2006/intr_filter/ufs/ufs/ufs_acl.c#2 integrate .. //depot/projects/soc2006/intr_filter/vm/swap_pager.c#5 integrate .. //depot/projects/soc2006/intr_filter/vm/uma.h#2 integrate .. //depot/projects/soc2006/intr_filter/vm/uma_core.c#4 integrate .. //depot/projects/soc2006/intr_filter/vm/vm_kern.c#4 integrate Differences ... ==== //depot/projects/soc2006/intr_filter/amd64/amd64/identcpu.c#3 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/identcpu.c,v 1.148 2006/08/01 01:23:39 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/identcpu.c,v 1.149 2007/01/09 19:23:21 jkim Exp $"); #include "opt_cpu.h" @@ -228,8 +228,8 @@ "\007" "\010EST" /* Enhanced SpeedStep */ "\011TM2" /* Thermal Monitor 2 */ - "\012" - "\013CNTX-ID" /* L1 context ID available */ + "\012SSSE3" /* SSSE3 */ + "\013CNXT-ID" /* L1 context ID available */ "\014" "\015" "\016CX16" /* CMPXCHG16B Instruction */ ==== //depot/projects/soc2006/intr_filter/amd64/amd64/mp_machdep.c#4 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/mp_machdep.c,v 1.278 2006/10/10 23:23:11 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/mp_machdep.c,v 1.279 2007/01/11 00:17:02 jeff Exp $"); #include "opt_cpu.h" #include "opt_kstack_pages.h" @@ -948,11 +948,10 @@ ipi_bitmap = atomic_readandclear_int(&cpu_ipi_pending[cpu]); -#ifdef IPI_PREEMPTION - if (ipi_bitmap & IPI_PREEMPT) { + if (ipi_bitmap & (1 << IPI_PREEMPT)) { mtx_lock_spin(&sched_lock); /* Don't preempt the idle thread */ - if (curthread->td_priority < PRI_MIN_IDLE) { + if (curthread != PCPU_GET(idlethread)) { struct thread *running_thread = curthread; if (running_thread->td_critnest > 1) running_thread->td_owepreempt = 1; @@ -961,7 +960,6 @@ } mtx_unlock_spin(&sched_lock); } -#endif /* Nothing to do for AST */ } ==== //depot/projects/soc2006/intr_filter/amd64/amd64/nexus.c#5 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/nexus.c,v 1.70 2006/11/13 22:23:32 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/nexus.c,v 1.71 2007/01/11 19:40:19 jhb Exp $"); /* * This code implements a `root nexus' for Intel Architecture @@ -372,24 +372,9 @@ * If this is a memory resource, map it into the kernel. */ if (rman_get_bustag(r) == AMD64_BUS_SPACE_MEM) { - caddr_t vaddr = 0; + void *vaddr; - if (rman_get_end(r) < 1024 * 1024) { - /* - * The first 1Mb is mapped at KERNBASE. - */ - vaddr = (caddr_t)(uintptr_t)(KERNBASE + rman_get_start(r)); - } else { - u_int64_t paddr; - u_int64_t psize; - u_int32_t poffs; - - paddr = rman_get_start(r); - psize = rman_get_size(r); - - poffs = paddr - trunc_page(paddr); - vaddr = (caddr_t) pmap_mapdev(paddr-poffs, psize+poffs) + poffs; - } + vaddr = pmap_mapdev(rman_get_start(r), rman_get_size(r)); rman_set_virtual(r, vaddr); rman_set_bushandle(r, (bus_space_handle_t) vaddr); } @@ -403,12 +388,9 @@ /* * If this is a memory resource, unmap it. */ - if ((rman_get_bustag(r) == AMD64_BUS_SPACE_MEM) && - (rman_get_end(r) >= 1024 * 1024)) { - u_int32_t psize; - - psize = rman_get_size(r); - pmap_unmapdev((vm_offset_t)rman_get_virtual(r), psize); + if (rman_get_bustag(r) == AMD64_BUS_SPACE_MEM) { + pmap_unmapdev((vm_offset_t)rman_get_virtual(r), + rman_get_size(r)); } return (rman_deactivate_resource(r)); ==== //depot/projects/soc2006/intr_filter/amd64/include/specialreg.h#3 (text+ko) ==== @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * from: @(#)specialreg.h 7.1 (Berkeley) 5/9/91 - * $FreeBSD: src/sys/amd64/include/specialreg.h,v 1.35 2006/07/13 16:09:40 jkim Exp $ + * $FreeBSD: src/sys/amd64/include/specialreg.h,v 1.36 2007/01/09 19:23:21 jkim Exp $ */ #ifndef _MACHINE_SPECIALREG_H_ @@ -118,7 +118,8 @@ #define CPUID2_VMX 0x00000020 #define CPUID2_EST 0x00000080 #define CPUID2_TM2 0x00000100 -#define CPUID2_CNTXID 0x00000400 +#define CPUID2_SSSE3 0x00000200 +#define CPUID2_CNXTID 0x00000400 #define CPUID2_CX16 0x00002000 #define CPUID2_XTPR 0x00004000 ==== //depot/projects/soc2006/intr_filter/amd64/linux32/linux32_machdep.c#6 (text+ko) ==== @@ -29,11 +29,13 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_machdep.c,v 1.23 2006/12/20 20:17:34 jkim Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_machdep.c,v 1.25 2007/01/07 19:00:38 netchild Exp $"); #include #include #include +#include +#include #include #include #include @@ -562,7 +564,7 @@ /* create the emuldata */ error = linux_proc_init(td, p2->p_pid, args->flags); /* reference it - no need to check this */ - em = em_find(p2, EMUL_UNLOCKED); + em = em_find(p2, EMUL_DOLOCK); KASSERT(em != NULL, ("clone: emuldata not found.\n")); /* and adjust it */ if (args->flags & CLONE_PARENT_SETTID) { @@ -728,9 +730,20 @@ off_t pos; } */ bsd_args; int error; + struct file *fp; error = 0; bsd_args.flags = 0; + fp = NULL; + + /* + * Linux mmap(2): + * You must specify exactly one of MAP_SHARED and MAP_PRIVATE + */ + if (! ((linux_args->flags & LINUX_MAP_SHARED) ^ + (linux_args->flags & LINUX_MAP_PRIVATE))) + return (EINVAL); + if (linux_args->flags & LINUX_MAP_SHARED) bsd_args.flags |= MAP_SHARED; if (linux_args->flags & LINUX_MAP_PRIVATE) @@ -813,17 +826,44 @@ bsd_args.addr = (caddr_t)PTRIN(linux_args->addr); bsd_args.len = linux_args->len; } + /* - * XXX i386 Linux always emulator forces PROT_READ on (why?) - * so we do the same. We add PROT_EXEC to work around buggy - * applications (e.g. Java) that take advantage of the fact - * that execute permissions are not enforced by x86 CPUs. + * We add PROT_EXEC to work around buggy applications (e.g. Java) + * that take advantage of the fact that execute permissions are not + * enforced by x86 CPUs. */ - bsd_args.prot = linux_args->prot | PROT_EXEC | PROT_READ; + bsd_args.prot = linux_args->prot | PROT_EXEC; if (linux_args->flags & LINUX_MAP_ANON) bsd_args.fd = -1; - else + else { + /* + * Linux follows Solaris mmap(2) description: + * The file descriptor fildes is opened with + * read permission, regardless of the + * protection options specified. + * If PROT_WRITE is specified, the application + * must have opened the file descriptor + * fildes with write permission unless + * MAP_PRIVATE is specified in the flag + * argument as described below. + */ + + if ((error = fget(td, linux_args->fd, &fp)) != 0) + return (error); + if (fp->f_type != DTYPE_VNODE) { + fdrop(fp, td); + return (EINVAL); + } + + /* Linux mmap() just fails for O_WRONLY files */ + if (! (fp->f_flag & FREAD)) { + fdrop(fp, td); + return (EACCES); + } + bsd_args.fd = linux_args->fd; + fdrop(fp, td); + } bsd_args.pos = (off_t)linux_args->pgoff * PAGE_SIZE; bsd_args.pad = 0; ==== //depot/projects/soc2006/intr_filter/arm/at91/at91_mci.c#2 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/at91/at91_mci.c,v 1.1 2006/10/20 06:44:04 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/at91/at91_mci.c,v 1.2 2007/01/05 01:18:32 ticso Exp $"); #include #include @@ -403,12 +403,14 @@ } // printf("CMDR %x ARGR %x with data\n", cmdr, cmd->arg); WR4(sc, MCI_ARGR, cmd->arg); - WR4(sc, MCI_CMDR, cmdr); if (cmdr & MCI_CMDR_TRCMD_START) { - if (cmdr & MCI_CMDR_TRDIR) + if (cmdr & MCI_CMDR_TRDIR) { WR4(sc, PDC_PTCR, PDC_PTCR_RXTEN); - else + WR4(sc, MCI_CMDR, cmdr); + } else { + WR4(sc, MCI_CMDR, cmdr); WR4(sc, PDC_PTCR, PDC_PTCR_TXTEN); + } } WR4(sc, MCI_IER, MCI_SR_ERROR | ier); } ==== //depot/projects/soc2006/intr_filter/arm/at91/at91_pmc.c#4 (text) ==== @@ -25,7 +25,7 @@ #include "opt_at91.h" #include -__FBSDID("$FreeBSD: src/sys/arm/at91/at91_pmc.c,v 1.3 2006/07/14 22:01:51 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/at91/at91_pmc.c,v 1.4 2007/01/05 01:14:14 ticso Exp $"); #include #include @@ -399,7 +399,7 @@ pmc_softc->dev = dev; if ((err = at91_pmc_activate(dev)) != 0) return err; -#ifdef AT91_TSC +#if defined(AT91_TSC) | defined (AT91_BWCT) at91_pmc_init_clock(pmc_softc, 16000000); #else at91_pmc_init_clock(pmc_softc, 10000000); ==== //depot/projects/soc2006/intr_filter/arm/at91/at91_st.c#8 (text) ==== @@ -23,7 +23,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/at91/at91_st.c,v 1.6 2006/12/15 21:44:48 n_hibma Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/at91/at91_st.c,v 1.7 2007/01/05 02:52:06 ticso Exp $"); #include #include @@ -208,11 +208,14 @@ void *ih; device_t dev = timer_softc->sc_dev; + rel_value = 32768 / hz; + if (rel_value < 1) + rel_value = 1; if (32768 % hz) { - printf("Cannot get %d Hz clock; using 128Hz\n", hz); - hz = 128; + printf("Cannot get %d Hz clock; using %dHz\n", hz, 32768 / rel_value); + hz = 32768 / rel_value; + tick = 1000000 / hz; } - rel_value = 32768 / hz; /* Disable all interrupts. */ WR4(ST_IDR, 0xffffffff); /* The system timer shares the system irq (1) */ ==== //depot/projects/soc2006/intr_filter/arm/at91/files.at91#4 (text) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/arm/at91/files.at91,v 1.6 2006/07/14 22:41:54 imp Exp $ +# $FreeBSD: src/sys/arm/at91/files.at91,v 1.7 2007/01/05 02:06:53 ticso Exp $ arm/arm/cpufunc_asm_arm9.S standard arm/arm/irq_dispatch.S standard arm/at91/at91.c standard @@ -6,7 +6,7 @@ arm/at91/at91_mci.c optional at91_mci arm/at91/at91_pio.c standard arm/at91/at91_pmc.c standard -arm/at91/at91_rtc.c standard +arm/at91/at91_rtc.c optional at91_rtc arm/at91/at91_ssc.c optional at91_ssc arm/at91/at91_spi.c optional at91_spi \ dependency "spibus_if.h" ==== //depot/projects/soc2006/intr_filter/arm/at91/if_ate.c#7 (text) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/at91/if_ate.c,v 1.13 2007/01/01 00:48:25 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/at91/if_ate.c,v 1.15 2007/01/05 01:07:59 ticso Exp $"); #include #include @@ -72,7 +72,7 @@ #include "miibus_if.h" -#define ATE_MAX_TX_BUFFERS 64 /* We have ping-pong tx buffers */ +#define ATE_MAX_TX_BUFFERS 2 /* We have ping-pong tx buffers */ #define ATE_MAX_RX_BUFFERS 64 struct ate_softc @@ -205,6 +205,8 @@ if_initname(ifp, device_get_name(dev), device_get_unit(dev)); ifp->if_mtu = ETHERMTU; ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST; + ifp->if_capabilities |= IFCAP_VLAN_MTU; + ifp->if_capenable |= IFCAP_VLAN_MTU; /* the hw bits already set */ ifp->if_start = atestart; ifp->if_ioctl = ateioctl; ifp->if_init = ateinit; @@ -752,6 +754,9 @@ */ ate_setmcast(sc); + /* enable big packets */ + WR4(sc, ETH_CFG, RD4(sc, ETH_CFG) | ETH_CFG_BIG); + /* * Set 'running' flag, and clear output active flag * and attempt to start the output @@ -914,7 +919,7 @@ struct ate_softc *sc = ifp->if_softc; struct mii_data *mii; struct ifreq *ifr = (struct ifreq *)data; - int error = 0; + int mask, error = 0; switch (cmd) { case SIOCSIFFLAGS: @@ -944,6 +949,19 @@ mii = device_get_softc(sc->miibus); error = ifmedia_ioctl(ifp, ifr, &mii->mii_media, cmd); break; + case SIOCSIFCAP: + mask = ifp->if_capenable ^ ifr->ifr_reqcap; + if (mask & IFCAP_VLAN_MTU) { + ATE_LOCK(sc); + if (ifr->ifr_reqcap & IFCAP_VLAN_MTU) { + WR4(sc, ETH_CFG, RD4(sc, ETH_CFG) | ETH_CFG_BIG); + ifp->if_capenable |= IFCAP_VLAN_MTU; + } else { + WR4(sc, ETH_CFG, RD4(sc, ETH_CFG) & ~ETH_CFG_BIG); + ifp->if_capenable &= ~IFCAP_VLAN_MTU; + } + ATE_UNLOCK(sc); + } default: error = ether_ioctl(ifp, cmd, data); break; ==== //depot/projects/soc2006/intr_filter/arm/include/atomic.h#3 (text+ko) ==== @@ -33,7 +33,7 @@ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/arm/include/atomic.h,v 1.20 2006/11/07 11:53:44 cognet Exp $ + * $FreeBSD: src/sys/arm/include/atomic.h,v 1.21 2007/01/05 02:50:27 ticso Exp $ */ #ifndef _MACHINE_ATOMIC_H_ @@ -308,46 +308,76 @@ #endif /* _LOCORE */ +#define atomic_add_long(p, v) \ + atomic_add_32((volatile u_int *)(p), (u_int)(v)) +#define atomic_add_acq_long atomic_add_long +#define atomic_add_rel_long atomic_add_long +#define atomic_subtract_long(p, v) \ + atomic_subtract_32((volatile u_int *)(p), (u_int)(v)) +#define atomic_subtract_acq_long atomic_subtract_long +#define atomic_subtract_rel_long atomic_subtract_long +#define atomic_clear_long(p, v) \ + atomic_clear_32((volatile u_int *)(p), (u_int)(v)) +#define atomic_clear_acq_long atomic_clear_long +#define atomic_clear_rel_long atomic_clear_long +#define atomic_set_long(p, v) \ + atomic_set_32((volatile u_int *)(p), (u_int)(v)) +#define atomic_set_acq_long atomic_set_long +#define atomic_set_rel_long atomic_set_long +#define atomic_cmpset_long(dst, old, new) \ + atomic_cmpset_32((volatile u_int *)(dst), (u_int)(old), (u_int)(new)) +#define atomic_cmpset_acq_long atomic_cmpset_long +#define atomic_cmpset_rel_long atomic_cmpset_long +#define atomic_fetchadd_long(p, v) \ + atomic_fetchadd_32((volatile u_int *)(p), (u_int)(v)) +#define atomic_readandclear_long(p) \ + atomic_readandclear_long((volatile u_int *)(p)) +#define atomic_load_long(p) \ + atomic_load_32((volatile u_int *)(p)) +#define atomic_load_acq_long atomic_load_long +#define atomic_store_rel_long(p, v) \ + atomic_store_rel_32((volatile u_int *)(p), (u_int)(v)) -static __inline int -atomic_cmpset_long(volatile u_long *dst, u_long exp, u_long src) -{ - return (atomic_cmpset_32((volatile u_int *)dst, (u_int)exp, - (u_int)src)); -} + +#define atomic_clear_ptr atomic_clear_32 +#define atomic_set_ptr atomic_set_32 +#define atomic_cmpset_ptr atomic_cmpset_32 +#define atomic_cmpset_rel_ptr atomic_cmpset_ptr +#define atomic_cmpset_acq_ptr atomic_cmpset_ptr +#define atomic_store_ptr atomic_store_32 +#define atomic_store_rel_ptr atomic_store_ptr -#define atomic_set_rel_int atomic_set_32 -#define atomic_set_acq_long atomic_set_32 +#define atomic_add_int atomic_add_32 +#define atomic_add_acq_int atomic_add_int +#define atomic_add_rel_int atomic_add_int +#define atomic_subtract_int atomic_subtract_32 +#define atomic_subtract_acq_int atomic_subtract_int +#define atomic_subtract_rel_int atomic_subtract_int +#define atomic_clear_int atomic_clear_32 +#define atomic_clear_acq_int atomic_clear_int +#define atomic_clear_rel_int atomic_clear_int #define atomic_set_int atomic_set_32 +#define atomic_set_acq_int atomic_set_int +#define atomic_set_rel_int atomic_set_int +#define atomic_cmpset_int atomic_cmpset_32 +#define atomic_cmpset_acq_int atomic_cmpset_int +#define atomic_cmpset_rel_int atomic_cmpset_int +#define atomic_fetchadd_int atomic_fetchadd_32 #define atomic_readandclear_int atomic_readandclear_32 -#define atomic_clear_int atomic_clear_32 -#define atomic_clear_acq_long atomic_clear_32 -#define atomic_subtract_int atomic_subtract_32 -#define atomic_subtract_rel_int atomic_subtract_32 +#define atomic_load_acq_int atomic_load_32 +#define atomic_store_rel_int atomic_store_32 + +#define atomic_add_acq_32 atomic_add_32 +#define atomic_add_rel_32 atomic_add_32 +#define atomic_subtract_acq_32 atomic_subtract_32 #define atomic_subtract_rel_32 atomic_subtract_32 -#define atomic_subtract_acq_int atomic_subtract_32 -#define atomic_add_int atomic_add_32 -#define atomic_add_acq_long atomic_add_32 -#define atomic_add_rel_int atomic_add_32 -#define atomic_add_rel_32 atomic_add_32 -#define atomic_add_acq_int atomic_add_32 -#define atomic_cmpset_int atomic_cmpset_32 -#define atomic_cmpset_rel_int atomic_cmpset_32 -#define atomic_cmpset_rel_ptr atomic_cmpset_ptr -#define atomic_cmpset_acq_int atomic_cmpset_32 -#define atomic_cmpset_acq_ptr atomic_cmpset_ptr -#define atomic_cmpset_acq_long atomic_cmpset_long +#define atomic_clear_acq_32 atomic_clear_32 +#define atomic_clear_rel_32 atomic_clear_32 +#define atomic_set_acq_32 atomic_set_32 +#define atomic_set_rel_32 atomic_set_32 #define atomic_cmpset_acq_32 atomic_cmpset_32 -#define atomic_store_rel_ptr atomic_store_ptr -#define atomic_store_rel_int atomic_store_32 #define atomic_cmpset_rel_32 atomic_cmpset_32 -#define atomic_cmpset_rel_ptr atomic_cmpset_ptr -#define atomic_load_acq_int atomic_load_32 #define atomic_load_acq_32 atomic_load_32 -#define atomic_clear_ptr atomic_clear_32 -#define atomic_store_ptr atomic_store_32 -#define atomic_cmpset_ptr atomic_cmpset_32 -#define atomic_set_ptr atomic_set_32 -#define atomic_fetchadd_int atomic_fetchadd_32 +#define atomic_store_rel_32 atomic_store_32 #endif /* _MACHINE_ATOMIC_H_ */ ==== //depot/projects/soc2006/intr_filter/boot/common/pnp.c#2 (text+ko) ==== @@ -4,7 +4,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/boot/common/pnp.c,v 1.16 2003/08/25 23:30:41 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/common/pnp.c,v 1.17 2007/01/07 22:25:45 marius Exp $"); /* * "Plug and Play" functionality. @@ -82,52 +82,6 @@ return(CMD_OK); } -#if 0 -/* - * Try to load outstanding modules (eg. after disk change) - */ -COMMAND_SET(pnpload, "pnpload", "load modules for PnP devices", pnp_load); - -static int -pnp_load(int argc, char *argv[]) -{ - struct pnpinfo *pi; - char *modfname; - - /* find anything? */ - if (STAILQ_FIRST(&pnp_devices) != NULL) { - - /* check for kernel, assign modules handled by static drivers there */ - if (pnp_scankernel()) { - command_errmsg = "cannot load drivers until kernel loaded"; - return(CMD_ERROR); - } - if (fname == NULL) { - /* default paths */ - pnp_readconf("/boot/pnpdata.local"); - pnp_readconf("/boot/pnpdata"); - } else { - if (pnp_readconf(fname)) { - sprintf(command_errbuf, "can't read PnP information from '%s'", fname); - return(CMD_ERROR); - } - } - - /* try to load any modules that have been nominated */ - STAILQ_FOREACH(pi, &pnp_devices, pi_link) { - /* Already loaded? */ - if ((pi->pi_module != NULL) && (file_findfile(pi->pi_module, NULL) == NULL)) { - modfname = malloc(strlen(pi->pi_module) + 4); - sprintf(modfname, "%s.ko", pi->pi_module); /* XXX implicit knowledge of KLD module filenames */ - if (mod_load(pi->pi_module, pi->pi_argc, pi->pi_argv)) - printf("Could not load module '%s' for device '%s'\n", modfname, STAILQ_FIRST(&pi->pi_ident)->id_ident); - free(modfname); - } - } - } - return(CMD_OK); -} -#endif /* * Throw away anything we think we know about PnP devices. */ @@ -142,159 +96,7 @@ pnp_freeinfo(pi); } } -#if 0 -/* - * The PnP configuration database consists of a flat text file with - * entries one per line. Valid lines are: - * - * # - * - * This line is a comment, and ignored. - * - * [] - * - * Entries following this line are for devices connected to the - * bus , At least one such entry must be encountered - * before identifiers are recognised. - * - * ident= rev= module= args= - * - * This line describes an identifier:module mapping. The 'ident' - * and 'module' fields are required; the 'rev' field is currently - * ignored (but should be used), and the 'args' field must come - * last. - * - * Comments may be appended to lines; any character including or following - * '#' on a line is ignored. - */ -static int -pnp_readconf(char *path) -{ - struct pnpinfo *pi; - struct pnpident *id; - int fd, line; - char lbuf[128], *currbus, *ident, *revision, *module, *args; - char *cp, *ep, *tp, c; - - /* try to open the file */ - if ((fd = open(path, O_RDONLY)) >= 0) { - line = 0; - currbus = NULL; - - while (fgetstr(lbuf, sizeof(lbuf), fd) > 0) { - line++; - /* Find the first non-space character on the line */ - for (cp = lbuf; (*cp != 0) && !isspace(*cp); cp++) - ; - - /* keep/discard? */ - if ((*cp == 0) || (*cp == '#')) - continue; - - /* cut trailing comment? */ - if ((ep = strchr(cp, '#')) != NULL) - *ep = 0; - - /* bus declaration? */ - if (*cp == '[') { - if (((ep = strchr(cp, ']')) == NULL) || ((ep - cp) < 2)) { - printf("%s line %d: bad bus specification\n", path, line); - } else { - if (currbus != NULL) - free(currbus); - *ep = 0; - currbus = strdup(cp + 1); - } - continue; - } - - /* XXX should we complain? */ - if (currbus == NULL) - continue; - - /* mapping */ - for (ident = module = args = revision = NULL; *cp != 0;) { - - /* discard leading whitespace */ - if (isspace(*cp)) { - cp++; - continue; - } - - /* scan for terminator, separator */ - for (ep = cp; (*ep != 0) && (*ep != '=') && !isspace(*ep); ep++) - ; - - if (*ep == '=') { - *ep = 0; - for (tp = ep + 1; (*tp != 0) && !isspace(*tp); tp++) - ; - c = *tp; - *tp = 0; - if ((ident == NULL) && !strcmp(cp, "ident")) { - ident = ep + 1; - } else if ((revision == NULL) && !strcmp(cp, "revision")) { - revision = ep + 1; - } else if ((args == NULL) && !strcmp(cp, "args")) { - *tp = c; - while (*tp != 0) /* skip to end of string */ - tp++; - args = ep + 1; - } else { - /* XXX complain? */ - } - cp = tp; - continue; - } - - /* it's garbage or a keyword - ignore it for now */ - cp = ep; - } - - /* we must have at least ident and module set to be interesting */ - if ((ident == NULL) || (module == NULL)) - continue; - - /* - * Loop looking for module/bus that might match this, but aren't already - * assigned. - * XXX no revision parse/test here yet. - */ - STAILQ_FOREACH(pi, &pnp_devices, pi_link) { - - /* no driver assigned, bus matches OK */ - if ((pi->pi_module == NULL) && - !strcmp(pi->pi_handler->pp_name, currbus)) { - - /* scan idents, take first match */ - STAILQ_FOREACH(id, &pi->pi_ident, id_link) - if (!strcmp(id->id_ident, ident)) - break; - - /* find a match? */ - if (id != NULL) { - if (args != NULL) - if (parse(&pi->pi_argc, &pi->pi_argv, args)) { - printf("%s line %d: bad arguments\n", path, line); - continue; - } - pi->pi_module = strdup(module); - printf("use module '%s' for %s:%s\n", module, pi->pi_handler->pp_name, id->id_ident); - } - } - } - } - close(fd); - } - return(CMD_OK); -} -static int -pnp_scankernel(void) -{ - return(CMD_OK); -} -#endif /* * Add a unique identifier to (pi) */ ==== //depot/projects/soc2006/intr_filter/bsm/audit.h#3 (text) ==== ==== //depot/projects/soc2006/intr_filter/bsm/audit_internal.h#3 (text) ==== ==== //depot/projects/soc2006/intr_filter/bsm/audit_kevents.h#4 (text) ==== ==== //depot/projects/soc2006/intr_filter/bsm/audit_record.h#4 (text) ==== ==== //depot/projects/soc2006/intr_filter/compat/linux/linux_emul.c#6 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/linux/linux_emul.c,v 1.10 2006/12/31 12:42:55 netchild Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linux/linux_emul.c,v 1.12 2007/01/07 19:09:20 netchild Exp $"); #include "opt_compat.h" @@ -63,12 +63,12 @@ { struct linux_emuldata *em; - if (locked == EMUL_UNLOCKED) + if (locked == EMUL_DOLOCK) EMUL_LOCK(&emul_lock); em = p->p_emuldata; - if (em == NULL && locked == EMUL_UNLOCKED) + if (em == NULL && locked == EMUL_DOLOCK) EMUL_UNLOCK(&emul_lock); return (em); @@ -104,7 +104,7 @@ EMUL_LOCK(&emul_lock); } else { /* lookup the old one */ - em = em_find(td->td_proc, EMUL_UNLOCKED); + em = em_find(td->td_proc, EMUL_DOLOCK); KASSERT(em != NULL, ("proc_init: emuldata not found in exec case.\n")); } @@ -119,10 +119,12 @@ if (child != 0) { if (flags & CLONE_THREAD) { /* lookup the parent */ - p_em = em_find(td->td_proc, EMUL_LOCKED); + EMUL_SHARED_WLOCK(&emul_shared_lock); + p_em = em_find(td->td_proc, EMUL_DONTLOCK); KASSERT(p_em != NULL, ("proc_init: parent emuldata not found for CLONE_THREAD\n")); em->shared = p_em->shared; em->shared->refs++; + EMUL_SHARED_WUNLOCK(&emul_shared_lock); } else { /* * handled earlier to avoid malloc(M_WAITOK) with @@ -159,7 +161,7 @@ return; /* find the emuldata */ - em = em_find(p, EMUL_UNLOCKED); + em = em_find(p, EMUL_DOLOCK); KASSERT(em != NULL, ("proc_exit: emuldata not found.\n")); @@ -217,7 +219,7 @@ continue; if (__predict_false(q->p_sysent != &elf_linux_sysvec)) continue; - em = em_find(q, EMUL_UNLOCKED); + em = em_find(q, EMUL_DOLOCK); KASSERT(em != NULL, ("linux_reparent: emuldata not found: %i\n", q->p_pid)); if (em->pdeath_signal != 0) { PROC_LOCK(q); @@ -244,7 +246,7 @@ && p->p_sysent == &elf_linux_sysvec)) { struct linux_emuldata *em; - em = em_find(p, EMUL_UNLOCKED); + em = em_find(p, EMUL_DOLOCK); >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Jan 12 15:16:38 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3695916A415; Fri, 12 Jan 2007 15:16:38 +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 E8EBF16A407 for ; Fri, 12 Jan 2007 15:16: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 C159213C461 for ; Fri, 12 Jan 2007 15:16:37 +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 l0CFGbsv010484 for ; Fri, 12 Jan 2007 15:16:37 GMT (envelope-from piso@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0CFGb9V010481 for perforce@freebsd.org; Fri, 12 Jan 2007 15:16:37 GMT (envelope-from piso@freebsd.org) Date: Fri, 12 Jan 2007 15:16:37 GMT Message-Id: <200701121516.l0CFGb9V010481@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 112818 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 12 Jan 2007 15:16:38 -0000 http://perforce.freebsd.org/chv.cgi?CH=112818 Change 112818 by piso@piso_newluxor on 2007/01/12 15:15:57 Fix ichsmb. Affected files ... .. //depot/projects/soc2006/intr_filter/dev/ichsmb/ichsmb.c#4 edit Differences ... ==== //depot/projects/soc2006/intr_filter/dev/ichsmb/ichsmb.c#4 (text+ko) ==== @@ -125,7 +125,7 @@ /* Set up interrupt handler */ error = bus_setup_intr(dev, sc->irq_res, INTR_TYPE_MISC, - ichsmb_device_intr, sc, &sc->irq_handle); + NULL, ichsmb_device_intr, sc, &sc->irq_handle); if (error != 0) { device_printf(dev, "can't setup irq\n"); goto fail; From owner-p4-projects@FreeBSD.ORG Fri Jan 12 15:16: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 8C8C816A554; Fri, 12 Jan 2007 15:16:38 +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 2FD5816A40F for ; Fri, 12 Jan 2007 15:16:38 +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 209F613C467 for ; Fri, 12 Jan 2007 15:16:38 +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 l0CFGcuD010491 for ; Fri, 12 Jan 2007 15:16:38 GMT (envelope-from piso@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0CFGb9O010487 for perforce@freebsd.org; Fri, 12 Jan 2007 15:16:37 GMT (envelope-from piso@freebsd.org) Date: Fri, 12 Jan 2007 15:16:37 GMT Message-Id: <200701121516.l0CFGb9O010487@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 112819 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 12 Jan 2007 15:16:39 -0000 http://perforce.freebsd.org/chv.cgi?CH=112819 Change 112819 by piso@piso_newluxor on 2007/01/12 15:16:16 Fix sparc64/psycho Affected files ... .. //depot/projects/soc2006/intr_filter/sparc64/pci/psycho.c#9 edit Differences ... ==== //depot/projects/soc2006/intr_filter/sparc64/pci/psycho.c#9 (text+ko) ==== @@ -705,11 +705,11 @@ if (sc->sc_irq_res[index] == NULL) panic("%s: failed to get interrupt", __func__); if (iflags & FAST) - res = bus_setup_intr(dev, sc->sc_irq_res[index], + res = bus_setup_intr(sc->sc_dev, sc->sc_irq_res[index], INTR_TYPE_MISC | (iflags & ~FAST), handler, NULL, sc, &sc->sc_ihand[index]); else - res = bus_setup_intr(dev, sc->sc_irq_res[index], + res = bus_setup_intr(sc->sc_dev, sc->sc_irq_res[index], INTR_TYPE_MISC | iflags, NULL, handler, sc, &sc->sc_ihand[index]); if (res != 0) From owner-p4-projects@FreeBSD.ORG Fri Jan 12 15:44: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 1FD2316A417; Fri, 12 Jan 2007 15:44: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 E9E8416A403 for ; Fri, 12 Jan 2007 15:44:13 +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 C273F13C4A7 for ; Fri, 12 Jan 2007 15:44:13 +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 l0CFiDhk014953 for ; Fri, 12 Jan 2007 15:44:13 GMT (envelope-from piso@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0CFiDMC014950 for perforce@freebsd.org; Fri, 12 Jan 2007 15:44:13 GMT (envelope-from piso@freebsd.org) Date: Fri, 12 Jan 2007 15:44:13 GMT Message-Id: <200701121544.l0CFiDMC014950@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 112820 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 12 Jan 2007 15:44:14 -0000 http://perforce.freebsd.org/chv.cgi?CH=112820 Change 112820 by piso@piso_newluxor on 2007/01/12 15:43:28 Fix intpm. Affected files ... .. //depot/projects/soc2006/intr_filter/pci/intpm.c#6 edit Differences ... ==== //depot/projects/soc2006/intr_filter/pci/intpm.c#6 (text+ko) ==== @@ -160,8 +160,8 @@ goto fail; } - error = bus_setup_intr(dev, sc->irq_res, INTR_TYPE_MISC, intsmb_rawintr, - sc, &sc->irq_hand); + error = bus_setup_intr(dev, sc->irq_res, INTR_TYPE_MISC, NULL, + intsmb_rawintr, sc, &sc->irq_hand); if (error) { device_printf(dev, "Failed to map intr\n"); goto fail; From owner-p4-projects@FreeBSD.ORG Fri Jan 12 21:08:25 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3954116A415; Fri, 12 Jan 2007 21:08:25 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 1223716A40F for ; Fri, 12 Jan 2007 21:08:25 +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 0185713C43E for ; Fri, 12 Jan 2007 21:08:25 +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 l0CL8OsQ090984 for ; Fri, 12 Jan 2007 21:08:24 GMT (envelope-from piso@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0CL8OH0090981 for perforce@freebsd.org; Fri, 12 Jan 2007 21:08:24 GMT (envelope-from piso@freebsd.org) Date: Fri, 12 Jan 2007 21:08:24 GMT Message-Id: <200701122108.l0CL8OH0090981@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 112832 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 12 Jan 2007 21:08:25 -0000 http://perforce.freebsd.org/chv.cgi?CH=112832 Change 112832 by piso@piso_newluxor on 2007/01/12 21:07:57 Sync with HEAD. Affected files ... .. //depot/projects/soc2006/intr_filter/sun4v/sun4v/hcall.S#3 edit Differences ... ==== //depot/projects/soc2006/intr_filter/sun4v/sun4v/hcall.S#3 (text+ko) ==== @@ -1,1454 +1,1852 @@ -/* - * CDDL HEADER START +/*- + * Copyright (c) 2006 Kip Macy + * All rights reserved. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. * - * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE - * or http://www.opensolaris.org/os/licensing. - * See the License for the specific language governing permissions - * and limitations under the License. + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at usr/src/OPENSOLARIS.LICENSE. - * If applicable, add the following below this CDDL HEADER, with the - * fields enclosed by brackets "[]" replaced with your own identifying - * information: Portions Copyright [yyyy] [name of copyright owner] - * - * CDDL HEADER END + * $FreeBSD: src/sys/sun4v/sun4v/hcall.S,v 1.18 2006/12/17 01:22:51 kmacy Exp $ */ -/* - * Copyright 2005 Sun Microsystems, Inc. All rights reserved. - * Use is subject to license terms. - */ -#pragma ident "@(#)hcall.s 1.10 05/09/28 SMI" - -/* - * Hypervisor calls - */ -#define _ASM - +#include + #include -__FBSDID("$FreeBSD: src/sys/sun4v/sun4v/hcall.S,v 1.2 2006/11/01 08:14:14 jb Exp $") - #include #include -#include +#include #include #include "assym.s" +/* + * Section 9 API Versioning + * + */ -#if defined(lint) -#error lint -#endif -#if defined(__lint) -#error __lint -#endif -#if defined(lint) || defined(__lint) +/* + * request and check for a version of the hypervisor apis + * which may be compatible + * + * arg0 api_group (%o0) + * arg1 major_number (%o1) + * arg2 req_minor_number (%o2) + * + * ret0 status (%o0) + * ret1 act_minor_number (%o1) + * + */ +ENTRY(api_set_version) + mov API_SET_VERSION, %o5 + ta CORE_TRAP + retl + stx %o1, [%o3] +END(api_set_version) -/*ARGSUSED*/ -int64_t -hv_cnputchar(uint8_t ch) -{ return (0); } +/* + * retrieve the major and minor number of the most recently + * successfully negotiated API + * + * arg0 api_group (%o0) + * + * ret0 status (%o0) + * ret1 major_number (%o1) + * ret2 major_number (%o2) + * + */ +ENTRY(api_get_version) + mov %o2, %o4 + mov %o1, %o3 + mov API_GET_VERSION, %o5 + ta CORE_TRAP + retl + stx %o1, [%o4] + +END(api_get_version) + +/* + * Section 10 Domain Services + * + */ -/*ARGSUSED*/ -int64_t -hv_cngetchar(uint8_t *ch) -{ return (0); } +/* + * stop all CPUs in the virtual machine domain and place them + * in the stopped state + * + * arg0 exit_code (%o0) + * + */ +ENTRY(hv_mach_exit) + mov MACH_EXIT, %o5 + ta FAST_TRAP + retl + nop +END(hv_mach_exit) + +/* + * copy the most current machine description into buffer + * upon success or EINVAL the service returns the actual + * size of the machine description + * + * arg0 buffer (%o0) + * arg1 length (%o1) + * + * ret0 status (%o0) + * ret1 length (%o1) + * + */ +ENTRY(hv_mach_desc) + mov %o1, %o2 + ldx [%o1], %o1 + mov MACH_DESC, %o5 + ta FAST_TRAP + retl + stx %o1, [%o2] +END(hv_mach_desc) -/*ARGSUSED*/ -uint64_t -hv_tod_get(uint64_t *seconds) -{ return (0); } +/* + * execute a software initiated reset of a virtual machine domain + * + */ +ENTRY(hv_mach_sir) + mov MACH_SIR, %o5 + ta FAST_TRAP + retl + nop +END(hv_mach_sir) + +/* + * report the guests soft state to the hypervisor + * + * arg0 soft_state (%o0) + * arg1 soft_state_desc_ptr (%o1) + * + * ret0 status (%o0) + * + */ +ENTRY(hv_mach_set_soft_state) + mov MACH_SET_SOFT_STATE, %o5 + ta FAST_TRAP + retl + nop +END(hv_mach_set_soft_state) + +/* + * retrieve the current value of the guest's software state + * + * arg0 soft_desc_ptr (%o0) + * + * ret0 status (%o0) + * arg1 soft_state (%o1) + * + */ +ENTRY(hv_mach_get_soft_state) + mov %o1, %o2 + mov MACH_SET_SOFT_STATE, %o5 + ta FAST_TRAP + retl + stx %o1, [%o2] +END(hv_mach_get_soft_state) + +/* + * set a watchdog timer, 0 disables, upon success + * time_remaining contains the time previously remaining + * + * arg0 timeout (%o0) + * + * ret0 status (%o0) + * ret1 time_remaining (%o1) + * + */ +ENTRY(hv_mach_watchdog) + mov %o1, %o2 + mov MACH_WATCHDOG, %o5 + ta FAST_TRAP + brnz,pn %o0, 1f + nop + stx %o1, [%o2] +1: retl + nop +END(hv_mach_watchdog) + +/* + * Section 11 CPU Services + * + */ -/*ARGSUSED*/ -uint64_t -hv_tod_set(uint64_t seconds) -{ return (0);} +/* + * start CPU with id cpuid with pc in %pc and real trap base address + * of rtba + * + * arg0 cpuid (%o0) + * arg1 pc (%o1) + * arg2 rtba (%o2) + * arg3 target_arg0 (%o3) + * + * ret0 status (%o0) + * + */ +ENTRY(hv_cpu_start) + mov CPU_START, %o5 + ta FAST_TRAP + retl + nop +END(hv_cpu_start) -/*ARGSUSED*/ -uint64_t -hv_mmu_map_perm_addr(void *vaddr, int ctx, uint64_t tte, int flags) -{ return (0); } +/* + * stop CPU with id cpuid + * + * arg0 cpuid (%o0) + * + * ret0 status (%o0) + * + */ +ENTRY(hv_cpu_stop) + mov CPU_STOP, %o5 + ta FAST_TRAP + retl + nop +END(hv_cpu_stop) -/*ARGSUSED*/ -uint64_t -hv_mmu_unmap_perm_addr(void *vaddr, int ctx, int flags) -{ return (0); } +/* + * set the real trap base address of the local cpu to rtba + * upon success the previous_rtba contains the address of the + * old rtba + * + * arg0 rtba (%o0) + * + * ret0 status (%o0) + * ret1 previous_rtba(%o1) + * + */ +ENTRY(hv_cpu_set_rtba) + mov %o1, %o2 + mov CPU_SET_RTBA, %o5 + ta FAST_TRAP + retl + stx %o1, [%o2] + +END(hv_cpu_set_rtba) -/*ARGSUSED*/ -uint64_t -hv_set_ctx0(uint64_t ntsb_descriptor, uint64_t desc_ra) -{ return (0); } +/* + * return the current real trap base address + * + * ret0 status (%o0) + * ret1 rtba (%o1) + * + */ +ENTRY(hv_cpu_get_rtba) + mov CPU_GET_RTBA, %o5 + ta FAST_TRAP + retl + nop +END(hv_cpu_get_rtba) + +/* + * suspend execution on current cpu + * + * ret0 status (%o0) + * + */ +ENTRY(hv_cpu_yield) + mov CPU_YIELD, %o5 + ta FAST_TRAP + retl + nop +END(hv_cpu_yield) -/*ARGSUSED*/ -uint64_t -hv_set_ctxnon0(uint64_t ntsb_descriptor, uint64_t desc_ra) -{ return (0); } +/* + * configure queue of size nentries to be placed at base raddr + * + * arg0 queue (%o0) + * arg1 base raddr (%o1) + * arg2 nentries (%o2) + * + * ret0 status (%o0) + * + */ +ENTRY(hv_cpu_qconf) + mov CPU_QCONF, %o5 + ta FAST_TRAP + retl + nop +END(hv_cpu_qconf) + +/* + * return configuration of queue queue + * + * arg0 queue (%o0) + * + * ret0 status (%o0) + * ret1 base raddr (%o1) + * ret2 nentries (%o2) + * + */ +ENTRY(hv_cpu_qinfo) +END(hv_cpu_qinfo) + +/* + * send cpu mondo interrupt to cpulist + * + * arg0 ncpus (%o0) + * arg1 cpu list ra (%o1) + * arg2 mondo data ra(%o2) + * + * ret0 status (%o0) + * + */ +ENTRY(hv_cpu_mondo_send) + ldx [PCPU(MONDO_DATA_RA)], %o2 + mov CPU_MONDO_SEND, %o5 + ta FAST_TRAP + retl + membar #Sync +END(hv_cpu_mondo_send) -#ifdef SET_MMU_STATS -/*ARGSUSED*/ -uint64_t -hv_mmu_set_stat_area(uint64_t rstatarea, uint64_t size) -{ return (0); } -#endif /* SET_MMU_STATS */ +/* + * return the hypervisor id for the current cpu + * + * ret0 status (%o0) + * ret1 cpuid (%o1) + * + */ +ENTRY(hv_cpu_myid) + mov %o0, %o2 + mov CPU_MYID, %o5 + ta FAST_TRAP + stx %o1, [%o2] + retl + nop +END(hv_cpu_myid) -/*ARGSUSED*/ -uint64_t -hv_cpu_qconf(int queue, uint64_t paddr, int size) -{ return (0); } +/* + * retrieve the current state of cpu cpuid + * + * arg0 cpuid (%o0) + * + * ret0 status (%o0) + * ret1 state (%o1) + * + */ +ENTRY(hv_cpu_state) + mov %o1, %o2 + mov CPU_STATE, %o5 + ta FAST_TRAP + stx %o1, [%o2] + retl + nop +END(hv_cpu_state) + +/* + * Section 12 MMU Services + * + */ + +/* + * set the tsb(s) for the current cpu for context 0 + * + * arg0 ntsb (%o0) + * arg1 tsbdptr (%o1) + * + * ret0 status (%o0) + * + */ +ENTRY(hv_mmu_tsb_ctx0) + mov MMU_TSB_CTX0, %o5 + ta FAST_TRAP + retl + nop +END(hv_mmu_tsb_ctx0) -/*ARGSUSED*/ -uint64_t -hvio_config_get(devhandle_t dev_hdl, pci_device_t bdf, - pci_config_offset_t off, pci_config_size_t size, pci_cfg_data_t *data_p) -{ return (0); } +/* + * set the tsb(s) for the current cpu for non-zero contexts + * + * arg0 ntsb (%o0) + * arg1 tsbptr (%o1) + * + * ret0 status (%o0) + * + */ +ENTRY(hv_mmu_tsb_ctxnon0) + mov MMU_TSB_CTXNON0, %o5 + ta FAST_TRAP + retl + nop +END(hv_mmu_tsb_ctxnon0) -/*ARGSUSED*/ -uint64_t -hvio_config_put(devhandle_t dev_hdl, pci_device_t bdf, - pci_config_offset_t off, pci_config_size_t size, pci_cfg_data_t data) -{ return (0); } +/* + * demap any page mapping of virtual address vaddr in context ctx + * + * arg0 reserved (%o0) + * arg1 reserved (%o1) + * arg2 vaddr (%o2) + * arg3 ctx (%o3) + * arg4 flags (%o4) + * + * ret0 status (%o0) + * + */ +ENTRY(hv_mmu_demap_page) + mov MMU_DEMAP_PAGE, %o5 + ta FAST_TRAP + retl + nop +END(hv_mmu_demap_page) -/*ARGSUSED*/ -uint64_t -hvio_intr_devino_to_sysino(uint64_t dev_hdl, uint32_t devino, uint64_t *sysino) -{ return (0); } +/* + * demap all non-permanent virtual address mappings in context ctx + * + * arg0 reserved (%o0) + * arg1 reserved (%o1) + * arg2 ctx (%o2) + * arg3 flags (%o3) + * + * ret0 status (%o0) + * + */ +ENTRY(hv_mmu_demap_ctx) + mov MMU_DEMAP_CTX, %o5 + ta FAST_TRAP + retl + nop +END(hv_mmu_demap_ctx) -/*ARGSUSED*/ -uint64_t -hvio_intr_getvalid(uint64_t sysino, int *intr_valid_state) -{ return (0); } +/* + * demap all non-permanent virtual address mappings for the current + * virtual cpu + * + * arg0 reserved (%o0) + * arg1 reserved (%o1) + * arg2 flags (%o2) + * + * ret0 status (%o0) + * + */ +ENTRY(hv_mmu_demap_all) + mov MMU_DEMAP_ALL, %o5 + ta FAST_TRAP + retl + nop +END(hv_mmu_demap_all) -/*ARGSUSED*/ -uint64_t -hvio_intr_setvalid(uint64_t sysino, int intr_valid_state) -{ return (0); } +/* + * create a non-permanent mapping for the calling virtual cpu + * + * arg0 vaddr (%o0) + * arg1 context (%o1) + * arg2 TTE (%o2) + * arg3 flags (%o3) + * + * ret0 status (%o0) + * + */ +ENTRY(hv_mmu_map_addr) + mov MMU_MAP_ADDR, %o5 + ta FAST_TRAP + retl + nop +END(hv_mmu_map_addr) -/*ARGSUSED*/ -uint64_t -hvio_intr_getstate(uint64_t sysino, int *intr_state) -{ return (0); } +/* + * create a permanent mapping for the calling virtual cpu + * + * arg0 vaddr (%o0) + * arg1 reserved (%o1) + * arg2 TTE (%o2) + * arg3 flags (%o3) + * + * ret0 status (%o0) + * + */ +ENTRY(hv_mmu_map_perm_addr) + mov MMU_MAP_PERM_ADDR, %o5 + ta FAST_TRAP + retl + nop +END(hv_mmu_map_perm_addr) -/*ARGSUSED*/ -uint64_t -hvio_intr_setstate(uint64_t sysino, int intr_state) -{ return (0); } +/* + * demap virtual address vaddr in context ctx on current virtual cpu + * + * arg0 vaddr (%o0) + * arg1 ctx (%o1) + * arg2 flags (%o2) + * + * ret0 status (%o0) + * + */ +ENTRY(hv_mmu_unmap_addr) + mov MMU_UNMAP_ADDR, %o5 + ta FAST_TRAP + retl + nop +END(hv_mmu_unmap_addr) -/*ARGSUSED*/ -uint64_t -hvio_intr_gettarget(uint64_t sysino, uint32_t *cpuid) -{ return (0); } +/* + * demap any permanent mapping at virtual address vaddr on current virtual cpu + * + * arg0 vaddr (%o0) + * arg1 reserved (%o1) + * arg2 flags (%o2) + * + * ret0 status (%o0) + * + */ +ENTRY(hv_mmu_unmap_perm_addr) + mov %o1, %o2 + clr %o1 + mov MMU_UNMAP_PERM_ADDR, %o5 + ta FAST_TRAP + retl + nop +END(hv_mmu_unmap_perm_addr) -/*ARGSUSED*/ -uint64_t -hvio_intr_settarget(uint64_t sysino, uint32_t cpuid) -{ return (0); } +/* + * configure the MMU fault status area for the current virtual cpu + * + * arg0 raddr (%o0) + * + * ret0 status (%o0) + * ret1 prev_raddr (%o1) + * + */ +ENTRY(hv_mmu_fault_area_conf) + mov %o1, %o2 + mov MMU_FAULT_AREA_CONF, %o5 + ta FAST_TRAP + retl + stx %o1, [%o2] +END(hv_mmu_fault_area_conf) -/*ARGSUSED*/ -uint64_t -hvio_iommu_map(devhandle_t dev_hdl, tsbid_t tsbid, - pages_t pages, io_attributes_t io_attributes, - io_page_list_t *io_page_list_p, pages_t *pages_mapped) -{ return (0); } +/* + * enable or disable virtual address translation for the current virtual cpu + * + * arg0 enable_flag (%o0) + * arg1 return_target (%o1) + * + * ret0 status (%o0) + * + */ +ENTRY(hv_mmu_enable) + mov MMU_ENABLE, %o5 + ta FAST_TRAP + retl + nop +END(hv_mmu_enable) -/*ARGSUSED*/ -uint64_t -hvio_iommu_demap(devhandle_t dev_hdl, tsbid_t tsbid, - pages_t pages, pages_t *pages_demapped) -{ return (0); } +/* + * return the TSB configuration as previously defined by mmu_tsb_ctx0 + * + * arg0 maxtsbs (%o0) + * arg1 buffer_ra (%o1) + * + * ret0 status (%o0) + * ret1 ntsbs (%o1) + * + */ +ENTRY(hv_mmu_tsb_ctx0_info) + mov %o1, %o2 + mov MMU_TSB_CTX0_INFO, %o5 + ta FAST_TRAP + retl + stx %o1, [%o2] +END(hv_mmu_tsb_ctx0_info) -/*ARGSUSED*/ -uint64_t -hvio_iommu_getmap(devhandle_t dev_hdl, tsbid_t tsbid, - io_attributes_t *attributes_p, r_addr_t *r_addr_p) -{ return (0); } +/* + * return the TSB configuration as previously defined by mmu_tsb_ctxnon0 + * + * arg0 maxtsbs (%o0) + * arg1 buffer_ra (%o1) + * + * ret0 status (%o0) + * ret1 ntsbs (%o1) + * + */ +ENTRY(hv_mmu_tsb_ctxnon0_info) + mov %o1, %o2 + mov MMU_TSB_CTXNON0_INFO, %o5 + ta FAST_TRAP + retl + stx %o1, [%o2] +END(hv_mmu_tsb_ctxnon0_info) -/*ARGSUSED*/ -uint64_t -hvio_iommu_getbypass(devhandle_t dev_hdl, r_addr_t ra, - io_attributes_t io_attributes, io_addr_t *io_addr_p) -{ return (0); } - -/*ARGSUSED*/ -uint64_t -hvio_peek(devhandle_t dev_hdl, r_addr_t ra, size_t size, uint32_t *status, - uint64_t *data_p) -{ return (0); } - -/*ARGSUSED*/ -uint64_t -hvio_poke(devhandle_t dev_hdl, r_addr_t ra, uint64_t sizes, uint64_t data, - r_addr_t ra2, uint32_t *rdbk_status) -{ return (0); } - -/*ARGSUSED*/ -uint64_t -hvio_dma_sync(devhandle_t dev_hdl, r_addr_t ra, size_t num_bytes, - int io_sync_direction, size_t *bytes_synched) -{ return (0); } - -/*ARGSUSED*/ -uint64_t -hvio_msiq_conf(devhandle_t dev_hdl, msiqid_t msiq_id, r_addr_t ra, - uint_t msiq_rec_cnt) -{ return (0); } - -/*ARGSUSED*/ -uint64_t -hvio_msiq_info(devhandle_t dev_hdl, msiqid_t msiq_id, r_addr_t *r_addr_p, - uint_t *msiq_rec_cnt_p) -{ return (0); } +/* + * return the MMU fault status area defined for the current virtual cpu + * + * ret0 status (%o0) + * ret1 mmfsara (%o1) + * + */ +ENTRY(hv_mmu_fault_area_info) + mov %o0, %o2 + mov MMU_FAULT_AREA_INFO, %o5 + ta FAST_TRAP + retl + stx %o1, [%o2] -/*ARGSUSED*/ -uint64_t -hvio_msiq_getvalid(devhandle_t dev_hdl, msiqid_t msiq_id, - pci_msiq_valid_state_t *msiq_valid_state) -{ return (0); } +END(hv_mmu_fault_area_info) -/*ARGSUSED*/ -uint64_t -hvio_msiq_setvalid(devhandle_t dev_hdl, msiqid_t msiq_id, - pci_msiq_valid_state_t msiq_valid_state) -{ return (0); } +/* + * Section 13 Cache and Memory Services + * + */ -/*ARGSUSED*/ -uint64_t -hvio_msiq_getstate(devhandle_t dev_hdl, msiqid_t msiq_id, - pci_msiq_state_t *msiq_state) -{ return (0); } +/* + * zero from raddr to raddr+length-1 + * + * arg0 raddr (%o0) + * arg1 length (%o1) + * + * ret0 status (%o0) + * ret1 length scrubbed (%o1) + * + */ +ENTRY(hv_mem_scrub) + mov MEM_SCRUB, %o5 + ta FAST_TRAP + stx %o1, [%o2] + retl + nop +END(hv_mem_scrub) -/*ARGSUSED*/ -uint64_t -hvio_msiq_setstate(devhandle_t dev_hdl, msiqid_t msiq_id, - pci_msiq_state_t msiq_state) -{ return (0); } +/* + * for the memory address range from raddr to raddr+length-1 + * for the next access within that range from main system memory + * + * arg0 raddr (%o0) + * arg1 length (%o1) + * + * ret0 status (%o0) + * ret1 length synced (%o1) + * + */ +ENTRY(hv_mem_sync) + mov MEM_SYNC, %o5 + ta FAST_TRAP + stx %o1, [%o2] + retl + nop +END(hv_mem_sync) -/*ARGSUSED*/ -uint64_t -hvio_msiq_gethead(devhandle_t dev_hdl, msiqid_t msiq_id, - msiqhead_t *msiq_head) -{ return (0); } +/* + * Section 14 Device Interrupt Services + * + */ -/*ARGSUSED*/ -uint64_t -hvio_msiq_sethead(devhandle_t dev_hdl, msiqid_t msiq_id, - msiqhead_t msiq_head) -{ return (0); } +/* + * converts a device specific interrupt number given by + * devhandle and devino to a system specific ino (sysino) + * + * arg0 devhandle (%o0) + * arg1 devino (%o1) + * + * ret0 status (%o0) + * ret1 sysino (%o1) + * + */ +ENTRY(hv_intr_devino_to_sysino) + mov INTR_DEVINO2SYSINO, %o5 + ta FAST_TRAP + retl + stx %o1, [%o2] +END(hv_intr_devino_to_sysino) -/*ARGSUSED*/ -uint64_t -hvio_msiq_gettail(devhandle_t dev_hdl, msiqid_t msiq_id, - msiqtail_t *msiq_tail) -{ return (0); } +/* + * return intr enabled state + * + * arg0 sysino (%o0) + * + * ret0 status (%o0) + * ret1 intr_enabled (%o1) + * + */ +ENTRY(hv_intr_getenabled) + mov %o1, %o2 + mov INTR_GETENABLED, %o5 + ta FAST_TRAP + retl + st %o1, [%o2] +END(hv_intr_getenabled) -/*ARGSUSED*/ -uint64_t -hvio_msi_getmsiq(devhandle_t dev_hdl, msinum_t msi_num, - msiqid_t *msiq_id) -{ return (0); } +/* + * set intr enabled state + * + * arg0 sysino (%o0) + * arg1 intr_enabled (%o1) + * + * ret0 status (%o0) + * + */ +ENTRY(hv_intr_setenabled) + mov INTR_SETENABLED, %o5 + ta FAST_TRAP + retl + nop +END(hv_intr_setenabled) -/*ARGSUSED*/ -uint64_t -hvio_msi_setmsiq(devhandle_t dev_hdl, msinum_t msi_num, - msiqid_t msiq_id, msi_type_t msitype) -{ return (0); } +/* + * return current state of the interrupt given + * by the sysino + * + * arg0 sysino (%o0) + * + * ret0 status (%o0) + * ret1 intr_state (%o1) + * + */ +ENTRY(hv_intr_getstate) + mov %o1, %o2 + mov INTR_GETSTATE, %o5 + ta FAST_TRAP + retl + st %o1, [%o2] +END(hv_intr_getstate) -/*ARGSUSED*/ -uint64_t -hvio_msi_getvalid(devhandle_t dev_hdl, msinum_t msi_num, - pci_msi_valid_state_t *msi_valid_state) -{ return (0); } +/* + * set the current state of the interrupt given + * by the sysino + * + * arg0 sysino (%o0) + * arg1 intr_state (%o1) + * + * ret0 status (%o0) + * + */ +ENTRY(hv_intr_setstate) + mov INTR_SETSTATE, %o5 + ta FAST_TRAP + retl + nop +END(hv_intr_setstate) -/*ARGSUSED*/ -uint64_t -hvio_msi_setvalid(devhandle_t dev_hdl, msinum_t msi_num, - pci_msi_valid_state_t msi_valid_state) -{ return (0); } +/* + * return the cpuid that is the current target of the + * interrupt given by the sysino + * + * arg0 sysino (%o0) + * + * ret0 status (%o0) + * ret1 cpuid (%o1) + * + */ +ENTRY(hv_intr_gettarget) + mov %o1, %o2 + mov INTR_GETTARGET, %o5 + ta FAST_TRAP + retl + st %o1, [%o2] +END(hv_intr_gettarget) -/*ARGSUSED*/ -uint64_t -hvio_msi_getstate(devhandle_t dev_hdl, msinum_t msi_num, - pci_msi_state_t *msi_state) -{ return (0); } +/* + * set the target to cpuid that for the + * interrupt given by the sysino >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Jan 12 21:10: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 5735516A47B; Fri, 12 Jan 2007 21:10: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 1D9B316A403 for ; Fri, 12 Jan 2007 21:10:28 +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 0E90313C441 for ; Fri, 12 Jan 2007 21:10:28 +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 l0CLARpD091162 for ; Fri, 12 Jan 2007 21:10:27 GMT (envelope-from piso@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0CLAR8C091159 for perforce@freebsd.org; Fri, 12 Jan 2007 21:10:27 GMT (envelope-from piso@freebsd.org) Date: Fri, 12 Jan 2007 21:10:27 GMT Message-Id: <200701122110.l0CLAR8C091159@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 112833 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 12 Jan 2007 21:10:28 -0000 http://perforce.freebsd.org/chv.cgi?CH=112833 Change 112833 by piso@piso_newluxor on 2007/01/12 21:10:11 Sync with HEAD. Affected files ... .. //depot/projects/soc2006/intr_filter/sun4v/include/reloc.h#2 edit .. //depot/projects/soc2006/intr_filter/sun4v/include/setjmp.h#2 edit Differences ... ==== //depot/projects/soc2006/intr_filter/sun4v/include/reloc.h#2 (text+ko) ==== @@ -10,10 +10,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by John Birrell. - * 4. Neither the name of the author nor the names of any co-contributors + * 3. Neither the name of the author nor the names of any co-contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -29,5 +26,5 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/sun4v/include/reloc.h,v 1.1 2006/10/05 06:14:26 kmacy Exp $ + * $FreeBSD: src/sys/sun4v/include/reloc.h,v 1.2 2007/01/12 07:19:22 imp Exp $ */ ==== //depot/projects/soc2006/intr_filter/sun4v/include/setjmp.h#2 (text+ko) ==== @@ -10,10 +10,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by John Birrell. - * 4. Neither the name of the author nor the names of any co-contributors + * 3. Neither the name of the author nor the names of any co-contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -30,7 +27,7 @@ * SUCH DAMAGE. * * From: FreeBSD: src/sys/i386/include/setjmp.h,v 1.5 2000/10/06 - * $FreeBSD: src/sys/sun4v/include/setjmp.h,v 1.1 2006/10/05 06:14:26 kmacy Exp $ + * $FreeBSD: src/sys/sun4v/include/setjmp.h,v 1.2 2007/01/12 07:19:22 imp Exp $ */ #ifndef _MACHINE_SETJMP_H_ From owner-p4-projects@FreeBSD.ORG Fri Jan 12 21:32:57 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 742EB16A505; Fri, 12 Jan 2007 21:32:57 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 21E7C16A500 for ; Fri, 12 Jan 2007 21:32:57 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 1228A13C458 for ; Fri, 12 Jan 2007 21:32:57 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l0CLWugT096030 for ; Fri, 12 Jan 2007 21:32:56 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0CLWuAG096027 for perforce@freebsd.org; Fri, 12 Jan 2007 21:32:56 GMT (envelope-from hselasky@FreeBSD.org) Date: Fri, 12 Jan 2007 21:32:56 GMT Message-Id: <200701122132.l0CLWuAG096027@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Cc: Subject: PERFORCE change 112835 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 12 Jan 2007 21:32:57 -0000 http://perforce.freebsd.org/chv.cgi?CH=112835 Change 112835 by hselasky@hselasky_mini_itx on 2007/01/12 21:32:24 ether_ifattach() must be called without any mutexes held, hence it can sleep. Use generated typedef's for prototypes for exported device methods. This prevents invalid parameter passing and return. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/if_aue.c#14 edit .. //depot/projects/usb/src/sys/dev/usb/if_axe.c#13 edit .. //depot/projects/usb/src/sys/dev/usb/if_cdce.c#9 edit .. //depot/projects/usb/src/sys/dev/usb/if_cue.c#11 edit .. //depot/projects/usb/src/sys/dev/usb/if_kue.c#13 edit .. //depot/projects/usb/src/sys/dev/usb/if_rue.c#12 edit .. //depot/projects/usb/src/sys/dev/usb/if_udav.c#12 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/if_aue.c#14 (text+ko) ==== @@ -215,14 +215,10 @@ static void aue_cfg_read_eeprom(struct aue_softc *sc, u_int8_t *dest, u_int16_t off, u_int16_t len); -static int -aue_cfg_miibus_readreg(device_t dev, int phy, int reg); -static int -aue_cfg_miibus_writereg(device_t dev, int phy, int reg, int data); - -static void -aue_cfg_miibus_statchg(device_t dev); +static miibus_readreg_t aue_cfg_miibus_readreg; +static miibus_writereg_t aue_cfg_miibus_writereg; +static miibus_statchg_t aue_cfg_miibus_statchg; static void aue_cfg_setmulti(struct aue_softc *sc, @@ -957,11 +953,15 @@ sc->sc_ifp = ifp; + mtx_unlock(&(sc->sc_mtx)); + /* * Call MI attach routine. */ ether_ifattach(ifp, eaddr); + mtx_lock(&(sc->sc_mtx)); + done: return; } @@ -1530,7 +1530,6 @@ ifmr->ifm_status = sc->sc_media_status; mtx_unlock(&(sc->sc_mtx)); - return; } @@ -1681,3 +1680,4 @@ return 0; } + ==== //depot/projects/usb/src/sys/dev/usb/if_axe.c#13 (text+ko) ==== @@ -149,15 +149,11 @@ static void axe_cfg_cmd(struct axe_softc *sc, u_int16_t cmd, u_int16_t index, u_int16_t val, void *buf); -static int -axe_cfg_miibus_readreg(device_t dev, int phy, int reg); -static int -axe_cfg_miibus_writereg(device_t dev, int phy, int reg, int val); +static miibus_readreg_t axe_cfg_miibus_readreg; +static miibus_writereg_t axe_cfg_miibus_writereg; +static miibus_statchg_t axe_cfg_miibus_statchg; -static void -axe_cfg_miibus_statchg(device_t dev); - static int axe_ifmedia_upd_cb(struct ifnet *ifp); @@ -757,12 +753,16 @@ sc->sc_ifp = ifp; + mtx_unlock(&(sc->sc_mtx)); + /* * Call MI attach routine. */ ether_ifattach(ifp, eaddr); + mtx_lock(&(sc->sc_mtx)); + done: return; } ==== //depot/projects/usb/src/sys/dev/usb/if_cdce.c#9 (text+ko) ==== @@ -396,8 +396,12 @@ sc->sc_ifp = ifp; + mtx_unlock(&(sc->sc_mtx)); + ether_ifattach(ifp, eaddr); + mtx_lock(&(sc->sc_mtx)); + return 0; /* success */ detach: ==== //depot/projects/usb/src/sys/dev/usb/if_cue.c#11 (text+ko) ==== @@ -595,7 +595,12 @@ sc->sc_ifp = ifp; + mtx_unlock(&(sc->sc_mtx)); + ether_ifattach(ifp, eaddr); + + mtx_lock(&(sc->sc_mtx)); + done: return; } ==== //depot/projects/usb/src/sys/dev/usb/if_kue.c#13 (text+ko) ==== @@ -630,7 +630,11 @@ sc->sc_ifp = ifp; + mtx_unlock(&(sc->sc_mtx)); + ether_ifattach(ifp, sc->sc_desc.kue_macaddr); + + mtx_lock(&(sc->sc_mtx)); done: return; } ==== //depot/projects/usb/src/sys/dev/usb/if_rue.c#12 (text+ko) ==== @@ -162,16 +162,11 @@ static void rue_cfg_csr_write_4(struct rue_softc *sc, int reg, u_int32_t val); -static int -rue_cfg_miibus_readreg(device_t dev, int phy, int reg); - -static int -rue_cfg_miibus_writereg(device_t dev, int phy, int reg, int data); +static miibus_readreg_t rue_cfg_miibus_readreg; +static miibus_writereg_t rue_cfg_miibus_writereg; +static miibus_statchg_t rue_cfg_miibus_statchg; static void -rue_cfg_miibus_statchg(device_t dev); - -static void rue_config_copy(struct rue_softc *sc, struct rue_config_copy *cc, u_int16_t refcount); static void @@ -857,12 +852,16 @@ sc->sc_ifp = ifp; + mtx_unlock(&(sc->sc_mtx)); + /* * Call MI attach routine. */ ether_ifattach(ifp, eaddr); + mtx_lock(&(sc->sc_mtx)); + done: return; } ==== //depot/projects/usb/src/sys/dev/usb/if_udav.c#12 (text+ko) ==== @@ -174,15 +174,10 @@ static void udav_cfg_tick(struct udav_softc *sc, struct udav_config_copy *cc, u_int16_t refcount); -static int -udav_cfg_miibus_readreg(device_t dev, int phy, int reg); -static void -udav_cfg_miibus_writereg(device_t dev, int phy, int reg, int data); - -static void -udav_cfg_miibus_statchg(device_t dev); - +static miibus_readreg_t udav_cfg_miibus_readreg; +static miibus_writereg_t udav_cfg_miibus_writereg; +static miibus_statchg_t udav_cfg_miibus_statchg; static const struct usbd_config udav_config[UDAV_ENDPT_MAX] = { @@ -464,12 +459,16 @@ sc->sc_ifp = ifp; + mtx_unlock(&(sc->sc_mtx)); + /* * Call MI attach routine. */ ether_ifattach(ifp, eaddr); + mtx_lock(&(sc->sc_mtx)); + done: return; } @@ -1430,7 +1429,7 @@ return data16; } -static void +static int udav_cfg_miibus_writereg(device_t dev, int phy, int reg, int data) { struct udav_softc *sc = device_get_softc(dev); @@ -1438,7 +1437,7 @@ /* XXX: one PHY only for the internal PHY */ if (phy != 0) { - return; + return 0; } mtx_lock(&(sc->sc_mtx)); /* XXX */ @@ -1462,7 +1461,7 @@ mtx_unlock(&(sc->sc_mtx)); /* XXX */ - return; + return 0; } static void From owner-p4-projects@FreeBSD.ORG Fri Jan 12 22:35:43 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8417516A416; Fri, 12 Jan 2007 22:35:43 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 59F7F16A40F for ; Fri, 12 Jan 2007 22:35:43 +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 45A0F13C44C for ; Fri, 12 Jan 2007 22:35:43 +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 l0CMZJiC007933 for ; Fri, 12 Jan 2007 22:35:19 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0CMZJ2s007930 for perforce@freebsd.org; Fri, 12 Jan 2007 22:35:19 GMT (envelope-from jhb@freebsd.org) Date: Fri, 12 Jan 2007 22:35:19 GMT Message-Id: <200701122235.l0CMZJ2s007930@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 112839 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 12 Jan 2007 22:35:43 -0000 http://perforce.freebsd.org/chv.cgi?CH=112839 Change 112839 by jhb@jhb_zion on 2007/01/12 22:34:28 IFC @112838. Affected files ... .. //depot/projects/smpng/sys/amd64/include/setjmp.h#3 integrate .. //depot/projects/smpng/sys/dev/mii/amphy.c#15 integrate .. //depot/projects/smpng/sys/dev/mii/exphy.c#14 integrate .. //depot/projects/smpng/sys/dev/mii/inphy.c#10 integrate .. //depot/projects/smpng/sys/dev/mii/lxtphy.c#16 integrate .. //depot/projects/smpng/sys/dev/mii/nsphy.c#15 integrate .. //depot/projects/smpng/sys/dev/mii/rlphy.c#19 integrate .. //depot/projects/smpng/sys/dev/pci/pci.c#83 integrate .. //depot/projects/smpng/sys/i386/include/setjmp.h#3 integrate .. //depot/projects/smpng/sys/ia64/include/exec.h#4 integrate .. //depot/projects/smpng/sys/ia64/include/floatingpoint.h#3 integrate .. //depot/projects/smpng/sys/ia64/include/reloc.h#3 integrate .. //depot/projects/smpng/sys/kern/kern_acl.c#28 integrate .. //depot/projects/smpng/sys/kern/kern_ntptime.c#20 integrate .. //depot/projects/smpng/sys/netatalk/aarp.c#22 integrate .. //depot/projects/smpng/sys/netatalk/aarp.h#3 integrate .. //depot/projects/smpng/sys/netatalk/at.h#4 integrate .. //depot/projects/smpng/sys/netatalk/at_extern.h#8 integrate .. //depot/projects/smpng/sys/netatalk/at_proto.c#5 integrate .. //depot/projects/smpng/sys/netatalk/at_rmx.c#5 integrate .. //depot/projects/smpng/sys/netatalk/at_var.h#6 integrate .. //depot/projects/smpng/sys/netatalk/ddp.h#3 integrate .. //depot/projects/smpng/sys/netatalk/ddp_input.c#17 integrate .. //depot/projects/smpng/sys/netatalk/ddp_output.c#13 integrate .. //depot/projects/smpng/sys/netatalk/ddp_pcb.c#11 integrate .. //depot/projects/smpng/sys/netatalk/ddp_pcb.h#5 integrate .. //depot/projects/smpng/sys/netatalk/ddp_usrreq.c#29 integrate .. //depot/projects/smpng/sys/netatalk/ddp_var.h#5 integrate .. //depot/projects/smpng/sys/netinet/ip.h#12 integrate .. //depot/projects/smpng/sys/netinet6/esp_aesctr.c#5 integrate .. //depot/projects/smpng/sys/netinet6/in6_cksum.c#12 integrate .. //depot/projects/smpng/sys/powerpc/include/reloc.h#3 integrate .. //depot/projects/smpng/sys/sparc64/include/reloc.h#3 integrate .. //depot/projects/smpng/sys/sparc64/include/setjmp.h#7 integrate .. //depot/projects/smpng/sys/sun4v/include/reloc.h#2 integrate .. //depot/projects/smpng/sys/sun4v/include/setjmp.h#2 integrate Differences ... ==== //depot/projects/smpng/sys/amd64/include/setjmp.h#3 (text+ko) ==== @@ -10,10 +10,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by John Birrell. - * 4. Neither the name of the author nor the names of any co-contributors + * 3. Neither the name of the author nor the names of any co-contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -29,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/include/setjmp.h,v 1.9 2003/06/02 21:49:35 peter Exp $ + * $FreeBSD: src/sys/amd64/include/setjmp.h,v 1.10 2007/01/12 07:24:06 imp Exp $ */ #ifndef _MACHINE_SETJMP_H_ ==== //depot/projects/smpng/sys/dev/mii/amphy.c#15 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/mii/amphy.c,v 1.21 2006/12/02 21:21:16 marius Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/mii/amphy.c,v 1.22 2007/01/12 22:27:46 marius Exp $"); /* * driver for AMD AM79c873 PHYs @@ -120,7 +120,7 @@ #if 0 ADD(IFM_MAKEWORD(IFM_ETHER, IFM_100_TX, IFM_LOOP, sc->mii_inst), - BMCR_LOOP|BMCR_S100); + MII_MEDIA_100_TX); #endif mii_phy_reset(sc); ==== //depot/projects/smpng/sys/dev/mii/exphy.c#14 (text+ko) ==== @@ -67,7 +67,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/mii/exphy.c,v 1.21 2006/07/03 02:53:39 yongari Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/mii/exphy.c,v 1.22 2007/01/12 22:27:46 marius Exp $"); /* * driver for 3Com internal PHYs @@ -185,7 +185,7 @@ #endif ADD(IFM_MAKEWORD(IFM_ETHER, IFM_100_TX, IFM_LOOP, sc->mii_inst), - BMCR_LOOP|BMCR_S100); + MII_MEDIA_100_TX); exphy_reset(sc); ==== //depot/projects/smpng/sys/dev/mii/inphy.c#10 (text+ko) ==== @@ -29,7 +29,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/mii/inphy.c,v 1.16 2006/12/02 15:32:33 marius Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/mii/inphy.c,v 1.17 2007/01/12 22:27:46 marius Exp $"); /* * driver for Intel 82553 and 82555 PHYs @@ -115,7 +115,7 @@ ifmedia_add(&mii->mii_media, IFM_MAKEWORD(IFM_ETHER, IFM_100_TX, IFM_LOOP, sc->mii_inst), - BMCR_LOOP|BMCR_S100, NULL); + MII_MEDIA_100_TX, NULL); mii_phy_reset(sc); ==== //depot/projects/smpng/sys/dev/mii/lxtphy.c#16 (text+ko) ==== @@ -68,7 +68,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/mii/lxtphy.c,v 1.18 2006/12/02 15:32:33 marius Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/mii/lxtphy.c,v 1.19 2007/01/12 22:27:46 marius Exp $"); /* * driver for Level One's LXT-970 ethernet 10/100 PHY @@ -161,10 +161,10 @@ #define ADD(m, c) ifmedia_add(&mii->mii_media, (m), (c), NULL) ADD(IFM_MAKEWORD(IFM_ETHER, IFM_100_FX, 0, sc->mii_inst), - BMCR_S100); + MII_MEDIA_100_TX); printf("100baseFX, "); ADD(IFM_MAKEWORD(IFM_ETHER, IFM_100_FX, IFM_FDX, sc->mii_inst), - BMCR_S100|BMCR_FDX); + MII_MEDIA_100_TX_FDX); printf("100baseFX-FDX, "); #undef ADD ==== //depot/projects/smpng/sys/dev/mii/nsphy.c#15 (text+ko) ==== @@ -67,7 +67,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/mii/nsphy.c,v 1.27 2006/12/02 15:32:33 marius Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/mii/nsphy.c,v 1.28 2007/01/12 22:27:46 marius Exp $"); /* * driver for National Semiconductor's DP83840A ethernet 10/100 PHY @@ -178,7 +178,7 @@ if (strcmp(nic, "pcn") != 0) #if 1 ADD(IFM_MAKEWORD(IFM_ETHER, IFM_100_TX, IFM_LOOP, - sc->mii_inst), BMCR_LOOP|BMCR_S100); + sc->mii_inst), MII_MEDIA_100_TX); #else if (strcmp(nic, "pcn") == 0) sc->mii_flags |= MIIF_NOLOOP; ==== //depot/projects/smpng/sys/dev/mii/rlphy.c#19 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/mii/rlphy.c,v 1.25 2006/12/02 15:32:33 marius Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/mii/rlphy.c,v 1.26 2007/01/12 22:27:46 marius Exp $"); /* * driver for RealTek 8139 internal PHYs @@ -153,7 +153,7 @@ #define ADD(m, c) ifmedia_add(&mii->mii_media, (m), (c), NULL) ADD(IFM_MAKEWORD(IFM_ETHER, IFM_100_TX, IFM_LOOP, sc->mii_inst), - BMCR_LOOP|BMCR_S100); + MII_MEDIA_100_TX); mii_phy_reset(sc); ==== //depot/projects/smpng/sys/dev/pci/pci.c#83 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/pci/pci.c,v 1.331 2006/12/28 06:14:42 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/pci/pci.c,v 1.334 2007/01/12 21:37:51 jhb Exp $"); #include "opt_bus.h" @@ -178,16 +178,21 @@ { 0x02001166, PCI_QUIRK_MAP_REG, 0x90, 0 }, /* - * MSI doesn't work with the Intel E7501 chipset, at least on - * the Tyan 2721 motherboard. + * MSI doesn't work with the ServerWorks CNB20-HE Host Bridge + * or the CMIC-SL (AKA ServerWorks GC_LE). */ - { 0x254c8086, PCI_QUIRK_DISABLE_MSI, 0, 0 }, + { 0x00141166, PCI_QUIRK_DISABLE_MSI, 0, 0 }, + { 0x00171166, PCI_QUIRK_DISABLE_MSI, 0, 0 }, /* - * MSI doesn't work with the Intel E7505 chipset, at least on - * the Tyan S2665ANF motherboard. + * MSI doesn't work on earlier Intel chipsets including + * E7500, E7501, E7505, E7210, and 855. */ + { 0x25408086, PCI_QUIRK_DISABLE_MSI, 0, 0 }, + { 0x254c8086, PCI_QUIRK_DISABLE_MSI, 0, 0 }, { 0x25508086, PCI_QUIRK_DISABLE_MSI, 0, 0 }, + { 0x25788086, PCI_QUIRK_DISABLE_MSI, 0, 0 }, + { 0x35808086, PCI_QUIRK_DISABLE_MSI, 0, 0 }, { 0 } }; ==== //depot/projects/smpng/sys/i386/include/setjmp.h#3 (text+ko) ==== @@ -10,10 +10,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by John Birrell. - * 4. Neither the name of the author nor the names of any co-contributors + * 3. Neither the name of the author nor the names of any co-contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -29,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/i386/include/setjmp.h,v 1.7 2002/10/05 05:47:55 mike Exp $ + * $FreeBSD: src/sys/i386/include/setjmp.h,v 1.8 2007/01/12 07:24:35 imp Exp $ */ #ifndef _MACHINE_SETJMP_H_ ==== //depot/projects/smpng/sys/ia64/include/exec.h#4 (text+ko) ==== @@ -10,10 +10,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by John Birrell. - * 4. Neither the name of the author nor the names of any co-contributors + * 3. Neither the name of the author nor the names of any co-contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -29,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/ia64/include/exec.h,v 1.3 2005/02/19 21:16:48 ru Exp $ + * $FreeBSD: src/sys/ia64/include/exec.h,v 1.4 2007/01/12 07:24:36 imp Exp $ */ #ifndef _MACHINE_EXEC_H_ ==== //depot/projects/smpng/sys/ia64/include/floatingpoint.h#3 (text+ko) ==== @@ -10,10 +10,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by John Birrell. - * 4. Neither the name of the author nor the names of any co-contributors + * 3. Neither the name of the author nor the names of any co-contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -29,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/ia64/include/floatingpoint.h,v 1.2 2005/01/06 22:18:23 imp Exp $ + * $FreeBSD: src/sys/ia64/include/floatingpoint.h,v 1.3 2007/01/12 07:24:36 imp Exp $ */ #include ==== //depot/projects/smpng/sys/ia64/include/reloc.h#3 (text+ko) ==== @@ -10,10 +10,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by John Birrell. - * 4. Neither the name of the author nor the names of any co-contributors + * 3. Neither the name of the author nor the names of any co-contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -29,5 +26,5 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/ia64/include/reloc.h,v 1.2 2005/01/06 22:18:23 imp Exp $ + * $FreeBSD: src/sys/ia64/include/reloc.h,v 1.3 2007/01/12 07:24:36 imp Exp $ */ ==== //depot/projects/smpng/sys/kern/kern_acl.c#28 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/kern_acl.c,v 1.49 2006/10/22 11:52:12 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_acl.c,v 1.50 2007/01/12 22:01:03 rwatson Exp $"); #include "opt_mac.h" @@ -66,12 +66,11 @@ acl_type_t type, struct acl *aclp); /* - * These calls wrap the real vnode operations, and are called by the - * syscall code once the syscall has converted the path or file - * descriptor to a vnode (unlocked). The aclp pointer is assumed - * still to point to userland, so this should not be consumed within - * the kernel except by syscall code. Other code should directly - * invoke VOP_{SET,GET}ACL. + * These calls wrap the real vnode operations, and are called by the syscall + * code once the syscall has converted the path or file descriptor to a vnode + * (unlocked). The aclp pointer is assumed still to point to userland, so + * this should not be consumed within the kernel except by syscall code. + * Other code should directly invoke VOP_{SET,GET}ACL. */ /* @@ -180,9 +179,8 @@ } /* - * syscalls -- convert the path/fd to a vnode, and call vacl_whatever. - * Don't need to lock, as the vacl_ code will get/release any locks - * required. + * syscalls -- convert the path/fd to a vnode, and call vacl_whatever. Don't + * need to lock, as the vacl_ code will get/release any locks required. */ /* ==== //depot/projects/smpng/sys/kern/kern_ntptime.c#20 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/kern_ntptime.c,v 1.60 2006/11/06 13:42:00 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_ntptime.c,v 1.61 2007/01/12 07:40:30 imp Exp $"); #include "opt_ntp.h" @@ -268,6 +268,7 @@ ntp_gettime1(&ntv); mtx_unlock(&Giant); + td->td_retval[0] = ntv.time_state; return (copyout(&ntv, uap->ntvp, sizeof(ntv))); } ==== //depot/projects/smpng/sys/netatalk/aarp.c#22 (text+ko) ==== @@ -47,7 +47,7 @@ * +1-313-764-2278 * netatalk@umich.edu * - * $FreeBSD: src/sys/netatalk/aarp.c,v 1.41 2007/01/08 17:58:27 rwatson Exp $ + * $FreeBSD: src/sys/netatalk/aarp.c,v 1.42 2007/01/12 12:25:12 rwatson Exp $ */ #include "opt_atalk.h" @@ -75,95 +75,89 @@ #include -static void aarptfree(struct aarptab *aat); -static void at_aarpinput(struct ifnet *ifp, struct mbuf *m); +static void aarptfree(struct aarptab *aat); +static void at_aarpinput(struct ifnet *ifp, struct mbuf *m); -#define AARPTAB_BSIZ 9 -#define AARPTAB_NB 19 -#define AARPTAB_SIZE (AARPTAB_BSIZ * AARPTAB_NB) +#define AARPTAB_BSIZ 9 +#define AARPTAB_NB 19 +#define AARPTAB_SIZE (AARPTAB_BSIZ * AARPTAB_NB) static struct aarptab aarptab[AARPTAB_SIZE]; -struct mtx aarptab_mtx; +struct mtx aarptab_mtx; MTX_SYSINIT(aarptab_mtx, &aarptab_mtx, "aarptab_mtx", MTX_DEF); -#define AARPTAB_HASH(a) \ - ((((a).s_net << 8) + (a).s_node) % AARPTAB_NB) +#define AARPTAB_HASH(a) ((((a).s_net << 8) + (a).s_node) % AARPTAB_NB) -#define AARPTAB_LOOK(aat, addr) { \ - int n; \ - AARPTAB_LOCK_ASSERT(); \ - aat = &aarptab[ AARPTAB_HASH(addr) * AARPTAB_BSIZ ]; \ - for (n = 0; n < AARPTAB_BSIZ; n++, aat++) \ - if (aat->aat_ataddr.s_net == (addr).s_net && \ - aat->aat_ataddr.s_node == (addr).s_node) \ - break; \ - if (n >= AARPTAB_BSIZ) \ - aat = NULL; \ -} +#define AARPTAB_LOOK(aat, addr) do { \ + int n; \ + \ + AARPTAB_LOCK_ASSERT(); \ + aat = &aarptab[ AARPTAB_HASH(addr) * AARPTAB_BSIZ ]; \ + for (n = 0; n < AARPTAB_BSIZ; n++, aat++) { \ + if (aat->aat_ataddr.s_net == (addr).s_net && \ + aat->aat_ataddr.s_node == (addr).s_node) \ + break; \ + } \ + if (n >= AARPTAB_BSIZ) \ + aat = NULL; \ +} while (0) -#define AARPT_AGE (60 * 1) -#define AARPT_KILLC 20 -#define AARPT_KILLI 3 +#define AARPT_AGE (60 * 1) +#define AARPT_KILLC 20 +#define AARPT_KILLI 3 -# if !defined(__FreeBSD__) -extern u_char etherbroadcastaddr[6]; -# endif /* __FreeBSD__ */ - -static const u_char atmulticastaddr[ 6 ] = { - 0x09, 0x00, 0x07, 0xff, 0xff, 0xff, +static const u_char atmulticastaddr[6] = { + 0x09, 0x00, 0x07, 0xff, 0xff, 0xff, }; -u_char at_org_code[ 3 ] = { - 0x08, 0x00, 0x07, +u_char at_org_code[3] = { + 0x08, 0x00, 0x07, }; -const u_char aarp_org_code[ 3 ] = { - 0x00, 0x00, 0x00, +const u_char aarp_org_code[3] = { + 0x00, 0x00, 0x00, }; -static struct callout_handle aarptimer_ch = +static struct callout_handle aarptimer_ch = CALLOUT_HANDLE_INITIALIZER(&aarptimer_ch); static void aarptimer(void *ignored) { - struct aarptab *aat; - int i; + struct aarptab *aat; + int i; - aarptimer_ch = timeout(aarptimer, (caddr_t)0, AARPT_AGE * hz); - aat = aarptab; - AARPTAB_LOCK(); - for (i = 0; i < AARPTAB_SIZE; i++, aat++) { - if (aat->aat_flags == 0 || (aat->aat_flags & ATF_PERM)) - continue; - if (++aat->aat_timer < ((aat->aat_flags & ATF_COM) ? - AARPT_KILLC : AARPT_KILLI)) - continue; - aarptfree(aat); - } - AARPTAB_UNLOCK(); + aarptimer_ch = timeout(aarptimer, NULL, AARPT_AGE * hz); + aat = aarptab; + AARPTAB_LOCK(); + for (i = 0; i < AARPTAB_SIZE; i++, aat++) { + if (aat->aat_flags == 0 || (aat->aat_flags & ATF_PERM)) + continue; + if (++aat->aat_timer < ((aat->aat_flags & ATF_COM) ? + AARPT_KILLC : AARPT_KILLI)) + continue; + aarptfree(aat); + } + AARPTAB_UNLOCK(); } /* - * search through the network addresses to find one that includes - * the given network.. remember to take netranges into - * consideration. + * Search through the network addresses to find one that includes the given + * network. Remember to take netranges into consideration. */ struct at_ifaddr * at_ifawithnet(struct sockaddr_at *sat) { - struct at_ifaddr *aa; - struct sockaddr_at *sat2; + struct at_ifaddr *aa; + struct sockaddr_at *sat2; for (aa = at_ifaddr_list; aa != NULL; aa = aa->aa_next) { sat2 = &(aa->aa_addr); - if (sat2->sat_addr.s_net == sat->sat_addr.s_net) { - break; - } - if((aa->aa_flags & AFA_PHASE2) - && (ntohs(aa->aa_firstnet) <= ntohs(sat->sat_addr.s_net)) - && (ntohs(aa->aa_lastnet) >= ntohs(sat->sat_addr.s_net))) { + if (sat2->sat_addr.s_net == sat->sat_addr.s_net) + break; + if ((aa->aa_flags & AFA_PHASE2) && + (ntohs(aa->aa_firstnet) <= ntohs(sat->sat_addr.s_net)) && + (ntohs(aa->aa_lastnet) >= ntohs(sat->sat_addr.s_net))) break; - } } return (aa); } @@ -171,521 +165,514 @@ static void aarpwhohas(struct ifnet *ifp, struct sockaddr_at *sat) { - struct mbuf *m; - struct ether_header *eh; - struct ether_aarp *ea; - struct at_ifaddr *aa; - struct llc *llc; - struct sockaddr sa; + struct mbuf *m; + struct ether_header *eh; + struct ether_aarp *ea; + struct at_ifaddr *aa; + struct llc *llc; + struct sockaddr sa; - AARPTAB_UNLOCK_ASSERT(); - if ((m = m_gethdr(M_DONTWAIT, MT_DATA)) == NULL) { - return; - } + AARPTAB_UNLOCK_ASSERT(); + m = m_gethdr(M_DONTWAIT, MT_DATA); + if (m == NULL) + return; #ifdef MAC - mac_create_mbuf_linklayer(ifp, m); + mac_create_mbuf_linklayer(ifp, m); #endif - m->m_len = sizeof(*ea); - m->m_pkthdr.len = sizeof(*ea); - MH_ALIGN(m, sizeof(*ea)); + m->m_len = sizeof(*ea); + m->m_pkthdr.len = sizeof(*ea); + MH_ALIGN(m, sizeof(*ea)); - ea = mtod(m, struct ether_aarp *); - bzero((caddr_t)ea, sizeof(*ea)); + ea = mtod(m, struct ether_aarp *); + bzero((caddr_t)ea, sizeof(*ea)); - ea->aarp_hrd = htons(AARPHRD_ETHER); - ea->aarp_pro = htons(ETHERTYPE_AT); - ea->aarp_hln = sizeof(ea->aarp_sha); - ea->aarp_pln = sizeof(ea->aarp_spu); - ea->aarp_op = htons(AARPOP_REQUEST); - bcopy(IF_LLADDR(ifp), (caddr_t)ea->aarp_sha, - sizeof(ea->aarp_sha)); + ea->aarp_hrd = htons(AARPHRD_ETHER); + ea->aarp_pro = htons(ETHERTYPE_AT); + ea->aarp_hln = sizeof(ea->aarp_sha); + ea->aarp_pln = sizeof(ea->aarp_spu); + ea->aarp_op = htons(AARPOP_REQUEST); + bcopy(IF_LLADDR(ifp), (caddr_t)ea->aarp_sha, sizeof(ea->aarp_sha)); - /* - * We need to check whether the output ethernet type should - * be phase 1 or 2. We have the interface that we'll be sending - * the aarp out. We need to find an AppleTalk network on that - * interface with the same address as we're looking for. If the - * net is phase 2, generate an 802.2 and SNAP header. - */ - if ((aa = at_ifawithnet(sat)) == NULL) { - m_freem(m); - return; - } + /* + * We need to check whether the output ethernet type should be phase + * 1 or 2. We have the interface that we'll be sending the aarp out. + * We need to find an AppleTalk network on that interface with the + * same address as we're looking for. If the net is phase 2, + * generate an 802.2 and SNAP header. + */ + if ((aa = at_ifawithnet(sat)) == NULL) { + m_freem(m); + return; + } - eh = (struct ether_header *)sa.sa_data; + eh = (struct ether_header *)sa.sa_data; - if (aa->aa_flags & AFA_PHASE2) { - bcopy(atmulticastaddr, eh->ether_dhost, sizeof(eh->ether_dhost)); - eh->ether_type = htons(sizeof(struct llc) + sizeof(struct ether_aarp)); - M_PREPEND(m, sizeof(struct llc), M_DONTWAIT); - if (m == NULL) { - return; + if (aa->aa_flags & AFA_PHASE2) { + bcopy(atmulticastaddr, eh->ether_dhost, + sizeof(eh->ether_dhost)); + eh->ether_type = htons(sizeof(struct llc) + + sizeof(struct ether_aarp)); + M_PREPEND(m, sizeof(struct llc), M_DONTWAIT); + if (m == NULL) + return; + llc = mtod(m, struct llc *); + llc->llc_dsap = llc->llc_ssap = LLC_SNAP_LSAP; + llc->llc_control = LLC_UI; + bcopy(aarp_org_code, llc->llc_org_code, + sizeof(aarp_org_code)); + llc->llc_ether_type = htons(ETHERTYPE_AARP); + bcopy(&AA_SAT(aa)->sat_addr.s_net, ea->aarp_spnet, + sizeof(ea->aarp_spnet)); + bcopy(&sat->sat_addr.s_net, ea->aarp_tpnet, + sizeof(ea->aarp_tpnet)); + ea->aarp_spnode = AA_SAT(aa)->sat_addr.s_node; + ea->aarp_tpnode = sat->sat_addr.s_node; + } else { + bcopy(ifp->if_broadcastaddr, (caddr_t)eh->ether_dhost, + sizeof(eh->ether_dhost)); + eh->ether_type = htons(ETHERTYPE_AARP); + ea->aarp_spa = AA_SAT(aa)->sat_addr.s_node; + ea->aarp_tpa = sat->sat_addr.s_node; } - llc = mtod(m, struct llc *); - llc->llc_dsap = llc->llc_ssap = LLC_SNAP_LSAP; - llc->llc_control = LLC_UI; - bcopy(aarp_org_code, llc->llc_org_code, sizeof(aarp_org_code)); - llc->llc_ether_type = htons(ETHERTYPE_AARP); - - bcopy(&AA_SAT(aa)->sat_addr.s_net, ea->aarp_spnet, - sizeof(ea->aarp_spnet)); - bcopy(&sat->sat_addr.s_net, ea->aarp_tpnet, - sizeof(ea->aarp_tpnet)); - ea->aarp_spnode = AA_SAT(aa)->sat_addr.s_node; - ea->aarp_tpnode = sat->sat_addr.s_node; - } else { - bcopy(ifp->if_broadcastaddr, (caddr_t)eh->ether_dhost, - sizeof(eh->ether_dhost)); - eh->ether_type = htons(ETHERTYPE_AARP); - - ea->aarp_spa = AA_SAT(aa)->sat_addr.s_node; - ea->aarp_tpa = sat->sat_addr.s_node; - } #ifdef NETATALKDEBUG - printf("aarp: sending request for %u.%u\n", - ntohs(AA_SAT(aa)->sat_addr.s_net), - AA_SAT(aa)->sat_addr.s_node); + printf("aarp: sending request for %u.%u\n", + ntohs(AA_SAT(aa)->sat_addr.s_net), AA_SAT(aa)->sat_addr.s_node); #endif /* NETATALKDEBUG */ - sa.sa_len = sizeof(struct sockaddr); - sa.sa_family = AF_UNSPEC; - ifp->if_output(ifp, m, &sa, NULL /* route */); + sa.sa_len = sizeof(struct sockaddr); + sa.sa_family = AF_UNSPEC; + ifp->if_output(ifp, m, &sa, NULL); } int -aarpresolve(ifp, m, destsat, desten) - struct ifnet *ifp; - struct mbuf *m; - struct sockaddr_at *destsat; - u_char *desten; +aarpresolve(struct ifnet *ifp, struct mbuf *m, struct sockaddr_at *destsat, + u_char *desten) { - struct at_ifaddr *aa; - struct aarptab *aat; + struct at_ifaddr *aa; + struct aarptab *aat; - if (at_broadcast(destsat)) { - m->m_flags |= M_BCAST; - if ((aa = at_ifawithnet(destsat)) == NULL) { - m_freem(m); - return (0); + if (at_broadcast(destsat)) { + m->m_flags |= M_BCAST; + if ((aa = at_ifawithnet(destsat)) == NULL) { + m_freem(m); + return (0); + } + if (aa->aa_flags & AFA_PHASE2) + bcopy(atmulticastaddr, (caddr_t)desten, + sizeof(atmulticastaddr)); + else + bcopy(ifp->if_broadcastaddr, (caddr_t)desten, + sizeof(ifp->if_addrlen)); + return (1); } - if (aa->aa_flags & AFA_PHASE2) { - bcopy(atmulticastaddr, (caddr_t)desten, sizeof(atmulticastaddr)); - } else { - bcopy(ifp->if_broadcastaddr, (caddr_t)desten, - sizeof(ifp->if_addrlen)); + + AARPTAB_LOCK(); + AARPTAB_LOOK(aat, destsat->sat_addr); + if (aat == NULL) { + /* No entry. */ + aat = aarptnew(&destsat->sat_addr); + + /* We should fail more gracefully. */ + if (aat == NULL) + panic("aarpresolve: no free entry"); + goto done; } - return (1); - } - AARPTAB_LOCK(); - AARPTAB_LOOK(aat, destsat->sat_addr); - if (aat == NULL) { /* No entry */ - aat = aarptnew(&destsat->sat_addr); - if (aat == NULL) { /* we should fail more gracefully! */ - panic("aarpresolve: no free entry"); + /* Found an entry. */ + aat->aat_timer = 0; + if (aat->aat_flags & ATF_COM) { + /* Entry is COMplete. */ + bcopy((caddr_t)aat->aat_enaddr, (caddr_t)desten, + sizeof(aat->aat_enaddr)); + AARPTAB_UNLOCK(); + return (1); } - goto done; - } - /* found an entry */ - aat->aat_timer = 0; - if (aat->aat_flags & ATF_COM) { /* entry is COMplete */ - bcopy((caddr_t)aat->aat_enaddr, (caddr_t)desten, - sizeof(aat->aat_enaddr)); + + /* Entry has not completed. */ + if (aat->aat_hold) + m_freem(aat->aat_hold); +done: + aat->aat_hold = m; AARPTAB_UNLOCK(); - return (1); - } - /* entry has not completed */ - if (aat->aat_hold) { - m_freem(aat->aat_hold); - } -done: - aat->aat_hold = m; - AARPTAB_UNLOCK(); - aarpwhohas(ifp, destsat); - return (0); + aarpwhohas(ifp, destsat); + return (0); } void -aarpintr(m) - struct mbuf *m; +aarpintr(struct mbuf *m) { - struct arphdr *ar; - struct ifnet *ifp; + struct arphdr *ar; + struct ifnet *ifp; - ifp = m->m_pkthdr.rcvif; - if (ifp->if_flags & IFF_NOARP) - goto out; + ifp = m->m_pkthdr.rcvif; + if (ifp->if_flags & IFF_NOARP) + goto out; - if (m->m_len < sizeof(struct arphdr)) { - goto out; - } + if (m->m_len < sizeof(struct arphdr)) + goto out; - ar = mtod(m, struct arphdr *); - if (ntohs(ar->ar_hrd) != AARPHRD_ETHER) { - goto out; - } - - if (m->m_len < sizeof(struct arphdr) + 2 * ar->ar_hln + - 2 * ar->ar_pln) { - goto out; - } - - switch(ntohs(ar->ar_pro)) { - case ETHERTYPE_AT : - at_aarpinput(ifp, m); - return; - - default: - break; - } + ar = mtod(m, struct arphdr *); + if (ntohs(ar->ar_hrd) != AARPHRD_ETHER) + goto out; + + if (m->m_len < sizeof(struct arphdr) + 2 * ar->ar_hln + + 2 * ar->ar_pln) + goto out; + + switch(ntohs(ar->ar_pro)) { + case ETHERTYPE_AT: + at_aarpinput(ifp, m); + return; + default: + break; + } out: - m_freem(m); + m_freem(m); } static void at_aarpinput(struct ifnet *ifp, struct mbuf *m) { - struct ether_aarp *ea; - struct at_ifaddr *aa; - struct aarptab *aat; - struct ether_header *eh; - struct llc *llc; - struct sockaddr_at sat; - struct sockaddr sa; - struct at_addr spa, tpa, ma; - int op; - u_short net; + struct ether_aarp *ea; + struct at_ifaddr *aa; + struct aarptab *aat; + struct ether_header *eh; + struct llc *llc; + struct sockaddr_at sat; + struct sockaddr sa; + struct at_addr spa, tpa, ma; + int op; + u_short net; - ea = mtod(m, struct ether_aarp *); + ea = mtod(m, struct ether_aarp *); - /* Check to see if from my hardware address */ - if (!bcmp((caddr_t)ea->aarp_sha, IF_LLADDR(ifp), ETHER_ADDR_LEN)) { - m_freem(m); - return; - } + /* Check to see if from my hardware address. */ + if (!bcmp((caddr_t)ea->aarp_sha, IF_LLADDR(ifp), ETHER_ADDR_LEN)) { + m_freem(m); + return; + } - op = ntohs(ea->aarp_op); - bcopy(ea->aarp_tpnet, &net, sizeof(net)); + op = ntohs(ea->aarp_op); + bcopy(ea->aarp_tpnet, &net, sizeof(net)); - if (net != 0) { /* should be ATADDR_ANYNET? */ - sat.sat_len = sizeof(struct sockaddr_at); - sat.sat_family = AF_APPLETALK; - sat.sat_addr.s_net = net; - if ((aa = at_ifawithnet(&sat)) == NULL) { - m_freem(m); - return; + if (net != 0) { + /* Should be ATADDR_ANYNET? */ + sat.sat_len = sizeof(struct sockaddr_at); + sat.sat_family = AF_APPLETALK; + sat.sat_addr.s_net = net; + if ((aa = at_ifawithnet(&sat)) == NULL) { + m_freem(m); + return; + } + bcopy(ea->aarp_spnet, &spa.s_net, sizeof(spa.s_net)); + bcopy(ea->aarp_tpnet, &tpa.s_net, sizeof(tpa.s_net)); + } else { + /* + * Since we don't know the net, we just look for the first + * phase 1 address on the interface. + */ + for (aa = (struct at_ifaddr *)TAILQ_FIRST(&ifp->if_addrhead); + aa; + aa = (struct at_ifaddr *)aa->aa_ifa.ifa_link.tqe_next) { + if (AA_SAT(aa)->sat_family == AF_APPLETALK && + (aa->aa_flags & AFA_PHASE2) == 0) { + break; + } + } + if (aa == NULL) { + m_freem(m); + return; + } + tpa.s_net = spa.s_net = AA_SAT(aa)->sat_addr.s_net; } - bcopy(ea->aarp_spnet, &spa.s_net, sizeof(spa.s_net)); - bcopy(ea->aarp_tpnet, &tpa.s_net, sizeof(tpa.s_net)); - } else { + + spa.s_node = ea->aarp_spnode; + tpa.s_node = ea->aarp_tpnode; + ma.s_net = AA_SAT(aa)->sat_addr.s_net; + ma.s_node = AA_SAT(aa)->sat_addr.s_node; + /* - * Since we don't know the net, we just look for the first - * phase 1 address on the interface. + * This looks like it's from us. */ - for (aa = (struct at_ifaddr *)TAILQ_FIRST(&ifp->if_addrhead); aa; - aa = (struct at_ifaddr *)aa->aa_ifa.ifa_link.tqe_next) { - if (AA_SAT(aa)->sat_family == AF_APPLETALK && - (aa->aa_flags & AFA_PHASE2) == 0) { - break; - } + if (spa.s_net == ma.s_net && spa.s_node == ma.s_node) { + if (aa->aa_flags & AFA_PROBING) { + /* + * We're probing, someone either responded to our + * probe, or probed for the same address we'd like to + * use. Change the address we're probing for. + */ + callout_stop(&aa->aa_callout); + wakeup(aa); + m_freem(m); + return; + } else if (op != AARPOP_PROBE) { + /* + * This is not a probe, and we're not probing. This + * means that someone's saying they have the same + * source address as the one we're using. Get upset. + */ + log(LOG_ERR, + "aarp: duplicate AT address!! %x:%x:%x:%x:%x:%x\n", + ea->aarp_sha[0], ea->aarp_sha[1], + ea->aarp_sha[2], ea->aarp_sha[3], + ea->aarp_sha[4], ea->aarp_sha[5]); + m_freem(m); + return; + } } - if (aa == NULL) { - m_freem(m); - return; - } - tpa.s_net = spa.s_net = AA_SAT(aa)->sat_addr.s_net; - } - spa.s_node = ea->aarp_spnode; - tpa.s_node = ea->aarp_tpnode; - ma.s_net = AA_SAT(aa)->sat_addr.s_net; >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Jan 12 23:27: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 EE0D516A412; Fri, 12 Jan 2007 23:27:35 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 99D2E16A403 for ; Fri, 12 Jan 2007 23:27:35 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 89AD413C44B for ; Fri, 12 Jan 2007 23:27:35 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l0CNRZUH017246 for ; Fri, 12 Jan 2007 23:27:35 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0CNRYLp017243 for perforce@freebsd.org; Fri, 12 Jan 2007 23:27:35 GMT (envelope-from hselasky@FreeBSD.org) Date: Fri, 12 Jan 2007 23:27:35 GMT Message-Id: <200701122327.l0CNRYLp017243@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Cc: Subject: PERFORCE change 112847 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 12 Jan 2007 23:27:36 -0000 http://perforce.freebsd.org/chv.cgi?CH=112847 Change 112847 by hselasky@hselasky_mini_itx on 2007/01/12 23:26:37 Fix "EVIL HACK" regression. Obviously some parts of the network stack, the MII-bus at least, still depends on a "struct ifnet" pointer at the beginning of the network device's softc. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/if_aue.c#15 edit .. //depot/projects/usb/src/sys/dev/usb/if_auereg.h#10 edit .. //depot/projects/usb/src/sys/dev/usb/if_axe.c#14 edit .. //depot/projects/usb/src/sys/dev/usb/if_axereg.h#10 edit .. //depot/projects/usb/src/sys/dev/usb/if_cdce.c#10 edit .. //depot/projects/usb/src/sys/dev/usb/if_cdcereg.h#9 edit .. //depot/projects/usb/src/sys/dev/usb/if_cue.c#12 edit .. //depot/projects/usb/src/sys/dev/usb/if_cuereg.h#7 edit .. //depot/projects/usb/src/sys/dev/usb/if_kue.c#14 edit .. //depot/projects/usb/src/sys/dev/usb/if_kuefw.h#3 edit .. //depot/projects/usb/src/sys/dev/usb/if_kuereg.h#7 edit .. //depot/projects/usb/src/sys/dev/usb/if_rue.c#13 edit .. //depot/projects/usb/src/sys/dev/usb/if_ruereg.h#8 edit .. //depot/projects/usb/src/sys/dev/usb/if_udav.c#13 edit .. //depot/projects/usb/src/sys/dev/usb/if_udavreg.h#8 edit .. //depot/projects/usb/src/sys/dev/usb/if_ural.c#16 edit .. //depot/projects/usb/src/sys/dev/usb/if_uralreg.h#8 edit .. //depot/projects/usb/src/sys/dev/usb/if_uralvar.h#11 edit .. //depot/projects/usb/src/sys/dev/usb/if_zyd.c#2 edit .. //depot/projects/usb/src/sys/dev/usb/if_zydfw.h#2 edit .. //depot/projects/usb/src/sys/dev/usb/if_zydreg.h#2 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/if_aue.c#15 (text+ko) ==== @@ -905,6 +905,8 @@ goto done; } + sc->sc_evilhack = ifp; + ifp->if_softc = sc; if_initname(ifp, "aue", sc->sc_unit); ifp->if_mtu = ETHERMTU; ==== //depot/projects/usb/src/sys/dev/usb/if_auereg.h#10 (text+ko) ==== @@ -198,6 +198,8 @@ struct aue_softc { + void *sc_evilhack; /* XXX this pointer must be first */ + struct usbd_config_td sc_config_td; struct __callout sc_watchdog; struct mtx sc_mtx; ==== //depot/projects/usb/src/sys/dev/usb/if_axe.c#14 (text+ko) ==== @@ -719,6 +719,8 @@ goto done; } + sc->sc_evilhack = ifp; + ifp->if_softc = sc; if_initname(ifp, "axe", sc->sc_unit); ifp->if_mtu = ETHERMTU; ==== //depot/projects/usb/src/sys/dev/usb/if_axereg.h#10 (text+ko) ==== @@ -113,6 +113,8 @@ device_get_softc((sc)->sc_miibus) : NULL) struct axe_softc { + void *sc_evilhack; /* XXX this pointer must be first */ + struct usbd_config_td sc_config_td; struct __callout sc_watchdog; struct mtx sc_mtx; ==== //depot/projects/usb/src/sys/dev/usb/if_cdce.c#10 (text+ko) ==== @@ -379,6 +379,8 @@ goto detach; } + sc->sc_evilhack = ifp; + ifp->if_softc = sc; if_initname(ifp, "cdce", sc->sc_unit); ifp->if_mtu = ETHERMTU; ==== //depot/projects/usb/src/sys/dev/usb/if_cdcereg.h#9 (text+ko) ==== @@ -43,6 +43,8 @@ }; struct cdce_softc { + void *sc_evilhack; /* XXX this pointer must be first */ + struct ifmedia sc_ifmedia; struct mtx sc_mtx; ==== //depot/projects/usb/src/sys/dev/usb/if_cue.c#12 (text+ko) ==== @@ -582,6 +582,8 @@ goto done; } + sc->sc_evilhack = ifp; + ifp->if_softc = sc; if_initname(ifp, "cue", sc->sc_unit); ifp->if_mtu = ETHERMTU; ==== //depot/projects/usb/src/sys/dev/usb/if_cuereg.h#7 (text+ko) ==== @@ -121,6 +121,8 @@ }; struct cue_softc { + void *sc_evilhack; /* XXX this pointer must be first */ + struct usbd_config_td sc_config_td; struct __callout sc_watchdog; struct mtx sc_mtx; ==== //depot/projects/usb/src/sys/dev/usb/if_kue.c#14 (text+ko) ==== @@ -617,6 +617,8 @@ goto done; } + sc->sc_evilhack = ifp; + ifp->if_softc = sc; if_initname(ifp, "kue", sc->sc_unit); ifp->if_mtu = ETHERMTU; ==== //depot/projects/usb/src/sys/dev/usb/if_kuefw.h#3 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb/if_kuereg.h#7 (text+ko) ==== @@ -126,6 +126,7 @@ }; struct kue_softc { + void *sc_evilhack; /* XXX this pointer must be first */ struct usbd_config_td sc_config_td; struct __callout sc_watchdog; ==== //depot/projects/usb/src/sys/dev/usb/if_rue.c#13 (text+ko) ==== @@ -817,6 +817,8 @@ goto done; } + sc->sc_evilhack = ifp; + ifp->if_softc = sc; if_initname(ifp, "rue", sc->sc_unit); ifp->if_mtu = ETHERMTU; ==== //depot/projects/usb/src/sys/dev/usb/if_ruereg.h#8 (text+ko) ==== @@ -166,6 +166,7 @@ }; struct rue_softc { + void *sc_evilhack; /* XXX this pointer must be first */ struct usbd_config_td sc_config_td; struct __callout sc_watchdog; ==== //depot/projects/usb/src/sys/dev/usb/if_udav.c#13 (text+ko) ==== @@ -425,6 +425,8 @@ goto done; } + sc->sc_evilhack = ifp; + ifp->if_softc = sc; if_initname(ifp, "udav", sc->sc_unit); ifp->if_mtu = ETHERMTU; ==== //depot/projects/usb/src/sys/dev/usb/if_udavreg.h#8 (text+ko) ==== @@ -137,6 +137,8 @@ device_get_softc((sc)->sc_miibus) : NULL) struct udav_softc { + void *sc_evilhack; /* XXX this pointer must be first */ + struct usbd_config_td sc_config_td; struct __callout sc_watchdog; struct mtx sc_mtx; ==== //depot/projects/usb/src/sys/dev/usb/if_ural.c#16 (text+ko) ==== @@ -869,6 +869,7 @@ goto done; } + sc->sc_evilhack = ifp; sc->sc_ifp = ifp; ifp->if_softc = sc; ==== //depot/projects/usb/src/sys/dev/usb/if_uralreg.h#8 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb/if_uralvar.h#11 (text+ko) ==== @@ -108,6 +108,7 @@ } __packed; struct ural_softc { + void *sc_evilhack; /* XXX this pointer must be first */ struct usbd_config_td sc_config_td; struct ural_tx_desc sc_tx_desc; ==== //depot/projects/usb/src/sys/dev/usb/if_zyd.c#2 (text+ko) ==== @@ -2060,6 +2060,7 @@ goto done; } + sc->sc_evilhack = ifp; sc->sc_ifp = ifp; ifp->if_softc = sc; ==== //depot/projects/usb/src/sys/dev/usb/if_zydfw.h#2 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb/if_zydreg.h#2 (text+ko) ==== @@ -1278,6 +1278,8 @@ (1 << IEEE80211_RADIOTAP_CHANNEL)) struct zyd_softc { + void *sc_evilhack; /* XXX this pointer must be first */ + struct ieee80211com sc_ic; struct zyd_rf sc_rf; struct __callout sc_scan_callout; From owner-p4-projects@FreeBSD.ORG Sat Jan 13 05:41:45 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0B3EF16A416; Sat, 13 Jan 2007 05:41:45 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id C07D216A407 for ; Sat, 13 Jan 2007 05:41:44 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id AF78613C45D for ; Sat, 13 Jan 2007 05:41:44 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l0D5ffj8011550 for ; Sat, 13 Jan 2007 05:41:41 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0D5feFV011547 for perforce@freebsd.org; Sat, 13 Jan 2007 05:41:40 GMT (envelope-from kmacy@freebsd.org) Date: Sat, 13 Jan 2007 05:41:40 GMT Message-Id: <200701130541.l0D5feFV011547@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 112858 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 13 Jan 2007 05:41:45 -0000 http://perforce.freebsd.org/chv.cgi?CH=112858 Change 112858 by kmacy@kmacy_netherworld:sam_wifi on 2007/01/13 05:40:54 remove direct channel initialization add scanning hooks remove calls to set channel in newstate drop softc lock across ieee80211_input prevent unload using RAL_INPUT_RUNNING flag make stop a no-op if the driver isn't running (prevents panic in newstate) don't acquire lock in ioctl, let called routines handle locking tested cross-section of sta functionality adhoc mode works in both 11g and 11b background scanning works Affected files ... .. //depot/projects/wifi/sys/dev/ral/rt2661.c#4 edit .. //depot/projects/wifi/sys/dev/ral/rt2661var.h#4 edit Differences ... ==== //depot/projects/wifi/sys/dev/ral/rt2661.c#4 (text) ==== @@ -53,6 +53,7 @@ #include #include +#include #include #include @@ -103,6 +104,9 @@ static void rt2661_mcu_wakeup(struct rt2661_softc *); static void rt2661_mcu_cmd_intr(struct rt2661_softc *); static int rt2661_ack_rate(struct ieee80211com *, int); +static void rt2661_scan_start(struct ieee80211com *); +static void rt2661_scan_end(struct ieee80211com *); +static void rt2661_set_channel(struct ieee80211com *); static uint16_t rt2661_txtime(int, int, uint32_t); static uint8_t rt2661_rxrate(struct rt2661_rx_desc *); static uint8_t rt2661_plcp_signal(int); @@ -147,6 +151,7 @@ static int rt2661_bbp_init(struct rt2661_softc *); static void rt2661_init(void *); static void rt2661_stop(void *); +static void rt2661_stop_locked(struct rt2661_softc *); static int rt2661_load_microcode(struct rt2661_softc *, const uint8_t *, int); #ifdef notyet @@ -201,7 +206,7 @@ struct ifnet *ifp; uint32_t val; const uint8_t *ucode = NULL; - int error, i, ac, ntries, size = 0; + int bands, error, ac, ntries, size = 0; sc->sc_dev = dev; @@ -314,44 +319,19 @@ #endif IEEE80211_C_WPA; /* 802.11i */ - if (sc->rf_rev == RT2661_RF_5225 || sc->rf_rev == RT2661_RF_5325) { - /* set supported .11a rates */ - ic->ic_sup_rates[IEEE80211_MODE_11A] = rt2661_rateset_11a; - - /* set supported .11a channels */ - for (i = 36; i <= 64; i += 4) { - ic->ic_channels[i].ic_freq = - ieee80211_ieee2mhz(i, IEEE80211_CHAN_5GHZ); - ic->ic_channels[i].ic_flags = IEEE80211_CHAN_A; - } - for (i = 100; i <= 140; i += 4) { - ic->ic_channels[i].ic_freq = - ieee80211_ieee2mhz(i, IEEE80211_CHAN_5GHZ); - ic->ic_channels[i].ic_flags = IEEE80211_CHAN_A; - } - for (i = 149; i <= 165; i += 4) { - ic->ic_channels[i].ic_freq = - ieee80211_ieee2mhz(i, IEEE80211_CHAN_5GHZ); - ic->ic_channels[i].ic_flags = IEEE80211_CHAN_A; - } - } - - /* set supported .11b and .11g rates */ - ic->ic_sup_rates[IEEE80211_MODE_11B] = rt2661_rateset_11b; - ic->ic_sup_rates[IEEE80211_MODE_11G] = rt2661_rateset_11g; + bands = 0; + setbit(&bands, IEEE80211_MODE_11B); + setbit(&bands, IEEE80211_MODE_11G); + if (sc->rf_rev == RT2661_RF_5225 || sc->rf_rev == RT2661_RF_5325) + setbit(&bands, IEEE80211_MODE_11A); + ieee80211_init_channels(ic, 0, CTRY_DEFAULT, bands, 0, 1); - /* set supported .11b and .11g channels (1 through 14) */ - for (i = 1; i <= 14; i++) { - ic->ic_channels[i].ic_freq = - ieee80211_ieee2mhz(i, IEEE80211_CHAN_2GHZ); - ic->ic_channels[i].ic_flags = - IEEE80211_CHAN_CCK | IEEE80211_CHAN_OFDM | - IEEE80211_CHAN_DYN | IEEE80211_CHAN_2GHZ; - } - ieee80211_ifattach(ic); ic->ic_node_alloc = rt2661_node_alloc; /* ic->ic_wme.wme_update = rt2661_wme_update;*/ + ic->ic_scan_start = rt2661_scan_start; + ic->ic_scan_end = rt2661_scan_end; + ic->ic_set_channel = rt2661_set_channel; ic->ic_updateslot = rt2661_update_slot; ic->ic_reset = rt2661_reset; /* enable s/w bmiss handling in sta mode */ @@ -823,20 +803,7 @@ tmp = RAL_READ(sc, RT2661_TXRX_CSR9); RAL_WRITE(sc, RT2661_TXRX_CSR9, tmp & ~0x00ffffff); } - break; - - case IEEE80211_S_SCAN: - rt2661_set_chan(sc, ic->ic_curchan); - break; - - case IEEE80211_S_AUTH: - case IEEE80211_S_ASSOC: - rt2661_set_chan(sc, ic->ic_curchan); - break; - case IEEE80211_S_RUN: - rt2661_set_chan(sc, ic->ic_curchan); - ni = ic->ic_bss; if (ic->ic_opmode != IEEE80211_M_MONITOR) { @@ -858,6 +825,10 @@ rt2661_enable_tsf_sync(sc); } break; + case IEEE80211_S_SCAN: + case IEEE80211_S_AUTH: + case IEEE80211_S_ASSOC: + break; } return (error != 0) ? error : sc->sc_newstate(ic, nstate, arg); @@ -1137,7 +1108,8 @@ bpf_mtap2(sc->sc_drvbpf, tap, sc->sc_rxtap_len, m); } - + sc->sc_flags |= RAL_INPUT_RUNNING; + RAL_UNLOCK(sc); wh = mtod(m, struct ieee80211_frame *); ni = ieee80211_find_rxnode(ic, (struct ieee80211_frame_min *)wh); @@ -1147,6 +1119,8 @@ /* 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)); @@ -1882,8 +1856,6 @@ struct ieee80211com *ic = &sc->sc_ic; int error = 0; - RAL_LOCK(sc); - switch (cmd) { case SIOCSIFFLAGS: if (ifp->if_flags & IFF_UP) { @@ -1909,8 +1881,6 @@ error = 0; } - RAL_UNLOCK(sc); - return error; } @@ -2460,7 +2430,7 @@ RAL_LOCK(sc); - rt2661_stop(sc); + rt2661_stop_locked(sc); /* initialize Tx rings */ RAL_WRITE(sc, RT2661_AC1_BASE_CSR, sc->txq[1].physaddr); @@ -2520,13 +2490,13 @@ } if (ntries == 1000) { printf("timeout waiting for BBP/RF to wakeup\n"); - rt2661_stop(sc); + rt2661_stop_locked(sc); RAL_UNLOCK(sc); return; } if (rt2661_bbp_init(sc) != 0) { - rt2661_stop(sc); + rt2661_stop_locked(sc); RAL_UNLOCK(sc); return; } @@ -2567,6 +2537,7 @@ /* kick Rx */ RAL_WRITE(sc, RT2661_RX_CNTL_CSR, 1); + RAL_UNLOCK(sc); ifp->if_drv_flags &= ~IFF_DRV_OACTIVE; ifp->if_drv_flags |= IFF_DRV_RUNNING; @@ -2577,7 +2548,7 @@ } else ieee80211_new_state(ic, IEEE80211_S_RUN, -1); - RAL_UNLOCK(sc); + #undef N } @@ -2585,41 +2556,57 @@ rt2661_stop(void *priv) { struct rt2661_softc *sc = priv; + + RAL_LOCK(sc); + rt2661_stop_locked(sc); + RAL_UNLOCK(sc); +} + +void +rt2661_stop_locked(struct rt2661_softc *sc) +{ struct ieee80211com *ic = &sc->sc_ic; struct ifnet *ifp = ic->ic_ifp; uint32_t tmp; + volatile int *flags = &sc->sc_flags; - sc->sc_tx_timer = 0; - ifp->if_drv_flags &= ~(IFF_DRV_RUNNING | IFF_DRV_OACTIVE); + while (*flags & RAL_INPUT_RUNNING) { + msleep(sc, &sc->sc_mtx, 0, "ralrunning", hz/10); + } - ieee80211_new_state(ic, IEEE80211_S_INIT, -1); - - /* abort Tx (for all 5 Tx rings) */ - RAL_WRITE(sc, RT2661_TX_CNTL_CSR, 0x1f << 16); - - /* disable Rx (value remains after reset!) */ - tmp = RAL_READ(sc, RT2661_TXRX_CSR0); - RAL_WRITE(sc, RT2661_TXRX_CSR0, tmp | RT2661_DISABLE_RX); - - /* reset ASIC */ - RAL_WRITE(sc, RT2661_MAC_CSR1, 3); - RAL_WRITE(sc, RT2661_MAC_CSR1, 0); - - /* disable interrupts */ - RAL_WRITE(sc, RT2661_INT_MASK_CSR, 0xffffffff); - RAL_WRITE(sc, RT2661_MCU_INT_MASK_CSR, 0xffffffff); - - /* clear any pending interrupt */ - RAL_WRITE(sc, RT2661_INT_SOURCE_CSR, 0xffffffff); - RAL_WRITE(sc, RT2661_MCU_INT_SOURCE_CSR, 0xffffffff); - - /* reset Tx and Rx rings */ - rt2661_reset_tx_ring(sc, &sc->txq[0]); - rt2661_reset_tx_ring(sc, &sc->txq[1]); - rt2661_reset_tx_ring(sc, &sc->txq[2]); - rt2661_reset_tx_ring(sc, &sc->txq[3]); - rt2661_reset_tx_ring(sc, &sc->mgtq); - rt2661_reset_rx_ring(sc, &sc->rxq); + if (ifp->if_drv_flags & IFF_DRV_RUNNING) { + sc->sc_tx_timer = 0; + ifp->if_drv_flags &= ~(IFF_DRV_RUNNING | IFF_DRV_OACTIVE); + + ieee80211_new_state(ic, IEEE80211_S_INIT, -1); + + /* abort Tx (for all 5 Tx rings) */ + RAL_WRITE(sc, RT2661_TX_CNTL_CSR, 0x1f << 16); + + /* disable Rx (value remains after reset!) */ + tmp = RAL_READ(sc, RT2661_TXRX_CSR0); + RAL_WRITE(sc, RT2661_TXRX_CSR0, tmp | RT2661_DISABLE_RX); + + /* reset ASIC */ + RAL_WRITE(sc, RT2661_MAC_CSR1, 3); + RAL_WRITE(sc, RT2661_MAC_CSR1, 0); + + /* disable interrupts */ + RAL_WRITE(sc, RT2661_INT_MASK_CSR, 0xffffffff); + RAL_WRITE(sc, RT2661_MCU_INT_MASK_CSR, 0xffffffff); + + /* clear any pending interrupt */ + RAL_WRITE(sc, RT2661_INT_SOURCE_CSR, 0xffffffff); + RAL_WRITE(sc, RT2661_MCU_INT_SOURCE_CSR, 0xffffffff); + + /* reset Tx and Rx rings */ + rt2661_reset_tx_ring(sc, &sc->txq[0]); + rt2661_reset_tx_ring(sc, &sc->txq[1]); + rt2661_reset_tx_ring(sc, &sc->txq[2]); + rt2661_reset_tx_ring(sc, &sc->txq[3]); + rt2661_reset_tx_ring(sc, &sc->mgtq); + rt2661_reset_rx_ring(sc, &sc->rxq); + } } static int @@ -2876,3 +2863,39 @@ } return rssi; } + +static void +rt2661_scan_start(struct ieee80211com *ic) +{ + struct ifnet *ifp = ic->ic_ifp; + struct rt2661_softc *sc = ifp->if_softc; + uint32_t tmp; + + /* abort TSF synchronization */ + tmp = RAL_READ(sc, RT2661_TXRX_CSR9); + RAL_WRITE(sc, RT2661_TXRX_CSR9, tmp & ~0xffffff); + rt2661_set_bssid(sc, ifp->if_broadcastaddr); +} + +static void +rt2661_scan_end(struct ieee80211com *ic) +{ + struct ifnet *ifp = ic->ic_ifp; + struct rt2661_softc *sc = ifp->if_softc; + + rt2661_enable_tsf_sync(sc); + /* XXX keep local copy */ + rt2661_set_bssid(sc, ic->ic_bss->ni_bssid); +} + +static void +rt2661_set_channel(struct ieee80211com *ic) +{ + struct ifnet *ifp = ic->ic_ifp; + struct rt2661_softc *sc = ifp->if_softc; + + RAL_LOCK(sc); + rt2661_set_chan(sc, ic->ic_curchan); + RAL_UNLOCK(sc); + +} ==== //depot/projects/wifi/sys/dev/ral/rt2661var.h#4 (text) ==== @@ -158,6 +158,8 @@ } sc_txtapu; #define sc_txtap sc_txtapu.th int sc_txtap_len; +#define RAL_INPUT_RUNNING 1 + int sc_flags; }; int rt2661_attach(device_t, int); From owner-p4-projects@FreeBSD.ORG Sat Jan 13 13:15: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 B5FCB16A47B; Sat, 13 Jan 2007 13:15: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 82E3116A40F for ; Sat, 13 Jan 2007 13:15:21 +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 766EA13C428 for ; Sat, 13 Jan 2007 13:15:21 +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 l0DDFLuX013107 for ; Sat, 13 Jan 2007 13:15:21 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0DDFL2W013104 for perforce@freebsd.org; Sat, 13 Jan 2007 13:15:21 GMT (envelope-from rdivacky@FreeBSD.org) Date: Sat, 13 Jan 2007 13:15:21 GMT Message-Id: <200701131315.l0DDFL2W013104@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 112861 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 13 Jan 2007 13:15:22 -0000 http://perforce.freebsd.org/chv.cgi?CH=112861 Change 112861 by rdivacky@rdivacky_witten on 2007/01/13 13:14:30 Add linux_openat syscall. Affected files ... .. //depot/projects/linuxolator/src/sys/amd64/linux32/syscalls.master#16 edit .. //depot/projects/linuxolator/src/sys/i386/linux/syscalls.master#15 edit Differences ... ==== //depot/projects/linuxolator/src/sys/amd64/linux32/syscalls.master#16 (text+ko) ==== @@ -464,7 +464,8 @@ 292 AUE_NULL STD { int linux_inotify_add_watch(void); } 293 AUE_NULL STD { int linux_inotify_rm_watch(void); } 294 AUE_NULL STD { int linux_migrate_pages(void); } -295 AUE_NULL STD { int linux_openat(void); } +295 AUE_OPEN_RWTC STD { int linux_openat(l_int dfd, char *filename, \ + l_int flags, l_int mode); } 296 AUE_NULL STD { int linux_mkdirat(void); } 297 AUE_NULL STD { int linux_mknodat(void); } 298 AUE_NULL STD { int linux_fchownat(void); } ==== //depot/projects/linuxolator/src/sys/i386/linux/syscalls.master#15 (text+ko) ==== @@ -474,7 +474,8 @@ 292 AUE_NULL STD { int linux_inotify_add_watch(void); } 293 AUE_NULL STD { int linux_inotify_rm_watch(void); } 294 AUE_NULL STD { int linux_migrate_pages(void); } -295 AUE_NULL STD { int linux_openat(void); } +295 AUE_OPEN_RWTC STD { int linux_openat(l_int dfd, char *filename, \ + l_int flags, l_int mode); } 296 AUE_NULL STD { int linux_mkdirat(void); } 297 AUE_NULL STD { int linux_mknodat(void); } 298 AUE_NULL STD { int linux_fchownat(void); } From owner-p4-projects@FreeBSD.ORG Sat Jan 13 13:15: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 23AA416A561; Sat, 13 Jan 2007 13:15: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 0168016A55F for ; Sat, 13 Jan 2007 13:15:21 +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 E73A713C43E for ; Sat, 13 Jan 2007 13:15:21 +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 l0DDFLtb013114 for ; Sat, 13 Jan 2007 13:15:21 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0DDFLvG013110 for perforce@freebsd.org; Sat, 13 Jan 2007 13:15:21 GMT (envelope-from rdivacky@FreeBSD.org) Date: Sat, 13 Jan 2007 13:15:21 GMT Message-Id: <200701131315.l0DDFLvG013110@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 112862 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 13 Jan 2007 13:15:22 -0000 http://perforce.freebsd.org/chv.cgi?CH=112862 Change 112862 by rdivacky@rdivacky_witten on 2007/01/13 13:14:57 Regen after syscalls.master update. Affected files ... .. //depot/projects/linuxolator/src/sys/amd64/linux32/linux32_proto.h#17 edit .. //depot/projects/linuxolator/src/sys/amd64/linux32/linux32_syscall.h#17 edit .. //depot/projects/linuxolator/src/sys/amd64/linux32/linux32_sysent.c#16 edit .. //depot/projects/linuxolator/src/sys/i386/linux/linux_proto.h#17 edit .. //depot/projects/linuxolator/src/sys/i386/linux/linux_syscall.h#16 edit .. //depot/projects/linuxolator/src/sys/i386/linux/linux_sysent.c#16 edit Differences ... ==== //depot/projects/linuxolator/src/sys/amd64/linux32/linux32_proto.h#17 (text+ko) ==== @@ -2,7 +2,7 @@ * System call prototypes. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/amd64/linux32/linux32_proto.h,v 1.28 2006/12/31 13:20:30 netchild Exp $ + * $FreeBSD$ * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.25 2006/12/31 13:16:00 netchild Exp */ @@ -901,7 +901,10 @@ register_t dummy; }; struct linux_openat_args { - register_t dummy; + char dfd_l_[PADL_(l_int)]; l_int dfd; char dfd_r_[PADR_(l_int)]; + char filename_l_[PADL_(char *)]; char * filename; char filename_r_[PADR_(char *)]; + char flags_l_[PADL_(l_int)]; l_int flags; char flags_r_[PADR_(l_int)]; + char mode_l_[PADL_(l_int)]; l_int mode; char mode_r_[PADR_(l_int)]; }; struct linux_mkdirat_args { register_t dummy; @@ -1423,7 +1426,7 @@ #define LINUX_SYS_AUE_linux_inotify_add_watch AUE_NULL #define LINUX_SYS_AUE_linux_inotify_rm_watch AUE_NULL #define LINUX_SYS_AUE_linux_migrate_pages AUE_NULL -#define LINUX_SYS_AUE_linux_openat AUE_NULL +#define LINUX_SYS_AUE_linux_openat AUE_OPEN_RWTC #define LINUX_SYS_AUE_linux_mkdirat AUE_NULL #define LINUX_SYS_AUE_linux_mknodat AUE_NULL #define LINUX_SYS_AUE_linux_fchownat AUE_NULL ==== //depot/projects/linuxolator/src/sys/amd64/linux32/linux32_syscall.h#17 (text+ko) ==== @@ -2,7 +2,7 @@ * System call numbers. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/amd64/linux32/linux32_syscall.h,v 1.28 2006/12/31 13:20:30 netchild Exp $ + * $FreeBSD$ * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.25 2006/12/31 13:16:00 netchild Exp */ ==== //depot/projects/linuxolator/src/sys/amd64/linux32/linux32_sysent.c#16 (text+ko) ==== @@ -2,7 +2,7 @@ * System call switch table. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/amd64/linux32/linux32_sysent.c,v 1.28 2006/12/31 13:20:30 netchild Exp $ + * $FreeBSD$ * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.25 2006/12/31 13:16:00 netchild Exp */ @@ -315,7 +315,7 @@ { 0, (sy_call_t *)linux_inotify_add_watch, AUE_NULL, NULL, 0, 0 }, /* 292 = linux_inotify_add_watch */ { 0, (sy_call_t *)linux_inotify_rm_watch, AUE_NULL, NULL, 0, 0 }, /* 293 = linux_inotify_rm_watch */ { 0, (sy_call_t *)linux_migrate_pages, AUE_NULL, NULL, 0, 0 }, /* 294 = linux_migrate_pages */ - { 0, (sy_call_t *)linux_openat, AUE_NULL, NULL, 0, 0 }, /* 295 = linux_openat */ + { AS(linux_openat_args), (sy_call_t *)linux_openat, AUE_OPEN_RWTC, NULL, 0, 0 }, /* 295 = linux_openat */ { 0, (sy_call_t *)linux_mkdirat, AUE_NULL, NULL, 0, 0 }, /* 296 = linux_mkdirat */ { 0, (sy_call_t *)linux_mknodat, AUE_NULL, NULL, 0, 0 }, /* 297 = linux_mknodat */ { 0, (sy_call_t *)linux_fchownat, AUE_NULL, NULL, 0, 0 }, /* 298 = linux_fchownat */ ==== //depot/projects/linuxolator/src/sys/i386/linux/linux_proto.h#17 (text+ko) ==== @@ -2,7 +2,7 @@ * System call prototypes. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/i386/linux/linux_proto.h,v 1.90 2006/12/31 13:20:30 netchild Exp $ + * $FreeBSD$ * created from FreeBSD: src/sys/i386/linux/syscalls.master,v 1.85 2006/12/31 13:16:00 netchild Exp */ @@ -918,7 +918,10 @@ register_t dummy; }; struct linux_openat_args { - register_t dummy; + char dfd_l_[PADL_(l_int)]; l_int dfd; char dfd_r_[PADR_(l_int)]; + char filename_l_[PADL_(char *)]; char * filename; char filename_r_[PADR_(char *)]; + char flags_l_[PADL_(l_int)]; l_int flags; char flags_r_[PADR_(l_int)]; + char mode_l_[PADL_(l_int)]; l_int mode; char mode_r_[PADR_(l_int)]; }; struct linux_mkdirat_args { register_t dummy; @@ -1442,7 +1445,7 @@ #define LINUX_SYS_AUE_linux_inotify_add_watch AUE_NULL #define LINUX_SYS_AUE_linux_inotify_rm_watch AUE_NULL #define LINUX_SYS_AUE_linux_migrate_pages AUE_NULL -#define LINUX_SYS_AUE_linux_openat AUE_NULL +#define LINUX_SYS_AUE_linux_openat AUE_OPEN_RWTC #define LINUX_SYS_AUE_linux_mkdirat AUE_NULL #define LINUX_SYS_AUE_linux_mknodat AUE_NULL #define LINUX_SYS_AUE_linux_fchownat AUE_NULL ==== //depot/projects/linuxolator/src/sys/i386/linux/linux_syscall.h#16 (text+ko) ==== @@ -2,7 +2,7 @@ * System call numbers. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/i386/linux/linux_syscall.h,v 1.83 2006/12/31 13:20:30 netchild Exp $ + * $FreeBSD$ * created from FreeBSD: src/sys/i386/linux/syscalls.master,v 1.85 2006/12/31 13:16:00 netchild Exp */ ==== //depot/projects/linuxolator/src/sys/i386/linux/linux_sysent.c#16 (text+ko) ==== @@ -2,7 +2,7 @@ * System call switch table. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/i386/linux/linux_sysent.c,v 1.90 2006/12/31 13:20:31 netchild Exp $ + * $FreeBSD$ * created from FreeBSD: src/sys/i386/linux/syscalls.master,v 1.85 2006/12/31 13:16:00 netchild Exp */ @@ -314,7 +314,7 @@ { 0, (sy_call_t *)linux_inotify_add_watch, AUE_NULL, NULL, 0, 0 }, /* 292 = linux_inotify_add_watch */ { 0, (sy_call_t *)linux_inotify_rm_watch, AUE_NULL, NULL, 0, 0 }, /* 293 = linux_inotify_rm_watch */ { 0, (sy_call_t *)linux_migrate_pages, AUE_NULL, NULL, 0, 0 }, /* 294 = linux_migrate_pages */ - { 0, (sy_call_t *)linux_openat, AUE_NULL, NULL, 0, 0 }, /* 295 = linux_openat */ + { AS(linux_openat_args), (sy_call_t *)linux_openat, AUE_OPEN_RWTC, NULL, 0, 0 }, /* 295 = linux_openat */ { 0, (sy_call_t *)linux_mkdirat, AUE_NULL, NULL, 0, 0 }, /* 296 = linux_mkdirat */ { 0, (sy_call_t *)linux_mknodat, AUE_NULL, NULL, 0, 0 }, /* 297 = linux_mknodat */ { 0, (sy_call_t *)linux_fchownat, AUE_NULL, NULL, 0, 0 }, /* 298 = linux_fchownat */ From owner-p4-projects@FreeBSD.ORG Sat Jan 13 15:15:57 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6C5BB16A407; Sat, 13 Jan 2007 15:15:57 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 1183016A415 for ; Sat, 13 Jan 2007 15:15:57 +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 04DF113C442 for ; Sat, 13 Jan 2007 15:15:57 +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 l0DFFuwK033782 for ; Sat, 13 Jan 2007 15:15:56 GMT (envelope-from piso@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0DFFurf033779 for perforce@freebsd.org; Sat, 13 Jan 2007 15:15:56 GMT (envelope-from piso@freebsd.org) Date: Sat, 13 Jan 2007 15:15:56 GMT Message-Id: <200701131515.l0DFFurf033779@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 112863 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 13 Jan 2007 15:15:57 -0000 http://perforce.freebsd.org/chv.cgi?CH=112863 Change 112863 by piso@piso_newluxor on 2007/01/13 15:15:25 Start teaching sun4v about filters: the enable/eoi/disab calls are NULL for now, that's the next step. Affected files ... .. //depot/projects/soc2006/intr_filter/sun4v/include/intr_machdep.h#2 edit .. //depot/projects/soc2006/intr_filter/sun4v/sun4v/hvcons.c#4 edit .. //depot/projects/soc2006/intr_filter/sun4v/sun4v/intr_machdep.c#3 edit .. //depot/projects/soc2006/intr_filter/sun4v/sun4v/nexus.c#3 edit .. //depot/projects/soc2006/intr_filter/sun4v/sun4v/vnex.c#4 edit Differences ... ==== //depot/projects/soc2006/intr_filter/sun4v/include/intr_machdep.h#2 (text+ko) ==== @@ -77,8 +77,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, void (*handler)(void *), - void *arg, int flags, void **cookiep); +int inthand_add(const char *name, int vec, int (*filter)(void *), + void (*handler)(void *), void *arg, int flags, void **cookiep); int inthand_remove(int vec, void *cookie); void cpu_intrq_init(void); ==== //depot/projects/soc2006/intr_filter/sun4v/sun4v/hvcons.c#4 (text+ko) ==== @@ -390,8 +390,8 @@ goto fail; } - error = bus_setup_intr(dev, hvcn_irq, INTR_TYPE_TTY, 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/intr_machdep.c#3 (text+ko) ==== @@ -142,6 +142,9 @@ /* protect the intr_vectors table */ static struct mtx intr_table_lock; +extern struct callout stray_callout_handle; +void intr_callout_reset(void); + static void intr_execute_handlers(void *); static void intr_stray_level(struct trapframe *); static void intr_stray_vector(void *); @@ -149,6 +152,32 @@ static void intrcnt_updatename(int, const char *, int); static void cpu_intrq_alloc(void); +/* Stray detection MD code */ +static struct intr_event * +walk_intr_sun4v(void) { + struct intr_vector *iv; + static int i = 0; + + for (; iiv_event != NULL) + return (iv->iv_event); + } + i = 0; + return (NULL); +} + +void +intr_callout_reset(void) +{ + + mtx_lock_spin(&intr_table_lock); + callout_reset(&stray_callout_handle, hz, + &stray_detection, &walk_intr_sun4v); + mtx_unlock_spin(&intr_table_lock); +} + /* * not MPSAFE */ @@ -274,7 +303,7 @@ } SYSINIT(intr_init, SI_SUB_INTR, SI_ORDER_FIRST, intr_init, NULL); - +#if 0 static void intr_execute_handlers(void *cookie) { @@ -312,27 +341,35 @@ hv_intr_setstate(iv->iv_vec, HV_INTR_IDLE_STATE); } } +#endif static void -ithread_wrapper(void *arg) +intr_execute_handlers(void *cookie) { - struct ithread_vector_handler *ivh = (struct ithread_vector_handler *)arg; - - ivh->ivh_handler(ivh->ivh_arg); - /* re-enable interrupt */ - hv_intr_setstate(ivh->ivh_vec, HV_INTR_IDLE_STATE); + struct intr_vector *iv; + struct intr_event *ie; + + iv = cookie; + ie = iv->iv_event; + if (intr_event_handle(ie, NULL) != 0) + intr_stray_vector(iv); + /* + * XXX - hv_intr_setstate() is used indistinctly after a + * FAST/ITHREAD handler ran: right now enable/eoi/disab in + * intr_event_create() is broken. + * hv_intr_setstate(iv->iv_vec, HV_INTR_IDLE_STATE); + */ } int -inthand_add(const char *name, int vec, void (*handler)(void *), void *arg, - int flags, void **cookiep) +inthand_add(const char *name, int vec, driver_filter_t *filter, + void (*handler)(void *), void *arg, int flags, void **cookiep) { struct intr_vector *iv; struct intr_event *ie; /* descriptor for the IRQ */ struct intr_event *orphan; - struct ithread_vector_handler *ivh; - int errcode, pil; + int errcode; /* * Work around a race where more than one CPU may be registering @@ -343,8 +380,9 @@ ie = iv->iv_event; mtx_unlock_spin(&intr_table_lock); if (ie == NULL) { - errcode = intr_event_create(&ie, (void *)(intptr_t)vec, 0, NULL, - "vec%d:", vec); + errcode = intr_event_create(&ie, (void *)(intptr_t)vec, 0, + NULL, NULL, NULL, NULL, "vec%d:", + vec); if (errcode) return (errcode); mtx_lock_spin(&intr_table_lock); @@ -359,29 +397,13 @@ } } - if (!(flags & INTR_FAST)) { - ivh = (struct ithread_vector_handler *) - malloc(sizeof(struct ithread_vector_handler), M_DEVBUF, M_WAITOK); - ivh->ivh_handler = handler; - ivh->ivh_arg = arg; - ivh->ivh_vec = vec; - errcode = intr_event_add_handler(ie, name, ithread_wrapper, ivh, - intr_priority(flags), flags, cookiep); - } else { - ivh = NULL; - errcode = intr_event_add_handler(ie, name, handler, arg, - intr_priority(flags), flags, - cookiep); - } - - if (errcode) { - if (ivh) - free(ivh, M_DEVBUF); + errcode = intr_event_add_handler(ie, name, filter, handler, arg, + intr_priority(flags), flags, cookiep); + if (errcode) return (errcode); - } - pil = (flags & INTR_FAST) ? PIL_FAST : PIL_ITHREAD; - intr_setup(pil, intr_fast, vec, intr_execute_handlers, iv); + intr_setup((handler == NULL) ? PIL_FAST : PIL_ITHREAD, intr_fast, vec, + intr_execute_handlers, iv); intr_stray_count[vec] = 0; ==== //depot/projects/soc2006/intr_filter/sun4v/sun4v/nexus.c#3 (text+ko) ==== @@ -306,7 +306,7 @@ static int nexus_setup_intr(device_t dev, device_t child, struct resource *res, int flags, - driver_intr_t *intr, void *arg, void **cookiep) + driver_filter_t *filter, driver_intr_t *intr, void *arg, void **cookiep) { struct nexus_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, - intr, arg, flags, cookiep); + error = inthand_add(device_get_nameunit(child), ihdl, filter, + intr, arg, flags, cookiep); cpuid = 0; if (hv_intr_settarget(ihdl, cpuid) != H_EOK) { ==== //depot/projects/soc2006/intr_filter/sun4v/sun4v/vnex.c#4 (text+ko) ==== @@ -249,7 +249,7 @@ static int vnex_setup_intr(device_t dev, device_t child, struct resource *res, int flags, - driver_intr_t *intr, void *arg, void **cookiep) + driver_filter_t *filter, driver_intr_t *intr, void *arg, void **cookiep) { uint64_t reg, nreg; @@ -297,8 +297,8 @@ if ((error = rman_activate_resource(res))) goto fail; - error = inthand_add(device_get_nameunit(child), ihdl, - intr, arg, flags, cookiep); + error = inthand_add(device_get_nameunit(child), ihdl, filter, + intr, arg, flags, cookiep); printf("inthandler added\n"); fail: From owner-p4-projects@FreeBSD.ORG Sat Jan 13 19:31: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 5E60E16A412; Sat, 13 Jan 2007 19:31: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 35C1E16A407; Sat, 13 Jan 2007 19:31:37 +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 D581D13C461; Sat, 13 Jan 2007 19:31:36 +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 l0DJTOBV008480; Sat, 13 Jan 2007 12:29:24 -0700 (MST) (envelope-from imp@bsdimp.com) Date: Sat, 13 Jan 2007 12:29:40 -0700 (MST) Message-Id: <20070113.122940.420518338.imp@bsdimp.com> To: hselasky@freebsd.org From: "M. Warner Losh" In-Reply-To: <200701122132.l0CLWuAG096027@repoman.freebsd.org> References: <200701122132.l0CLWuAG096027@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, 13 Jan 2007 12:29:24 -0700 (MST) Cc: perforce@freebsd.org Subject: Re: PERFORCE change 112835 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 13 Jan 2007 19:31:37 -0000 In message: <200701122132.l0CLWuAG096027@repoman.freebsd.org> Hans Petter Selasky writes: : http://perforce.freebsd.org/chv.cgi?CH=112835 : : Change 112835 by hselasky@hselasky_mini_itx on 2007/01/12 21:32:24 : : ether_ifattach() must be called without any mutexes held, hence : it can sleep. Use generated typedef's for prototypes for exported : device methods. This prevents invalid parameter passing and return. Why do the attach methods even have locked mutexes to drop? That was a common error in the early locking efforts that too many network drivers inherited. Maybe the right fix is to just remove the lock/unlock pairs in attach entirely... : Affected files ... : : .. //depot/projects/usb/src/sys/dev/usb/if_aue.c#14 edit : .. //depot/projects/usb/src/sys/dev/usb/if_axe.c#13 edit : .. //depot/projects/usb/src/sys/dev/usb/if_cdce.c#9 edit : .. //depot/projects/usb/src/sys/dev/usb/if_cue.c#11 edit : .. //depot/projects/usb/src/sys/dev/usb/if_kue.c#13 edit : .. //depot/projects/usb/src/sys/dev/usb/if_rue.c#12 edit : .. //depot/projects/usb/src/sys/dev/usb/if_udav.c#12 edit : : Differences ... : : ==== //depot/projects/usb/src/sys/dev/usb/if_aue.c#14 (text+ko) ==== : : @@ -215,14 +215,10 @@ : static void : aue_cfg_read_eeprom(struct aue_softc *sc, u_int8_t *dest, : u_int16_t off, u_int16_t len); : -static int : -aue_cfg_miibus_readreg(device_t dev, int phy, int reg); : : -static int : -aue_cfg_miibus_writereg(device_t dev, int phy, int reg, int data); : - : -static void : -aue_cfg_miibus_statchg(device_t dev); : +static miibus_readreg_t aue_cfg_miibus_readreg; : +static miibus_writereg_t aue_cfg_miibus_writereg; : +static miibus_statchg_t aue_cfg_miibus_statchg; : : static void : aue_cfg_setmulti(struct aue_softc *sc, : @@ -957,11 +953,15 @@ : : sc->sc_ifp = ifp; : : + mtx_unlock(&(sc->sc_mtx)); : + : /* : * Call MI attach routine. : */ : ether_ifattach(ifp, eaddr); : : + mtx_lock(&(sc->sc_mtx)); : + : done: : return; : } : @@ -1530,7 +1530,6 @@ : ifmr->ifm_status = sc->sc_media_status; : : mtx_unlock(&(sc->sc_mtx)); : - : return; : } : : @@ -1681,3 +1680,4 @@ : : return 0; : } : + : : ==== //depot/projects/usb/src/sys/dev/usb/if_axe.c#13 (text+ko) ==== : : @@ -149,15 +149,11 @@ : static void : axe_cfg_cmd(struct axe_softc *sc, u_int16_t cmd, u_int16_t index, : u_int16_t val, void *buf); : -static int : -axe_cfg_miibus_readreg(device_t dev, int phy, int reg); : : -static int : -axe_cfg_miibus_writereg(device_t dev, int phy, int reg, int val); : +static miibus_readreg_t axe_cfg_miibus_readreg; : +static miibus_writereg_t axe_cfg_miibus_writereg; : +static miibus_statchg_t axe_cfg_miibus_statchg; : : -static void : -axe_cfg_miibus_statchg(device_t dev); : - : static int : axe_ifmedia_upd_cb(struct ifnet *ifp); : : @@ -757,12 +753,16 @@ : : sc->sc_ifp = ifp; : : + mtx_unlock(&(sc->sc_mtx)); : + : /* : * Call MI attach routine. : */ : : ether_ifattach(ifp, eaddr); : : + mtx_lock(&(sc->sc_mtx)); : + : done: : return; : } : : ==== //depot/projects/usb/src/sys/dev/usb/if_cdce.c#9 (text+ko) ==== : : @@ -396,8 +396,12 @@ : : sc->sc_ifp = ifp; : : + mtx_unlock(&(sc->sc_mtx)); : + : ether_ifattach(ifp, eaddr); : : + mtx_lock(&(sc->sc_mtx)); : + : return 0; /* success */ : : detach: : : ==== //depot/projects/usb/src/sys/dev/usb/if_cue.c#11 (text+ko) ==== : : @@ -595,7 +595,12 @@ : : sc->sc_ifp = ifp; : : + mtx_unlock(&(sc->sc_mtx)); : + : ether_ifattach(ifp, eaddr); : + : + mtx_lock(&(sc->sc_mtx)); : + : done: : return; : } : : ==== //depot/projects/usb/src/sys/dev/usb/if_kue.c#13 (text+ko) ==== : : @@ -630,7 +630,11 @@ : : sc->sc_ifp = ifp; : : + mtx_unlock(&(sc->sc_mtx)); : + : ether_ifattach(ifp, sc->sc_desc.kue_macaddr); : + : + mtx_lock(&(sc->sc_mtx)); : done: : return; : } : : ==== //depot/projects/usb/src/sys/dev/usb/if_rue.c#12 (text+ko) ==== : : @@ -162,16 +162,11 @@ : static void : rue_cfg_csr_write_4(struct rue_softc *sc, int reg, u_int32_t val); : : -static int : -rue_cfg_miibus_readreg(device_t dev, int phy, int reg); : - : -static int : -rue_cfg_miibus_writereg(device_t dev, int phy, int reg, int data); : +static miibus_readreg_t rue_cfg_miibus_readreg; : +static miibus_writereg_t rue_cfg_miibus_writereg; : +static miibus_statchg_t rue_cfg_miibus_statchg; : : static void : -rue_cfg_miibus_statchg(device_t dev); : - : -static void : rue_config_copy(struct rue_softc *sc, : struct rue_config_copy *cc, u_int16_t refcount); : static void : @@ -857,12 +852,16 @@ : : sc->sc_ifp = ifp; : : + mtx_unlock(&(sc->sc_mtx)); : + : /* : * Call MI attach routine. : */ : : ether_ifattach(ifp, eaddr); : : + mtx_lock(&(sc->sc_mtx)); : + : done: : return; : } : : ==== //depot/projects/usb/src/sys/dev/usb/if_udav.c#12 (text+ko) ==== : : @@ -174,15 +174,10 @@ : static void : udav_cfg_tick(struct udav_softc *sc, : struct udav_config_copy *cc, u_int16_t refcount); : -static int : -udav_cfg_miibus_readreg(device_t dev, int phy, int reg); : : -static void : -udav_cfg_miibus_writereg(device_t dev, int phy, int reg, int data); : - : -static void : -udav_cfg_miibus_statchg(device_t dev); : - : +static miibus_readreg_t udav_cfg_miibus_readreg; : +static miibus_writereg_t udav_cfg_miibus_writereg; : +static miibus_statchg_t udav_cfg_miibus_statchg; : : static const struct usbd_config udav_config[UDAV_ENDPT_MAX] = { : : @@ -464,12 +459,16 @@ : : sc->sc_ifp = ifp; : : + mtx_unlock(&(sc->sc_mtx)); : + : /* : * Call MI attach routine. : */ : : ether_ifattach(ifp, eaddr); : : + mtx_lock(&(sc->sc_mtx)); : + : done: : return; : } : @@ -1430,7 +1429,7 @@ : return data16; : } : : -static void : +static int : udav_cfg_miibus_writereg(device_t dev, int phy, int reg, int data) : { : struct udav_softc *sc = device_get_softc(dev); : @@ -1438,7 +1437,7 @@ : : /* XXX: one PHY only for the internal PHY */ : if (phy != 0) { : - return; : + return 0; : } : : mtx_lock(&(sc->sc_mtx)); /* XXX */ : @@ -1462,7 +1461,7 @@ : : mtx_unlock(&(sc->sc_mtx)); /* XXX */ : : - return; : + return 0; : } : : static void : From owner-p4-projects@FreeBSD.ORG Sat Jan 13 20:44: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 7009716A40F; Sat, 13 Jan 2007 20:44: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 2F5DD16A417 for ; Sat, 13 Jan 2007 20:44:46 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 0F44813C46A for ; Sat, 13 Jan 2007 20:44:46 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l0DKijw5025122 for ; Sat, 13 Jan 2007 20:44:46 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0DKiL4q025101 for perforce@freebsd.org; Sat, 13 Jan 2007 20:44:21 GMT (envelope-from imp@freebsd.org) Date: Sat, 13 Jan 2007 20:44:21 GMT Message-Id: <200701132044.l0DKiL4q025101@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 112876 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 13 Jan 2007 20:44:46 -0000 http://perforce.freebsd.org/chv.cgi?CH=112876 Change 112876 by imp@imp_paco-paco on 2007/01/13 20:43:52 IFC @112868 Affected files ... .. //depot/projects/arm/src/bin/sh/exec.c#2 integrate .. //depot/projects/arm/src/etc/rc.d/jail#3 integrate .. //depot/projects/arm/src/etc/rc.d/power_profile#2 integrate .. //depot/projects/arm/src/games/fortune/datfiles/fortunes#10 integrate .. //depot/projects/arm/src/games/fortune/datfiles/fortunes.sp.ok#2 integrate .. //depot/projects/arm/src/games/fortune/datfiles/fortunes2-o#2 integrate .. //depot/projects/arm/src/games/fortune/datfiles/zippy#2 integrate .. //depot/projects/arm/src/lib/libarchive/COPYING#2 integrate .. //depot/projects/arm/src/lib/libarchive/archive.h.in#7 integrate .. //depot/projects/arm/src/lib/libarchive/archive_check_magic.c#3 integrate .. //depot/projects/arm/src/lib/libarchive/archive_entry.3#2 integrate .. //depot/projects/arm/src/lib/libarchive/archive_entry.c#3 integrate .. //depot/projects/arm/src/lib/libarchive/archive_entry.h#2 integrate .. //depot/projects/arm/src/lib/libarchive/archive_platform.h#4 integrate .. //depot/projects/arm/src/lib/libarchive/archive_private.h#6 integrate .. //depot/projects/arm/src/lib/libarchive/archive_read.3#6 integrate .. //depot/projects/arm/src/lib/libarchive/archive_read.c#6 integrate .. //depot/projects/arm/src/lib/libarchive/archive_read_data_into_buffer.c#3 integrate .. //depot/projects/arm/src/lib/libarchive/archive_read_data_into_fd.c#3 integrate .. //depot/projects/arm/src/lib/libarchive/archive_read_extract.c#5 integrate .. //depot/projects/arm/src/lib/libarchive/archive_read_open_fd.c#5 integrate .. //depot/projects/arm/src/lib/libarchive/archive_read_open_file.c#9 integrate .. //depot/projects/arm/src/lib/libarchive/archive_read_open_filename.c#3 integrate .. //depot/projects/arm/src/lib/libarchive/archive_read_open_memory.c#3 integrate .. //depot/projects/arm/src/lib/libarchive/archive_read_support_compression_all.c#2 integrate .. //depot/projects/arm/src/lib/libarchive/archive_read_support_compression_bzip2.c#5 integrate .. //depot/projects/arm/src/lib/libarchive/archive_read_support_compression_compress.c#4 integrate .. //depot/projects/arm/src/lib/libarchive/archive_read_support_compression_gzip.c#4 integrate .. //depot/projects/arm/src/lib/libarchive/archive_read_support_compression_none.c#6 integrate .. //depot/projects/arm/src/lib/libarchive/archive_read_support_format_all.c#2 integrate .. //depot/projects/arm/src/lib/libarchive/archive_read_support_format_cpio.c#5 integrate .. //depot/projects/arm/src/lib/libarchive/archive_read_support_format_iso9660.c#5 integrate .. //depot/projects/arm/src/lib/libarchive/archive_read_support_format_tar.c#6 integrate .. //depot/projects/arm/src/lib/libarchive/archive_read_support_format_zip.c#3 integrate .. //depot/projects/arm/src/lib/libarchive/archive_string.c#3 integrate .. //depot/projects/arm/src/lib/libarchive/archive_string.h#3 integrate .. //depot/projects/arm/src/lib/libarchive/archive_string_sprintf.c#2 integrate .. //depot/projects/arm/src/lib/libarchive/archive_util.3#2 integrate .. //depot/projects/arm/src/lib/libarchive/archive_util.c#3 integrate .. //depot/projects/arm/src/lib/libarchive/archive_write.3#6 integrate .. //depot/projects/arm/src/lib/libarchive/archive_write.c#7 integrate .. //depot/projects/arm/src/lib/libarchive/archive_write_open_fd.c#4 integrate .. //depot/projects/arm/src/lib/libarchive/archive_write_open_file.c#6 integrate .. //depot/projects/arm/src/lib/libarchive/archive_write_open_filename.c#3 integrate .. //depot/projects/arm/src/lib/libarchive/archive_write_open_memory.c#2 integrate .. //depot/projects/arm/src/lib/libarchive/archive_write_set_compression_bzip2.c#3 integrate .. //depot/projects/arm/src/lib/libarchive/archive_write_set_compression_gzip.c#3 integrate .. //depot/projects/arm/src/lib/libarchive/archive_write_set_compression_none.c#4 integrate .. //depot/projects/arm/src/lib/libarchive/archive_write_set_format.c#3 integrate .. //depot/projects/arm/src/lib/libarchive/archive_write_set_format_by_name.c#3 integrate .. //depot/projects/arm/src/lib/libarchive/archive_write_set_format_cpio.c#4 integrate .. //depot/projects/arm/src/lib/libarchive/archive_write_set_format_pax.c#5 integrate .. //depot/projects/arm/src/lib/libarchive/archive_write_set_format_shar.c#4 integrate .. //depot/projects/arm/src/lib/libarchive/archive_write_set_format_ustar.c#5 integrate .. //depot/projects/arm/src/lib/libarchive/config_freebsd.h#2 integrate .. //depot/projects/arm/src/lib/libarchive/libarchive-formats.5#3 integrate .. //depot/projects/arm/src/lib/libarchive/libarchive.3#4 integrate .. //depot/projects/arm/src/lib/libarchive/tar.5#4 integrate .. //depot/projects/arm/src/lib/libc/amd64/SYS.h#2 integrate .. //depot/projects/arm/src/lib/libc/amd64/gen/_setjmp.S#2 integrate .. //depot/projects/arm/src/lib/libc/amd64/gen/ldexp.c#2 integrate .. //depot/projects/arm/src/lib/libc/amd64/gen/modf.S#2 integrate .. //depot/projects/arm/src/lib/libc/amd64/gen/setjmp.S#2 integrate .. //depot/projects/arm/src/lib/libc/amd64/gen/sigsetjmp.S#2 integrate .. //depot/projects/arm/src/lib/libc/amd64/sys/brk.S#2 integrate .. //depot/projects/arm/src/lib/libc/amd64/sys/cerror.S#2 integrate .. //depot/projects/arm/src/lib/libc/amd64/sys/exect.S#2 integrate .. //depot/projects/arm/src/lib/libc/amd64/sys/pipe.S#2 integrate .. //depot/projects/arm/src/lib/libc/amd64/sys/ptrace.S#2 integrate .. //depot/projects/arm/src/lib/libc/amd64/sys/reboot.S#2 integrate .. //depot/projects/arm/src/lib/libc/amd64/sys/sbrk.S#2 integrate .. //depot/projects/arm/src/lib/libc/amd64/sys/setlogin.S#2 integrate .. //depot/projects/arm/src/lib/libc/amd64/sys/sigreturn.S#2 integrate .. //depot/projects/arm/src/lib/libc/amd64/sys/vfork.S#2 integrate .. //depot/projects/arm/src/lib/libc/compat-43/creat.2#2 integrate .. //depot/projects/arm/src/lib/libc/compat-43/creat.c#2 integrate .. //depot/projects/arm/src/lib/libc/compat-43/gethostid.3#2 integrate .. //depot/projects/arm/src/lib/libc/compat-43/gethostid.c#2 integrate .. //depot/projects/arm/src/lib/libc/compat-43/getwd.c#2 integrate .. //depot/projects/arm/src/lib/libc/compat-43/killpg.2#3 integrate .. //depot/projects/arm/src/lib/libc/compat-43/killpg.c#2 integrate .. //depot/projects/arm/src/lib/libc/compat-43/sethostid.c#2 integrate .. //depot/projects/arm/src/lib/libc/compat-43/setpgrp.c#2 integrate .. //depot/projects/arm/src/lib/libc/compat-43/setrgid.c#2 integrate .. //depot/projects/arm/src/lib/libc/compat-43/setruid.3#2 integrate .. //depot/projects/arm/src/lib/libc/compat-43/setruid.c#2 integrate .. //depot/projects/arm/src/lib/libc/compat-43/sigcompat.c#2 integrate .. //depot/projects/arm/src/lib/libc/compat-43/sigpause.2#2 integrate .. //depot/projects/arm/src/lib/libc/compat-43/sigsetmask.2#2 integrate .. //depot/projects/arm/src/lib/libc/compat-43/sigvec.2#2 integrate .. //depot/projects/arm/src/lib/libc/db/btree/bt_close.c#2 integrate .. //depot/projects/arm/src/lib/libc/db/btree/bt_conv.c#2 integrate .. //depot/projects/arm/src/lib/libc/db/btree/bt_debug.c#2 integrate .. //depot/projects/arm/src/lib/libc/db/btree/bt_delete.c#2 integrate .. //depot/projects/arm/src/lib/libc/db/btree/bt_get.c#2 integrate .. //depot/projects/arm/src/lib/libc/db/btree/bt_open.c#2 integrate .. //depot/projects/arm/src/lib/libc/db/btree/bt_overflow.c#2 integrate .. //depot/projects/arm/src/lib/libc/db/btree/bt_page.c#2 integrate .. //depot/projects/arm/src/lib/libc/db/btree/bt_put.c#2 integrate .. //depot/projects/arm/src/lib/libc/db/btree/bt_search.c#2 integrate .. //depot/projects/arm/src/lib/libc/db/btree/bt_seq.c#2 integrate .. //depot/projects/arm/src/lib/libc/db/btree/bt_split.c#2 integrate .. //depot/projects/arm/src/lib/libc/db/btree/bt_utils.c#2 integrate .. //depot/projects/arm/src/lib/libc/db/btree/btree.h#2 integrate .. //depot/projects/arm/src/lib/libc/db/btree/extern.h#2 integrate .. //depot/projects/arm/src/lib/libc/db/db/db.c#2 integrate .. //depot/projects/arm/src/lib/libc/db/hash/extern.h#2 integrate .. //depot/projects/arm/src/lib/libc/db/hash/hash.c#2 integrate .. //depot/projects/arm/src/lib/libc/db/hash/hash.h#2 integrate .. //depot/projects/arm/src/lib/libc/db/hash/hash_bigkey.c#2 integrate .. //depot/projects/arm/src/lib/libc/db/hash/hash_buf.c#2 integrate .. //depot/projects/arm/src/lib/libc/db/hash/hash_func.c#2 integrate .. //depot/projects/arm/src/lib/libc/db/hash/hash_log2.c#2 integrate .. //depot/projects/arm/src/lib/libc/db/hash/hash_page.c#2 integrate .. //depot/projects/arm/src/lib/libc/db/hash/ndbm.c#2 integrate .. //depot/projects/arm/src/lib/libc/db/hash/page.h#2 integrate .. //depot/projects/arm/src/lib/libc/db/man/btree.3#2 integrate .. //depot/projects/arm/src/lib/libc/db/man/dbopen.3#2 integrate .. //depot/projects/arm/src/lib/libc/db/man/hash.3#2 integrate .. //depot/projects/arm/src/lib/libc/db/man/mpool.3#2 integrate .. //depot/projects/arm/src/lib/libc/db/man/recno.3#2 integrate .. //depot/projects/arm/src/lib/libc/db/mpool/mpool.c#2 integrate .. //depot/projects/arm/src/lib/libc/db/recno/extern.h#2 integrate .. //depot/projects/arm/src/lib/libc/db/recno/rec_close.c#2 integrate .. //depot/projects/arm/src/lib/libc/db/recno/rec_delete.c#2 integrate .. //depot/projects/arm/src/lib/libc/db/recno/rec_get.c#2 integrate .. //depot/projects/arm/src/lib/libc/db/recno/rec_open.c#2 integrate .. //depot/projects/arm/src/lib/libc/db/recno/rec_put.c#2 integrate .. //depot/projects/arm/src/lib/libc/db/recno/rec_search.c#2 integrate .. //depot/projects/arm/src/lib/libc/db/recno/rec_seq.c#2 integrate .. //depot/projects/arm/src/lib/libc/db/recno/rec_utils.c#2 integrate .. //depot/projects/arm/src/lib/libc/db/recno/recno.h#2 integrate .. //depot/projects/arm/src/lib/libc/db/test/btree.tests/main.c#2 integrate .. //depot/projects/arm/src/lib/libc/db/test/dbtest.c#2 integrate .. //depot/projects/arm/src/lib/libc/db/test/hash.tests/driver2.c#2 integrate .. //depot/projects/arm/src/lib/libc/db/test/hash.tests/tcreat3.c#2 integrate .. //depot/projects/arm/src/lib/libc/db/test/hash.tests/tdel.c#2 integrate .. //depot/projects/arm/src/lib/libc/db/test/hash.tests/thash4.c#2 integrate .. //depot/projects/arm/src/lib/libc/db/test/hash.tests/tread2.c#2 integrate .. //depot/projects/arm/src/lib/libc/db/test/hash.tests/tseq.c#2 integrate .. //depot/projects/arm/src/lib/libc/db/test/hash.tests/tverify.c#2 integrate .. //depot/projects/arm/src/lib/libc/gen/__xuname.c#2 integrate .. //depot/projects/arm/src/lib/libc/gen/_spinlock_stub.c#2 integrate .. //depot/projects/arm/src/lib/libc/gen/alarm.3#2 integrate .. //depot/projects/arm/src/lib/libc/gen/alarm.c#2 integrate .. //depot/projects/arm/src/lib/libc/gen/assert.c#2 integrate .. //depot/projects/arm/src/lib/libc/gen/clock.3#2 integrate .. //depot/projects/arm/src/lib/libc/gen/clock.c#2 integrate .. //depot/projects/arm/src/lib/libc/gen/closedir.c#2 integrate .. //depot/projects/arm/src/lib/libc/gen/confstr.3#3 integrate .. //depot/projects/arm/src/lib/libc/gen/confstr.c#2 integrate .. //depot/projects/arm/src/lib/libc/gen/crypt.c#2 integrate .. //depot/projects/arm/src/lib/libc/gen/ctermid.3#2 integrate .. //depot/projects/arm/src/lib/libc/gen/ctermid.c#2 integrate .. //depot/projects/arm/src/lib/libc/gen/daemon.3#2 integrate .. //depot/projects/arm/src/lib/libc/gen/daemon.c#2 integrate .. //depot/projects/arm/src/lib/libc/gen/devname.3#2 integrate .. //depot/projects/arm/src/lib/libc/gen/devname.c#2 integrate .. //depot/projects/arm/src/lib/libc/gen/directory.3#2 integrate .. //depot/projects/arm/src/lib/libc/gen/disklabel.c#2 integrate .. //depot/projects/arm/src/lib/libc/gen/err.3#4 integrate .. //depot/projects/arm/src/lib/libc/gen/err.c#2 integrate .. //depot/projects/arm/src/lib/libc/gen/errlst.c#2 integrate .. //depot/projects/arm/src/lib/libc/gen/exec.3#2 integrate .. //depot/projects/arm/src/lib/libc/gen/exec.c#2 integrate .. //depot/projects/arm/src/lib/libc/gen/fnmatch.3#2 integrate .. //depot/projects/arm/src/lib/libc/gen/fnmatch.c#2 integrate .. //depot/projects/arm/src/lib/libc/gen/frexp.3#2 integrate .. //depot/projects/arm/src/lib/libc/gen/fstab.c#2 integrate .. //depot/projects/arm/src/lib/libc/gen/fts.3#2 integrate .. //depot/projects/arm/src/lib/libc/gen/fts.c#2 integrate .. //depot/projects/arm/src/lib/libc/gen/getbootfile.3#2 integrate .. //depot/projects/arm/src/lib/libc/gen/getbootfile.c#2 integrate .. //depot/projects/arm/src/lib/libc/gen/getbsize.3#2 integrate .. //depot/projects/arm/src/lib/libc/gen/getbsize.c#2 integrate .. //depot/projects/arm/src/lib/libc/gen/getcap.3#2 integrate .. //depot/projects/arm/src/lib/libc/gen/getcap.c#2 integrate .. //depot/projects/arm/src/lib/libc/gen/getcwd.3#2 integrate .. //depot/projects/arm/src/lib/libc/gen/getcwd.c#2 integrate .. //depot/projects/arm/src/lib/libc/gen/getdiskbyname.3#2 integrate .. //depot/projects/arm/src/lib/libc/gen/getdomainname.3#2 integrate .. //depot/projects/arm/src/lib/libc/gen/getdomainname.c#2 integrate .. //depot/projects/arm/src/lib/libc/gen/getfsent.3#2 integrate .. //depot/projects/arm/src/lib/libc/gen/getgrent.3#2 integrate .. //depot/projects/arm/src/lib/libc/gen/getgrouplist.3#2 integrate .. //depot/projects/arm/src/lib/libc/gen/getgrouplist.c#2 integrate .. //depot/projects/arm/src/lib/libc/gen/gethostname.3#2 integrate .. //depot/projects/arm/src/lib/libc/gen/gethostname.c#2 integrate .. //depot/projects/arm/src/lib/libc/gen/getloadavg.3#2 integrate .. //depot/projects/arm/src/lib/libc/gen/getloadavg.c#2 integrate .. //depot/projects/arm/src/lib/libc/gen/getlogin.c#2 integrate .. //depot/projects/arm/src/lib/libc/gen/getmntinfo.3#2 integrate .. //depot/projects/arm/src/lib/libc/gen/getmntinfo.c#2 integrate .. //depot/projects/arm/src/lib/libc/gen/getnetgrent.3#2 integrate .. //depot/projects/arm/src/lib/libc/gen/getnetgrent.c#2 integrate .. //depot/projects/arm/src/lib/libc/gen/getosreldate.c#2 integrate .. //depot/projects/arm/src/lib/libc/gen/getpagesize.3#2 integrate .. //depot/projects/arm/src/lib/libc/gen/getpagesize.c#2 integrate .. //depot/projects/arm/src/lib/libc/gen/getpass.3#2 integrate .. //depot/projects/arm/src/lib/libc/gen/getpwent.3#2 integrate .. //depot/projects/arm/src/lib/libc/gen/getttyent.3#2 integrate .. //depot/projects/arm/src/lib/libc/gen/getttyent.c#2 integrate .. //depot/projects/arm/src/lib/libc/gen/getusershell.3#2 integrate .. //depot/projects/arm/src/lib/libc/gen/getusershell.c#2 integrate .. //depot/projects/arm/src/lib/libc/gen/getvfsbyname.3#2 integrate .. //depot/projects/arm/src/lib/libc/gen/getvfsbyname.c#2 integrate .. //depot/projects/arm/src/lib/libc/gen/glob.3#2 integrate .. //depot/projects/arm/src/lib/libc/gen/glob.c#2 integrate .. //depot/projects/arm/src/lib/libc/gen/initgroups.3#2 integrate .. //depot/projects/arm/src/lib/libc/gen/initgroups.c#2 integrate .. //depot/projects/arm/src/lib/libc/gen/isatty.c#2 integrate .. //depot/projects/arm/src/lib/libc/gen/ldexp.3#2 integrate .. //depot/projects/arm/src/lib/libc/gen/modf.3#2 integrate .. //depot/projects/arm/src/lib/libc/gen/nice.3#2 integrate .. //depot/projects/arm/src/lib/libc/gen/nice.c#2 integrate .. //depot/projects/arm/src/lib/libc/gen/nlist.3#2 integrate .. //depot/projects/arm/src/lib/libc/gen/nlist.c#2 integrate .. //depot/projects/arm/src/lib/libc/gen/opendir.c#2 integrate .. //depot/projects/arm/src/lib/libc/gen/pause.3#2 integrate .. //depot/projects/arm/src/lib/libc/gen/pause.c#2 integrate .. //depot/projects/arm/src/lib/libc/gen/popen.3#2 integrate .. //depot/projects/arm/src/lib/libc/gen/popen.c#2 integrate .. //depot/projects/arm/src/lib/libc/gen/psignal.3#2 integrate .. //depot/projects/arm/src/lib/libc/gen/psignal.c#2 integrate .. //depot/projects/arm/src/lib/libc/gen/pw_scan.c#2 integrate .. //depot/projects/arm/src/lib/libc/gen/pw_scan.h#2 integrate .. //depot/projects/arm/src/lib/libc/gen/pwcache.3#3 integrate .. //depot/projects/arm/src/lib/libc/gen/pwcache.c#2 integrate .. //depot/projects/arm/src/lib/libc/gen/raise.3#2 integrate .. //depot/projects/arm/src/lib/libc/gen/raise.c#2 integrate .. //depot/projects/arm/src/lib/libc/gen/readdir.c#2 integrate .. //depot/projects/arm/src/lib/libc/gen/rewinddir.c#2 integrate .. //depot/projects/arm/src/lib/libc/gen/scandir.3#2 integrate .. //depot/projects/arm/src/lib/libc/gen/scandir.c#2 integrate .. //depot/projects/arm/src/lib/libc/gen/seekdir.c#2 integrate .. //depot/projects/arm/src/lib/libc/gen/setdomainname.c#2 integrate .. //depot/projects/arm/src/lib/libc/gen/sethostname.c#2 integrate .. //depot/projects/arm/src/lib/libc/gen/setjmp.3#2 integrate .. //depot/projects/arm/src/lib/libc/gen/setjmperr.c#2 integrate .. //depot/projects/arm/src/lib/libc/gen/setmode.3#2 integrate .. //depot/projects/arm/src/lib/libc/gen/setmode.c#2 integrate .. //depot/projects/arm/src/lib/libc/gen/siginterrupt.3#2 integrate .. //depot/projects/arm/src/lib/libc/gen/siginterrupt.c#2 integrate .. //depot/projects/arm/src/lib/libc/gen/siglist.c#2 integrate .. //depot/projects/arm/src/lib/libc/gen/signal.3#2 integrate .. //depot/projects/arm/src/lib/libc/gen/signal.c#2 integrate .. //depot/projects/arm/src/lib/libc/gen/sigsetops.3#2 integrate .. //depot/projects/arm/src/lib/libc/gen/sigsetops.c#2 integrate .. //depot/projects/arm/src/lib/libc/gen/sleep.3#2 integrate .. //depot/projects/arm/src/lib/libc/gen/sleep.c#2 integrate .. //depot/projects/arm/src/lib/libc/gen/stringlist.c#2 integrate .. //depot/projects/arm/src/lib/libc/gen/strtofflags.3#2 integrate .. //depot/projects/arm/src/lib/libc/gen/strtofflags.c#2 integrate .. //depot/projects/arm/src/lib/libc/gen/sysconf.3#3 integrate .. //depot/projects/arm/src/lib/libc/gen/sysconf.c#3 integrate .. //depot/projects/arm/src/lib/libc/gen/sysctl.3#2 integrate .. //depot/projects/arm/src/lib/libc/gen/sysctl.c#2 integrate .. //depot/projects/arm/src/lib/libc/gen/syslog.3#2 integrate .. //depot/projects/arm/src/lib/libc/gen/syslog.c#3 integrate .. //depot/projects/arm/src/lib/libc/gen/tcgetpgrp.3#2 integrate .. //depot/projects/arm/src/lib/libc/gen/tcsendbreak.3#2 integrate .. //depot/projects/arm/src/lib/libc/gen/tcsetattr.3#2 integrate .. //depot/projects/arm/src/lib/libc/gen/tcsetpgrp.3#2 integrate .. //depot/projects/arm/src/lib/libc/gen/telldir.c#2 integrate .. //depot/projects/arm/src/lib/libc/gen/termios.c#2 integrate .. //depot/projects/arm/src/lib/libc/gen/time.3#2 integrate .. //depot/projects/arm/src/lib/libc/gen/time.c#2 integrate .. //depot/projects/arm/src/lib/libc/gen/times.3#2 integrate .. //depot/projects/arm/src/lib/libc/gen/times.c#2 integrate .. //depot/projects/arm/src/lib/libc/gen/timezone.3#2 integrate .. //depot/projects/arm/src/lib/libc/gen/timezone.c#2 integrate .. //depot/projects/arm/src/lib/libc/gen/ttyname.3#2 integrate .. //depot/projects/arm/src/lib/libc/gen/ttyname.c#2 integrate .. //depot/projects/arm/src/lib/libc/gen/ttyslot.c#2 integrate .. //depot/projects/arm/src/lib/libc/gen/tzset.3#2 integrate .. //depot/projects/arm/src/lib/libc/gen/ualarm.3#2 integrate .. //depot/projects/arm/src/lib/libc/gen/ualarm.c#2 integrate .. //depot/projects/arm/src/lib/libc/gen/uname.3#2 integrate .. //depot/projects/arm/src/lib/libc/gen/uname.c#2 integrate .. //depot/projects/arm/src/lib/libc/gen/unvis.3#2 integrate .. //depot/projects/arm/src/lib/libc/gen/unvis.c#2 integrate .. //depot/projects/arm/src/lib/libc/gen/usleep.3#2 integrate .. //depot/projects/arm/src/lib/libc/gen/usleep.c#2 integrate .. //depot/projects/arm/src/lib/libc/gen/utime.3#2 integrate .. //depot/projects/arm/src/lib/libc/gen/utime.c#2 integrate .. //depot/projects/arm/src/lib/libc/gen/valloc.3#2 integrate .. //depot/projects/arm/src/lib/libc/gen/valloc.c#2 integrate .. //depot/projects/arm/src/lib/libc/gen/vis.3#3 integrate .. //depot/projects/arm/src/lib/libc/gen/vis.c#2 integrate .. //depot/projects/arm/src/lib/libc/gen/wait.c#2 integrate .. //depot/projects/arm/src/lib/libc/gen/wait3.c#2 integrate .. //depot/projects/arm/src/lib/libc/gen/waitpid.c#2 integrate .. //depot/projects/arm/src/lib/libc/gmon/gmon.c#2 integrate .. //depot/projects/arm/src/lib/libc/gmon/mcount.c#2 integrate .. //depot/projects/arm/src/lib/libc/gmon/moncontrol.3#2 integrate .. //depot/projects/arm/src/lib/libc/i386/SYS.h#2 integrate .. //depot/projects/arm/src/lib/libc/i386/gen/_setjmp.S#2 integrate .. //depot/projects/arm/src/lib/libc/i386/gen/fabs.S#2 integrate .. //depot/projects/arm/src/lib/libc/i386/gen/ldexp.c#2 integrate .. //depot/projects/arm/src/lib/libc/i386/gen/modf.S#2 integrate .. //depot/projects/arm/src/lib/libc/i386/gen/setjmp.S#2 integrate .. //depot/projects/arm/src/lib/libc/i386/gen/sigsetjmp.S#2 integrate .. //depot/projects/arm/src/lib/libc/i386/stdlib/abs.S#2 integrate .. //depot/projects/arm/src/lib/libc/i386/stdlib/div.S#2 integrate .. //depot/projects/arm/src/lib/libc/i386/stdlib/labs.S#2 integrate .. //depot/projects/arm/src/lib/libc/i386/string/bcopy.S#2 integrate .. //depot/projects/arm/src/lib/libc/i386/sys/Ovfork.S#2 integrate .. //depot/projects/arm/src/lib/libc/i386/sys/brk.S#2 integrate .. //depot/projects/arm/src/lib/libc/i386/sys/cerror.S#2 integrate .. //depot/projects/arm/src/lib/libc/i386/sys/exect.S#2 integrate .. //depot/projects/arm/src/lib/libc/i386/sys/i386_get_ldt.2#3 integrate .. //depot/projects/arm/src/lib/libc/i386/sys/pipe.S#2 integrate .. //depot/projects/arm/src/lib/libc/i386/sys/ptrace.S#2 integrate .. //depot/projects/arm/src/lib/libc/i386/sys/reboot.S#2 integrate .. //depot/projects/arm/src/lib/libc/i386/sys/sbrk.S#2 integrate .. //depot/projects/arm/src/lib/libc/i386/sys/setlogin.S#2 integrate .. //depot/projects/arm/src/lib/libc/i386/sys/sigreturn.S#2 integrate .. //depot/projects/arm/src/lib/libc/i386/sys/syscall.S#2 integrate .. //depot/projects/arm/src/lib/libc/include/libc_private.h#2 integrate .. //depot/projects/arm/src/lib/libc/include/spinlock.h#2 integrate .. //depot/projects/arm/src/lib/libc/inet/inet_addr.c#2 integrate .. //depot/projects/arm/src/lib/libc/inet/inet_lnaof.c#2 integrate .. //depot/projects/arm/src/lib/libc/inet/inet_makeaddr.c#2 integrate .. //depot/projects/arm/src/lib/libc/inet/inet_netof.c#2 integrate .. //depot/projects/arm/src/lib/libc/inet/inet_network.c#2 integrate .. //depot/projects/arm/src/lib/libc/inet/inet_ntoa.c#2 integrate .. //depot/projects/arm/src/lib/libc/locale/ctype.3#2 integrate .. //depot/projects/arm/src/lib/libc/locale/digittoint.3#2 integrate .. //depot/projects/arm/src/lib/libc/locale/euc.5#2 integrate .. //depot/projects/arm/src/lib/libc/locale/gbk.c#2 integrate .. //depot/projects/arm/src/lib/libc/locale/isalnum.3#2 integrate .. //depot/projects/arm/src/lib/libc/locale/isalpha.3#2 integrate .. //depot/projects/arm/src/lib/libc/locale/isascii.3#2 integrate .. //depot/projects/arm/src/lib/libc/locale/isblank.3#2 integrate .. //depot/projects/arm/src/lib/libc/locale/iscntrl.3#2 integrate .. //depot/projects/arm/src/lib/libc/locale/isctype.c#2 integrate .. //depot/projects/arm/src/lib/libc/locale/isdigit.3#2 integrate .. //depot/projects/arm/src/lib/libc/locale/isgraph.3#2 integrate .. //depot/projects/arm/src/lib/libc/locale/islower.3#2 integrate .. //depot/projects/arm/src/lib/libc/locale/isprint.3#2 integrate .. //depot/projects/arm/src/lib/libc/locale/ispunct.3#2 integrate .. //depot/projects/arm/src/lib/libc/locale/isspace.3#2 integrate .. //depot/projects/arm/src/lib/libc/locale/isupper.3#2 integrate .. //depot/projects/arm/src/lib/libc/locale/iswalnum.3#2 integrate .. //depot/projects/arm/src/lib/libc/locale/iswctype.c#2 integrate .. //depot/projects/arm/src/lib/libc/locale/isxdigit.3#2 integrate .. //depot/projects/arm/src/lib/libc/locale/localeconv.3#2 integrate .. //depot/projects/arm/src/lib/libc/locale/mblen.3#2 integrate .. //depot/projects/arm/src/lib/libc/locale/mbstowcs.3#2 integrate .. //depot/projects/arm/src/lib/libc/locale/mbtowc.3#2 integrate .. //depot/projects/arm/src/lib/libc/locale/multibyte.3#2 integrate .. //depot/projects/arm/src/lib/libc/locale/none.c#2 integrate .. //depot/projects/arm/src/lib/libc/locale/rune.c#2 integrate .. //depot/projects/arm/src/lib/libc/locale/runetype.c#2 integrate .. //depot/projects/arm/src/lib/libc/locale/setlocale.3#2 integrate .. //depot/projects/arm/src/lib/libc/locale/setlocale.c#2 integrate .. //depot/projects/arm/src/lib/libc/locale/setrunelocale.c#2 integrate .. //depot/projects/arm/src/lib/libc/locale/table.c#2 integrate .. //depot/projects/arm/src/lib/libc/locale/toascii.3#2 integrate .. //depot/projects/arm/src/lib/libc/locale/tolower.3#2 integrate .. //depot/projects/arm/src/lib/libc/locale/tolower.c#2 integrate .. //depot/projects/arm/src/lib/libc/locale/toupper.3#2 integrate .. //depot/projects/arm/src/lib/libc/locale/toupper.c#2 integrate .. //depot/projects/arm/src/lib/libc/locale/towlower.3#2 integrate .. //depot/projects/arm/src/lib/libc/locale/towupper.3#2 integrate .. //depot/projects/arm/src/lib/libc/locale/utf8.5#2 integrate .. //depot/projects/arm/src/lib/libc/locale/wcstoimax.c#2 integrate .. //depot/projects/arm/src/lib/libc/locale/wcstol.c#2 integrate .. //depot/projects/arm/src/lib/libc/locale/wcstoll.c#2 integrate .. //depot/projects/arm/src/lib/libc/locale/wcstombs.3#2 integrate .. //depot/projects/arm/src/lib/libc/locale/wcstoul.c#2 integrate .. //depot/projects/arm/src/lib/libc/locale/wcstoull.c#2 integrate .. //depot/projects/arm/src/lib/libc/locale/wcstoumax.c#2 integrate .. //depot/projects/arm/src/lib/libc/locale/wctomb.3#2 integrate .. //depot/projects/arm/src/lib/libc/locale/wcwidth.c#2 integrate .. //depot/projects/arm/src/lib/libc/net/byteorder.3#2 integrate .. //depot/projects/arm/src/lib/libc/net/gethostbydns.c#2 integrate .. //depot/projects/arm/src/lib/libc/net/gethostbyht.c#2 integrate .. //depot/projects/arm/src/lib/libc/net/gethostbyname.3#4 integrate .. //depot/projects/arm/src/lib/libc/net/getipnodebyname.3#2 integrate .. //depot/projects/arm/src/lib/libc/net/getnetbydns.c#2 integrate .. //depot/projects/arm/src/lib/libc/net/getnetbyht.c#2 integrate .. //depot/projects/arm/src/lib/libc/net/getnetent.3#2 integrate .. //depot/projects/arm/src/lib/libc/net/getproto.c#2 integrate .. //depot/projects/arm/src/lib/libc/net/getprotoent.3#2 integrate .. //depot/projects/arm/src/lib/libc/net/getprotoent.c#2 integrate .. //depot/projects/arm/src/lib/libc/net/getprotoname.c#2 integrate .. //depot/projects/arm/src/lib/libc/net/getservent.3#2 integrate .. //depot/projects/arm/src/lib/libc/net/getservent.c#2 integrate .. //depot/projects/arm/src/lib/libc/net/inet.3#3 integrate .. //depot/projects/arm/src/lib/libc/net/inet_net.3#2 integrate .. //depot/projects/arm/src/lib/libc/net/linkaddr.3#2 integrate .. //depot/projects/arm/src/lib/libc/net/linkaddr.c#2 integrate .. //depot/projects/arm/src/lib/libc/net/map_v4v6.c#2 integrate .. //depot/projects/arm/src/lib/libc/net/nsdispatch.3#2 integrate .. //depot/projects/arm/src/lib/libc/net/rcmd.3#2 integrate .. //depot/projects/arm/src/lib/libc/net/rcmd.c#2 integrate .. //depot/projects/arm/src/lib/libc/net/rcmdsh.3#2 integrate .. //depot/projects/arm/src/lib/libc/net/recv.c#2 integrate .. //depot/projects/arm/src/lib/libc/net/resolver.3#3 integrate .. //depot/projects/arm/src/lib/libc/net/send.c#2 integrate .. //depot/projects/arm/src/lib/libc/quad/TESTS/divrem.c#2 integrate .. //depot/projects/arm/src/lib/libc/quad/TESTS/mul.c#2 integrate .. //depot/projects/arm/src/lib/libc/quad/adddi3.c#2 integrate .. //depot/projects/arm/src/lib/libc/quad/anddi3.c#2 integrate .. //depot/projects/arm/src/lib/libc/quad/ashldi3.c#2 integrate .. //depot/projects/arm/src/lib/libc/quad/ashrdi3.c#2 integrate .. //depot/projects/arm/src/lib/libc/quad/cmpdi2.c#2 integrate .. //depot/projects/arm/src/lib/libc/quad/divdi3.c#2 integrate .. //depot/projects/arm/src/lib/libc/quad/fixdfdi.c#2 integrate .. //depot/projects/arm/src/lib/libc/quad/fixsfdi.c#2 integrate .. //depot/projects/arm/src/lib/libc/quad/fixunsdfdi.c#2 integrate .. //depot/projects/arm/src/lib/libc/quad/fixunssfdi.c#2 integrate .. //depot/projects/arm/src/lib/libc/quad/floatdidf.c#2 integrate .. //depot/projects/arm/src/lib/libc/quad/floatdisf.c#2 integrate .. //depot/projects/arm/src/lib/libc/quad/floatunsdidf.c#2 integrate .. //depot/projects/arm/src/lib/libc/quad/iordi3.c#2 integrate .. //depot/projects/arm/src/lib/libc/quad/lshldi3.c#2 integrate .. //depot/projects/arm/src/lib/libc/quad/lshrdi3.c#2 integrate .. //depot/projects/arm/src/lib/libc/quad/moddi3.c#2 integrate .. //depot/projects/arm/src/lib/libc/quad/muldi3.c#2 integrate .. //depot/projects/arm/src/lib/libc/quad/negdi2.c#2 integrate .. //depot/projects/arm/src/lib/libc/quad/notdi2.c#2 integrate .. //depot/projects/arm/src/lib/libc/quad/qdivrem.c#2 integrate .. //depot/projects/arm/src/lib/libc/quad/quad.h#2 integrate .. //depot/projects/arm/src/lib/libc/quad/subdi3.c#2 integrate .. //depot/projects/arm/src/lib/libc/quad/ucmpdi2.c#2 integrate .. //depot/projects/arm/src/lib/libc/quad/udivdi3.c#2 integrate .. //depot/projects/arm/src/lib/libc/quad/umoddi3.c#2 integrate .. //depot/projects/arm/src/lib/libc/quad/xordi3.c#2 integrate .. //depot/projects/arm/src/lib/libc/regex/cname.h#2 integrate .. //depot/projects/arm/src/lib/libc/regex/engine.c#2 integrate .. //depot/projects/arm/src/lib/libc/regex/regcomp.c#2 integrate .. //depot/projects/arm/src/lib/libc/regex/regerror.c#2 integrate .. //depot/projects/arm/src/lib/libc/regex/regex.3#2 integrate .. //depot/projects/arm/src/lib/libc/regex/regex2.h#2 integrate .. //depot/projects/arm/src/lib/libc/regex/regexec.c#2 integrate .. //depot/projects/arm/src/lib/libc/regex/regfree.c#2 integrate .. //depot/projects/arm/src/lib/libc/regex/utils.h#2 integrate .. //depot/projects/arm/src/lib/libc/resolv/herror.c#2 integrate .. //depot/projects/arm/src/lib/libc/resolv/res_comp.c#2 integrate .. //depot/projects/arm/src/lib/libc/resolv/res_debug.c#2 integrate .. //depot/projects/arm/src/lib/libc/resolv/res_init.c#4 integrate .. //depot/projects/arm/src/lib/libc/resolv/res_mkquery.c#2 integrate .. //depot/projects/arm/src/lib/libc/resolv/res_query.c#2 integrate .. //depot/projects/arm/src/lib/libc/resolv/res_send.c#5 integrate .. //depot/projects/arm/src/lib/libc/sparc64/SYS.h#2 integrate .. //depot/projects/arm/src/lib/libc/sparc64/fpu/fpu.c#2 integrate .. //depot/projects/arm/src/lib/libc/sparc64/fpu/fpu_add.c#2 integrate .. //depot/projects/arm/src/lib/libc/sparc64/fpu/fpu_arith.h#2 integrate .. //depot/projects/arm/src/lib/libc/sparc64/fpu/fpu_compare.c#2 integrate .. //depot/projects/arm/src/lib/libc/sparc64/fpu/fpu_div.c#2 integrate .. //depot/projects/arm/src/lib/libc/sparc64/fpu/fpu_emu.h#3 integrate .. //depot/projects/arm/src/lib/libc/sparc64/fpu/fpu_explode.c#2 integrate .. //depot/projects/arm/src/lib/libc/sparc64/fpu/fpu_implode.c#3 integrate .. //depot/projects/arm/src/lib/libc/sparc64/fpu/fpu_mul.c#2 integrate .. //depot/projects/arm/src/lib/libc/sparc64/fpu/fpu_sqrt.c#2 integrate .. //depot/projects/arm/src/lib/libc/sparc64/fpu/fpu_subr.c#2 integrate .. //depot/projects/arm/src/lib/libc/sparc64/gen/_setjmp.S#2 integrate .. //depot/projects/arm/src/lib/libc/sparc64/gen/fixunsdfsi.S#2 integrate .. //depot/projects/arm/src/lib/libc/sparc64/gen/modf.S#2 integrate .. //depot/projects/arm/src/lib/libc/sparc64/gen/setjmp.S#2 integrate .. //depot/projects/arm/src/lib/libc/sparc64/sys/brk.S#2 integrate .. //depot/projects/arm/src/lib/libc/sparc64/sys/cerror.S#2 integrate .. //depot/projects/arm/src/lib/libc/sparc64/sys/exect.S#2 integrate .. //depot/projects/arm/src/lib/libc/sparc64/sys/pipe.S#2 integrate .. //depot/projects/arm/src/lib/libc/sparc64/sys/ptrace.S#2 integrate .. //depot/projects/arm/src/lib/libc/sparc64/sys/sbrk.S#2 integrate .. //depot/projects/arm/src/lib/libc/sparc64/sys/setlogin.S#2 integrate .. //depot/projects/arm/src/lib/libc/stdio/_flock_stub.c#2 integrate .. //depot/projects/arm/src/lib/libc/stdio/clrerr.c#2 integrate .. //depot/projects/arm/src/lib/libc/stdio/fclose.3#3 integrate .. //depot/projects/arm/src/lib/libc/stdio/fclose.c#2 integrate .. //depot/projects/arm/src/lib/libc/stdio/fdopen.c#2 integrate .. //depot/projects/arm/src/lib/libc/stdio/feof.c#2 integrate .. //depot/projects/arm/src/lib/libc/stdio/ferror.3#2 integrate .. //depot/projects/arm/src/lib/libc/stdio/ferror.c#2 integrate .. //depot/projects/arm/src/lib/libc/stdio/fflush.3#2 integrate .. //depot/projects/arm/src/lib/libc/stdio/fflush.c#2 integrate .. //depot/projects/arm/src/lib/libc/stdio/fgetc.c#2 integrate .. //depot/projects/arm/src/lib/libc/stdio/fgetln.3#2 integrate .. //depot/projects/arm/src/lib/libc/stdio/fgetln.c#2 integrate .. //depot/projects/arm/src/lib/libc/stdio/fgetpos.c#2 integrate .. //depot/projects/arm/src/lib/libc/stdio/fgets.3#2 integrate .. //depot/projects/arm/src/lib/libc/stdio/fgets.c#2 integrate .. //depot/projects/arm/src/lib/libc/stdio/fgetwln.3#2 integrate .. //depot/projects/arm/src/lib/libc/stdio/fgetws.3#2 integrate .. //depot/projects/arm/src/lib/libc/stdio/fileno.c#2 integrate .. //depot/projects/arm/src/lib/libc/stdio/findfp.c#3 integrate .. //depot/projects/arm/src/lib/libc/stdio/flags.c#2 integrate .. //depot/projects/arm/src/lib/libc/stdio/floatio.h#2 integrate .. //depot/projects/arm/src/lib/libc/stdio/fopen.3#2 integrate .. //depot/projects/arm/src/lib/libc/stdio/fopen.c#2 integrate .. //depot/projects/arm/src/lib/libc/stdio/fprintf.c#2 integrate .. //depot/projects/arm/src/lib/libc/stdio/fpurge.c#2 integrate .. //depot/projects/arm/src/lib/libc/stdio/fputc.c#2 integrate .. //depot/projects/arm/src/lib/libc/stdio/fputs.3#2 integrate .. //depot/projects/arm/src/lib/libc/stdio/fputs.c#2 integrate .. //depot/projects/arm/src/lib/libc/stdio/fputws.3#2 integrate .. //depot/projects/arm/src/lib/libc/stdio/fread.3#2 integrate .. //depot/projects/arm/src/lib/libc/stdio/fread.c#2 integrate .. //depot/projects/arm/src/lib/libc/stdio/freopen.c#3 integrate .. //depot/projects/arm/src/lib/libc/stdio/fscanf.c#2 integrate .. //depot/projects/arm/src/lib/libc/stdio/fseek.3#2 integrate .. //depot/projects/arm/src/lib/libc/stdio/fseek.c#2 integrate .. //depot/projects/arm/src/lib/libc/stdio/fsetpos.c#2 integrate .. //depot/projects/arm/src/lib/libc/stdio/ftell.c#2 integrate .. //depot/projects/arm/src/lib/libc/stdio/funopen.3#2 integrate .. //depot/projects/arm/src/lib/libc/stdio/funopen.c#2 integrate .. //depot/projects/arm/src/lib/libc/stdio/fvwrite.c#2 integrate .. //depot/projects/arm/src/lib/libc/stdio/fvwrite.h#2 integrate .. //depot/projects/arm/src/lib/libc/stdio/fwalk.c#2 integrate .. //depot/projects/arm/src/lib/libc/stdio/fwrite.c#2 integrate .. //depot/projects/arm/src/lib/libc/stdio/getc.3#2 integrate .. //depot/projects/arm/src/lib/libc/stdio/getc.c#2 integrate .. //depot/projects/arm/src/lib/libc/stdio/getchar.c#2 integrate .. //depot/projects/arm/src/lib/libc/stdio/gets.c#2 integrate .. //depot/projects/arm/src/lib/libc/stdio/getw.c#2 integrate .. //depot/projects/arm/src/lib/libc/stdio/getwc.3#2 integrate .. //depot/projects/arm/src/lib/libc/stdio/glue.h#2 integrate .. //depot/projects/arm/src/lib/libc/stdio/local.h#2 integrate .. //depot/projects/arm/src/lib/libc/stdio/makebuf.c#2 integrate .. //depot/projects/arm/src/lib/libc/stdio/mktemp.3#2 integrate .. //depot/projects/arm/src/lib/libc/stdio/mktemp.c#2 integrate .. //depot/projects/arm/src/lib/libc/stdio/perror.c#2 integrate .. //depot/projects/arm/src/lib/libc/stdio/printf.3#2 integrate .. //depot/projects/arm/src/lib/libc/stdio/printf.c#2 integrate .. //depot/projects/arm/src/lib/libc/stdio/putc.3#2 integrate .. //depot/projects/arm/src/lib/libc/stdio/putc.c#2 integrate .. //depot/projects/arm/src/lib/libc/stdio/putchar.c#2 integrate .. //depot/projects/arm/src/lib/libc/stdio/puts.c#2 integrate .. //depot/projects/arm/src/lib/libc/stdio/putw.c#2 integrate .. //depot/projects/arm/src/lib/libc/stdio/putwc.3#2 integrate .. //depot/projects/arm/src/lib/libc/stdio/refill.c#2 integrate .. //depot/projects/arm/src/lib/libc/stdio/remove.3#2 integrate .. //depot/projects/arm/src/lib/libc/stdio/remove.c#2 integrate .. //depot/projects/arm/src/lib/libc/stdio/rewind.c#2 integrate .. //depot/projects/arm/src/lib/libc/stdio/rget.c#2 integrate .. //depot/projects/arm/src/lib/libc/stdio/scanf.3#2 integrate .. //depot/projects/arm/src/lib/libc/stdio/scanf.c#2 integrate .. //depot/projects/arm/src/lib/libc/stdio/setbuf.3#2 integrate .. //depot/projects/arm/src/lib/libc/stdio/setbuf.c#2 integrate .. //depot/projects/arm/src/lib/libc/stdio/setbuffer.c#2 integrate .. //depot/projects/arm/src/lib/libc/stdio/setvbuf.c#2 integrate .. //depot/projects/arm/src/lib/libc/stdio/snprintf.c#2 integrate .. //depot/projects/arm/src/lib/libc/stdio/sprintf.c#2 integrate .. //depot/projects/arm/src/lib/libc/stdio/sscanf.c#2 integrate .. //depot/projects/arm/src/lib/libc/stdio/stdio.3#2 integrate .. //depot/projects/arm/src/lib/libc/stdio/stdio.c#2 integrate .. //depot/projects/arm/src/lib/libc/stdio/tempnam.c#2 integrate .. //depot/projects/arm/src/lib/libc/stdio/tmpfile.c#2 integrate .. //depot/projects/arm/src/lib/libc/stdio/tmpnam.3#2 integrate .. //depot/projects/arm/src/lib/libc/stdio/tmpnam.c#2 integrate .. //depot/projects/arm/src/lib/libc/stdio/ungetc.3#2 integrate .. //depot/projects/arm/src/lib/libc/stdio/ungetc.c#2 integrate .. //depot/projects/arm/src/lib/libc/stdio/ungetwc.3#2 integrate .. //depot/projects/arm/src/lib/libc/stdio/vfprintf.c#4 integrate .. //depot/projects/arm/src/lib/libc/stdio/vfscanf.c#2 integrate .. //depot/projects/arm/src/lib/libc/stdio/vfwprintf.c#3 integrate .. //depot/projects/arm/src/lib/libc/stdio/vfwscanf.c#2 integrate .. //depot/projects/arm/src/lib/libc/stdio/vprintf.c#2 integrate .. //depot/projects/arm/src/lib/libc/stdio/vscanf.c#2 integrate .. //depot/projects/arm/src/lib/libc/stdio/vsnprintf.c#2 integrate .. //depot/projects/arm/src/lib/libc/stdio/vsprintf.c#2 integrate .. //depot/projects/arm/src/lib/libc/stdio/vsscanf.c#2 integrate .. //depot/projects/arm/src/lib/libc/stdio/vswscanf.c#2 integrate .. //depot/projects/arm/src/lib/libc/stdio/wbuf.c#2 integrate .. //depot/projects/arm/src/lib/libc/stdio/wprintf.3#2 integrate .. //depot/projects/arm/src/lib/libc/stdio/wscanf.3#2 integrate .. //depot/projects/arm/src/lib/libc/stdio/wsetup.c#2 integrate .. //depot/projects/arm/src/lib/libc/stdlib/abort.3#2 integrate .. //depot/projects/arm/src/lib/libc/stdlib/abort.c#2 integrate .. //depot/projects/arm/src/lib/libc/stdlib/abs.3#2 integrate .. //depot/projects/arm/src/lib/libc/stdlib/abs.c#2 integrate .. //depot/projects/arm/src/lib/libc/stdlib/alloca.3#3 integrate .. //depot/projects/arm/src/lib/libc/stdlib/atexit.3#2 integrate .. //depot/projects/arm/src/lib/libc/stdlib/atexit.c#2 integrate .. //depot/projects/arm/src/lib/libc/stdlib/atexit.h#2 integrate .. //depot/projects/arm/src/lib/libc/stdlib/atof.3#2 integrate .. //depot/projects/arm/src/lib/libc/stdlib/atof.c#2 integrate .. //depot/projects/arm/src/lib/libc/stdlib/atoi.3#2 integrate .. //depot/projects/arm/src/lib/libc/stdlib/atoi.c#2 integrate .. //depot/projects/arm/src/lib/libc/stdlib/atol.3#2 integrate .. //depot/projects/arm/src/lib/libc/stdlib/atol.c#2 integrate .. //depot/projects/arm/src/lib/libc/stdlib/atoll.c#2 integrate .. //depot/projects/arm/src/lib/libc/stdlib/bsearch.3#2 integrate .. //depot/projects/arm/src/lib/libc/stdlib/bsearch.c#2 integrate .. //depot/projects/arm/src/lib/libc/stdlib/div.3#2 integrate .. //depot/projects/arm/src/lib/libc/stdlib/div.c#2 integrate .. //depot/projects/arm/src/lib/libc/stdlib/exit.3#2 integrate .. //depot/projects/arm/src/lib/libc/stdlib/exit.c#2 integrate .. //depot/projects/arm/src/lib/libc/stdlib/getenv.3#3 integrate .. //depot/projects/arm/src/lib/libc/stdlib/getenv.c#2 integrate .. //depot/projects/arm/src/lib/libc/stdlib/getopt.3#2 integrate .. //depot/projects/arm/src/lib/libc/stdlib/getopt.c#2 integrate .. //depot/projects/arm/src/lib/libc/stdlib/getsubopt.3#2 integrate .. //depot/projects/arm/src/lib/libc/stdlib/getsubopt.c#2 integrate .. //depot/projects/arm/src/lib/libc/stdlib/heapsort.c#2 integrate .. //depot/projects/arm/src/lib/libc/stdlib/labs.3#2 integrate .. //depot/projects/arm/src/lib/libc/stdlib/labs.c#2 integrate .. //depot/projects/arm/src/lib/libc/stdlib/ldiv.3#2 integrate .. //depot/projects/arm/src/lib/libc/stdlib/ldiv.c#2 integrate .. //depot/projects/arm/src/lib/libc/stdlib/memory.3#2 integrate .. //depot/projects/arm/src/lib/libc/stdlib/merge.c#2 integrate .. //depot/projects/arm/src/lib/libc/stdlib/putenv.c#2 integrate .. //depot/projects/arm/src/lib/libc/stdlib/qsort.3#2 integrate .. //depot/projects/arm/src/lib/libc/stdlib/qsort.c#2 integrate .. //depot/projects/arm/src/lib/libc/stdlib/radixsort.3#2 integrate .. //depot/projects/arm/src/lib/libc/stdlib/radixsort.c#2 integrate .. //depot/projects/arm/src/lib/libc/stdlib/rand.3#2 integrate .. //depot/projects/arm/src/lib/libc/stdlib/rand.c#2 integrate .. //depot/projects/arm/src/lib/libc/stdlib/random.3#2 integrate .. //depot/projects/arm/src/lib/libc/stdlib/random.c#2 integrate .. //depot/projects/arm/src/lib/libc/stdlib/realpath.3#2 integrate .. //depot/projects/arm/src/lib/libc/stdlib/setenv.c#2 integrate .. //depot/projects/arm/src/lib/libc/stdlib/strtod.3#2 integrate .. //depot/projects/arm/src/lib/libc/stdlib/strtoimax.c#2 integrate .. //depot/projects/arm/src/lib/libc/stdlib/strtol.3#2 integrate .. //depot/projects/arm/src/lib/libc/stdlib/strtol.c#2 integrate .. //depot/projects/arm/src/lib/libc/stdlib/strtoll.c#2 integrate .. //depot/projects/arm/src/lib/libc/stdlib/strtoq.c#2 integrate .. //depot/projects/arm/src/lib/libc/stdlib/strtoul.3#2 integrate .. //depot/projects/arm/src/lib/libc/stdlib/strtoul.c#2 integrate .. //depot/projects/arm/src/lib/libc/stdlib/strtoull.c#2 integrate .. //depot/projects/arm/src/lib/libc/stdlib/strtoumax.c#2 integrate .. //depot/projects/arm/src/lib/libc/stdlib/strtouq.c#2 integrate .. //depot/projects/arm/src/lib/libc/stdlib/system.3#2 integrate .. //depot/projects/arm/src/lib/libc/stdlib/system.c#2 integrate .. //depot/projects/arm/src/lib/libc/stdtime/ctime.3#2 integrate .. //depot/projects/arm/src/lib/libc/stdtime/strftime.3#3 integrate .. //depot/projects/arm/src/lib/libc/string/bcmp.3#2 integrate .. //depot/projects/arm/src/lib/libc/string/bcmp.c#2 integrate .. //depot/projects/arm/src/lib/libc/string/bcopy.3#2 integrate .. //depot/projects/arm/src/lib/libc/string/bcopy.c#2 integrate .. //depot/projects/arm/src/lib/libc/string/bstring.3#2 integrate .. //depot/projects/arm/src/lib/libc/string/bzero.3#2 integrate .. //depot/projects/arm/src/lib/libc/string/ffs.3#3 integrate .. //depot/projects/arm/src/lib/libc/string/ffs.c#2 integrate .. //depot/projects/arm/src/lib/libc/string/ffsl.c#2 integrate .. //depot/projects/arm/src/lib/libc/string/fls.c#2 integrate .. //depot/projects/arm/src/lib/libc/string/flsl.c#2 integrate .. //depot/projects/arm/src/lib/libc/string/index.3#2 integrate .. //depot/projects/arm/src/lib/libc/string/index.c#2 integrate .. //depot/projects/arm/src/lib/libc/string/memccpy.3#2 integrate .. //depot/projects/arm/src/lib/libc/string/memccpy.c#2 integrate .. //depot/projects/arm/src/lib/libc/string/memchr.3#2 integrate .. //depot/projects/arm/src/lib/libc/string/memchr.c#2 integrate .. //depot/projects/arm/src/lib/libc/string/memcmp.3#2 integrate .. //depot/projects/arm/src/lib/libc/string/memcmp.c#2 integrate .. //depot/projects/arm/src/lib/libc/string/memcpy.3#2 integrate .. //depot/projects/arm/src/lib/libc/string/memmove.3#2 integrate .. //depot/projects/arm/src/lib/libc/string/memset.3#2 integrate .. //depot/projects/arm/src/lib/libc/string/memset.c#2 integrate .. //depot/projects/arm/src/lib/libc/string/rindex.c#2 integrate .. //depot/projects/arm/src/lib/libc/string/strcasecmp.3#2 integrate .. //depot/projects/arm/src/lib/libc/string/strcasecmp.c#2 integrate .. //depot/projects/arm/src/lib/libc/string/strcasestr.c#2 integrate .. //depot/projects/arm/src/lib/libc/string/strcat.3#2 integrate .. //depot/projects/arm/src/lib/libc/string/strcat.c#2 integrate .. //depot/projects/arm/src/lib/libc/string/strchr.3#2 integrate .. //depot/projects/arm/src/lib/libc/string/strcmp.3#2 integrate .. //depot/projects/arm/src/lib/libc/string/strcmp.c#2 integrate .. //depot/projects/arm/src/lib/libc/string/strcoll.3#3 integrate .. //depot/projects/arm/src/lib/libc/string/strcpy.3#2 integrate .. //depot/projects/arm/src/lib/libc/string/strcpy.c#2 integrate .. //depot/projects/arm/src/lib/libc/string/strcspn.3#2 integrate .. //depot/projects/arm/src/lib/libc/string/strdup.3#2 integrate .. //depot/projects/arm/src/lib/libc/string/strdup.c#2 integrate .. //depot/projects/arm/src/lib/libc/string/strerror.3#2 integrate .. //depot/projects/arm/src/lib/libc/string/strerror.c#2 integrate .. //depot/projects/arm/src/lib/libc/string/string.3#2 integrate .. //depot/projects/arm/src/lib/libc/string/strlen.3#2 integrate .. //depot/projects/arm/src/lib/libc/string/strlen.c#2 integrate .. //depot/projects/arm/src/lib/libc/string/strmode.3#2 integrate .. //depot/projects/arm/src/lib/libc/string/strmode.c#2 integrate .. //depot/projects/arm/src/lib/libc/string/strncat.c#2 integrate .. //depot/projects/arm/src/lib/libc/string/strncmp.c#2 integrate .. //depot/projects/arm/src/lib/libc/string/strncpy.c#2 integrate .. //depot/projects/arm/src/lib/libc/string/strnstr.c#2 integrate .. //depot/projects/arm/src/lib/libc/string/strpbrk.3#2 integrate .. //depot/projects/arm/src/lib/libc/string/strpbrk.c#2 integrate .. //depot/projects/arm/src/lib/libc/string/strsep.3#2 integrate .. //depot/projects/arm/src/lib/libc/string/strsep.c#2 integrate .. //depot/projects/arm/src/lib/libc/string/strsignal.c#2 integrate .. //depot/projects/arm/src/lib/libc/string/strspn.3#2 integrate .. //depot/projects/arm/src/lib/libc/string/strstr.3#2 integrate .. //depot/projects/arm/src/lib/libc/string/strstr.c#2 integrate .. //depot/projects/arm/src/lib/libc/string/strxfrm.3#2 integrate .. //depot/projects/arm/src/lib/libc/string/swab.3#2 integrate .. //depot/projects/arm/src/lib/libc/string/swab.c#2 integrate .. //depot/projects/arm/src/lib/libc/string/wcscmp.c#2 integrate .. //depot/projects/arm/src/lib/libc/string/wcscoll.3#2 integrate .. //depot/projects/arm/src/lib/libc/string/wcsncmp.c#2 integrate .. //depot/projects/arm/src/lib/libc/string/wcsncpy.c#2 integrate .. //depot/projects/arm/src/lib/libc/string/wcsstr.c#2 integrate .. //depot/projects/arm/src/lib/libc/string/wcswidth.c#2 integrate .. //depot/projects/arm/src/lib/libc/string/wcsxfrm.3#2 integrate .. //depot/projects/arm/src/lib/libc/string/wmemchr.3#2 integrate .. //depot/projects/arm/src/lib/libc/sys/__error.c#2 integrate .. //depot/projects/arm/src/lib/libc/sys/_exit.2#2 integrate .. //depot/projects/arm/src/lib/libc/sys/accept.2#2 integrate .. //depot/projects/arm/src/lib/libc/sys/access.2#2 integrate .. //depot/projects/arm/src/lib/libc/sys/acct.2#2 integrate .. //depot/projects/arm/src/lib/libc/sys/adjtime.2#2 integrate .. //depot/projects/arm/src/lib/libc/sys/bind.2#2 integrate .. //depot/projects/arm/src/lib/libc/sys/brk.2#2 integrate .. //depot/projects/arm/src/lib/libc/sys/chdir.2#2 integrate .. //depot/projects/arm/src/lib/libc/sys/chflags.2#4 integrate .. //depot/projects/arm/src/lib/libc/sys/chmod.2#4 integrate .. //depot/projects/arm/src/lib/libc/sys/chown.2#4 integrate .. //depot/projects/arm/src/lib/libc/sys/chroot.2#2 integrate .. //depot/projects/arm/src/lib/libc/sys/clock_gettime.2#4 integrate .. //depot/projects/arm/src/lib/libc/sys/close.2#3 integrate .. //depot/projects/arm/src/lib/libc/sys/connect.2#4 integrate .. //depot/projects/arm/src/lib/libc/sys/dup.2#2 integrate .. //depot/projects/arm/src/lib/libc/sys/execve.2#2 integrate .. //depot/projects/arm/src/lib/libc/sys/fcntl.2#2 integrate .. //depot/projects/arm/src/lib/libc/sys/flock.2#2 integrate .. //depot/projects/arm/src/lib/libc/sys/fork.2#2 integrate .. //depot/projects/arm/src/lib/libc/sys/fsync.2#2 integrate .. //depot/projects/arm/src/lib/libc/sys/ftruncate.c#2 integrate .. //depot/projects/arm/src/lib/libc/sys/getdirentries.2#2 integrate .. //depot/projects/arm/src/lib/libc/sys/getdtablesize.2#2 integrate .. //depot/projects/arm/src/lib/libc/sys/getfh.2#2 integrate .. //depot/projects/arm/src/lib/libc/sys/getfsstat.2#3 integrate .. //depot/projects/arm/src/lib/libc/sys/getgid.2#2 integrate .. //depot/projects/arm/src/lib/libc/sys/getgroups.2#2 integrate .. //depot/projects/arm/src/lib/libc/sys/getitimer.2#2 integrate .. //depot/projects/arm/src/lib/libc/sys/getlogin.2#2 integrate .. //depot/projects/arm/src/lib/libc/sys/getpeername.2#2 integrate .. //depot/projects/arm/src/lib/libc/sys/getpgrp.2#2 integrate .. //depot/projects/arm/src/lib/libc/sys/getpid.2#3 integrate .. //depot/projects/arm/src/lib/libc/sys/getpriority.2#2 integrate .. //depot/projects/arm/src/lib/libc/sys/getrlimit.2#2 integrate .. //depot/projects/arm/src/lib/libc/sys/getrusage.2#2 integrate .. //depot/projects/arm/src/lib/libc/sys/getsockname.2#2 integrate .. //depot/projects/arm/src/lib/libc/sys/getsockopt.2#3 integrate .. //depot/projects/arm/src/lib/libc/sys/gettimeofday.2#3 integrate .. //depot/projects/arm/src/lib/libc/sys/getuid.2#2 integrate .. //depot/projects/arm/src/lib/libc/sys/intro.2#3 integrate .. //depot/projects/arm/src/lib/libc/sys/ioctl.2#2 integrate .. //depot/projects/arm/src/lib/libc/sys/issetugid.2#2 integrate .. //depot/projects/arm/src/lib/libc/sys/kill.2#2 integrate .. //depot/projects/arm/src/lib/libc/sys/ktrace.2#2 integrate .. //depot/projects/arm/src/lib/libc/sys/link.2#3 integrate .. //depot/projects/arm/src/lib/libc/sys/listen.2#3 integrate .. //depot/projects/arm/src/lib/libc/sys/lseek.2#2 integrate .. //depot/projects/arm/src/lib/libc/sys/lseek.c#2 integrate .. //depot/projects/arm/src/lib/libc/sys/madvise.2#2 integrate .. //depot/projects/arm/src/lib/libc/sys/mincore.2#2 integrate .. //depot/projects/arm/src/lib/libc/sys/minherit.2#2 integrate .. //depot/projects/arm/src/lib/libc/sys/mkdir.2#4 integrate .. //depot/projects/arm/src/lib/libc/sys/mkfifo.2#4 integrate .. //depot/projects/arm/src/lib/libc/sys/mknod.2#2 integrate .. //depot/projects/arm/src/lib/libc/sys/mlock.2#2 integrate .. //depot/projects/arm/src/lib/libc/sys/mmap.2#3 integrate .. //depot/projects/arm/src/lib/libc/sys/mmap.c#2 integrate .. //depot/projects/arm/src/lib/libc/sys/mount.2#2 integrate .. //depot/projects/arm/src/lib/libc/sys/mprotect.2#2 integrate .. //depot/projects/arm/src/lib/libc/sys/msync.2#2 integrate .. //depot/projects/arm/src/lib/libc/sys/munmap.2#2 integrate .. //depot/projects/arm/src/lib/libc/sys/nanosleep.2#2 integrate .. //depot/projects/arm/src/lib/libc/sys/nfssvc.2#2 integrate .. //depot/projects/arm/src/lib/libc/sys/open.2#3 integrate .. //depot/projects/arm/src/lib/libc/sys/pathconf.2#2 integrate .. //depot/projects/arm/src/lib/libc/sys/pipe.2#2 integrate .. //depot/projects/arm/src/lib/libc/sys/pread.c#2 integrate .. //depot/projects/arm/src/lib/libc/sys/profil.2#2 integrate .. //depot/projects/arm/src/lib/libc/sys/pwrite.c#2 integrate .. //depot/projects/arm/src/lib/libc/sys/quotactl.2#2 integrate .. //depot/projects/arm/src/lib/libc/sys/read.2#4 integrate .. //depot/projects/arm/src/lib/libc/sys/readlink.2#2 integrate .. //depot/projects/arm/src/lib/libc/sys/reboot.2#2 integrate .. //depot/projects/arm/src/lib/libc/sys/recv.2#4 integrate .. //depot/projects/arm/src/lib/libc/sys/rename.2#3 integrate .. //depot/projects/arm/src/lib/libc/sys/revoke.2#2 integrate .. //depot/projects/arm/src/lib/libc/sys/rmdir.2#3 integrate .. //depot/projects/arm/src/lib/libc/sys/select.2#2 integrate .. //depot/projects/arm/src/lib/libc/sys/send.2#3 integrate .. //depot/projects/arm/src/lib/libc/sys/setgroups.2#2 integrate .. //depot/projects/arm/src/lib/libc/sys/setpgid.2#2 integrate .. //depot/projects/arm/src/lib/libc/sys/setregid.2#2 integrate .. //depot/projects/arm/src/lib/libc/sys/setreuid.2#2 integrate .. //depot/projects/arm/src/lib/libc/sys/setsid.2#2 integrate .. //depot/projects/arm/src/lib/libc/sys/setuid.2#2 integrate .. //depot/projects/arm/src/lib/libc/sys/shutdown.2#2 integrate .. //depot/projects/arm/src/lib/libc/sys/sigaction.2#2 integrate .. //depot/projects/arm/src/lib/libc/sys/sigaltstack.2#2 integrate .. //depot/projects/arm/src/lib/libc/sys/sigpending.2#2 integrate .. //depot/projects/arm/src/lib/libc/sys/sigprocmask.2#2 integrate .. //depot/projects/arm/src/lib/libc/sys/sigreturn.2#2 integrate .. //depot/projects/arm/src/lib/libc/sys/sigstack.2#2 integrate .. //depot/projects/arm/src/lib/libc/sys/sigsuspend.2#2 integrate .. //depot/projects/arm/src/lib/libc/sys/socket.2#2 integrate .. //depot/projects/arm/src/lib/libc/sys/socketpair.2#2 integrate .. //depot/projects/arm/src/lib/libc/sys/stat.2#3 integrate .. //depot/projects/arm/src/lib/libc/sys/statfs.2#3 integrate .. //depot/projects/arm/src/lib/libc/sys/swapon.2#2 integrate .. //depot/projects/arm/src/lib/libc/sys/symlink.2#4 integrate .. //depot/projects/arm/src/lib/libc/sys/sync.2#2 integrate .. //depot/projects/arm/src/lib/libc/sys/sysarch.2#2 integrate .. //depot/projects/arm/src/lib/libc/sys/syscall.2#2 integrate .. //depot/projects/arm/src/lib/libc/sys/truncate.2#4 integrate .. //depot/projects/arm/src/lib/libc/sys/truncate.c#2 integrate .. //depot/projects/arm/src/lib/libc/sys/umask.2#2 integrate .. //depot/projects/arm/src/lib/libc/sys/undelete.2#2 integrate .. //depot/projects/arm/src/lib/libc/sys/unlink.2#3 integrate .. //depot/projects/arm/src/lib/libc/sys/utimes.2#4 integrate .. //depot/projects/arm/src/lib/libc/sys/vfork.2#2 integrate .. //depot/projects/arm/src/lib/libc/sys/wait.2#2 integrate .. //depot/projects/arm/src/lib/libc/sys/write.2#3 integrate .. //depot/projects/arm/src/lib/libc_r/uthread/pthread_private.h#2 integrate .. //depot/projects/arm/src/lib/libc_r/uthread/uthread_accept.c#2 integrate .. //depot/projects/arm/src/lib/libc_r/uthread/uthread_attr_destroy.c#2 integrate .. //depot/projects/arm/src/lib/libc_r/uthread/uthread_attr_getdetachstate.c#2 integrate .. //depot/projects/arm/src/lib/libc_r/uthread/uthread_attr_getstackaddr.c#2 integrate .. //depot/projects/arm/src/lib/libc_r/uthread/uthread_attr_getstacksize.c#2 integrate .. //depot/projects/arm/src/lib/libc_r/uthread/uthread_attr_init.c#2 integrate .. //depot/projects/arm/src/lib/libc_r/uthread/uthread_attr_setcreatesuspend_np.c#2 integrate .. //depot/projects/arm/src/lib/libc_r/uthread/uthread_attr_setdetachstate.c#2 integrate .. //depot/projects/arm/src/lib/libc_r/uthread/uthread_attr_setstackaddr.c#2 integrate .. //depot/projects/arm/src/lib/libc_r/uthread/uthread_attr_setstacksize.c#2 integrate .. //depot/projects/arm/src/lib/libc_r/uthread/uthread_bind.c#2 integrate .. //depot/projects/arm/src/lib/libc_r/uthread/uthread_clean.c#2 integrate .. //depot/projects/arm/src/lib/libc_r/uthread/uthread_close.c#2 integrate .. //depot/projects/arm/src/lib/libc_r/uthread/uthread_cond.c#2 integrate .. //depot/projects/arm/src/lib/libc_r/uthread/uthread_condattr_destroy.c#2 integrate .. //depot/projects/arm/src/lib/libc_r/uthread/uthread_condattr_init.c#2 integrate .. //depot/projects/arm/src/lib/libc_r/uthread/uthread_connect.c#2 integrate .. //depot/projects/arm/src/lib/libc_r/uthread/uthread_create.c#2 integrate .. //depot/projects/arm/src/lib/libc_r/uthread/uthread_detach.c#2 integrate .. //depot/projects/arm/src/lib/libc_r/uthread/uthread_dup.c#2 integrate .. //depot/projects/arm/src/lib/libc_r/uthread/uthread_dup2.c#2 integrate .. //depot/projects/arm/src/lib/libc_r/uthread/uthread_equal.c#2 integrate .. //depot/projects/arm/src/lib/libc_r/uthread/uthread_execve.c#2 integrate .. //depot/projects/arm/src/lib/libc_r/uthread/uthread_exit.c#2 integrate .. //depot/projects/arm/src/lib/libc_r/uthread/uthread_fchmod.c#2 integrate .. //depot/projects/arm/src/lib/libc_r/uthread/uthread_fchown.c#2 integrate .. //depot/projects/arm/src/lib/libc_r/uthread/uthread_fcntl.c#2 integrate .. //depot/projects/arm/src/lib/libc_r/uthread/uthread_fd.c#2 integrate .. //depot/projects/arm/src/lib/libc_r/uthread/uthread_find_thread.c#2 integrate .. //depot/projects/arm/src/lib/libc_r/uthread/uthread_flock.c#2 integrate .. //depot/projects/arm/src/lib/libc_r/uthread/uthread_fork.c#2 integrate .. //depot/projects/arm/src/lib/libc_r/uthread/uthread_fstat.c#2 integrate .. //depot/projects/arm/src/lib/libc_r/uthread/uthread_fstatfs.c#2 integrate .. //depot/projects/arm/src/lib/libc_r/uthread/uthread_fsync.c#2 integrate .. //depot/projects/arm/src/lib/libc_r/uthread/uthread_gc.c#2 integrate .. //depot/projects/arm/src/lib/libc_r/uthread/uthread_getdirentries.c#2 integrate .. //depot/projects/arm/src/lib/libc_r/uthread/uthread_getpeername.c#2 integrate .. //depot/projects/arm/src/lib/libc_r/uthread/uthread_getprio.c#2 integrate .. //depot/projects/arm/src/lib/libc_r/uthread/uthread_getsockname.c#2 integrate .. //depot/projects/arm/src/lib/libc_r/uthread/uthread_getsockopt.c#2 integrate .. //depot/projects/arm/src/lib/libc_r/uthread/uthread_info.c#2 integrate .. //depot/projects/arm/src/lib/libc_r/uthread/uthread_init.c#3 integrate .. //depot/projects/arm/src/lib/libc_r/uthread/uthread_ioctl.c#2 integrate .. //depot/projects/arm/src/lib/libc_r/uthread/uthread_join.c#2 integrate .. //depot/projects/arm/src/lib/libc_r/uthread/uthread_kern.c#2 integrate .. //depot/projects/arm/src/lib/libc_r/uthread/uthread_kill.c#2 integrate .. //depot/projects/arm/src/lib/libc_r/uthread/uthread_listen.c#2 integrate .. //depot/projects/arm/src/lib/libc_r/uthread/uthread_multi_np.c#2 integrate .. //depot/projects/arm/src/lib/libc_r/uthread/uthread_mutex.c#2 integrate .. //depot/projects/arm/src/lib/libc_r/uthread/uthread_mutexattr_destroy.c#2 integrate .. //depot/projects/arm/src/lib/libc_r/uthread/uthread_nanosleep.c#2 integrate .. //depot/projects/arm/src/lib/libc_r/uthread/uthread_once.c#2 integrate .. //depot/projects/arm/src/lib/libc_r/uthread/uthread_open.c#2 integrate .. //depot/projects/arm/src/lib/libc_r/uthread/uthread_pipe.c#2 integrate .. //depot/projects/arm/src/lib/libc_r/uthread/uthread_read.c#2 integrate .. //depot/projects/arm/src/lib/libc_r/uthread/uthread_readv.c#2 integrate .. //depot/projects/arm/src/lib/libc_r/uthread/uthread_recvfrom.c#2 integrate .. //depot/projects/arm/src/lib/libc_r/uthread/uthread_recvmsg.c#2 integrate .. //depot/projects/arm/src/lib/libc_r/uthread/uthread_resume_np.c#2 integrate .. //depot/projects/arm/src/lib/libc_r/uthread/uthread_select.c#3 integrate .. //depot/projects/arm/src/lib/libc_r/uthread/uthread_self.c#2 integrate .. //depot/projects/arm/src/lib/libc_r/uthread/uthread_sendmsg.c#2 integrate .. //depot/projects/arm/src/lib/libc_r/uthread/uthread_sendto.c#2 integrate .. //depot/projects/arm/src/lib/libc_r/uthread/uthread_seterrno.c#2 integrate .. //depot/projects/arm/src/lib/libc_r/uthread/uthread_setprio.c#2 integrate .. //depot/projects/arm/src/lib/libc_r/uthread/uthread_setsockopt.c#2 integrate .. //depot/projects/arm/src/lib/libc_r/uthread/uthread_shutdown.c#2 integrate .. //depot/projects/arm/src/lib/libc_r/uthread/uthread_sig.c#3 integrate .. //depot/projects/arm/src/lib/libc_r/uthread/uthread_sigaction.c#2 integrate .. //depot/projects/arm/src/lib/libc_r/uthread/uthread_sigmask.c#2 integrate .. //depot/projects/arm/src/lib/libc_r/uthread/uthread_sigpending.c#2 integrate .. //depot/projects/arm/src/lib/libc_r/uthread/uthread_sigprocmask.c#2 integrate .. //depot/projects/arm/src/lib/libc_r/uthread/uthread_sigsuspend.c#2 integrate .. //depot/projects/arm/src/lib/libc_r/uthread/uthread_sigwait.c#2 integrate .. //depot/projects/arm/src/lib/libc_r/uthread/uthread_single_np.c#2 integrate .. //depot/projects/arm/src/lib/libc_r/uthread/uthread_socket.c#2 integrate .. //depot/projects/arm/src/lib/libc_r/uthread/uthread_socketpair.c#2 integrate .. //depot/projects/arm/src/lib/libc_r/uthread/uthread_spec.c#2 integrate .. //depot/projects/arm/src/lib/libc_r/uthread/uthread_spinlock.c#2 integrate .. //depot/projects/arm/src/lib/libc_r/uthread/uthread_suspend_np.c#2 integrate .. //depot/projects/arm/src/lib/libc_r/uthread/uthread_wait4.c#2 integrate .. //depot/projects/arm/src/lib/libc_r/uthread/uthread_write.c#2 integrate .. //depot/projects/arm/src/lib/libc_r/uthread/uthread_writev.c#2 integrate .. //depot/projects/arm/src/lib/libc_r/uthread/uthread_yield.c#2 integrate .. //depot/projects/arm/src/lib/libcompat/4.1/ftime.3#2 integrate .. //depot/projects/arm/src/lib/libcompat/4.1/getpw.3#2 integrate .. //depot/projects/arm/src/lib/libcompat/4.1/stty.3#2 integrate .. //depot/projects/arm/src/lib/libcompat/4.3/cfree.c#2 integrate .. //depot/projects/arm/src/lib/libcompat/4.3/re_comp.3#2 integrate .. //depot/projects/arm/src/lib/libcompat/4.3/regex.c#2 integrate .. //depot/projects/arm/src/lib/libcompat/4.3/rexec.3#2 integrate .. //depot/projects/arm/src/lib/libcompat/4.3/rexec.c#2 integrate .. //depot/projects/arm/src/lib/libcompat/4.4/cuserid.c#2 integrate .. //depot/projects/arm/src/lib/libcompat/regexp/regexp.3#2 integrate .. //depot/projects/arm/src/lib/libipx/ipx.3#2 integrate .. //depot/projects/arm/src/lib/libipx/ipx_addr.c#2 integrate .. //depot/projects/arm/src/lib/libipx/ipx_ntoa.c#2 integrate .. //depot/projects/arm/src/lib/libkvm/kvm.3#2 integrate .. //depot/projects/arm/src/lib/libkvm/kvm.c#3 integrate .. //depot/projects/arm/src/lib/libkvm/kvm.h#2 integrate .. //depot/projects/arm/src/lib/libkvm/kvm_amd64.c#2 integrate .. //depot/projects/arm/src/lib/libkvm/kvm_arm.c#2 integrate .. //depot/projects/arm/src/lib/libkvm/kvm_file.c#2 integrate .. //depot/projects/arm/src/lib/libkvm/kvm_geterr.3#2 integrate .. //depot/projects/arm/src/lib/libkvm/kvm_getfiles.3#2 integrate .. //depot/projects/arm/src/lib/libkvm/kvm_getloadavg.3#2 integrate .. //depot/projects/arm/src/lib/libkvm/kvm_getloadavg.c#2 integrate .. //depot/projects/arm/src/lib/libkvm/kvm_getprocs.3#2 integrate .. //depot/projects/arm/src/lib/libkvm/kvm_i386.c#2 integrate .. //depot/projects/arm/src/lib/libkvm/kvm_nlist.3#2 integrate .. //depot/projects/arm/src/lib/libkvm/kvm_open.3#2 integrate .. //depot/projects/arm/src/lib/libkvm/kvm_private.h#2 integrate .. //depot/projects/arm/src/lib/libkvm/kvm_proc.c#5 integrate .. //depot/projects/arm/src/lib/libkvm/kvm_read.3#2 integrate .. //depot/projects/arm/src/lib/libkvm/kvm_sparc.c#2 integrate .. //depot/projects/arm/src/lib/libkvm/kvm_sparc64.c#3 integrate .. //depot/projects/arm/src/lib/libncp/ipx.c#2 integrate .. //depot/projects/arm/src/lib/libncp/ipxsap.h#2 integrate .. //depot/projects/arm/src/lib/libncp/ncpl_bind.c#2 integrate .. //depot/projects/arm/src/lib/libncp/ncpl_conn.c#2 integrate .. //depot/projects/arm/src/lib/libncp/ncpl_file.c#3 integrate .. //depot/projects/arm/src/lib/libncp/ncpl_misc.c#3 integrate .. //depot/projects/arm/src/lib/libncp/ncpl_msg.c#3 integrate .. //depot/projects/arm/src/lib/libncp/ncpl_net.c#2 integrate .. //depot/projects/arm/src/lib/libncp/ncpl_nls.c#3 integrate .. //depot/projects/arm/src/lib/libncp/ncpl_queue.c#3 integrate .. //depot/projects/arm/src/lib/libncp/ncpl_rcfile.c#2 integrate .. //depot/projects/arm/src/lib/libncp/ncpl_rpc.c#3 integrate .. //depot/projects/arm/src/lib/libncp/ncpl_subr.c#2 integrate .. //depot/projects/arm/src/lib/libncp/sap.c#2 integrate .. //depot/projects/arm/src/lib/libncurses/pathnames.h#2 integrate .. //depot/projects/arm/src/lib/libncurses/termcap.c#2 integrate .. //depot/projects/arm/src/lib/libpthread/thread/thr_attr_destroy.c#2 integrate .. //depot/projects/arm/src/lib/libpthread/thread/thr_attr_getdetachstate.c#2 integrate .. //depot/projects/arm/src/lib/libpthread/thread/thr_attr_getstackaddr.c#2 integrate .. //depot/projects/arm/src/lib/libpthread/thread/thr_attr_getstacksize.c#2 integrate .. //depot/projects/arm/src/lib/libpthread/thread/thr_attr_init.c#2 integrate .. //depot/projects/arm/src/lib/libpthread/thread/thr_attr_setcreatesuspend_np.c#2 integrate .. //depot/projects/arm/src/lib/libpthread/thread/thr_attr_setdetachstate.c#2 integrate .. //depot/projects/arm/src/lib/libpthread/thread/thr_attr_setstackaddr.c#2 integrate .. //depot/projects/arm/src/lib/libpthread/thread/thr_attr_setstacksize.c#2 integrate .. //depot/projects/arm/src/lib/libpthread/thread/thr_clean.c#2 integrate .. //depot/projects/arm/src/lib/libpthread/thread/thr_close.c#2 integrate .. //depot/projects/arm/src/lib/libpthread/thread/thr_cond.c#2 integrate .. //depot/projects/arm/src/lib/libpthread/thread/thr_condattr_destroy.c#2 integrate .. //depot/projects/arm/src/lib/libpthread/thread/thr_condattr_init.c#2 integrate .. //depot/projects/arm/src/lib/libpthread/thread/thr_create.c#2 integrate .. //depot/projects/arm/src/lib/libpthread/thread/thr_detach.c#2 integrate .. //depot/projects/arm/src/lib/libpthread/thread/thr_equal.c#2 integrate .. //depot/projects/arm/src/lib/libpthread/thread/thr_exit.c#2 integrate .. //depot/projects/arm/src/lib/libpthread/thread/thr_fcntl.c#2 integrate .. //depot/projects/arm/src/lib/libpthread/thread/thr_find_thread.c#2 integrate .. //depot/projects/arm/src/lib/libpthread/thread/thr_fork.c#2 integrate .. //depot/projects/arm/src/lib/libpthread/thread/thr_fsync.c#2 integrate .. //depot/projects/arm/src/lib/libpthread/thread/thr_getprio.c#2 integrate .. //depot/projects/arm/src/lib/libpthread/thread/thr_info.c#2 integrate .. //depot/projects/arm/src/lib/libpthread/thread/thr_init.c#2 integrate .. //depot/projects/arm/src/lib/libpthread/thread/thr_join.c#3 integrate .. //depot/projects/arm/src/lib/libpthread/thread/thr_kill.c#2 integrate .. //depot/projects/arm/src/lib/libpthread/thread/thr_mattr_kind_np.c#2 integrate .. //depot/projects/arm/src/lib/libpthread/thread/thr_multi_np.c#2 integrate .. //depot/projects/arm/src/lib/libpthread/thread/thr_mutex.c#2 integrate .. //depot/projects/arm/src/lib/libpthread/thread/thr_mutexattr_destroy.c#2 integrate .. //depot/projects/arm/src/lib/libpthread/thread/thr_nanosleep.c#2 integrate .. //depot/projects/arm/src/lib/libpthread/thread/thr_once.c#2 integrate .. //depot/projects/arm/src/lib/libpthread/thread/thr_open.c#2 integrate .. //depot/projects/arm/src/lib/libpthread/thread/thr_private.h#2 integrate .. //depot/projects/arm/src/lib/libpthread/thread/thr_read.c#2 integrate .. //depot/projects/arm/src/lib/libpthread/thread/thr_readv.c#2 integrate .. //depot/projects/arm/src/lib/libpthread/thread/thr_resume_np.c#2 integrate .. //depot/projects/arm/src/lib/libpthread/thread/thr_select.c#2 integrate .. //depot/projects/arm/src/lib/libpthread/thread/thr_self.c#2 integrate .. //depot/projects/arm/src/lib/libpthread/thread/thr_seterrno.c#2 integrate .. //depot/projects/arm/src/lib/libpthread/thread/thr_setprio.c#2 integrate .. //depot/projects/arm/src/lib/libpthread/thread/thr_sig.c#2 integrate .. //depot/projects/arm/src/lib/libpthread/thread/thr_sigaction.c#2 integrate .. //depot/projects/arm/src/lib/libpthread/thread/thr_sigmask.c#2 integrate .. //depot/projects/arm/src/lib/libpthread/thread/thr_sigprocmask.c#2 integrate .. //depot/projects/arm/src/lib/libpthread/thread/thr_sigsuspend.c#2 integrate .. //depot/projects/arm/src/lib/libpthread/thread/thr_sigwait.c#2 integrate .. //depot/projects/arm/src/lib/libpthread/thread/thr_single_np.c#2 integrate .. //depot/projects/arm/src/lib/libpthread/thread/thr_spec.c#2 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat Jan 13 20:58: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 235B216A415; Sat, 13 Jan 2007 20:58: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 D669916A412 for ; Sat, 13 Jan 2007 20:58:03 +0000 (UTC) (envelope-from zec@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id C6E2B13C45A for ; Sat, 13 Jan 2007 20:58:03 +0000 (UTC) (envelope-from zec@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l0DKw3Eg034862 for ; Sat, 13 Jan 2007 20:58:03 GMT (envelope-from zec@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0DKw35X034859 for perforce@freebsd.org; Sat, 13 Jan 2007 20:58:03 GMT (envelope-from zec@FreeBSD.org) Date: Sat, 13 Jan 2007 20:58:03 GMT Message-Id: <200701132058.l0DKw35X034859@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@FreeBSD.org using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 112877 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 13 Jan 2007 20:58:04 -0000 http://perforce.freebsd.org/chv.cgi?CH=112877 Change 112877 by zec@zec_tpx32 on 2007/01/13 20:57:20 When deregistering a vnet module unlink it from the list of all registered modules. Affected files ... .. //depot/projects/vimage/src/sys/kern/kern_vimage.c#12 edit Differences ... ==== //depot/projects/vimage/src/sys/kern/kern_vimage.c#12 (text+ko) ==== @@ -78,7 +78,7 @@ int last_vi_id = 0; static struct vnet_modlink vnet_modules[VNET_MOD_MAX]; -static TAILQ_HEAD(, vnet_modlink) vnet_modlink_head; +static TAILQ_HEAD(vnet_modlink_head, vnet_modlink) vnet_modlink_head; void vnet_mod_register(modinfo) struct vnet_modinfo *modinfo; @@ -118,6 +118,8 @@ } vnet_modules[modinfo->id].modinfo = NULL; + TAILQ_REMOVE(&vnet_modlink_head, + &vnet_modules[modinfo->id], mod_le); } struct vimage *vnetb2vimage(vnetb) From owner-p4-projects@FreeBSD.ORG Sat Jan 13 21:03:11 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EABC216A415; Sat, 13 Jan 2007 21:03:10 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id B7A4316A403 for ; Sat, 13 Jan 2007 21:03:10 +0000 (UTC) (envelope-from zec@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id A80F913C457 for ; Sat, 13 Jan 2007 21:03:10 +0000 (UTC) (envelope-from zec@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l0DL3Ab2037114 for ; Sat, 13 Jan 2007 21:03:10 GMT (envelope-from zec@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0DL3Aue037111 for perforce@freebsd.org; Sat, 13 Jan 2007 21:03:10 GMT (envelope-from zec@FreeBSD.org) Date: Sat, 13 Jan 2007 21:03:10 GMT Message-Id: <200701132103.l0DL3Aue037111@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@FreeBSD.org using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 112878 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 13 Jan 2007 21:03:11 -0000 http://perforce.freebsd.org/chv.cgi?CH=112878 Change 112878 by zec@zec_tpx32 on 2007/01/13 21:03:01 Provide an instance-detach method for ipfw. This allows ipfw to be correctly kldunloaded regardless of the number of active vnets, and should be called on vnet destroy events in the future. Affected files ... .. //depot/projects/vimage/src/sys/netinet/ip_fw2.c#6 edit Differences ... ==== //depot/projects/vimage/src/sys/netinet/ip_fw2.c#6 (text+ko) ==== @@ -115,6 +115,7 @@ #include static int vnet_ipfw_iattach(void); +static int vnet_ipfw_idetach(void); #ifdef VIMAGE static struct vnet_modinfo vnet_ipfw_modinfo = { @@ -123,7 +124,7 @@ .name = "ipfw", .symmap = NULL, .i_attach = vnet_ipfw_iattach, - .i_detach = NULL, + .i_detach = vnet_ipfw_idetach, }; #endif @@ -5064,17 +5065,14 @@ return (0); } -void -ipfw_destroy(void) +static int vnet_ipfw_idetach(void) { - INIT_VNET_IPFW(curvnetb); /* XXX */ + INIT_VNET_IPFW(curvnetb); struct ip_fw *reap; #ifdef IPFIREWALL_NAT struct cfg_nat *ptr, *ptr_temp; #endif - ip_fw_chk_ptr = NULL; - ip_fw_ctl_ptr = NULL; callout_drain(&V_ipfw_timeout); IPFW_WLOCK(&V_layer3_chain); flush_tables(&V_layer3_chain); @@ -5085,7 +5083,6 @@ LibAliasUninit(ptr->lib); free(ptr, M_IPFW); } - EVENTHANDLER_DEREGISTER(ifaddr_event, ifaddr_event_tag); #endif V_layer3_chain.reap = NULL; free_chain(&V_layer3_chain, 1 /* kill default rule */); @@ -5093,9 +5090,33 @@ IPFW_WUNLOCK(&V_layer3_chain); if (reap != NULL) reap_rules(reap); + IPFW_LOCK_DESTROY(&V_layer3_chain); + +#ifdef VIMAGE + curvnetb->mod_data[vnet_ipfw_modinfo.id] = NULL; + free(vnet_ipfw, M_IPFW); +#endif + + return 0; +} + +void +ipfw_destroy(void) +{ + ip_fw_chk_ptr = NULL; + ip_fw_ctl_ptr = NULL; + +#ifdef VIMAGE + vnet_mod_deregister(&vnet_ipfw_modinfo); +#else + vnet_ipfw_idetach(); +#endif + +#ifdef IPFIREWALL_NAT + EVENTHANDLER_DEREGISTER(ifaddr_event, ifaddr_event_tag); +#endif IPFW_DYN_LOCK_DESTROY(); uma_zdestroy(ipfw_dyn_rule_zone); - IPFW_LOCK_DESTROY(&V_layer3_chain); #ifdef INET6 /* Free IPv6 fw sysctl tree. */