From owner-p4-projects@FreeBSD.ORG Sun Sep 21 04:34:15 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 17E35106566C; Sun, 21 Sep 2008 04:34:15 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B6577106564A for ; Sun, 21 Sep 2008 04:34:14 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id A24C18FC16 for ; Sun, 21 Sep 2008 04:34:14 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id m8L4YEhJ047662 for ; Sun, 21 Sep 2008 04:34:14 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m8L4YEHs047638 for perforce@freebsd.org; Sun, 21 Sep 2008 04:34:14 GMT (envelope-from imp@freebsd.org) Date: Sun, 21 Sep 2008 04:34:14 GMT Message-Id: <200809210434.m8L4YEHs047638@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 150188 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 21 Sep 2008 04:34:15 -0000 http://perforce.freebsd.org/chv.cgi?CH=150188 Change 150188 by imp@imp_paco-paco on 2008/09/21 04:33:24 IFC @150187 Affected files ... .. //depot/projects/mips2/src/Makefile.inc1#24 integrate .. //depot/projects/mips2/src/lib/libc/gen/getosreldate.3#2 integrate .. //depot/projects/mips2/src/lib/libc/uuid/Symbol.map#4 integrate .. //depot/projects/mips2/src/lib/libpmc/pmc.3#8 integrate .. //depot/projects/mips2/src/sbin/ipfw/ipfw2.c#11 integrate .. //depot/projects/mips2/src/sbin/mount_nfs/mount_nfs.c#6 integrate .. //depot/projects/mips2/src/share/man/man5/rc.conf.5#15 integrate .. //depot/projects/mips2/src/sys/boot/ofw/libofw/Makefile#4 integrate .. //depot/projects/mips2/src/sys/boot/ofw/libofw/ofw_console.c#4 integrate .. //depot/projects/mips2/src/sys/compat/freebsd32/freebsd32_misc.c#11 integrate .. //depot/projects/mips2/src/sys/compat/freebsd32/freebsd32_proto.h#13 integrate .. //depot/projects/mips2/src/sys/compat/freebsd32/freebsd32_syscall.h#13 integrate .. //depot/projects/mips2/src/sys/compat/freebsd32/freebsd32_syscalls.c#13 integrate .. //depot/projects/mips2/src/sys/compat/freebsd32/freebsd32_sysent.c#13 integrate .. //depot/projects/mips2/src/sys/compat/freebsd32/syscalls.master#14 integrate .. //depot/projects/mips2/src/sys/conf/files.mips#25 integrate .. //depot/projects/mips2/src/sys/conf/files.sparc64#9 integrate .. //depot/projects/mips2/src/sys/conf/options.sparc64#4 integrate .. //depot/projects/mips2/src/sys/dev/acpica/acpi_quirk.c#3 integrate .. //depot/projects/mips2/src/sys/dev/ath/if_ath.c#12 integrate .. //depot/projects/mips2/src/sys/dev/ath/if_athvar.h#7 integrate .. //depot/projects/mips2/src/sys/dev/cxgb/cxgb_osdep.h#10 integrate .. //depot/projects/mips2/src/sys/dev/cxgb/ulp/tom/cxgb_defs.h#5 integrate .. //depot/projects/mips2/src/sys/dev/cxgb/ulp/tom/cxgb_tom.c#6 integrate .. //depot/projects/mips2/src/sys/dev/pci/vga_pci.c#3 integrate .. //depot/projects/mips2/src/sys/dev/snp/snp.c#8 integrate .. //depot/projects/mips2/src/sys/dev/usb/if_zyd.c#10 integrate .. //depot/projects/mips2/src/sys/dev/usb/usbdevs#24 integrate .. //depot/projects/mips2/src/sys/fs/devfs/devfs_vnops.c#13 integrate .. //depot/projects/mips2/src/sys/fs/fdescfs/fdesc_vnops.c#9 integrate .. //depot/projects/mips2/src/sys/fs/hpfs/hpfs_vnops.c#5 integrate .. //depot/projects/mips2/src/sys/fs/msdosfs/msdosfs_vnops.c#11 integrate .. //depot/projects/mips2/src/sys/fs/ntfs/ntfs_vnops.c#4 integrate .. //depot/projects/mips2/src/sys/fs/portalfs/portal_vnops.c#6 integrate .. //depot/projects/mips2/src/sys/fs/pseudofs/pseudofs_vnops.c#7 integrate .. //depot/projects/mips2/src/sys/fs/smbfs/smbfs_node.c#8 integrate .. //depot/projects/mips2/src/sys/fs/tmpfs/tmpfs_vnops.c#13 integrate .. //depot/projects/mips2/src/sys/fs/udf/udf_vnops.c#6 integrate .. //depot/projects/mips2/src/sys/gnu/fs/xfs/FreeBSD/xfs_vnops.c#6 integrate .. //depot/projects/mips2/src/sys/i386/i386/pmap.c#22 integrate .. //depot/projects/mips2/src/sys/kern/uipc_mqueue.c#9 integrate .. //depot/projects/mips2/src/sys/kern/vfs_mount.c#19 integrate .. //depot/projects/mips2/src/sys/kern/vfs_vnops.c#11 integrate .. //depot/projects/mips2/src/sys/mips/adm5120/obio.c#5 integrate .. //depot/projects/mips2/src/sys/mips/idt/obio.c#5 integrate .. //depot/projects/mips2/src/sys/mips/malta/gt_pci.c#5 integrate .. //depot/projects/mips2/src/sys/mips/mips/intr_machdep.c#9 integrate .. //depot/projects/mips2/src/sys/net/if_clone.c#3 integrate .. //depot/projects/mips2/src/sys/net/if_clone.h#3 integrate .. //depot/projects/mips2/src/sys/net/route.c#12 integrate .. //depot/projects/mips2/src/sys/net/route.h#7 integrate .. //depot/projects/mips2/src/sys/net80211/ieee80211_freebsd.c#9 integrate .. //depot/projects/mips2/src/sys/nfsclient/nfs_vnops.c#11 integrate .. //depot/projects/mips2/src/sys/sparc64/include/tick.h#3 integrate .. //depot/projects/mips2/src/sys/sparc64/sparc64/mp_machdep.c#11 integrate .. //depot/projects/mips2/src/sys/sparc64/sparc64/tick.c#5 integrate .. //depot/projects/mips2/src/sys/sys/mount.h#11 integrate .. //depot/projects/mips2/src/sys/ufs/ufs/ufs_vnops.c#11 integrate .. //depot/projects/mips2/src/sys/vm/vm_mmap.c#11 integrate .. //depot/projects/mips2/src/tools/tools/net80211/scripts/config#2 integrate .. //depot/projects/mips2/src/usr.bin/ar/Makefile#3 integrate .. //depot/projects/mips2/src/usr.bin/ar/acplex.l#1 branch .. //depot/projects/mips2/src/usr.bin/ar/acpyacc.y#1 branch .. //depot/projects/mips2/src/usr.bin/ar/ar.c#3 integrate .. //depot/projects/mips2/src/usr.bin/ar/ar.h#3 integrate .. //depot/projects/mips2/src/usr.bin/ar/write.c#4 integrate .. //depot/projects/mips2/src/usr.sbin/Makefile#15 integrate .. //depot/projects/mips2/src/usr.sbin/pmcstat/pmcstat.8#6 integrate .. //depot/projects/mips2/src/usr.sbin/pmcstat/pmcstat.c#8 integrate Differences ... ==== //depot/projects/mips2/src/Makefile.inc1#24 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.610 2008/08/19 14:23:26 jhb Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.611 2008/09/19 16:14:42 obrien Exp $ # # Make command line options: # -DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir @@ -27,6 +27,10 @@ .include +.if ${MACHINE_ARCH} == "mips" +MK_RESCUE=no # not yet +.endif + # We must do share/info early so that installation of info `dir' # entries works correctly. Do it first since it is less likely to # grow dependencies on include and lib than vice versa. ==== //depot/projects/mips2/src/lib/libc/gen/getosreldate.3#2 (text+ko) ==== @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libc/gen/getosreldate.3,v 1.3 2005/12/03 05:11:07 ambrisko Exp $ +.\" $FreeBSD: src/lib/libc/gen/getosreldate.3,v 1.4 2008/09/20 21:12:54 rodrigc Exp $ .\" .Dd December 2, 2005 .Dt GETOSRELDATE 3 @@ -34,7 +34,6 @@ .Sh LIBRARY .Lb libc .Sh SYNOPSIS -.In osreldate.h .Ft int .Fn getosreldate void .Sh DESCRIPTION ==== //depot/projects/mips2/src/lib/libc/uuid/Symbol.map#4 (text) ==== @@ -1,5 +1,5 @@ /* - * $FreeBSD: src/lib/libc/uuid/Symbol.map,v 1.3 2008/09/15 23:54:55 emax Exp $ + * $FreeBSD: src/lib/libc/uuid/Symbol.map,v 1.4 2008/09/19 15:52:56 emax Exp $ */ FBSD_1.0 { @@ -11,6 +11,9 @@ uuid_create_nil; uuid_create; uuid_compare; +}; + +FBSD_1.1 { uuid_enc_le; uuid_dec_le; uuid_enc_be; ==== //depot/projects/mips2/src/lib/libpmc/pmc.3#8 (text+ko) ==== @@ -21,7 +21,7 @@ .\" out of the use of this software, even if advised of the possibility of .\" such damage. .\" -.\" $FreeBSD: src/lib/libpmc/pmc.3,v 1.20 2008/09/18 10:20:35 jkoshy Exp $ +.\" $FreeBSD: src/lib/libpmc/pmc.3,v 1.21 2008/09/19 13:21:23 jkoshy Exp $ .\" .Dd September 16, 2008 .Os @@ -242,13 +242,13 @@ .It Li PMC_CAP_INVERT The ability to invert the sense of the hardware conditions being measured. -.It Li PMC_CAP_READ -The ability to read from performance counters. +.It Li PMC_CAP_PRECISE +The ability to perform precise sampling. .It Li PMC_CAP_QUALIFIER The hardware allows monitored to be further qualified in some system dependent way. -.It Li PMC_CAP_PRECISE -The ability to perform precise sampling. +.It Li PMC_CAP_READ +The ability to read from performance counters. .It Li PMC_CAP_SYSTEM The ability to restrict counting of hardware events to when the CPU is running privileged code. ==== //depot/projects/mips2/src/sbin/ipfw/ipfw2.c#11 (text+ko) ==== @@ -17,7 +17,7 @@ * * NEW command line interface for IP firewall facility * - * $FreeBSD: src/sbin/ipfw/ipfw2.c,v 1.121 2008/09/06 17:23:37 rik Exp $ + * $FreeBSD: src/sbin/ipfw/ipfw2.c,v 1.125 2008/09/20 19:25:02 rik Exp $ */ #include @@ -3569,7 +3569,7 @@ char **av, *sep; /* Token separator. */ /* Temporary buffer used to hold server pool ip's. */ char tmp_spool_buf[NAT_BUF_LEN]; - int ac, i, space, lsnat; + int ac, space, lsnat; struct cfg_redir *r; struct cfg_spool *tmp; @@ -3788,7 +3788,7 @@ int *_ac, char ***_av) { char **av; - int ac, i, space; + int ac, space; struct protoent *protoent; struct cfg_redir *r; @@ -3975,7 +3975,6 @@ config_nat(int ac, char **av) { struct cfg_nat *n; /* Nat instance configuration. */ - struct in_addr ip; int i, len, off, tok; char *id, buf[NAT_BUF_LEN]; /* Buffer for serialized data. */ @@ -5937,6 +5936,11 @@ l = sizeof(a); if (do_cmd(IP_FW_TABLE_GETSIZE, &a, (uintptr_t)&l) < 0) err(EX_OSERR, "getsockopt(IP_FW_TABLE_GETSIZE)"); + + /* If a is zero we have nothing to do, the table is empty. */ + if (a == 0) + return; + l = sizeof(*tbl) + a * sizeof(ipfw_table_entry); tbl = malloc(l); if (tbl == NULL) @@ -5961,18 +5965,20 @@ tbl->ent[a].masklen, tval); } } + free(tbl); } else errx(EX_USAGE, "invalid table command %s", *av); } static void -show_nat(int ac, char **av) { +show_nat(int ac, char **av) +{ struct cfg_nat *n; struct cfg_redir *e; int cmd, i, nbytes, do_cfg, do_rule, frule, lrule, nalloc, size; int nat_cnt, redir_cnt, r; uint8_t *data, *p; - char **lav, *endptr; + char *endptr; do_rule = 0; nalloc = 1024; ==== //depot/projects/mips2/src/sbin/mount_nfs/mount_nfs.c#6 (text+ko) ==== @@ -66,7 +66,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/sbin/mount_nfs/mount_nfs.c,v 1.79 2008/09/13 20:22:46 rodrigc Exp $"); +__FBSDID("$FreeBSD: src/sbin/mount_nfs/mount_nfs.c,v 1.80 2008/09/19 11:59:10 rodrigc Exp $"); #include #include @@ -164,19 +164,19 @@ enum tryret nfs4_tryproto(struct addrinfo *ai, char *hostp, char *spec, char **errstr); enum tryret returncode(enum clnt_stat stat, struct rpc_err *rpcerr); +extern int getosreldate(void); int main(int argc, char *argv[]) { int c; struct iovec *iov; - int mntflags, altflags, num; - int iovlen; + int mntflags, num, iovlen; + int osversion; char *name, *p, *spec, *fstype; char mntpath[MAXPATHLEN], errmsg[255]; mntflags = 0; - altflags = 0; iov = NULL; iovlen = 0; memset(errmsg, 0, sizeof(errmsg)); @@ -403,9 +403,19 @@ build_iovec(&iov, &iovlen, "fspath", mntpath, (size_t)-1); build_iovec(&iov, &iovlen, "errmsg", errmsg, sizeof(errmsg)); - if (nmount(iov, iovlen, mntflags)) { - if (errno != ENOENT - || fallback_mount(iov, iovlen, mntflags)) + /* + * XXX: + * Backwards compatibility routines for older kernels. + * Remove this and fallback_mount() code when we do not need to support + * NFS mounts against older kernels which still need + * struct nfs_args to be passed in via nmount(). + */ + osversion = getosreldate(); + if (osversion >= 800048) { + if (nmount(iov, iovlen, mntflags)) + err(1, "%s, %s", mntpath, errmsg); + } else { + if (fallback_mount(iov, iovlen, mntflags)) err(1, "%s, %s", mntpath, errmsg); } ==== //depot/projects/mips2/src/share/man/man5/rc.conf.5#15 (text+ko) ==== @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man5/rc.conf.5,v 1.346 2008/09/16 20:18:25 thompsa Exp $ +.\" $FreeBSD: src/share/man/man5/rc.conf.5,v 1.347 2008/09/19 15:27:37 thompsa Exp $ .\" .Dd September 16, 2008 .Dt RC.CONF 5 @@ -3453,7 +3453,8 @@ .It Va jail_ Ns Ao Ar jname Ac Ns Va _fib .Pq Vt str Unset by default. -When set, the jail is started with the specified routing table via +When set, the jail is started with the specified forwarding table (sometimes +referred to as a routing table) via .Xr setfib 1 . .It Va jail_ Ns Ao Ar jname Ac Ns Va _fstab .Pq Vt str ==== //depot/projects/mips2/src/sys/boot/ofw/libofw/Makefile#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/boot/ofw/libofw/Makefile,v 1.11 2007/06/17 00:17:15 marius Exp $ +# $FreeBSD: src/sys/boot/ofw/libofw/Makefile,v 1.13 2008/09/19 19:49:58 sobomax Exp $ LIB= ofw INTERNALLIB= ==== //depot/projects/mips2/src/sys/boot/ofw/libofw/ofw_console.c#4 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/boot/ofw/libofw/ofw_console.c,v 1.13 2008/02/06 22:04:28 grehan Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/ofw/libofw/ofw_console.c,v 1.15 2008/09/19 19:49:58 sobomax Exp $"); #include ==== //depot/projects/mips2/src/sys/compat/freebsd32/freebsd32_misc.c#11 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/freebsd32/freebsd32_misc.c,v 1.78 2008/09/15 17:39:40 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/freebsd32/freebsd32_misc.c,v 1.79 2008/09/19 15:17:32 obrien Exp $"); #include "opt_compat.h" @@ -85,6 +85,8 @@ #include +#include + #include #include #include @@ -2552,8 +2554,51 @@ return (cpuset_setaffinity(td, &ap)); } +int +freebsd32_nmount(struct thread *td, + struct freebsd32_nmount_args /* { + struct iovec *iovp; + unsigned int iovcnt; + int flags; + } */ *uap) +{ + struct uio *auio; + struct iovec *iov; + int error, k; + + AUDIT_ARG(fflags, uap->flags); + + /* + * Filter out MNT_ROOTFS. We do not want clients of nmount() in + * userspace to set this flag, but we must filter it out if we want + * MNT_UPDATE on the root file system to work. + * MNT_ROOTFS should only be set in the kernel in vfs_mountroot_try(). + */ + uap->flags &= ~MNT_ROOTFS; + + /* + * check that we have an even number of iovec's + * and that we have at least two options. + */ + if ((uap->iovcnt & 1) || (uap->iovcnt < 4)) + return (EINVAL); + + error = freebsd32_copyinuio(uap->iovp, uap->iovcnt, &auio); + if (error) + return (error); + for (iov = auio->uio_iov, k = 0; k < uap->iovcnt; ++k, ++iov) { + if (iov->iov_len > MMAXOPTIONLEN) { + free(auio, M_IOV); + return (EINVAL); + } + } + + error = vfs_donmount(td, uap->flags, auio); + free(auio, M_IOV); + return error; +} + #if 0 - int freebsd32_xxx(struct thread *td, struct freebsd32_xxx_args *uap) { @@ -2578,5 +2623,4 @@ } return (error); } - #endif ==== //depot/projects/mips2/src/sys/compat/freebsd32/freebsd32_proto.h#13 (text+ko) ==== @@ -2,8 +2,8 @@ * System call prototypes. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/freebsd32/freebsd32_proto.h,v 1.90 2008/09/15 17:39:01 obrien Exp $ - * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 183042 2008-09-15 17:37:41Z obrien + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_proto.h,v 1.91 2008/09/19 15:21:40 obrien Exp $ + * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 183188 2008-09-19 15:17:32Z obrien */ #ifndef _FREEBSD32_SYSPROTO_H_ @@ -241,6 +241,11 @@ char nevents_l_[PADL_(int)]; int nevents; char nevents_r_[PADR_(int)]; char timeout_l_[PADL_(const struct timespec32 *)]; const struct timespec32 * timeout; char timeout_r_[PADR_(const struct timespec32 *)]; }; +struct freebsd32_nmount_args { + char iovp_l_[PADL_(struct iovec32 *)]; struct iovec32 * iovp; char iovp_r_[PADR_(struct iovec32 *)]; + char iovcnt_l_[PADL_(unsigned int)]; unsigned int iovcnt; char iovcnt_r_[PADR_(unsigned int)]; + char flags_l_[PADL_(int)]; int flags; char flags_r_[PADR_(int)]; +}; struct freebsd32_sendfile_args { char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)]; char s_l_[PADL_(int)]; int s; char s_r_[PADR_(int)]; @@ -413,6 +418,7 @@ int freebsd32_sigtimedwait(struct thread *, struct freebsd32_sigtimedwait_args *); int freebsd32_sigwaitinfo(struct thread *, struct freebsd32_sigwaitinfo_args *); int freebsd32_kevent(struct thread *, struct freebsd32_kevent_args *); +int freebsd32_nmount(struct thread *, struct freebsd32_nmount_args *); int freebsd32_sendfile(struct thread *, struct freebsd32_sendfile_args *); int freebsd32_sigaction(struct thread *, struct freebsd32_sigaction_args *); int freebsd32_sigreturn(struct thread *, struct freebsd32_sigreturn_args *); @@ -623,6 +629,7 @@ #define FREEBSD32_SYS_AUE_freebsd32_sigtimedwait AUE_SIGWAIT #define FREEBSD32_SYS_AUE_freebsd32_sigwaitinfo AUE_NULL #define FREEBSD32_SYS_AUE_freebsd32_kevent AUE_NULL +#define FREEBSD32_SYS_AUE_freebsd32_nmount AUE_NMOUNT #define FREEBSD32_SYS_AUE_freebsd32_sendfile AUE_SENDFILE #define FREEBSD32_SYS_AUE_freebsd32_sigaction AUE_SIGACTION #define FREEBSD32_SYS_AUE_freebsd32_sigreturn AUE_SIGRETURN ==== //depot/projects/mips2/src/sys/compat/freebsd32/freebsd32_syscall.h#13 (text+ko) ==== @@ -2,8 +2,8 @@ * System call numbers. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscall.h,v 1.89 2008/09/15 17:39:01 obrien Exp $ - * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 183042 2008-09-15 17:37:41Z obrien + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscall.h,v 1.90 2008/09/19 15:21:40 obrien Exp $ + * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 183188 2008-09-19 15:17:32Z obrien */ #define FREEBSD32_SYS_syscall 0 @@ -283,7 +283,7 @@ #define FREEBSD32_SYS_extattr_delete_fd 373 #define FREEBSD32_SYS___setugid 374 #define FREEBSD32_SYS_eaccess 376 -#define FREEBSD32_SYS_nmount 378 +#define FREEBSD32_SYS_freebsd32_nmount 378 #define FREEBSD32_SYS_kenv 390 #define FREEBSD32_SYS_lchflags 391 #define FREEBSD32_SYS_uuidgen 392 ==== //depot/projects/mips2/src/sys/compat/freebsd32/freebsd32_syscalls.c#13 (text+ko) ==== @@ -2,8 +2,8 @@ * System call names. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscalls.c,v 1.80 2008/09/15 17:39:01 obrien Exp $ - * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 183042 2008-09-15 17:37:41Z obrien + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscalls.c,v 1.81 2008/09/19 15:21:40 obrien Exp $ + * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 183188 2008-09-19 15:17:32Z obrien */ const char *freebsd32_syscallnames[] = { @@ -385,7 +385,7 @@ "#375", /* 375 = nfsclnt */ "eaccess", /* 376 = eaccess */ "#377", /* 377 = afs_syscall */ - "nmount", /* 378 = nmount */ + "freebsd32_nmount", /* 378 = freebsd32_nmount */ "#379", /* 379 = kse_exit */ "#380", /* 380 = kse_wakeup */ "#381", /* 381 = kse_create */ ==== //depot/projects/mips2/src/sys/compat/freebsd32/freebsd32_sysent.c#13 (text+ko) ==== @@ -2,8 +2,8 @@ * System call switch table. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/freebsd32/freebsd32_sysent.c,v 1.90 2008/09/15 17:39:01 obrien Exp $ - * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 183042 2008-09-15 17:37:41Z obrien + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_sysent.c,v 1.91 2008/09/19 15:21:40 obrien Exp $ + * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 183188 2008-09-19 15:17:32Z obrien */ #include "opt_compat.h" @@ -416,7 +416,7 @@ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 375 = nfsclnt */ { AS(eaccess_args), (sy_call_t *)eaccess, AUE_EACCESS, NULL, 0, 0 }, /* 376 = eaccess */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 377 = afs_syscall */ - { AS(nmount_args), (sy_call_t *)nmount, AUE_NMOUNT, NULL, 0, 0 }, /* 378 = nmount */ + { AS(freebsd32_nmount_args), (sy_call_t *)freebsd32_nmount, AUE_NMOUNT, NULL, 0, 0 }, /* 378 = freebsd32_nmount */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 379 = kse_exit */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 380 = kse_wakeup */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 381 = kse_create */ ==== //depot/projects/mips2/src/sys/compat/freebsd32/syscalls.master#14 (text+ko) ==== @@ -1,4 +1,4 @@ - $FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.105 2008/09/15 17:37:41 obrien Exp $ + $FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.106 2008/09/19 15:17:32 obrien Exp $ ; from: @(#)syscalls.master 8.2 (Berkeley) 1/13/94 ; from: src/sys/kern/syscalls.master 1.107 ; @@ -651,7 +651,7 @@ 375 AUE_NULL UNIMPL nfsclnt 376 AUE_EACCESS NOPROTO { int eaccess(char *path, int flags); } 377 AUE_NULL UNIMPL afs_syscall -378 AUE_NMOUNT NOPROTO { int nmount(struct iovec *iovp, \ +378 AUE_NMOUNT STD { int freebsd32_nmount(struct iovec32 *iovp, \ unsigned int iovcnt, int flags); } 379 AUE_NULL UNIMPL kse_exit 380 AUE_NULL UNIMPL kse_wakeup ==== //depot/projects/mips2/src/sys/conf/files.mips#25 (text+ko) ==== @@ -44,7 +44,7 @@ # Copyright (c) 2001, 2004-2005, Juniper Networks, Inc. # All rights reserved. # JNPR: files.mips,v 1.11 2007/08/09 12:25:35 katta -# $FreeBSD: src/sys/conf/files.mips,v 1.2 2008/08/27 01:41:32 imp Exp $ +# $FreeBSD: src/sys/conf/files.mips,v 1.4 2008/09/19 19:46:11 imp Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and ==== //depot/projects/mips2/src/sys/conf/files.sparc64#9 (text+ko) ==== @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $FreeBSD: src/sys/conf/files.sparc64,v 1.97 2008/09/10 20:22:27 marius Exp $ +# $FreeBSD: src/sys/conf/files.sparc64,v 1.99 2008/09/20 11:34:18 marius Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -100,20 +100,23 @@ sparc64/sparc64/db_hwwatch.c optional ddb sparc64/sparc64/dump_machdep.c standard sparc64/sparc64/elf_machdep.c standard -sparc64/sparc64/exception.S standard no-obj +sparc64/sparc64/exception.S standard no-obj \ + compile-with "${NORMAL_S} -mcpu=ultrasparc" sparc64/sparc64/eeprom.c optional eeprom ebus | eeprom fhc | \ eeprom sbus sparc64/sparc64/gdb_machdep.c optional gdb sparc64/sparc64/identcpu.c standard sparc64/sparc64/in_cksum.c optional inet -sparc64/sparc64/interrupt.S standard no-obj +sparc64/sparc64/interrupt.S standard no-obj \ + compile-with "${NORMAL_S} -mcpu=ultrasparc" sparc64/sparc64/intr_machdep.c standard sparc64/sparc64/iommu.c standard sparc64/sparc64/jbusppm.c standard sparc64/sparc64/locore.S standard no-obj sparc64/sparc64/machdep.c standard sparc64/sparc64/mem.c optional mem -sparc64/sparc64/mp_exception.S optional smp +sparc64/sparc64/mp_exception.S optional smp \ + compile-with "${NORMAL_S} -mcpu=ultrasparc" sparc64/sparc64/mp_locore.S optional smp sparc64/sparc64/mp_machdep.c optional smp sparc64/sparc64/nexus.c standard @@ -127,7 +130,8 @@ sparc64/sparc64/schppm.c standard sparc64/sparc64/spitfire.c standard sparc64/sparc64/stack_machdep.c optional ddb | stack -sparc64/sparc64/support.S standard +sparc64/sparc64/support.S standard \ + compile-with "${NORMAL_S} -mcpu=ultrasparc" sparc64/sparc64/sys_machdep.c standard sparc64/sparc64/swtch.S standard sparc64/sparc64/tick.c standard ==== //depot/projects/mips2/src/sys/conf/options.sparc64#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options.sparc64,v 1.15 2008/08/22 20:28:19 marius Exp $ +# $FreeBSD: src/sys/conf/options.sparc64,v 1.17 2008/09/20 11:46:07 marius Exp $ GFB_DEBUG opt_gfb.h GFB_NO_FONT_LOADING opt_gfb.h ==== //depot/projects/mips2/src/sys/dev/acpica/acpi_quirk.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_quirk.c,v 1.4 2007/03/22 18:16:40 jkim Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_quirk.c,v 1.5 2008/09/19 15:25:13 jkim Exp $"); #include #include @@ -149,9 +149,9 @@ if (ACPI_FAILURE(AcpiGetTableHeader(ACPI_SIG_FADT, 0, &fadt))) bzero(&fadt, sizeof(fadt)); if (ACPI_FAILURE(AcpiGetTableHeader(ACPI_SIG_DSDT, 0, &dsdt))) - bzero(&fadt, sizeof(dsdt)); + bzero(&dsdt, sizeof(dsdt)); if (ACPI_FAILURE(AcpiGetTableHeader(ACPI_SIG_XSDT, 0, &xsdt))) - bzero(&fadt, sizeof(xsdt)); + bzero(&xsdt, sizeof(xsdt)); /* Then, override the quirks with any matched from table signatures. */ for (entry = acpi_quirks_table; entry->match; entry++) { ==== //depot/projects/mips2/src/sys/dev/ath/if_ath.c#12 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ath/if_ath.c,v 1.191 2008/06/07 18:38:02 sam Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ath/if_ath.c,v 1.192 2008/09/21 00:30:33 sam Exp $"); /* * Driver for the Atheros Wireless LAN controller. @@ -2852,7 +2852,8 @@ DPRINTF(sc, ATH_DEBUG_BEACON, "%s: %s beacons bslot %d intval %u tsfadjust %llu\n", __func__, sc->sc_stagbeacons ? "stagger" : "burst", - avp->av_bslot, ni->ni_intval, le64toh(tsfadjust)); + avp->av_bslot, ni->ni_intval, + (long long unsigned) le64toh(tsfadjust)); wh = mtod(m, struct ieee80211_frame *); memcpy(&wh[1], &tsfadjust, sizeof(tsfadjust)); ==== //depot/projects/mips2/src/sys/dev/ath/if_athvar.h#7 (text+ko) ==== @@ -26,7 +26,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF * THE POSSIBILITY OF SUCH DAMAGES. * - * $FreeBSD: src/sys/dev/ath/if_athvar.h,v 1.66 2008/09/09 16:21:25 rpaulo Exp $ + * $FreeBSD: src/sys/dev/ath/if_athvar.h,v 1.67 2008/09/21 00:28:54 sam Exp $ */ /* @@ -505,8 +505,13 @@ (ath_hal_getcapability(_ah, HAL_CAP_CIPHER, _cipher, NULL) == HAL_OK) #define ath_hal_getregdomain(_ah, _prd) \ (ath_hal_getcapability(_ah, HAL_CAP_REG_DMN, 0, (_prd)) == HAL_OK) +#if defined(__LP64__) #define ath_hal_setregdomain(_ah, _rd) \ + (*(uint16_t *)(((uint8_t *)&(_ah)[1]) + 176) = (_rd)) +#else +#define ath_hal_setregdomain(_ah, _rd) \ (*(uint16_t *)(((uint8_t *)&(_ah)[1]) + 128) = (_rd)) +#endif #define ath_hal_getcountrycode(_ah, _pcc) \ (*(_pcc) = (_ah)->ah_countryCode) #define ath_hal_gettkipmic(_ah) \ ==== //depot/projects/mips2/src/sys/dev/cxgb/cxgb_osdep.h#10 (text+ko) ==== @@ -26,7 +26,7 @@ POSSIBILITY OF SUCH DAMAGE. -$FreeBSD: src/sys/dev/cxgb/cxgb_osdep.h,v 1.24 2008/09/16 02:28:08 kmacy Exp $ +$FreeBSD: src/sys/dev/cxgb/cxgb_osdep.h,v 1.25 2008/09/19 21:12:19 kmacy Exp $ ***************************************************************************/ @@ -92,7 +92,6 @@ #define m_get_socket(m) ((m)->m_pkthdr.header) #define KTR_CXGB KTR_SPARE2 -void cxgb_log_tcb(struct adapter *sc, unsigned int tid); #define MT_DONTFREE 128 ==== //depot/projects/mips2/src/sys/dev/cxgb/ulp/tom/cxgb_defs.h#5 (text+ko) ==== @@ -27,7 +27,7 @@ POSSIBILITY OF SUCH DAMAGE. -$FreeBSD: src/sys/dev/cxgb/ulp/tom/cxgb_defs.h,v 1.4 2008/04/19 03:22:42 kmacy Exp $ +$FreeBSD: src/sys/dev/cxgb/ulp/tom/cxgb_defs.h,v 1.5 2008/09/19 21:12:19 kmacy Exp $ ***************************************************************************/ #ifndef CXGB_DEFS_H_ @@ -49,6 +49,7 @@ struct toepcb; struct listen_ctx; +void cxgb_log_tcb(struct adapter *sc, unsigned int tid); typedef void (*defer_handler_t)(struct toedev *dev, struct mbuf *m); void t3tom_register_cpl_handler(unsigned int opcode, cxgb_cpl_handler_func h); ==== //depot/projects/mips2/src/sys/dev/cxgb/ulp/tom/cxgb_tom.c#6 (text+ko) ==== @@ -28,7 +28,7 @@ ***************************************************************************/ #include -__FBSDID("$FreeBSD: src/sys/dev/cxgb/ulp/tom/cxgb_tom.c,v 1.8 2008/09/16 01:02:17 kmacy Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/cxgb/ulp/tom/cxgb_tom.c,v 1.9 2008/09/19 21:12:19 kmacy Exp $"); #include #include @@ -145,6 +145,35 @@ .redirect = NULL }; +void +cxgb_log_tcb(struct adapter *sc, unsigned int tid) +{ + + char buf[TCB_SIZE]; + uint64_t *tcb = (uint64_t *)buf; + int i, error; + struct mc7 *mem = &sc->cm; + + error = t3_mc7_bd_read(mem, tid*TCB_SIZE/8, TCB_SIZE/8, tcb); + if (error) + printf("cxgb_tcb_log failed\n"); + + + CTR1(KTR_CXGB, "TCB tid=%u", tid); + for (i = 0; i < TCB_SIZE / 32; i++) { + + CTR5(KTR_CXGB, "%1d: %08x %08x %08x %08x", + i, (uint32_t)tcb[1], (uint32_t)(tcb[1] >> 32), + (uint32_t)tcb[0], (uint32_t)(tcb[0] >> 32)); + + tcb += 2; + CTR4(KTR_CXGB, " %08x %08x %08x %08x", + (uint32_t)tcb[1], (uint32_t)(tcb[1] >> 32), + (uint32_t)tcb[0], (uint32_t)(tcb[0] >> 32)); + tcb += 2; + } +} + /* * Add an skb to the deferred skb queue for processing from process context. */ ==== //depot/projects/mips2/src/sys/dev/pci/vga_pci.c#3 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/pci/vga_pci.c,v 1.6 2008/09/16 19:52:02 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/pci/vga_pci.c,v 1.7 2008/09/19 19:11:35 rnoland Exp $"); /* * Simple driver for PCI VGA display devices. Drivers such as agp(4) and @@ -110,6 +110,22 @@ return (EINVAL); } +static int +vga_pci_setup_intr(device_t dev, device_t child, struct resource *irq, + int flags, driver_filter_t *filter, driver_intr_t *intr, void *arg, + void **cookiep) +{ + return (BUS_SETUP_INTR(device_get_parent(dev), dev, irq, flags, + filter, intr, arg, cookiep)); +} + +static int +vga_pci_teardown_intr(device_t dev, device_t child, struct resource *irq, + void *cookie) +{ + return (BUS_TEARDOWN_INTR(device_get_parent(dev), dev, irq, cookie)); +} + static struct resource * vga_pci_alloc_resource(device_t dev, device_t child, int type, int *rid, u_long start, u_long end, u_long count, u_int flags) @@ -311,8 +327,8 @@ /* Bus interface */ DEVMETHOD(bus_read_ivar, vga_pci_read_ivar), DEVMETHOD(bus_write_ivar, vga_pci_write_ivar), - DEVMETHOD(bus_setup_intr, bus_generic_setup_intr), - DEVMETHOD(bus_teardown_intr, bus_generic_teardown_intr), + DEVMETHOD(bus_setup_intr, vga_pci_setup_intr), + DEVMETHOD(bus_teardown_intr, vga_pci_teardown_intr), DEVMETHOD(bus_alloc_resource, vga_pci_alloc_resource), DEVMETHOD(bus_release_resource, vga_pci_release_resource), ==== //depot/projects/mips2/src/sys/dev/snp/snp.c#8 (text+ko) ==== @@ -15,7 +15,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/snp/snp.c,v 1.109 2008/08/15 13:07:07 ed Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/snp/snp.c,v 1.110 2008/09/19 10:21:30 ed Exp $"); #include #include @@ -43,7 +43,7 @@ static struct cdevsw snp_cdevsw = { .d_version = D_VERSION, - .d_flags = D_PSEUDO | D_NEEDGIANT | D_NEEDMINOR, + .d_flags = D_PSEUDO | D_NEEDGIANT, .d_open = snpopen, .d_read = snpread, .d_write = snpwrite, ==== //depot/projects/mips2/src/sys/dev/usb/if_zyd.c#10 (text+ko) ==== @@ -1,6 +1,6 @@ /* $OpenBSD: if_zyd.c,v 1.52 2007/02/11 00:08:04 jsg Exp $ */ /* $NetBSD: if_zyd.c,v 1.7 2007/06/21 04:04:29 kiyohara Exp $ */ -/* $FreeBSD: src/sys/dev/usb/if_zyd.c,v 1.20 2008/09/10 03:40:51 weongyo Exp $ */ +/* $FreeBSD: src/sys/dev/usb/if_zyd.c,v 1.22 2008/09/19 07:40:30 weongyo Exp $ */ /*- * Copyright (c) 2006 by Damien Bergamini @@ -234,6 +234,7 @@ static void zyd_scan_start(struct ieee80211com *); static void zyd_scan_end(struct ieee80211com *); static void zyd_set_channel(struct ieee80211com *); +static void zyd_wakeup(struct zyd_softc *); static int zyd_match(device_t dev) @@ -451,9 +452,6 @@ if (!device_is_attached(dev)) return 0; - /* set a flag to indicate we're detaching. */ - sc->sc_flags |= ZYD_FLAG_DETACHING; - /* protect a race when we have listeners related with the driver. */ ifp->if_flags &= ~IFF_UP; @@ -461,10 +459,14 @@ bpfdetach(ifp); ieee80211_ifdetach(ic); + /* set a flag to indicate we're detaching. */ + sc->sc_flags |= ZYD_FLAG_DETACHING; + usb_rem_task(sc->sc_udev, &sc->sc_scantask); usb_rem_task(sc->sc_udev, &sc->sc_task); callout_stop(&sc->sc_watchdog_ch); + zyd_wakeup(sc); zyd_close_pipes(sc); if_free(ifp); @@ -763,7 +765,9 @@ struct ieee80211com *ic = vap->iv_ic; struct zyd_softc *sc = ic->ic_ifp->if_softc; + usb_rem_task(sc->sc_udev, &sc->sc_scantask); usb_rem_task(sc->sc_udev, &sc->sc_task); + callout_stop(&sc->sc_watchdog_ch); /* do it in a process context */ sc->sc_state = nstate; @@ -788,6 +792,9 @@ uint16_t xferflags; usbd_status error; + if (sc->sc_flags & ZYD_FLAG_DETACHING) + return ENXIO; + if ((xfer = usbd_alloc_xfer(sc->sc_udev)) == NULL) return ENOMEM; @@ -2746,9 +2753,6 @@ struct ifnet *ifp = sc->sc_ifp; struct ieee80211com *ic = ifp->if_l2com; - if (sc->sc_flags & ZYD_FLAG_DETACHING) - return; - ZYD_LOCK(sc); switch (sc->sc_scan_action) { @@ -2777,6 +2781,16 @@ ZYD_UNLOCK(sc); } +static void +zyd_wakeup(struct zyd_softc *sc) +{ + struct rq *rqp; + + STAILQ_FOREACH(rqp, &sc->sc_rqh, rq) { + wakeup(rqp->odata); /* wakeup sleeping caller */ + } +} + static device_method_t zyd_methods[] = { /* Device interface */ DEVMETHOD(device_probe, zyd_match), ==== //depot/projects/mips2/src/sys/dev/usb/usbdevs#24 (text+ko) ==== @@ -1,4 +1,4 @@ -$FreeBSD: src/sys/dev/usb/usbdevs,v 1.371 2008/09/14 15:21:22 thompsa Exp $ +$FreeBSD: src/sys/dev/usb/usbdevs,v 1.372 2008/09/19 09:04:06 kevlo Exp $ /* $NetBSD: usbdevs,v 1.392 2004/12/29 08:38:44 imp Exp $ */ /*- @@ -282,6 +282,7 @@ vendor APPLE 0x05ac Apple Computer vendor YCCABLE 0x05ad Y.C. Cable vendor DIGITALPERSONA 0x05ba DigitalPersona +vendor 3G 0x05bc 3G Green Green Globe vendor RAFI 0x05bd RAFI vendor TYCO 0x05be Tyco vendor KAWASAKI 0x05c1 Kawasaki ==== //depot/projects/mips2/src/sys/fs/devfs/devfs_vnops.c#13 (text+ko) ==== @@ -31,7 +31,7 @@ * @(#)kernfs_vnops.c 8.15 (Berkeley) 5/21/95 * From: FreeBSD: src/sys/miscfs/kernfs/kernfs_vnops.c 1.43 * - * $FreeBSD: src/sys/fs/devfs/devfs_vnops.c,v 1.166 2008/08/28 15:23:18 attilio Exp $ + * $FreeBSD: src/sys/fs/devfs/devfs_vnops.c,v 1.167 2008/09/20 19:50:52 kib Exp $ */ /* @@ -499,8 +499,6 @@ KASSERT(de != NULL, ("Null dir dirent in devfs_getattr vp=%p", vp)); } - bzero((caddr_t) vap, sizeof(*vap)); - vattr_null(vap); vap->va_uid = de->de_uid; vap->va_gid = de->de_gid; vap->va_mode = de->de_mode; @@ -543,6 +541,7 @@ } vap->va_gen = 0; vap->va_flags = 0; + vap->va_filerev = 0; vap->va_nlink = de->de_links; vap->va_fileid = de->de_inode; ==== //depot/projects/mips2/src/sys/fs/fdescfs/fdesc_vnops.c#9 (text+ko) ==== @@ -31,7 +31,7 @@ * * @(#)fdesc_vnops.c 8.9 (Berkeley) 1/21/94 * - * $FreeBSD: src/sys/fs/fdescfs/fdesc_vnops.c,v 1.110 2008/08/28 15:23:18 attilio Exp $ + * $FreeBSD: src/sys/fs/fdescfs/fdesc_vnops.c,v 1.112 2008/09/20 19:50:52 kib Exp $ */ /* @@ -391,8 +391,6 @@ switch (VTOFDESC(vp)->fd_type) { >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Sep 21 06:24:22 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3682F1065678; Sun, 21 Sep 2008 06:24:22 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id EEAA51065675 for ; Sun, 21 Sep 2008 06:24:21 +0000 (UTC) (envelope-from thompsa@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id DB0C98FC3A for ; Sun, 21 Sep 2008 06:24:21 +0000 (UTC) (envelope-from thompsa@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id m8L6OL3I009964 for ; Sun, 21 Sep 2008 06:24:21 GMT (envelope-from thompsa@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m8L6OLBY009942 for perforce@freebsd.org; Sun, 21 Sep 2008 06:24:21 GMT (envelope-from thompsa@freebsd.org) Date: Sun, 21 Sep 2008 06:24:21 GMT Message-Id: <200809210624.m8L6OLBY009942@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to thompsa@freebsd.org using -f From: Andrew Thompson To: Perforce Change Reviews Cc: Subject: PERFORCE change 150191 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 21 Sep 2008 06:24:22 -0000 http://perforce.freebsd.org/chv.cgi?CH=150191 Change 150191 by thompsa@thompsa_burger on 2008/09/21 06:23:27 Re-run the sed script to remove the parenthesis from &(var) as it only converts the first match on the line. Affected files ... .. //depot/projects/usb/src/sys/dev/usb2/controller/ehci2.c#14 edit .. //depot/projects/usb/src/sys/dev/usb2/controller/ehci2_pci.c#11 edit .. //depot/projects/usb/src/sys/dev/usb2/controller/ohci2.c#13 edit .. //depot/projects/usb/src/sys/dev/usb2/controller/ohci2_pci.c#9 edit .. //depot/projects/usb/src/sys/dev/usb2/controller/uhci2.c#11 edit .. //depot/projects/usb/src/sys/dev/usb2/controller/uhci2_pci.c#10 edit .. //depot/projects/usb/src/sys/dev/usb2/controller/usb2_controller.c#12 edit .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_hub.c#17 edit .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_msctest.c#7 edit .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_transfer.c#27 edit .. //depot/projects/usb/src/sys/dev/usb2/ethernet/if_aue2.c#9 edit .. //depot/projects/usb/src/sys/dev/usb2/ethernet/if_axe2.c#9 edit .. //depot/projects/usb/src/sys/dev/usb2/ethernet/if_cue2.c#9 edit .. //depot/projects/usb/src/sys/dev/usb2/ethernet/if_kue2.c#9 edit .. //depot/projects/usb/src/sys/dev/usb2/ethernet/if_rue2.c#9 edit .. //depot/projects/usb/src/sys/dev/usb2/ethernet/if_udav2.c#9 edit .. //depot/projects/usb/src/sys/dev/usb2/input/ukbd2.c#8 edit .. //depot/projects/usb/src/sys/dev/usb2/serial/uark2.c#6 edit .. //depot/projects/usb/src/sys/dev/usb2/serial/ubsa2.c#8 edit .. //depot/projects/usb/src/sys/dev/usb2/serial/uchcom2.c#7 edit .. //depot/projects/usb/src/sys/dev/usb2/serial/ucycom2.c#7 edit .. //depot/projects/usb/src/sys/dev/usb2/serial/ufoma2.c#8 edit .. //depot/projects/usb/src/sys/dev/usb2/serial/uftdi2.c#7 edit .. //depot/projects/usb/src/sys/dev/usb2/serial/uipaq2.c#8 edit .. //depot/projects/usb/src/sys/dev/usb2/serial/umct2.c#6 edit .. //depot/projects/usb/src/sys/dev/usb2/serial/umodem2.c#8 edit .. //depot/projects/usb/src/sys/dev/usb2/serial/umoscom2.c#7 edit .. //depot/projects/usb/src/sys/dev/usb2/serial/uplcom2.c#8 edit .. //depot/projects/usb/src/sys/dev/usb2/serial/uvisor2.c#7 edit .. //depot/projects/usb/src/sys/dev/usb2/serial/uvscom2.c#7 edit .. //depot/projects/usb/src/sys/dev/usb2/sound/uaudio2.c#13 edit .. //depot/projects/usb/src/sys/dev/usb2/wlan/if_rum2.c#15 edit .. //depot/projects/usb/src/sys/dev/usb2/wlan/if_ural2.c#15 edit .. //depot/projects/usb/src/sys/dev/usb2/wlan/if_zyd2.c#16 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb2/controller/ehci2.c#14 (text+ko) ==== @@ -126,10 +126,10 @@ struct ehci_softc *sc = EHCI_BUS2SC(bus); uint32_t i; - cb(bus, &sc->sc_hw.pframes_pc, &(sc->sc_hw.pframes_pg), + cb(bus, &sc->sc_hw.pframes_pc, &sc->sc_hw.pframes_pg, sizeof(uint32_t) * EHCI_FRAMELIST_COUNT, EHCI_FRAMELIST_ALIGN); - cb(bus, &sc->sc_hw.async_start_pc, &(sc->sc_hw.async_start_pg), + cb(bus, &sc->sc_hw.async_start_pc, &sc->sc_hw.async_start_pg, sizeof(ehci_qh_t), EHCI_QH_ALIGN); for (i = 0; i != EHCI_VIRTUAL_FRAMELIST_COUNT; i++) { ==== //depot/projects/usb/src/sys/dev/usb2/controller/ehci2_pci.c#11 (text+ko) ==== @@ -337,7 +337,7 @@ sprintf(sc->sc_vendor, "(0x%04x)", pci_get_vendor(self)); } - err = usb2_config_td_setup(&sc->sc_config_td, sc, &(sc->sc_bus.mtx), + err = usb2_config_td_setup(&sc->sc_config_td, sc, &sc->sc_bus.mtx, NULL, 0, 4); if (err) { device_printf(self, "could not setup config thread!\n"); ==== //depot/projects/usb/src/sys/dev/usb2/controller/ohci2.c#13 (text+ko) ==== @@ -135,16 +135,16 @@ struct ohci_softc *sc = OHCI_BUS2SC(bus); uint32_t i; - cb(bus, &sc->sc_hw.hcca_pc, &(sc->sc_hw.hcca_pg), + cb(bus, &sc->sc_hw.hcca_pc, &sc->sc_hw.hcca_pg, sizeof(ohci_hcca_t), OHCI_HCCA_ALIGN); - cb(bus, &sc->sc_hw.ctrl_start_pc, &(sc->sc_hw.ctrl_start_pg), + cb(bus, &sc->sc_hw.ctrl_start_pc, &sc->sc_hw.ctrl_start_pg, sizeof(ohci_ed_t), OHCI_ED_ALIGN); - cb(bus, &sc->sc_hw.bulk_start_pc, &(sc->sc_hw.bulk_start_pg), + cb(bus, &sc->sc_hw.bulk_start_pc, &sc->sc_hw.bulk_start_pg, sizeof(ohci_ed_t), OHCI_ED_ALIGN); - cb(bus, &sc->sc_hw.isoc_start_pc, &(sc->sc_hw.isoc_start_pg), + cb(bus, &sc->sc_hw.isoc_start_pc, &sc->sc_hw.isoc_start_pg, sizeof(ohci_ed_t), OHCI_ED_ALIGN); for (i = 0; i != OHCI_NO_EDS; i++) { ==== //depot/projects/usb/src/sys/dev/usb2/controller/ohci2_pci.c#9 (text+ko) ==== @@ -280,7 +280,7 @@ sprintf(sc->sc_vendor, "(0x%04x)", pci_get_vendor(self)); } - err = usb2_config_td_setup(&sc->sc_config_td, sc, &(sc->sc_bus.mtx), + err = usb2_config_td_setup(&sc->sc_config_td, sc, &sc->sc_bus.mtx, NULL, 0, 4); if (err) { device_printf(self, "could not setup config thread!\n"); ==== //depot/projects/usb/src/sys/dev/usb2/controller/uhci2.c#11 (text+ko) ==== @@ -153,22 +153,22 @@ struct uhci_softc *sc = UHCI_BUS2SC(bus); uint32_t i; - cb(bus, &sc->sc_hw.pframes_pc, &(sc->sc_hw.pframes_pg), + cb(bus, &sc->sc_hw.pframes_pc, &sc->sc_hw.pframes_pg, sizeof(uint32_t) * UHCI_FRAMELIST_COUNT, UHCI_FRAMELIST_ALIGN); - cb(bus, &sc->sc_hw.ls_ctl_start_pc, &(sc->sc_hw.ls_ctl_start_pg), + cb(bus, &sc->sc_hw.ls_ctl_start_pc, &sc->sc_hw.ls_ctl_start_pg, sizeof(uhci_qh_t), UHCI_QH_ALIGN); - cb(bus, &sc->sc_hw.fs_ctl_start_pc, &(sc->sc_hw.fs_ctl_start_pg), + cb(bus, &sc->sc_hw.fs_ctl_start_pc, &sc->sc_hw.fs_ctl_start_pg, sizeof(uhci_qh_t), UHCI_QH_ALIGN); - cb(bus, &sc->sc_hw.bulk_start_pc, &(sc->sc_hw.bulk_start_pg), + cb(bus, &sc->sc_hw.bulk_start_pc, &sc->sc_hw.bulk_start_pg, sizeof(uhci_qh_t), UHCI_QH_ALIGN); - cb(bus, &sc->sc_hw.last_qh_pc, &(sc->sc_hw.last_qh_pg), + cb(bus, &sc->sc_hw.last_qh_pc, &sc->sc_hw.last_qh_pg, sizeof(uhci_qh_t), UHCI_QH_ALIGN); - cb(bus, &sc->sc_hw.last_td_pc, &(sc->sc_hw.last_td_pg), + cb(bus, &sc->sc_hw.last_td_pc, &sc->sc_hw.last_td_pg, sizeof(uhci_td_t), UHCI_TD_ALIGN); for (i = 0; i != UHCI_VFRAMELIST_COUNT; i++) { ==== //depot/projects/usb/src/sys/dev/usb2/controller/uhci2_pci.c#10 (text+ko) ==== @@ -321,7 +321,7 @@ break; } - err = usb2_config_td_setup(&sc->sc_config_td, sc, &(sc->sc_bus.mtx), + err = usb2_config_td_setup(&sc->sc_config_td, sc, &sc->sc_bus.mtx, NULL, 0, 4); if (err) { device_printf(self, "could not setup config thread!\n"); ==== //depot/projects/usb/src/sys/dev/usb2/controller/usb2_controller.c#12 (text+ko) ==== @@ -146,7 +146,7 @@ mtx_lock(&bus->mtx); if (usb2_proc_msignal(&bus->explore_proc, - &bus->detach_msg[0], &(bus->detach_msg[1]))) { + &bus->detach_msg[0], &bus->detach_msg[1])) { /* ignore */ } mtx_unlock(&bus->mtx); @@ -154,7 +154,7 @@ /* Wait for detach to complete */ usb2_proc_mwait(&bus->explore_proc, - &bus->detach_msg[0], &(bus->detach_msg[1])); + &bus->detach_msg[0], &bus->detach_msg[1]); /* Get rid of USB explore process */ ==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_hub.c#17 (text+ko) ==== @@ -1284,7 +1284,7 @@ bus->do_probe = 1; } if (usb2_proc_msignal(&bus->explore_proc, - &bus->explore_msg[0], &(bus->explore_msg[1]))) { + &bus->explore_msg[0], &bus->explore_msg[1])) { /* ignore */ } mtx_unlock(&bus->mtx); ==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_msctest.c#7 (text+ko) ==== @@ -461,7 +461,7 @@ usb2_transfer_start(sc->xfer[sc->state]); while (usb2_transfer_pending(sc->xfer[sc->state])) { - usb2_cv_wait(&sc->cv, &(sc->mtx)); + usb2_cv_wait(&sc->cv, &sc->mtx); } return (sc->error); } ==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_transfer.c#27 (text+ko) ==== @@ -1751,7 +1751,7 @@ * proceed ! */ if (usb2_proc_msignal(&info->done_p, - &info->done_m[0], &(info->done_m[1]))) { + &info->done_m[0], &info->done_m[1])) { /* ignore */ } } else { @@ -1793,7 +1793,7 @@ * proceed ! */ if (usb2_proc_msignal(&info->done_p, - &info->done_m[0], &(info->done_m[1]))) { + &info->done_m[0], &info->done_m[1])) { /* ignore */ } return; @@ -2142,7 +2142,7 @@ } else if (udev->default_xfer[1]) { info = udev->default_xfer[1]->usb2_root; if (usb2_proc_msignal(&info->done_p, - &udev->cs_msg[0], &(udev->cs_msg[1]))) { + &udev->cs_msg[0], &udev->cs_msg[1])) { /* ignore */ } } else { ==== //depot/projects/usb/src/sys/dev/usb2/ethernet/if_aue2.c#9 (text+ko) ==== @@ -780,7 +780,7 @@ "transfers failed!\n"); goto detach; } - error = usb2_config_td_setup(&sc->sc_config_td, sc, &(sc->sc_mtx), + error = usb2_config_td_setup(&sc->sc_config_td, sc, &sc->sc_mtx, NULL, sizeof(struct usb2_config_td_cc), 16); if (error) { device_printf(dev, "could not setup config " ==== //depot/projects/usb/src/sys/dev/usb2/ethernet/if_axe2.c#9 (text+ko) ==== @@ -620,7 +620,7 @@ "transfers failed!\n"); goto detach; } - error = usb2_config_td_setup(&sc->sc_config_td, sc, &(sc->sc_mtx), + error = usb2_config_td_setup(&sc->sc_config_td, sc, &sc->sc_mtx, NULL, sizeof(struct usb2_config_td_cc), 16); if (error) { device_printf(dev, "could not setup config " ==== //depot/projects/usb/src/sys/dev/usb2/ethernet/if_cue2.c#9 (text+ko) ==== @@ -424,7 +424,7 @@ "transfers failed!\n"); goto detach; } - error = usb2_config_td_setup(&sc->sc_config_td, sc, &(sc->sc_mtx), + error = usb2_config_td_setup(&sc->sc_config_td, sc, &sc->sc_mtx, NULL, sizeof(struct usb2_config_td_cc), 16); if (error) { device_printf(dev, "could not setup config " ==== //depot/projects/usb/src/sys/dev/usb2/ethernet/if_kue2.c#9 (text+ko) ==== @@ -488,7 +488,7 @@ "transfers failed!\n"); goto detach; } - error = usb2_config_td_setup(&sc->sc_config_td, sc, &(sc->sc_mtx), + error = usb2_config_td_setup(&sc->sc_config_td, sc, &sc->sc_mtx, NULL, sizeof(struct usb2_config_td_cc), 16); if (error) { device_printf(dev, "could not setup config " ==== //depot/projects/usb/src/sys/dev/usb2/ethernet/if_rue2.c#9 (text+ko) ==== @@ -673,7 +673,7 @@ "transfers failed!\n"); goto detach; } - error = usb2_config_td_setup(&sc->sc_config_td, sc, &(sc->sc_mtx), + error = usb2_config_td_setup(&sc->sc_config_td, sc, &sc->sc_mtx, NULL, sizeof(struct usb2_config_td_cc), 16); if (error) { device_printf(dev, "could not setup config " ==== //depot/projects/usb/src/sys/dev/usb2/ethernet/if_udav2.c#9 (text+ko) ==== @@ -289,7 +289,7 @@ "transfers failed!\n"); goto detach; } - error = usb2_config_td_setup(&sc->sc_config_td, sc, &(sc->sc_mtx), + error = usb2_config_td_setup(&sc->sc_config_td, sc, &sc->sc_mtx, NULL, sizeof(struct usb2_config_td_cc), 16); if (error) { device_printf(dev, "could not setup config " ==== //depot/projects/usb/src/sys/dev/usb2/input/ukbd2.c#8 (text+ko) ==== @@ -666,7 +666,7 @@ sc->sc_fkeymap[n] = fkey_tab[n]; } - kbd_set_maps(kbd, &sc->sc_keymap, &(sc->sc_accmap), + kbd_set_maps(kbd, &sc->sc_keymap, &sc->sc_accmap, sc->sc_fkeymap, UKBD_NFKEY); KBD_FOUND_DEVICE(kbd); ==== //depot/projects/usb/src/sys/dev/usb2/serial/uark2.c#6 (text+ko) ==== @@ -225,7 +225,7 @@ sc->sc_flags |= (UARK_FLAG_BULK_WRITE_STALL | UARK_FLAG_BULK_READ_STALL); - error = usb2_com_attach(&sc->sc_super_ucom, &(sc->sc_ucom), 1, sc, + error = usb2_com_attach(&sc->sc_super_ucom, &sc->sc_ucom, 1, sc, &uark_callback, &Giant); if (error) { DPRINTF("usb2_com_attach failed\n"); @@ -243,7 +243,7 @@ { struct uark_softc *sc = device_get_softc(dev); - usb2_com_detach(&sc->sc_super_ucom, &(sc->sc_ucom), 1); + usb2_com_detach(&sc->sc_super_ucom, &sc->sc_ucom, 1); usb2_transfer_unsetup(sc->sc_xfer, UARK_N_TRANSFER); ==== //depot/projects/usb/src/sys/dev/usb2/serial/ubsa2.c#8 (text+ko) ==== @@ -362,7 +362,7 @@ sc->sc_flag |= (UBSA_FLAG_WRITE_STALL | UBSA_FLAG_READ_STALL); - error = usb2_com_attach(&sc->sc_super_ucom, &(sc->sc_ucom), 1, sc, + error = usb2_com_attach(&sc->sc_super_ucom, &sc->sc_ucom, 1, sc, &ubsa_callback, &Giant); if (error) { DPRINTF("usb2_com_attach failed\n"); @@ -382,7 +382,7 @@ DPRINTF("sc=%p\n", sc); - usb2_com_detach(&sc->sc_super_ucom, &(sc->sc_ucom), 1); + usb2_com_detach(&sc->sc_super_ucom, &sc->sc_ucom, 1); usb2_transfer_unsetup(sc->sc_xfer, UBSA_N_TRANSFER); ==== //depot/projects/usb/src/sys/dev/usb2/serial/uchcom2.c#7 (text+ko) ==== @@ -378,7 +378,7 @@ sc->sc_flag |= (UCHCOM_FLAG_READ_STALL | UCHCOM_FLAG_WRITE_STALL); - error = usb2_com_attach(&sc->sc_super_ucom, &(sc->sc_ucom), 1, sc, + error = usb2_com_attach(&sc->sc_super_ucom, &sc->sc_ucom, 1, sc, &uchcom_callback, &Giant); if (error) { goto detach; @@ -397,7 +397,7 @@ DPRINTFN(11, "\n"); - usb2_com_detach(&sc->sc_super_ucom, &(sc->sc_ucom), 1); + usb2_com_detach(&sc->sc_super_ucom, &sc->sc_ucom, 1); usb2_transfer_unsetup(sc->sc_xfer, UCHCOM_N_TRANSFER); ==== //depot/projects/usb/src/sys/dev/usb2/serial/ucycom2.c#7 (text+ko) ==== @@ -269,7 +269,7 @@ "transfers failed!\n"); goto detach; } - error = usb2_com_attach(&sc->sc_super_ucom, &(sc->sc_ucom), 1, sc, + error = usb2_com_attach(&sc->sc_super_ucom, &sc->sc_ucom, 1, sc, &ucycom_callback, &Giant); if (error) { @@ -293,7 +293,7 @@ { struct ucycom_softc *sc = device_get_softc(dev); - usb2_com_detach(&sc->sc_super_ucom, &(sc->sc_ucom), 1); + usb2_com_detach(&sc->sc_super_ucom, &sc->sc_ucom, 1); usb2_transfer_unsetup(sc->sc_xfer, UCYCOM_ENDPT_MAX); ==== //depot/projects/usb/src/sys/dev/usb2/serial/ufoma2.c#8 (text+ko) ==== @@ -449,7 +449,7 @@ sc->sc_flags |= (UFOMA_FLAG_BULK_WRITE_STALL | UFOMA_FLAG_BULK_READ_STALL); - error = usb2_com_attach(&sc->sc_super_ucom, &(sc->sc_ucom), 1, sc, + error = usb2_com_attach(&sc->sc_super_ucom, &sc->sc_ucom, 1, sc, &ufoma_callback, &Giant); if (error) { DPRINTF("usb2_com_attach failed\n"); @@ -467,7 +467,7 @@ { struct ufoma_softc *sc = device_get_softc(dev); - usb2_com_detach(&sc->sc_super_ucom, &(sc->sc_ucom), 1); + usb2_com_detach(&sc->sc_super_ucom, &sc->sc_ucom, 1); usb2_transfer_unsetup(sc->sc_ctrl_xfer, UFOMA_CTRL_ENDPT_MAX); ==== //depot/projects/usb/src/sys/dev/usb2/serial/uftdi2.c#7 (text+ko) ==== @@ -326,7 +326,7 @@ FTDI_SIO_SET_DATA_PARITY_NONE | FTDI_SIO_SET_DATA_BITS(8)); - error = usb2_com_attach(&sc->sc_super_ucom, &(sc->sc_ucom), 1, sc, + error = usb2_com_attach(&sc->sc_super_ucom, &sc->sc_ucom, 1, sc, &uftdi_callback, &Giant); if (error) { goto detach; @@ -343,7 +343,7 @@ { struct uftdi_softc *sc = device_get_softc(dev); - usb2_com_detach(&sc->sc_super_ucom, &(sc->sc_ucom), 1); + usb2_com_detach(&sc->sc_super_ucom, &sc->sc_ucom, 1); usb2_transfer_unsetup(sc->sc_xfer, UFTDI_ENDPT_MAX); ==== //depot/projects/usb/src/sys/dev/usb2/serial/uipaq2.c#8 (text+ko) ==== @@ -1160,7 +1160,7 @@ sc->sc_flag |= (UIPAQ_FLAG_READ_STALL | UIPAQ_FLAG_WRITE_STALL); - error = usb2_com_attach(&sc->sc_super_ucom, &(sc->sc_ucom), 1, sc, + error = usb2_com_attach(&sc->sc_super_ucom, &sc->sc_ucom, 1, sc, &uipaq_callback, &Giant); if (error) { goto detach; @@ -1177,7 +1177,7 @@ { struct uipaq_softc *sc = device_get_softc(dev); - usb2_com_detach(&sc->sc_super_ucom, &(sc->sc_ucom), 1); + usb2_com_detach(&sc->sc_super_ucom, &sc->sc_ucom, 1); usb2_transfer_unsetup(sc->sc_xfer_data, UIPAQ_N_DATA_TRANSFER); ==== //depot/projects/usb/src/sys/dev/usb2/serial/umct2.c#6 (text+ko) ==== @@ -311,7 +311,7 @@ sc->sc_obufsize = 16; } } - error = usb2_com_attach(&sc->sc_super_ucom, &(sc->sc_ucom), 1, sc, + error = usb2_com_attach(&sc->sc_super_ucom, &sc->sc_ucom, 1, sc, &umct_callback, &Giant); if (error) { goto detach; @@ -328,7 +328,7 @@ { struct umct_softc *sc = device_get_softc(dev); - usb2_com_detach(&sc->sc_super_ucom, &(sc->sc_ucom), 1); + usb2_com_detach(&sc->sc_super_ucom, &sc->sc_ucom, 1); usb2_transfer_unsetup(sc->sc_xfer, UMCT_ENDPT_MAX); ==== //depot/projects/usb/src/sys/dev/usb2/serial/umodem2.c#8 (text+ko) ==== @@ -396,7 +396,7 @@ sc->sc_flag |= (UMODEM_FLAG_READ_STALL | UMODEM_FLAG_WRITE_STALL); - error = usb2_com_attach(&sc->sc_super_ucom, &(sc->sc_ucom), 1, sc, + error = usb2_com_attach(&sc->sc_super_ucom, &sc->sc_ucom, 1, sc, &umodem_callback, &Giant); if (error) { goto detach; @@ -881,7 +881,7 @@ DPRINTF("sc=%p\n", sc); - usb2_com_detach(&sc->sc_super_ucom, &(sc->sc_ucom), 1); + usb2_com_detach(&sc->sc_super_ucom, &sc->sc_ucom, 1); usb2_transfer_unsetup(sc->sc_xfer_intr, UMODEM_N_INTR_TRANSFER); ==== //depot/projects/usb/src/sys/dev/usb2/serial/umoscom2.c#7 (text+ko) ==== @@ -348,7 +348,7 @@ sc->sc_flags |= (UMOSCOM_FLAG_READ_STALL | UMOSCOM_FLAG_WRITE_STALL); - error = usb2_com_attach(&sc->sc_super_ucom, &(sc->sc_ucom), 1, sc, + error = usb2_com_attach(&sc->sc_super_ucom, &sc->sc_ucom, 1, sc, &umoscom_callback, &Giant); if (error) { goto detach; @@ -370,7 +370,7 @@ mtx_unlock(&Giant); - usb2_com_detach(&sc->sc_super_ucom, &(sc->sc_ucom), 1); + usb2_com_detach(&sc->sc_super_ucom, &sc->sc_ucom, 1); usb2_transfer_unsetup(sc->sc_xfer_data, UMOSCOM_N_DATA_TRANSFER); ==== //depot/projects/usb/src/sys/dev/usb2/serial/uplcom2.c#8 (text+ko) ==== @@ -427,7 +427,7 @@ sc->sc_flag |= (UPLCOM_FLAG_READ_STALL | UPLCOM_FLAG_WRITE_STALL); - error = usb2_com_attach(&sc->sc_super_ucom, &(sc->sc_ucom), 1, sc, + error = usb2_com_attach(&sc->sc_super_ucom, &sc->sc_ucom, 1, sc, &uplcom_callback, &Giant); if (error) { goto detach; @@ -456,7 +456,7 @@ DPRINTF("sc=%p\n", sc); - usb2_com_detach(&sc->sc_super_ucom, &(sc->sc_ucom), 1); + usb2_com_detach(&sc->sc_super_ucom, &sc->sc_ucom, 1); usb2_transfer_unsetup(sc->sc_xfer, UPLCOM_N_TRANSFER); ==== //depot/projects/usb/src/sys/dev/usb2/serial/uvisor2.c#7 (text+ko) ==== @@ -345,7 +345,7 @@ sc->sc_flag |= (UVISOR_FLAG_WRITE_STALL | UVISOR_FLAG_READ_STALL); - error = usb2_com_attach(&sc->sc_super_ucom, &(sc->sc_ucom), 1, sc, + error = usb2_com_attach(&sc->sc_super_ucom, &sc->sc_ucom, 1, sc, &uvisor_callback, &Giant); if (error) { DPRINTF("usb2_com_attach failed\n"); @@ -365,7 +365,7 @@ DPRINTF("sc=%p\n", sc); - usb2_com_detach(&sc->sc_super_ucom, &(sc->sc_ucom), 1); + usb2_com_detach(&sc->sc_super_ucom, &sc->sc_ucom, 1); usb2_transfer_unsetup(sc->sc_xfer, UVISOR_N_TRANSFER); ==== //depot/projects/usb/src/sys/dev/usb2/serial/uvscom2.c#7 (text+ko) ==== @@ -334,7 +334,7 @@ sc->sc_flag |= (UVSCOM_FLAG_WRITE_STALL | UVSCOM_FLAG_READ_STALL); - error = usb2_com_attach(&sc->sc_super_ucom, &(sc->sc_ucom), 1, sc, + error = usb2_com_attach(&sc->sc_super_ucom, &sc->sc_ucom, 1, sc, &uvscom_callback, &Giant); if (error) { goto detach; @@ -363,7 +363,7 @@ if (sc->sc_xfer[4]) { usb2_transfer_stop(sc->sc_xfer[4]); } - usb2_com_detach(&sc->sc_super_ucom, &(sc->sc_ucom), 1); + usb2_com_detach(&sc->sc_super_ucom, &sc->sc_ucom, 1); usb2_transfer_unsetup(sc->sc_xfer, UVSCOM_N_TRANSFER); ==== //depot/projects/usb/src/sys/dev/usb2/sound/uaudio2.c#13 (text+ko) ==== @@ -1316,7 +1316,7 @@ struct pcm_channel *c, int dir) { struct uaudio_chan *ch = ((dir == PCMDIR_PLAY) ? - &sc->sc_play_chan : &(sc->sc_rec_chan)); + &sc->sc_play_chan : &sc->sc_rec_chan); uint8_t endpoint; uint8_t iface_index; uint8_t alt_index; ==== //depot/projects/usb/src/sys/dev/usb2/wlan/if_rum2.c#15 (text+ko) ==== @@ -469,7 +469,7 @@ "err=%s\n", usb2_errstr(error)); goto detach; } - error = usb2_config_td_setup(&sc->sc_config_td, sc, &(sc->sc_mtx), + error = usb2_config_td_setup(&sc->sc_config_td, sc, &sc->sc_mtx, &rum_end_of_commands, sizeof(struct usb2_config_td_cc), 24); if (error) { ==== //depot/projects/usb/src/sys/dev/usb2/wlan/if_ural2.c#15 (text+ko) ==== @@ -462,7 +462,7 @@ "err=%s\n", usb2_errstr(error)); goto detach; } - error = usb2_config_td_setup(&sc->sc_config_td, sc, &(sc->sc_mtx), + error = usb2_config_td_setup(&sc->sc_config_td, sc, &sc->sc_mtx, &ural_end_of_commands, sizeof(struct usb2_config_td_cc), 24); if (error) { ==== //depot/projects/usb/src/sys/dev/usb2/wlan/if_zyd2.c#16 (text+ko) ==== @@ -1097,7 +1097,7 @@ "transfers: %s\n", usb2_errstr(error)); goto detach; } - error = usb2_config_td_setup(&sc->sc_config_td, sc, &(sc->sc_mtx), + error = usb2_config_td_setup(&sc->sc_config_td, sc, &sc->sc_mtx, &zyd_end_of_commands, sizeof(struct usb2_config_td_cc), 16); if (error) { device_printf(dev, "could not setup config " From owner-p4-projects@FreeBSD.ORG Sun Sep 21 08:14:34 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D70091065674; Sun, 21 Sep 2008 08:14:34 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 9B094106566C for ; Sun, 21 Sep 2008 08:14:34 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 893B38FC18 for ; Sun, 21 Sep 2008 08:14:34 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id m8L8EY6k062182 for ; Sun, 21 Sep 2008 08:14:34 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m8L8EY2a062176 for perforce@freebsd.org; Sun, 21 Sep 2008 08:14:34 GMT (envelope-from hselasky@FreeBSD.org) Date: Sun, 21 Sep 2008 08:14:34 GMT Message-Id: <200809210814.m8L8EY2a062176@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 150195 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 21 Sep 2008 08:14:35 -0000 http://perforce.freebsd.org/chv.cgi?CH=150195 Change 150195 by hselasky@hselasky_laptop001 on 2008/09/21 08:13:42 "usb2_proc_mwait()" should not be called locked. Affected files ... .. //depot/projects/usb/src/sys/dev/usb2/controller/usb2_controller.c#13 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb2/controller/usb2_controller.c#13 (text+ko) ==== @@ -149,13 +149,13 @@ &bus->detach_msg[0], &bus->detach_msg[1])) { /* ignore */ } - mtx_unlock(&bus->mtx); - /* Wait for detach to complete */ usb2_proc_mwait(&bus->explore_proc, &bus->detach_msg[0], &bus->detach_msg[1]); + mtx_unlock(&bus->mtx); + /* Get rid of USB explore process */ usb2_proc_unsetup(&bus->explore_proc); From owner-p4-projects@FreeBSD.ORG Sun Sep 21 11:05:29 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 986591065674; Sun, 21 Sep 2008 11:05:29 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 5C0A01065671 for ; Sun, 21 Sep 2008 11:05:29 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 2F17E8FC15 for ; Sun, 21 Sep 2008 11:05:29 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id m8LB5T9h008049 for ; Sun, 21 Sep 2008 11:05:29 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m8LB5TsR008043 for perforce@freebsd.org; Sun, 21 Sep 2008 11:05:29 GMT (envelope-from hselasky@FreeBSD.org) Date: Sun, 21 Sep 2008 11:05:29 GMT Message-Id: <200809211105.m8LB5TsR008043@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 150197 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 21 Sep 2008 11:05:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=150197 Change 150197 by hselasky@hselasky_laptop001 on 2008/09/21 11:05:09 Style existing usb2_core man-page and add multiple new manual pages for all the new USB modules. Affected files ... .. //depot/projects/usb/src/share/man/man4/usb2_bluetooth.4#1 add .. //depot/projects/usb/src/share/man/man4/usb2_controller.4#1 add .. //depot/projects/usb/src/share/man/man4/usb2_core.4#4 edit .. //depot/projects/usb/src/share/man/man4/usb2_ethernet.4#1 add .. //depot/projects/usb/src/share/man/man4/usb2_image.4#1 add .. //depot/projects/usb/src/share/man/man4/usb2_input.4#1 add .. //depot/projects/usb/src/share/man/man4/usb2_misc.4#1 add .. //depot/projects/usb/src/share/man/man4/usb2_ndis.4#1 add .. //depot/projects/usb/src/share/man/man4/usb2_quirk.4#1 add .. //depot/projects/usb/src/share/man/man4/usb2_serial.4#1 add .. //depot/projects/usb/src/share/man/man4/usb2_sound.4#1 add .. //depot/projects/usb/src/share/man/man4/usb2_storage.4#1 add .. //depot/projects/usb/src/share/man/man4/usb2_template.4#1 add .. //depot/projects/usb/src/share/man/man4/usb2_wlan.4#1 add Differences ... ==== //depot/projects/usb/src/share/man/man4/usb2_core.4#4 (text+ko) ==== @@ -90,22 +90,28 @@ .Nm module implements the core functionality of the USB standard and many helper functions to make USB device driver programming easier and more -safe. The +safe. +. +The .Nm module supports both USB Host and USB Device side mode! . .Sh USB TRANSFER MANAGEMENT FUNCTIONS -The USB standard defines four types of USB transfers. Control -transfers, Bulk transfers, Interrupt transfers and Isochronous -transfers. All the transfer types are managed using the following -five functions: +The USB standard defines four types of USB transfers. +. +Control transfers, Bulk transfers, Interrupt transfers and Isochronous +transfers. +. +All the transfer types are managed using the following five functions: . .Pp . .Fn usb2_transfer_setup This function will allocate memory for and initialise an array of USB -transfers and all required DMA memory. This function can sleep or -block waiting for resources to become available. +transfers and all required DMA memory. +. +This function can sleep or block waiting for resources to become +available. .Fa udev is a pointer to "struct usb2_device". .Fa ifaces @@ -137,70 +143,104 @@ that should be freed by the USB system. .Fa n_setup is a number telling the USB system how many USB transfers should be -unsetup. This function can sleep waiting for USB transfers to -complete. This function is NULL safe with regard to the USB transfer -structure pointer. It is not allowed to call this function from the -USB transfer callback. +unsetup. +. +This function can sleep waiting for USB transfers to complete. +. +This function is NULL safe with regard to the USB transfer structure +pointer. +. +It is not allowed to call this function from the USB transfer +callback. . .Pp . .Fn usb2_transfer_start This function will start the USB transfer pointed to by .Fa xfer, -if not already started. This function is always non-blocking and must -be called with the so-called private USB mutex locked. This function -is NULL safe with regard to the USB transfer structure pointer. +if not already started. +. +This function is always non-blocking and must be called with the +so-called private USB mutex locked. +. +This function is NULL safe with regard to the USB transfer structure +pointer. . .Pp . .Fn usb2_transfer_stop This function will stop the USB transfer pointed to by .Fa xfer, -if not already stopped. This function is always non-blocking and must -be called with the so-called private USB mutex locked. This function -can return before the USB callback has been called. This function is -NULL safe with regard to the USB transfer structure pointer. If the -transfer was in progress, the callback will called with "USB_ST_ERROR" -and "xfer->error = USB_ERR_CANCELLED". +if not already stopped. +. +This function is always non-blocking and must be called with the +so-called private USB mutex locked. +. +This function can return before the USB callback has been called. +. +This function is NULL safe with regard to the USB transfer structure +pointer. +. +If the transfer was in progress, the callback will called with +"USB_ST_ERROR" and "xfer->error = USB_ERR_CANCELLED". . .Pp . .Fn usb2_transfer_drain This function will stop an USB transfer, if not already stopped and -wait for any additional USB hardware operations to complete. Buffers -that are loaded into DMA using "usb2_set_frame_data()" can safely be -freed after that this function has returned. This function can block -the caller and will not return before the USB callback has been -called. This function is NULL safe with regard to the USB transfer -structure pointer. +wait for any additional USB hardware operations to complete. +. +Buffers that are loaded into DMA using "usb2_set_frame_data()" can +safely be freed after that this function has returned. +. +This function can block the caller and will not return before the USB +callback has been called. +. +This function is NULL safe with regard to the USB transfer structure +pointer. . .Sh USB TRANSFER CALLBACK . -The USB callback has three states. USB_ST_SETUP, USB_ST_TRANSFERRED -and USB_ST_ERROR. USB_ST_SETUP is the initial state. After the -callback has been called with this state it will always be called back -at a later stage in one of the other two states. In the USB_ST_ERROR -state the "error" field of the USB transfer structure is set to the -error cause. The USB callback should not restart the USB transfer in -case the error cause is USB_ERR_CANCELLED. The USB callback is -protected from recursion. That means one can start and stop whatever -transfer from the callback of another transfer one desires. Also the -transfer that is currently called back. Recursion is handled like this -that when the callback that wants to recurse returns it is called one -more time. +The USB callback has three states. +. +USB_ST_SETUP, USB_ST_TRANSFERRED and USB_ST_ERROR. USB_ST_SETUP is the +initial state. +. +After the callback has been called with this state it will always be +called back at a later stage in one of the other two states. +. +In the USB_ST_ERROR state the "error" field of the USB transfer +structure is set to the error cause. +. +The USB callback should not restart the USB transfer in case the error +cause is USB_ERR_CANCELLED. +. +The USB callback is protected from recursion. +. +That means one can start and stop whatever transfer from the callback +of another transfer one desires. +. +Also the transfer that is currently called back. +. +Recursion is handled like this that when the callback that wants to +recurse returns it is called one more time. . . .Pp . .Fn usb2_start_hardware This function should only be called from within the USB callback and -is used to start the USB hardware. Typical parameters that should be -set in the USB transfer structure before this function is called are -"frlengths[]", "nframes" and "frbuffers[]". An USB transfer can have -multiple frames consisting of one or more USB packets making up an I/O -vector for all USB transfer types. After the USB transfer is complete -"frlengths[]" is updated to the actual USB transfer length for the -given frame. +is used to start the USB hardware. +. +Typical parameters that should be set in the USB transfer structure +before this function is called are "frlengths[]", "nframes" and +"frbuffers[]". +. +An USB transfer can have multiple frames consisting of one or more USB +packets making up an I/O vector for all USB transfer types. +. +After the USB transfer is complete "frlengths[]" is updated to the +actual USB transfer length for the given frame. .Bd -literal -offset indent void usb2_default_callback(struct usb2_xfer *xfer) @@ -238,13 +278,17 @@ .Ed . .Sh USB CONTROL TRANSFERS -An USB control transfer has three parts. First the SETUP packet, then -DATA packet(s) and then a STATUS packet. The SETUP packet is always -pointed to by "xfer->frbuffers[0]" and the length is stored in -"xfer->frlengths[0]" also if there should not be sent any SETUP -packet! If an USB control transfer has no DATA stage, then -"xfer->nframes" should be set to 1. Else the default value is -"xfer->nframes" equal to 2. +An USB control transfer has three parts. +. +First the SETUP packet, then DATA packet(s) and then a STATUS +packet. +. +The SETUP packet is always pointed to by "xfer->frbuffers[0]" and the +length is stored in "xfer->frlengths[0]" also if there should not be +sent any SETUP packet! If an USB control transfer has no DATA stage, +then "xfer->nframes" should be set to 1. +. +Else the default value is "xfer->nframes" equal to 2. . .Bd -literal -offset indent @@ -309,31 +353,50 @@ . .Pp .Fa type -field selects the USB pipe type. Valid values are: UE_INTERRUPT, -UE_CONTROL, UE_BULK, UE_ISOCHRONOUS. The special value UE_BULK_INTR -will select BULK and INTERRUPT pipes. This field is mandatory. +field selects the USB pipe type. +. +Valid values are: UE_INTERRUPT, UE_CONTROL, UE_BULK, +UE_ISOCHRONOUS. +. +The special value UE_BULK_INTR will select BULK and INTERRUPT pipes. +. +This field is mandatory. . .Pp .Fa endpoint -field selects the USB endpoint number. A value of 0xFF, "-1" or -"UE_ADDR_ANY" will select the first matching endpoint. This field is -mandatory. +field selects the USB endpoint number. +. +A value of 0xFF, "-1" or "UE_ADDR_ANY" will select the first matching +endpoint. +. +This field is mandatory. . .Pp .Fa direction -field selects the USB endpoint direction. A value of "UE_DIR_ANY" will -select the first matching endpoint. Else valid values are: "UE_DIR_IN" -and "UE_DIR_OUT". "UE_DIR_IN" and "UE_DIR_OUT" can be binary ORed by -"UE_DIR_SID" which means that the direction will be swapped in case of -USB_MODE_DEVICE. Note that "UE_DIR_IN" refers to the data transfer -direction of the "IN" tokens and "UE_DIR_OUT" refers to the data -transfer direction of the "OUT" tokens. This field is mandatory. +field selects the USB endpoint direction. +. +A value of "UE_DIR_ANY" will select the first matching endpoint. +. +Else valid values are: "UE_DIR_IN" and "UE_DIR_OUT". +. +"UE_DIR_IN" and "UE_DIR_OUT" can be binary OR'ed by "UE_DIR_SID" which +means that the direction will be swapped in case of +USB_MODE_DEVICE. +. +Note that "UE_DIR_IN" refers to the data transfer direction of the +"IN" tokens and "UE_DIR_OUT" refers to the data transfer direction of +the "OUT" tokens. +. +This field is mandatory. . .Pp .Fa interval -field selects the interrupt interval. The value of this field is given -in milliseconds and is independent of device speed. Depending on the -endpoint type, this field has different meaning: +field selects the interrupt interval. +. +The value of this field is given in milliseconds and is independent of +device speed. +. +Depending on the endpoint type, this field has different meaning: .Bl -tag .It UE_INTERRUPT "0" use the default interrupt interval based on endpoint descriptor. @@ -410,10 +473,13 @@ The purpose of this flag is to avoid races when multiple transfers are queued for execution on an USB endpoint, and the first executing transfer fails leading to the need for clearing of stall for -example. In this case this flag is used to prevent the following USB -transfers from being executed at the same time the clear-stall command -is executed on the USB control endpoint. This flag can be changed -during operation. +example. +. +In this case this flag is used to prevent the following USB transfers +from being executed at the same time the clear-stall command is +executed on the USB control endpoint. +. +This flag can be changed during operation. .Pp "BOF" is short for "Block On Failure" .Pp @@ -423,26 +489,40 @@ . .It proxy_buffer Setting this flag will cause that the total buffer size will be -rounded up to the nearest atomic hardware transfer size. The maximum -data length of any USB transfer is always stored in the -"xfer->max_data_length". For control transfers the USB kernel will -allocate additional space for the 8-bytes of SETUP header. These -8-bytes are not counted by the "xfer->max_data_length" variable. This -flag can not be changed during operation. +rounded up to the nearest atomic hardware transfer size. +. +The maximum data length of any USB transfer is always stored in the +"xfer->max_data_length". +. +For control transfers the USB kernel will allocate additional space +for the 8-bytes of SETUP header. +. +These 8-bytes are not counted by the "xfer->max_data_length" +variable. +. +This flag can not be changed during operation. . . .It ext_buffer Setting this flag will cause that no data buffer will be -allocated. Instead the USB client must supply a data buffer. This -flag can not be changed during operation. +allocated. +. +Instead the USB client must supply a data buffer. +. +This flag can not be changed during operation. . . .It manual_status Setting this flag prevents an USB STATUS stage to be appended to the -end of the USB control transfer. If no control data is transferred -this flag must be cleared. Else an error will be returned to the USB -callback. This flag is mostly useful for the USB device side. This -flag can be changed during operation. +end of the USB control transfer. +. +If no control data is transferred this flag must be cleared. +. +Else an error will be returned to the USB callback. +. +This flag is mostly useful for the USB device side. +. +This flag can be changed during operation. . . .It no_pipe_ok @@ -454,10 +534,12 @@ .Bl -tag .It Device Side Mode Setting this flag will cause STALL pids to be sent to the endpoint -belonging to this transfer before the transfer is started. The -transfer is started at the moment the host issues a clear-stall -command on the STALL'ed endpoint. This flag can be changed during -operation. +belonging to this transfer before the transfer is started. +. +The transfer is started at the moment the host issues a clear-stall +command on the STALL'ed endpoint. +. +This flag can be changed during operation. .It Host Side Mode Setting this flag will cause a clear-stall control request to be executed on the endpoint before the USB transfer is started. @@ -470,10 +552,14 @@ .El .Pp .Fa bufsize -field sets the total buffer size in bytes. If this field is zero, -"wMaxPacketSize" will be used, multiplied by the "frames" field if the -transfer type is ISOCHRONOUS. This is useful for setting up interrupt -pipes. This field is mandatory. +field sets the total buffer size in bytes. +. +If this field is zero, "wMaxPacketSize" will be used, multiplied by +the "frames" field if the transfer type is ISOCHRONOUS. +. +This is useful for setting up interrupt pipes. +. +This field is mandatory. .Pp NOTE: For control transfers "bufsize" includes the length of the request structure. @@ -497,7 +583,9 @@ The .Nm module implements fine grained read and write access based on username -and group. Access is granted at four levels: +and group. +. +Access is granted at four levels: . .Bl -tag .It Level 4 - USB interface @@ -513,13 +601,18 @@ The .Nm module will search for access rights starting at level 4 continuing -downwards to USB at level 1. For critical applications you should be -aware that the outgoing serial BUS traffic will be broadcasted to all -USB devices. For absolute security USB devices that require different -access rights should not be placed on the same USB BUS or controller. +downwards to USB at level 1. +. +For critical applications you should be aware that the outgoing serial +BUS traffic will be broadcasted to all USB devices. +. +For absolute security USB devices that require different access rights +should not be placed on the same USB BUS or controller. +. If connected to the same USB bus, it is possible that a USB device can -sniff and intercept the communication of another USB device. Using USB -HUBs will not solve this problem. +sniff and intercept the communication of another USB device. +. +Using USB HUBs will not solve this problem. .Sh SEE ALSO .Xr usb2_controller 4 .Xr usbconfig 8 From owner-p4-projects@FreeBSD.ORG Sun Sep 21 11:09:29 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7246F1065671; Sun, 21 Sep 2008 11:09:29 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 35BB61065677 for ; Sun, 21 Sep 2008 11:09:29 +0000 (UTC) (envelope-from hselasky@c2i.net) Received: from swip.net (mailfe10.swipnet.se [212.247.155.33]) by mx1.freebsd.org (Postfix) with ESMTP id C38378FC14 for ; Sun, 21 Sep 2008 11:09:28 +0000 (UTC) (envelope-from hselasky@c2i.net) X-Cloudmark-Score: 0.000000 [] X-Cloudmark-Analysis: v=1.0 c=1 a=BsTSfCnn7dcA:10 a=6I5d2MoRAAAA:8 a=Mt58vldkky-VyQzgpcMA:9 a=wSGNlfDo8hLKqt6A8QMDxWzv7-oA:4 a=LY0hPdMaydYA:10 Received: from [193.217.167.134] (account mc467741@c2i.net HELO [10.0.0.249]) by mailfe10.swip.net (CommuniGate Pro SMTP 5.2.6) with ESMTPA id 914734352 for perforce@freebsd.org; Sun, 21 Sep 2008 12:09:25 +0200 From: Hans Petter Selasky To: Perforce Change Reviews Date: Sun, 21 Sep 2008 12:11:21 +0200 User-Agent: KMail/1.9.7 References: <200809210814.m8L8EY2a062176@repoman.freebsd.org> In-Reply-To: <200809210814.m8L8EY2a062176@repoman.freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit Content-Disposition: inline Message-Id: <200809211211.21530.hselasky@c2i.net> Cc: Subject: Re: PERFORCE change 150195 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 21 Sep 2008 11:09:29 -0000 On Sunday 21 September 2008, Hans Petter Selasky wrote: > http://perforce.freebsd.org/chv.cgi?CH=150195 > > Change 150195 by hselasky@hselasky_laptop001 on 2008/09/21 08:13:42 > > Small typo: > "usb2_proc_mwait()" should not be called locked. ^^unlocked --HPS From owner-p4-projects@FreeBSD.ORG Sun Sep 21 12:45:21 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D0A791065677; Sun, 21 Sep 2008 12:45:21 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7C3361065674 for ; Sun, 21 Sep 2008 12:45:21 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 69A618FC0C for ; Sun, 21 Sep 2008 12:45:21 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id m8LCjLT9020234 for ; Sun, 21 Sep 2008 12:45:21 GMT (envelope-from pgj@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m8LCjLd0020187 for perforce@freebsd.org; Sun, 21 Sep 2008 12:45:21 GMT (envelope-from pgj@FreeBSD.org) Date: Sun, 21 Sep 2008 12:45:21 GMT Message-Id: <200809211245.m8LCjLd0020187@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to pgj@FreeBSD.org using -f From: Gabor Pali To: Perforce Change Reviews Cc: Subject: PERFORCE change 150199 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 21 Sep 2008 12:45:22 -0000 http://perforce.freebsd.org/chv.cgi?CH=150199 Change 150199 by pgj@kolbasz on 2008/09/21 12:44:49 IFC Affected files ... .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/advanced-networking/chapter.sgml#18 integrate .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/config/chapter.sgml#14 integrate .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/mirrors/chapter.sgml#13 integrate .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/ppp-and-slip/chapter.sgml#9 integrate .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/x11/chapter.sgml#7 integrate .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/share/sgml/freebsd.ent#8 integrate .. //depot/projects/docproj_hu/www/en/cgi/cgi-style.pl#2 integrate .. //depot/projects/docproj_hu/www/en/docs/webresources.sgml#2 integrate .. //depot/projects/docproj_hu/www/en/projects/summerofcode.xsl#2 integrate .. //depot/projects/docproj_hu/www/en/security/security.sgml#3 integrate .. //depot/projects/docproj_hu/www/hu/where.sgml#9 integrate .. //depot/projects/docproj_hu/www/share/sgml/news.xml#20 integrate Differences ... ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/advanced-networking/chapter.sgml#18 (text+ko) ==== @@ -1,7 +1,7 @@ + @@ -42,11 +42,12 @@ organization in the Google Summer of Code 2008. This program funds students to contribute to an open - source project over the summer break. We have had over 50 successful + source project over the summer break. We have had over 70 successful students working on FreeBSD as part of this program in 2005, 2006, and 2007.

+ href="&base;/projects/summerofcode-2006.html">2006, 2007. and 2008.

+

List of FreeBSD OpenSearch Plugins

Web pages (including - + %developers; ]> - + &header; @@ -56,6 +56,18 @@

After this information has been reported the Security Officer or a Security Team delegate will get back with you.

+

Spam filters

+ +

Due to high volume of spam the main security contact mail + addresses are subject to spam filtering. If you cannot contact + the FreeBSD Security Officers or Security Team due to spam filters + (or suspect your mail has been filtered), please send mail to + security-officer-XXXX@FreeBSD.org with + XXXX replaced with 3432 instead of the normal + addresses. Note that this address will be changed periodically so + check back here for the latest address. Mails to this address + will go to the FreeBSD Security Officer Team.

+

The FreeBSD Security Officer Team and the FreeBSD Security Team

==== //depot/projects/docproj_nl/www/share/sgml/news.xml#10 (text+ko) ==== @@ -25,7 +25,7 @@ - $FreeBSD: www/share/sgml/news.xml,v 1.198 2008/09/19 05:09:13 murray Exp $ + $FreeBSD: www/share/sgml/news.xml,v 1.199 2008/09/22 21:57:53 rnoland Exp $ @@ -69,6 +69,11 @@ href="http://www.pcbsd.org">downloaded or purchased on DVD.

+ + +

New committer: Robert Noland + (src)

+ From owner-p4-projects@FreeBSD.ORG Tue Sep 23 10:40:55 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 57E2A106566C; Tue, 23 Sep 2008 10:40:55 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1A4361065673 for ; Tue, 23 Sep 2008 10:40:55 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 0B9418FC0C for ; Tue, 23 Sep 2008 10:40:55 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id m8NAesBx079363 for ; Tue, 23 Sep 2008 10:40:54 GMT (envelope-from rene@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m8NAes2R079357 for perforce@freebsd.org; Tue, 23 Sep 2008 10:40:54 GMT (envelope-from rene@FreeBSD.org) Date: Tue, 23 Sep 2008 10:40:54 GMT Message-Id: <200809231040.m8NAes2R079357@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rene@FreeBSD.org using -f From: Rene Ladan To: Perforce Change Reviews Cc: Subject: PERFORCE change 150338 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 23 Sep 2008 10:40:55 -0000 http://perforce.freebsd.org/chv.cgi?CH=150338 Change 150338 by rene@rene_self on 2008/09/23 10:40:44 MFen eresources/chapter.sgml 1.186 -> 1.187 Checked build Affected files ... .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/eresources/chapter.sgml#5 edit Differences ... ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/eresources/chapter.sgml#5 (text+ko) ==== @@ -6,7 +6,7 @@ Vertaald door: Siebrand Mazeland %SOURCE% en_US.ISO8859-1/books/handbook/eresources/chapter.sgml - %SRCID% 1.186 + %SRCID% 1.187 --> @@ -2083,7 +2083,7 @@ Alleen forwarden - freebsd-users@uk.FreeBSD.org + ukfreebsd@uk.FreeBSD.org Lee Johnston lee@uk.FreeBSD.org From owner-p4-projects@FreeBSD.ORG Tue Sep 23 13:02:19 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 808501065679; Tue, 23 Sep 2008 13:02:19 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 44E9C1065676 for ; Tue, 23 Sep 2008 13:02:19 +0000 (UTC) (envelope-from raj@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 367588FC14 for ; Tue, 23 Sep 2008 13:02:19 +0000 (UTC) (envelope-from raj@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id m8ND2J3q060588 for ; Tue, 23 Sep 2008 13:02:19 GMT (envelope-from raj@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m8ND2J9U060583 for perforce@freebsd.org; Tue, 23 Sep 2008 13:02:19 GMT (envelope-from raj@freebsd.org) Date: Tue, 23 Sep 2008 13:02:19 GMT Message-Id: <200809231302.m8ND2J9U060583@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to raj@freebsd.org using -f From: Rafal Jaworowski To: Perforce Change Reviews Cc: Subject: PERFORCE change 150342 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 23 Sep 2008 13:02:19 -0000 http://perforce.freebsd.org/chv.cgi?CH=150342 Change 150342 by raj@raj_mimi on 2008/09/23 13:01:32 Build libstand on ARM (this is a pre-requisite for loader(8) support). Affected files ... .. //depot/projects/arm/src/lib/libc/arm/gen/_setjmp.S#2 edit .. //depot/projects/arm/src/lib/libstand/Makefile#8 edit Differences ... ==== //depot/projects/arm/src/lib/libc/arm/gen/_setjmp.S#2 (text+ko) ==== @@ -101,6 +101,10 @@ /* validation failed, die die die. */ botch: +#if !defined(_STANDALONE) bl PIC_SYM(_C_LABEL(longjmperror), PLT) bl PIC_SYM(_C_LABEL(abort), PLT) b . - 8 /* Cannot get here */ +#else + b . +#endif ==== //depot/projects/arm/src/lib/libstand/Makefile#8 (text+ko) ==== @@ -32,6 +32,9 @@ .if ${MACHINE_ARCH} == "amd64" CFLAGS+= -m32 -I. .endif +.if ${MACHINE_ARCH} == "arm" +CFLAGS+= -msoft-float -DSOFTFLOAT -D_STANDALONE +.endif # standalone components and stuff we have modified locally SRCS+= zutil.h __main.c assert.c bcd.c bswap.c environment.c getopt.c gets.c \ @@ -48,12 +51,17 @@ # string functions from libc .PATH: ${.CURDIR}/../libc/string .if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "powerpc" || \ - ${MACHINE_ARCH} == "sparc64" || ${MACHINE_ARCH} == "amd64" + ${MACHINE_ARCH} == "sparc64" || ${MACHINE_ARCH} == "amd64" || \ + ${MACHINE_ARCH} == "arm" SRCS+= bcmp.c bcopy.c bzero.c ffs.c index.c memccpy.c memchr.c memcmp.c \ memcpy.c memmove.c memset.c qdivrem.c rindex.c strcat.c strchr.c \ strcmp.c strcpy.c strcspn.c strlen.c strncat.c strncmp.c strncpy.c \ strpbrk.c strrchr.c strsep.c strspn.c strstr.c strtok.c swab.c .endif +.if ${MACHINE_ARCH} == "arm" +.PATH: ${.CURDIR}/../libc/arm/gen +SRCS+= divsi3.S +.endif .if ${MACHINE_ARCH} == "ia64" .PATH: ${.CURDIR}/../libc/ia64/string SRCS+= bcmp.c bcopy.S bzero.S ffs.S index.c memccpy.c memchr.c memcmp.c \ From owner-p4-projects@FreeBSD.ORG Tue Sep 23 13:06:23 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C229E1065679; Tue, 23 Sep 2008 13:06:23 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 858631065673 for ; Tue, 23 Sep 2008 13:06:23 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 765048FC14 for ; Tue, 23 Sep 2008 13:06:23 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id m8ND6NRN093093 for ; Tue, 23 Sep 2008 13:06:23 GMT (envelope-from gabor@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m8ND6NnD093087 for perforce@freebsd.org; Tue, 23 Sep 2008 13:06:23 GMT (envelope-from gabor@freebsd.org) Date: Tue, 23 Sep 2008 13:06:23 GMT Message-Id: <200809231306.m8ND6NnD093087@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gabor@freebsd.org using -f From: Gabor Kovesdan To: Perforce Change Reviews Cc: Subject: PERFORCE change 150343 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 23 Sep 2008 13:06:24 -0000 http://perforce.freebsd.org/chv.cgi?CH=150343 Change 150343 by gabor@gabor_server on 2008/09/23 13:05:23 - Eliminate wip PCRE parts, it is not really demanded Affected files ... .. //depot/projects/soc2008/gabor_textproc/grep/Makefile#15 edit .. //depot/projects/soc2008/gabor_textproc/grep/grep.c#75 edit .. //depot/projects/soc2008/gabor_textproc/grep/grep.h#43 edit .. //depot/projects/soc2008/gabor_textproc/grep/util.c#76 edit Differences ... ==== //depot/projects/soc2008/gabor_textproc/grep/Makefile#15 (text+ko) ==== @@ -20,13 +20,6 @@ LDADD= -lz -lbz2 DPADD= ${LIBZ} ${LIBBZ2} -.if defined(WITH_PCRE) -CFLAGS+= -DWITH_PCRE=yes -I/usr/local/include -LDFLAGS+= -L/usr/local/lib -LDADD+= -lpcre -DPADD+= /usr/local/lib/libpcre.a -.endif - .if !defined(WITHOUT_NLS) NLS= hu_HU.ISO8859-2 NLS+= pt_BR.ISO8859-1 ==== //depot/projects/soc2008/gabor_textproc/grep/grep.c#75 (text+ko) ==== @@ -79,9 +79,6 @@ /*14*/ "unknown -d or --directory option", /*15*/ "unknown --color option", /*16*/ "cannot read bzip2 compressed file", -/*17*/ "PCRE is not enabled in this version of grep. " - "To enable this feature, please install libpcre and" - "recompile grep with WITH_PCRE set." }; /* Flags passed to regcomp() and regexec() */ @@ -96,9 +93,6 @@ char **pattern; regex_t *r_pattern; fastgrep_t *fg_pattern; -#ifdef WITH_PCRE -pcre **perl_pattern; -#endif /* Filename exclusion/inclusion patterns */ int epatterns, epattern_sz; @@ -209,7 +203,6 @@ {"max-count", required_argument, NULL, 'm'}, {"line-number", no_argument, NULL, 'n'}, {"only-matching", no_argument, NULL, 'o'}, - {"perl-regexp", no_argument, NULL, 'P'}, {"quiet", no_argument, NULL, 'q'}, {"silent", no_argument, NULL, 'q'}, {"recursive", no_argument, NULL, 'r'}, @@ -462,9 +455,6 @@ case 'o': oflag++; break; - case 'P': - grepbehave = GREP_PERL; - break; case 'p': linkbehave = LINK_SKIP; break; @@ -581,53 +571,32 @@ case GREP_EXTENDED: cflags |= REG_EXTENDED; break; - case GREP_PERL: -#ifndef WITH_PCRE - errx(2, getstr(17)); -#endif - break; default: /* NOTREACHED */ usage(); } - if (grepbehave != GREP_PERL) { - fg_pattern = grep_calloc(patterns, sizeof(*fg_pattern)); - r_pattern = grep_calloc(patterns, sizeof(*r_pattern)); + + fg_pattern = grep_calloc(patterns, sizeof(*fg_pattern)); + r_pattern = grep_calloc(patterns, sizeof(*r_pattern)); /* * XXX: fgrepcomp() and fastcomp() are workarounds for regexec() performance. * Optimizations should be done there. */ - for (i = 0; i < patterns; ++i) { - /* Check if cheating is allowed (always is for fgrep). */ - if (grepbehave == GREP_FIXED) - fgrepcomp(&fg_pattern[i], pattern[i]); - else { - if (fastcomp(&fg_pattern[i], pattern[i])) { - /* Fall back to full regex library */ - c = regcomp(&r_pattern[i], pattern[i], cflags); - if (c != 0) { - regerror(c, &r_pattern[i], re_error, - RE_ERROR_BUF); - errx(2, "%s", re_error); - } + for (i = 0; i < patterns; ++i) { + /* Check if cheating is allowed (always is for fgrep). */ + if (grepbehave == GREP_FIXED) + fgrepcomp(&fg_pattern[i], pattern[i]); + else { + if (fastcomp(&fg_pattern[i], pattern[i])) { + /* Fall back to full regex library */ + c = regcomp(&r_pattern[i], pattern[i], cflags); + if (c != 0) { + regerror(c, &r_pattern[i], re_error, + RE_ERROR_BUF); + errx(2, "%s", re_error); } } } - } else { -#ifdef WITH_PCRE - /* Compile Perl regexes with pcre_compile() */ - perl_pattern = grep_calloc(patterns, sizeof(perl_pattern)); - for (i = 0; i < patterns; ++i) { - char **err_msg = NULL; - int erroff; - - perl_pattern[i] = pcre_compile(pattern[i], 0, (const char **)err_msg, &erroff, NULL); - if (perl_pattern[i] != NULL) - errx(2, "wrong PCRE: %s", err_msg[0]); - } -#else - ; -#endif } if (lbflag) ==== //depot/projects/soc2008/gabor_textproc/grep/grep.h#43 (text+ko) ==== @@ -32,10 +32,6 @@ #include #include -#ifdef WITH_PCRE -#include -#endif - #ifdef WITHOUT_NLS #define getstr(n) errstr[n] #else @@ -52,7 +48,6 @@ #define GREP_FIXED 0 #define GREP_BASIC 1 #define GREP_EXTENDED 2 -#define GREP_PERL 3 #define BINFILE_BIN 0 #define BINFILE_SKIP 1 @@ -118,11 +113,6 @@ extern regex_t *r_pattern, *er_pattern; extern fastgrep_t *fg_pattern; -#ifdef WITH_PCRE -extern pcre **perl_pattern; -#endif - - /* For regex errors */ #define RE_ERROR_BUF 512 extern char re_error[RE_ERROR_BUF + 1]; /* Seems big enough */ ==== //depot/projects/soc2008/gabor_textproc/grep/util.c#76 (text+ko) ==== @@ -263,19 +263,10 @@ l->len, &pmatch); r = (r == 0) ? (vflag ? REG_NOMATCH : 0) : (vflag ? 0 : REG_NOMATCH); st = pmatch.rm_eo; - } else if (grepbehave != GREP_PERL) { + } else { r = regexec(&r_pattern[i], l->dat, 1, &pmatch, eflags); r = (r == 0) ? (vflag ? REG_NOMATCH : 0) : (vflag ? 0 : REG_NOMATCH); st = pmatch.rm_eo; - } else { -#ifdef WITH_PCRE - r = pcre_exec(perl_pattern[i], NULL, l->dat, l->len, st, 0, ovector, 3); - pmatch.rm_so = ovector[0]; - pmatch.rm_eo = ovector[1]; - st = ovector[1]; -#else - ; -#endif } if (r == REG_NOMATCH) continue; From owner-p4-projects@FreeBSD.ORG Tue Sep 23 13:07:25 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 334C7106567C; Tue, 23 Sep 2008 13:07:25 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id EA77E1065679 for ; Tue, 23 Sep 2008 13:07:24 +0000 (UTC) (envelope-from raj@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id DB8098FC14 for ; Tue, 23 Sep 2008 13:07:24 +0000 (UTC) (envelope-from raj@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id m8ND7OAG001838 for ; Tue, 23 Sep 2008 13:07:24 GMT (envelope-from raj@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m8ND7OIN001832 for perforce@freebsd.org; Tue, 23 Sep 2008 13:07:24 GMT (envelope-from raj@freebsd.org) Date: Tue, 23 Sep 2008 13:07:24 GMT Message-Id: <200809231307.m8ND7OIN001832@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to raj@freebsd.org using -f From: Rafal Jaworowski To: Perforce Change Reviews Cc: Subject: PERFORCE change 150344 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 23 Sep 2008 13:07:25 -0000 http://perforce.freebsd.org/chv.cgi?CH=150344 Change 150344 by raj@raj_mimi on 2008/09/23 13:06:26 Introduce basic loader(8) support for ARM. This relies on sys/boot/uboot support library and assumes an underlying U-Boot firmware with standalone apps API enabled. Current functionality is limited to netbooting. Obtained from: Semihalf Affected files ... .. //depot/projects/arm/src/sys/arm/include/bootinfo.h#1 add .. //depot/projects/arm/src/sys/arm/include/metadata.h#2 edit .. //depot/projects/arm/src/sys/boot/Makefile#11 edit .. //depot/projects/arm/src/sys/boot/arm/Makefile#4 edit .. //depot/projects/arm/src/sys/boot/arm/uboot/Makefile#1 add .. //depot/projects/arm/src/sys/boot/arm/uboot/conf.c#1 add .. //depot/projects/arm/src/sys/boot/arm/uboot/help.uboot#1 add .. //depot/projects/arm/src/sys/boot/arm/uboot/ldscript.arm#1 add .. //depot/projects/arm/src/sys/boot/arm/uboot/start.S#1 add .. //depot/projects/arm/src/sys/boot/arm/uboot/version#1 add .. //depot/projects/arm/src/sys/boot/common/Makefile.inc#4 edit .. //depot/projects/arm/src/sys/boot/common/load_elf.c#6 edit .. //depot/projects/arm/src/sys/boot/ficl/Makefile#6 edit Differences ... ==== //depot/projects/arm/src/sys/arm/include/metadata.h#2 (text+ko) ==== @@ -29,6 +29,6 @@ #ifndef _MACHINE_METADATA_H_ #define _MACHINE_METADATA_H_ -#define MODINFOMD_SMAP 0x1001 +#define MODINFOMD_BOOTINFO 0x1001 #endif /* !_MACHINE_METADATA_H_ */ ==== //depot/projects/arm/src/sys/boot/Makefile#11 (text+ko) ==== @@ -22,7 +22,7 @@ .endif # Build U-Boot library. -.if ${MACHINE_ARCH} == "powerpc" +.if ${MACHINE_ARCH} == "powerpc" || ${MACHINE_ARCH} == "arm" SUBDIR+= uboot .endif ==== //depot/projects/arm/src/sys/boot/arm/Makefile#4 (text+ko) ==== @@ -1,5 +1,5 @@ # $FreeBSD: src/sys/boot/arm/Makefile,v 1.3 2006/10/23 00:05:28 imp Exp $ -SUBDIR= +SUBDIR= uboot .include ==== //depot/projects/arm/src/sys/boot/common/Makefile.inc#4 (text+ko) ==== @@ -9,7 +9,7 @@ SRCS+= load_elf64.c load_elf64_obj.c reloc_elf64.c .elif ${MACHINE} == "pc98" SRCS+= load_elf32.c load_elf32_obj.c reloc_elf32.c -.elif ${MACHINE_ARCH} == "powerpc" +.elif ${MACHINE_ARCH} == "powerpc" || ${MACHINE_ARCH} == "arm" SRCS+= load_elf32.c reloc_elf32.c .elif ${MACHINE_ARCH} == "sparc64" || ${MACHINE_ARCH} == "ia64" SRCS+= load_elf64.c reloc_elf64.c ==== //depot/projects/arm/src/sys/boot/common/load_elf.c#6 (text+ko) ==== @@ -289,7 +289,16 @@ #ifdef ELF_VERBOSE printf("Converted entry 0x%08x\n", ehdr->e_entry); #endif - } else + } else + off = 0; +#elif defined(__arm__) + if (off & 0xf0000000u) { + off = -(off & 0xf0000000u); + ehdr->e_entry += off; +#ifdef ELF_VERBOSE + printf("Converted entry 0x%08x\n", ehdr->e_entry); +#endif + } else off = 0; #else off = 0; /* other archs use direct mapped kernels */ ==== //depot/projects/arm/src/sys/boot/ficl/Makefile#6 (text+ko) ==== @@ -14,7 +14,7 @@ .if ${MACHINE_ARCH} == "i386" CFLAGS+= -mno-sse3 .endif -.if ${MACHINE_ARCH} == "powerpc" +.if ${MACHINE_ARCH} == "powerpc" || ${MACHINE_ARCH} == "arm" CFLAGS+= -msoft-float .endif .if ${MACHINE} == "pc98" From owner-p4-projects@FreeBSD.ORG Tue Sep 23 13:08:26 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 752841065677; Tue, 23 Sep 2008 13:08:26 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 37F621065674 for ; Tue, 23 Sep 2008 13:08:26 +0000 (UTC) (envelope-from raj@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 106C88FC15 for ; Tue, 23 Sep 2008 13:08:26 +0000 (UTC) (envelope-from raj@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id m8ND8PxS005893 for ; Tue, 23 Sep 2008 13:08:25 GMT (envelope-from raj@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m8ND8P10005891 for perforce@freebsd.org; Tue, 23 Sep 2008 13:08:25 GMT (envelope-from raj@freebsd.org) Date: Tue, 23 Sep 2008 13:08:25 GMT Message-Id: <200809231308.m8ND8P10005891@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to raj@freebsd.org using -f From: Rafal Jaworowski To: Perforce Change Reviews Cc: Subject: PERFORCE change 150345 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 23 Sep 2008 13:08:26 -0000 http://perforce.freebsd.org/chv.cgi?CH=150345 Change 150345 by raj@raj_mimi on 2008/09/23 13:08:01 Increase U-Boot API search to 3MB range. Affected files ... .. //depot/projects/arm/src/sys/boot/uboot/lib/glue.c#5 edit Differences ... ==== //depot/projects/arm/src/sys/boot/uboot/lib/glue.c#5 (text+ko) ==== @@ -147,7 +147,7 @@ uboot_address = 255 * 1024 * 1024; sp = (void *)(uboot_address & ~0x000fffff); - spend = sp + 0x00100000 - API_SIG_MAGLEN; + spend = sp + 0x00300000 - API_SIG_MAGLEN; while (sp < spend) { if (!bcmp(sp, API_SIG_MAGIC, API_SIG_MAGLEN)) { *sig = (struct api_signature *)sp; From owner-p4-projects@FreeBSD.ORG Tue Sep 23 13:36:55 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 952801065678; Tue, 23 Sep 2008 13:36:55 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 597571065676 for ; Tue, 23 Sep 2008 13:36:55 +0000 (UTC) (envelope-from raj@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 4AB9F8FC15 for ; Tue, 23 Sep 2008 13:36:55 +0000 (UTC) (envelope-from raj@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id m8NDatBn082540 for ; Tue, 23 Sep 2008 13:36:55 GMT (envelope-from raj@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m8NDatmF082534 for perforce@freebsd.org; Tue, 23 Sep 2008 13:36:55 GMT (envelope-from raj@freebsd.org) Date: Tue, 23 Sep 2008 13:36:55 GMT Message-Id: <200809231336.m8NDatmF082534@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to raj@freebsd.org using -f From: Rafal Jaworowski To: Perforce Change Reviews Cc: Subject: PERFORCE change 150348 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 23 Sep 2008 13:36:56 -0000 http://perforce.freebsd.org/chv.cgi?CH=150348 Change 150348 by raj@raj_mimi on 2008/09/23 13:36:23 Change linking addr range for DB-88F6XXX system. U-Boot for 6281 systems is relocated to RAM at 6MB and uses up to 8th MB for run-time purposes (stack, malloc heap etc). Previously we were linked at 2nd MB, but with the advent of loader(8) the region we fit in between is no longer enough to process the ELF image (bigger than pure binary). Move kernel safely above all U-Boot regions. Affected files ... .. //depot/projects/arm/src/sys/arm/mv/kirkwood/std.db88f6xxx#2 edit Differences ... ==== //depot/projects/arm/src/sys/arm/mv/kirkwood/std.db88f6xxx#2 (text+ko) ==== @@ -3,10 +3,10 @@ include "../mv/std.mv" files "../mv/kirkwood/files.db88f6xxx" -makeoptions KERNPHYSADDR=0x00200000 -makeoptions KERNVIRTADDR=0xc0200000 +makeoptions KERNPHYSADDR=0x00900000 +makeoptions KERNVIRTADDR=0xc0900000 -options KERNPHYSADDR=0x00200000 -options KERNVIRTADDR=0xc0200000 +options KERNPHYSADDR=0x00900000 +options KERNVIRTADDR=0xc0900000 options PHYSADDR=0x00000000 options STARTUP_PAGETABLE_ADDR=0x00100000 From owner-p4-projects@FreeBSD.ORG Tue Sep 23 14:11:31 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E13EB10656A0; Tue, 23 Sep 2008 14:11:30 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 8234710656CF for ; Tue, 23 Sep 2008 14:11:30 +0000 (UTC) (envelope-from raj@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 717738FC1C for ; Tue, 23 Sep 2008 14:11:30 +0000 (UTC) (envelope-from raj@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id m8NEBUbl086578 for ; Tue, 23 Sep 2008 14:11:30 GMT (envelope-from raj@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m8NEBUQA086574 for perforce@freebsd.org; Tue, 23 Sep 2008 14:11:30 GMT (envelope-from raj@freebsd.org) Date: Tue, 23 Sep 2008 14:11:30 GMT Message-Id: <200809231411.m8NEBUQA086574@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to raj@freebsd.org using -f From: Rafal Jaworowski To: Perforce Change Reviews Cc: Subject: PERFORCE change 150350 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 23 Sep 2008 14:11:31 -0000 http://perforce.freebsd.org/chv.cgi?CH=150350 Change 150350 by raj@raj_mimi on 2008/09/23 14:10:58 Handle loader-provided metadata on ARM. The bootinfo, kernel flags and loader env variables are now fully processed by initarm(). Note we preserve backwards compatibility for cases when metadata is not handed over (kernel started directly without loader(8) and similar). To manage this some critical board info (mem size in particular) needs to be hard coded to fall back to. Obtained from: Semihalf Affected files ... .. //depot/projects/arm/src/sys/arm/arm/locore.S#28 edit .. //depot/projects/arm/src/sys/arm/mv/discovery/db78xxx.c#2 edit .. //depot/projects/arm/src/sys/arm/mv/discovery/std.db78xxx#2 edit .. //depot/projects/arm/src/sys/arm/mv/kirkwood/db88f6xxx.c#3 edit .. //depot/projects/arm/src/sys/arm/mv/kirkwood/std.db88f6xxx#3 edit .. //depot/projects/arm/src/sys/arm/mv/mv_machdep.c#4 edit .. //depot/projects/arm/src/sys/arm/mv/orion/db88f5xxx.c#6 edit .. //depot/projects/arm/src/sys/arm/mv/orion/std.db88f5xxx#4 edit .. //depot/projects/arm/src/sys/conf/options.arm#31 edit Differences ... ==== //depot/projects/arm/src/sys/arm/arm/locore.S#28 (text+ko) ==== @@ -66,6 +66,13 @@ ENTRY_NP(btext) ASENTRY_NP(_start) + +/* + * Move metadata ptr to r12 (ip) + */ + + mov ip, r0 + #if defined (FLASHADDR) && defined(LOADERRAMADDR) /* Check if we're running from flash. */ ldr r7, =FLASHADDR @@ -170,6 +177,8 @@ ldr pc, .Lvirt_done virt_done: + mov r0, ip /* Load argument: metadata ptr */ + mov fp, #0 /* trace back starts here */ bl _C_LABEL(initarm) /* Off we go */ ==== //depot/projects/arm/src/sys/arm/mv/discovery/db78xxx.c#2 (text+ko) ==== @@ -92,17 +92,6 @@ return (0); } -long -platform_ramsize(void) -{ - - /* - * XXX hard coded for now -- will be retrieved from bootloader - * dynamically, eventually. - */ - return (512 << 20); -} - static void platform_identify(void *dummy) { ==== //depot/projects/arm/src/sys/arm/mv/discovery/std.db78xxx#2 (text+ko) ==== @@ -9,4 +9,5 @@ options KERNPHYSADDR=0x00200000 options KERNVIRTADDR=0xc0200000 options PHYSADDR=0x00000000 +options PHYSMEM_SIZE=0x20000000 options STARTUP_PAGETABLE_ADDR=0x00100000 ==== //depot/projects/arm/src/sys/arm/mv/kirkwood/db88f6xxx.c#3 (text+ko) ==== @@ -106,17 +106,6 @@ return (0); } -long -platform_ramsize(void) -{ - - /* - * XXX hard coded for now -- will be retrieved from bootloader - * dynamically, eventually. - */ - return (512 << 20); -} - static void platform_identify(void *dummy) { ==== //depot/projects/arm/src/sys/arm/mv/kirkwood/std.db88f6xxx#3 (text+ko) ==== @@ -9,4 +9,5 @@ options KERNPHYSADDR=0x00900000 options KERNVIRTADDR=0xc0900000 options PHYSADDR=0x00000000 +options PHYSMEM_SIZE=0x20000000 options STARTUP_PAGETABLE_ADDR=0x00100000 ==== //depot/projects/arm/src/sys/arm/mv/mv_machdep.c#4 (text+ko) ==== @@ -83,9 +83,16 @@ #include #include #include +#include #include /* XXX eventually this should be eliminated */ +#ifdef DEBUG +#define debugf(fmt, args...) printf(fmt, ##args) +#else +#define debugf(fmt, args...) +#endif + #define KERNEL_PT_SYS 0 /* Page table for mapping proc0 zero page */ #define KERNEL_PT_KERN 1 @@ -101,16 +108,24 @@ #define ABT_STACK_SIZE 1 #define UND_STACK_SIZE 1 +/* Maximum number of memory regions */ +#define MEM_REGIONS 8 + +extern unsigned char kernbase[]; +extern unsigned char _etext[]; +extern unsigned char _edata[]; +extern unsigned char __bss_start[]; +extern unsigned char _end[]; + extern u_int data_abort_handler_address; extern u_int prefetch_abort_handler_address; extern u_int undefined_handler_address; -extern const struct pmap_devmap *pmap_devmap_bootstrap_table; -extern vm_offset_t pmap_bootstrap_lastaddr; +extern const struct pmap_devmap *pmap_devmap_bootstrap_table; +extern vm_offset_t pmap_bootstrap_lastaddr; struct pv_addr kernel_pt_table[KERNEL_PT_MAX]; -extern void *_end; extern int *end; struct pcpu __pcpu; @@ -131,21 +146,283 @@ static struct trapframe proc0_tf; +struct mem_region { + vm_offset_t mr_start; + vm_size_t mr_size; +}; + +static struct mem_region availmem_regions[MEM_REGIONS]; +static int availmem_regions_sz; + +struct bootinfo *bootinfo; + +static void print_kenv(void); +static void print_kernel_section_addr(void); +static void print_bootinfo(void); + +static void physmap_init(int); + +static char * +kenv_next(char *cp) +{ + + if (cp != NULL) { + while (*cp != 0) + cp++; + cp++; + if (*cp == 0) + cp = NULL; + } + return (cp); +} + +static void +print_kenv(void) +{ + int len; + char *cp; + + debugf("loader passed (static) kenv:\n"); + if (kern_envp == NULL) { + debugf(" no env, null ptr\n"); + return; + } + debugf(" kern_envp = 0x%08x\n", (uint32_t)kern_envp); + + len = 0; + for (cp = kern_envp; cp != NULL; cp = kenv_next(cp)) + debugf(" %x %s\n", (uint32_t)cp, cp); +} + +static void +print_bootinfo(void) +{ + struct bi_mem_region *mr; + struct bi_eth_addr *eth; + int i, j; + + debugf("bootinfo:\n"); + if (bootinfo == NULL) { + debugf(" no bootinfo, null ptr\n"); + return; + } + + debugf(" version = 0x%08x\n", bootinfo->bi_version); + debugf(" ccsrbar = 0x%08x\n", bootinfo->bi_bar_base); + debugf(" cpu_clk = 0x%08x\n", bootinfo->bi_cpu_clk); + debugf(" bus_clk = 0x%08x\n", bootinfo->bi_bus_clk); + + debugf(" mem regions:\n"); + mr = (struct bi_mem_region *)bootinfo->bi_data; + for (i = 0; i < bootinfo->bi_mem_reg_no; i++, mr++) + debugf(" #%d, base = 0x%08x, size = 0x%08x\n", i, + mr->mem_base, mr->mem_size); + + debugf(" eth addresses:\n"); + eth = (struct bi_eth_addr *)mr; + for (i = 0; i < bootinfo->bi_eth_addr_no; i++, eth++) { + debugf(" #%d, addr = ", i); + for (j = 0; j < 6; j++) + debugf("%02x ", eth->mac_addr[j]); + debugf("\n"); + } +} + +static void +print_kernel_section_addr(void) +{ + + debugf("kernel image addresses:\n"); + debugf(" kernbase = 0x%08x\n", (uint32_t)kernbase); + debugf(" _etext (sdata) = 0x%08x\n", (uint32_t)_etext); + debugf(" _edata = 0x%08x\n", (uint32_t)_edata); + debugf(" __bss_start = 0x%08x\n", (uint32_t)__bss_start); + debugf(" _end = 0x%08x\n", (uint32_t)_end); +} + +struct bi_mem_region * +bootinfo_mr(void) +{ + + return ((struct bi_mem_region *)bootinfo->bi_data); +} + +static void +physmap_init(int hardcoded) +{ + int i, j, cnt; + vm_offset_t phys_kernelend, kernload; + uint32_t s, e, sz; + struct mem_region *mp, *mp1; + + phys_kernelend = KERNPHYSADDR + (virtual_avail - KERNVIRTADDR); + kernload = KERNPHYSADDR; + + /* + * Use hardcoded physical addresses if we don't use memory regions + * from metadata. + */ + if (hardcoded) { + phys_avail[0] = 0; + phys_avail[1] = kernload; + + phys_avail[2] = phys_kernelend; + phys_avail[3] = PHYSMEM_SIZE; + + phys_avail[4] = 0; + phys_avail[5] = 0; + return; + } + + /* + * Remove kernel physical address range from avail + * regions list. Page align all regions. + * Non-page aligned memory isn't very interesting to us. + * Also, sort the entries for ascending addresses. + */ + sz = 0; + cnt = availmem_regions_sz; + debugf("processing avail regions:\n"); + for (mp = availmem_regions; mp->mr_size; mp++) { + s = mp->mr_start; + e = mp->mr_start + mp->mr_size; + debugf(" %08x-%08x -> ", s, e); + /* Check whether this region holds all of the kernel. */ + if (s < kernload && e > phys_kernelend) { + availmem_regions[cnt].mr_start = phys_kernelend; + availmem_regions[cnt++].mr_size = e - phys_kernelend; + e = kernload; + } + /* Look whether this regions starts within the kernel. */ + if (s >= kernload && s < phys_kernelend) { + if (e <= phys_kernelend) + goto empty; + s = phys_kernelend; + } + /* Now look whether this region ends within the kernel. */ + if (e > kernload && e <= phys_kernelend) { + if (s >= kernload) { + goto empty; + } + e = kernload; + } + /* Now page align the start and size of the region. */ + s = round_page(s); + e = trunc_page(e); + if (e < s) + e = s; + sz = e - s; + debugf("%08x-%08x = %x\n", s, e, sz); + + /* Check whether some memory is left here. */ + if (sz == 0) { + empty: + printf("skipping\n"); + bcopy(mp + 1, mp, + (cnt - (mp - availmem_regions)) * sizeof(*mp)); + cnt--; + mp--; + continue; + } + + /* Do an insertion sort. */ + for (mp1 = availmem_regions; mp1 < mp; mp1++) + if (s < mp1->mr_start) + break; + if (mp1 < mp) { + bcopy(mp1, mp1 + 1, (char *)mp - (char *)mp1); + mp1->mr_start = s; + mp1->mr_size = sz; + } else { + mp->mr_start = s; + mp->mr_size = sz; + } + } + availmem_regions_sz = cnt; + + /* Fill in phys_avail table, based on availmem_regions */ + debugf("fill in phys_avail:\n"); + for (i = 0, j = 0; i < availmem_regions_sz; i++, j += 2) { + + debugf(" region: 0x%08x - 0x%08x (0x%08x)\n", + availmem_regions[i].mr_start, + availmem_regions[i].mr_start + availmem_regions[i].mr_size, + availmem_regions[i].mr_size); + + phys_avail[j] = availmem_regions[i].mr_start; + phys_avail[j + 1] = availmem_regions[i].mr_start + + availmem_regions[i].mr_size; + } + phys_avail[j] = 0; + phys_avail[j + 1] = 0; +} + void * -initarm(void *arg, void *arg2) +initarm(void *mdp, void *unused __unused) { - struct pv_addr kernel_l1pt; + struct pv_addr kernel_l1pt; + vm_offset_t freemempos, l2_start, lastaddr; + uint32_t memsize, l2size; + struct bi_mem_region *mr; + void *kmdp; + u_int l1pagetable; int i = 0; - u_int l1pagetable; - vm_offset_t freemempos; - vm_offset_t l2_start; - vm_offset_t lastaddr; - uint32_t memsize, l2size; - boothowto = RB_VERBOSE | RB_SINGLE; + kmdp = NULL; + lastaddr = 0; + memsize = 0; set_cpufuncs(); - lastaddr = fake_preload_metadata(); + + /* + * Mask metadata pointer: it is supposed to be on page boundary. If + * the first agrument (mdp) doesn't point to a valid address the + * bootloader must have passed us something else than the metadata + * ptr... In this case we want to fall back to some built-in settings. + */ + mdp = (void *)((uint32_t)mdp & ~PAGE_MASK); + + /* Parse metadata and fetch parameters */ + if (mdp != NULL) { + preload_metadata = mdp; + kmdp = preload_search_by_type("elf kernel"); + if (kmdp != NULL) { + bootinfo = (struct bootinfo *)preload_search_info(kmdp, + MODINFO_METADATA|MODINFOMD_BOOTINFO); + + boothowto = MD_FETCH(kmdp, MODINFOMD_HOWTO, int); + kern_envp = MD_FETCH(kmdp, MODINFOMD_ENVP, char *); + lastaddr = MD_FETCH(kmdp, MODINFOMD_KERNEND, vm_offset_t); + } + + /* Initialize memory regions table */ + mr = bootinfo_mr(); + for (i = 0; i < bootinfo->bi_mem_reg_no; i++, mr++) { + if (i == MEM_REGIONS) + break; + availmem_regions[i].mr_start = mr->mem_base; + availmem_regions[i].mr_size = mr->mem_size; + memsize += mr->mem_size; + } + availmem_regions_sz = i; + } else { + /* Fall back to hardcoded boothowto flags and metadata. */ + boothowto = RB_VERBOSE | RB_SINGLE; + lastaddr = fake_preload_metadata(); + + /* + * Assume a single memory region of size specified in board + * configuration file. + */ + memsize = PHYSMEM_SIZE; + } + + /* + * If memsize is invalid, we can neither proceed nor panic (too + * early for console output). + */ + if (memsize == 0) + while (1); /* Platform-specific initialisation */ if (platform_pmap_init() != 0) @@ -154,13 +431,11 @@ pcpu_init(pcpup, 0, sizeof(struct pcpu)); PCPU_SET(curthread, &thread0); - memsize = platform_ramsize(); - /* Calculate number of L2 tables needed for mapping vm_page_array */ l2size = (memsize / PAGE_SIZE) * sizeof(struct vm_page); l2size = (l2size >> L1_S_SHIFT) + 1; - /* + /* * Add one table for end of kernel map, one for stacks, msgbuf and * L1 and L2 tables map and one for vectors map. */ @@ -270,6 +545,13 @@ cninit(); physmem = memsize / PAGE_SIZE; + debugf("initarm: console initialized\n"); + debugf(" arg1 mdp = 0x%08x\n", (uint32_t)mdp); + debugf(" boothowto = 0x%08x\n", boothowto); + print_bootinfo(); + print_kernel_section_addr(); + print_kenv(); + /* * Re-initialise decode windows */ @@ -304,10 +586,7 @@ */ cpu_idcache_wbinv_all(); - bootverbose = 1; - /* Set stack for exception handlers */ - data_abort_handler_address = (u_int)data_abort_handler; prefetch_abort_handler_address = (u_int)prefetch_abort_handler; undefined_handler_address = (u_int)undefinedinstruction_bounce; @@ -334,14 +613,12 @@ msgbufinit(msgbufp, MSGBUF_SIZE); mutex_init(); - phys_avail[0] = 0; - phys_avail[1] = KERNPHYSADDR; - - phys_avail[2] = KERNPHYSADDR + (virtual_avail - KERNVIRTADDR); - phys_avail[3] = memsize; - - phys_avail[4] = 0; - phys_avail[5] = 0; + /* + * Prepare map of physical memory regions available to vm subsystem. + * If metadata pointer doesn't point to a valid address, use hardcoded + * values. + */ + physmap_init((mdp != NULL) ? 0 : 1); /* Do basic tuning, hz etc */ init_param1(); ==== //depot/projects/arm/src/sys/arm/mv/orion/db88f5xxx.c#6 (text+ko) ==== @@ -159,18 +159,6 @@ return (0); } -long -platform_ramsize(void) -{ - - /* - * XXX hard coded for now -- will be retrieved from bootloader - * dynamically, eventually. Fall back should read from mem controller - * if other methods fail. - */ - return (128 << 20); -} - static void platform_identify(void *dummy) { ==== //depot/projects/arm/src/sys/arm/mv/orion/std.db88f5xxx#4 (text+ko) ==== @@ -9,4 +9,5 @@ options KERNPHYSADDR=0x00400000 options KERNVIRTADDR=0xc0400000 options PHYSADDR=0x00000000 +options PHYSMEM_SIZE=0x08000000 options STARTUP_PAGETABLE_ADDR=0x00100000 ==== //depot/projects/arm/src/sys/conf/options.arm#31 (text+ko) ==== @@ -22,6 +22,7 @@ KERNVIRTADDR opt_global.h LOADERRAMADDR opt_global.h PHYSADDR opt_global.h +PHYSMEM_SIZE opt_global.h SKYEYE_WORKAROUNDS opt_global.h SOC_MV_DISCOVERY opt_global.h SOC_MV_KIRKWOOD opt_global.h From owner-p4-projects@FreeBSD.ORG Tue Sep 23 17:30:54 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 49676106566C; Tue, 23 Sep 2008 17:30:54 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0E7BB106564A for ; Tue, 23 Sep 2008 17:30:54 +0000 (UTC) (envelope-from raj@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id D631B8FC1B for ; Tue, 23 Sep 2008 17:30:53 +0000 (UTC) (envelope-from raj@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id m8NHUrBH016765 for ; Tue, 23 Sep 2008 17:30:53 GMT (envelope-from raj@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m8NHUreB016759 for perforce@freebsd.org; Tue, 23 Sep 2008 17:30:53 GMT (envelope-from raj@freebsd.org) Date: Tue, 23 Sep 2008 17:30:53 GMT Message-Id: <200809231730.m8NHUreB016759@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to raj@freebsd.org using -f From: Rafal Jaworowski To: Perforce Change Reviews Cc: Subject: PERFORCE change 150359 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 23 Sep 2008 17:30:54 -0000 http://perforce.freebsd.org/chv.cgi?CH=150359 Change 150359 by raj@raj_mimi on 2008/09/23 17:30:10 Adjust decode_win_idma_dump() to the convention. Affected files ... .. //depot/projects/arm/src/sys/arm/mv/common.c#5 edit Differences ... ==== //depot/projects/arm/src/sys/arm/mv/common.c#5 (text+ko) ==== @@ -304,9 +304,7 @@ win_eth_bare_read(MV_ETH0_BASE), win_eth_epap_read(MV_ETH0_BASE)); -#if defined(SOC_MV_ORION) decode_win_idma_dump(); -#endif printf("\n"); } @@ -959,4 +957,9 @@ decode_win_idma_setup(void) { } + +void +decode_win_idma_dump(void) +{ +} #endif From owner-p4-projects@FreeBSD.ORG Tue Sep 23 18:00:24 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A64D11065673; Tue, 23 Sep 2008 18:00:24 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 699BC106566C for ; Tue, 23 Sep 2008 18:00:24 +0000 (UTC) (envelope-from ed@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 3CDC48FC1B for ; Tue, 23 Sep 2008 18:00:24 +0000 (UTC) (envelope-from ed@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id m8NI0OYA096224 for ; Tue, 23 Sep 2008 18:00:24 GMT (envelope-from ed@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m8NI0OA9096222 for perforce@freebsd.org; Tue, 23 Sep 2008 18:00:24 GMT (envelope-from ed@FreeBSD.org) Date: Tue, 23 Sep 2008 18:00:24 GMT Message-Id: <200809231800.m8NI0OA9096222@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to ed@FreeBSD.org using -f From: Ed Schouten To: Perforce Change Reviews Cc: Subject: PERFORCE change 150363 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 23 Sep 2008 18:00:24 -0000 http://perforce.freebsd.org/chv.cgi?CH=150363 Change 150363 by ed@ed_dull on 2008/09/23 17:59:43 Maybe a little safer: make sure we only allow hooks to be set on cdevs that use ttydev_cdevsw instead of relying on D_TTY. Affected files ... .. //depot/projects/mpsafetty/sys/kern/tty.c#43 edit Differences ... ==== //depot/projects/mpsafetty/sys/kern/tty.c#43 (text+ko) ==== @@ -1690,7 +1690,7 @@ cdp = dev_refthread(dev); if (cdp == NULL) goto done1; - if ((cdp->d_flags & D_TTY) == 0) + if (cdp != &ttydev_cdevsw) goto done2; tp = dev->si_drv1; From owner-p4-projects@FreeBSD.ORG Tue Sep 23 18:18:43 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 632E0106567C; Tue, 23 Sep 2008 18:18:43 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 26DA21065677 for ; Tue, 23 Sep 2008 18:18:43 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 133B18FC3B for ; Tue, 23 Sep 2008 18:18:43 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id m8NIIg22017530 for ; Tue, 23 Sep 2008 18:18:42 GMT (envelope-from pgj@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m8NIIgc0017528 for perforce@freebsd.org; Tue, 23 Sep 2008 18:18:42 GMT (envelope-from pgj@FreeBSD.org) Date: Tue, 23 Sep 2008 18:18:42 GMT Message-Id: <200809231818.m8NIIgc0017528@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to pgj@FreeBSD.org using -f From: Gabor Pali To: Perforce Change Reviews Cc: Subject: PERFORCE change 150365 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 23 Sep 2008 18:18:43 -0000 http://perforce.freebsd.org/chv.cgi?CH=150365 Change 150365 by pgj@kolbasz on 2008/09/23 18:18:16 Fix typos found in my articles/gjournal-desktop translation and trademarks.ent Submitted by: Hunger Affected files ... .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/articles/gjournal-desktop/article.sgml#3 edit .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/share/sgml/trademarks.ent#5 edit Differences ... ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/articles/gjournal-desktop/article.sgml#3 (text+ko) ==== @@ -15,13 +15,15 @@ --> --> %articles.ent; ]>
- Naplózó UFS használata asztali számítógépeken + Naplózó UFS használata asztali + számítógépeken Manolis @@ -119,7 +121,7 @@ (feltételezzük, hogy az operációs rendszer és az adatok egyetlen merevlemezen helyezkednek el). A folyamatot a &os; telepítésén - keresztül ismeretjük, és olyan lépesekre + keresztül ismertetjük, és olyan lépesekre bontottuk, hogy lehetõleg kerüljük a bonyolultabb parancssori mûveleteket. @@ -373,7 +375,7 @@ engedélyeznünk a naplózást a /var partíción is, habár egy asztali gép esetében ez sosem - árthat. Ha ezt az állományrendszer alig + árthat. Ha ezt az állományrendszert alig használjuk (ami nagyon valószínû egy asztali gépnél), kevesebb területet is rendelhetünk a naplóhoz. @@ -496,11 +498,11 @@ A rendszer elsõ indítása - A rendszerünk a szokásos módon fog indul, - de a naplók számára hozzáadott plusz - lapozóterületekhez tartozó - bejegyzéseket el kell távolítanunk az - /etc/fstab + A rendszerünk a szokásos módon fog + indulni, de a naplók számára + hozzáadott plusz lapozóterületekhez + tartozó bejegyzéseket el kell + távolítanunk az /etc/fstab állományból. A lapozóterületek közül ténylegesen lapozásra általában a b (tehát a ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/share/sgml/trademarks.ent#5 (text+ko) ==== @@ -428,4 +428,4 @@ jogot követel. Ahol ilyen megnevezés tûnik fel ebben a dokumentumban, és a FreeBSD Projektnek tudomása volt a védjegyrõl, a megnevezést a ™ vagy a - ® szimbölum követi."> + ® szimbólum követi."> From owner-p4-projects@FreeBSD.ORG Wed Sep 24 11:49:41 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C01F11065679; Wed, 24 Sep 2008 11:49:40 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 835EC106566C for ; Wed, 24 Sep 2008 11:49:40 +0000 (UTC) (envelope-from ed@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 743968FC28 for ; Wed, 24 Sep 2008 11:49:40 +0000 (UTC) (envelope-from ed@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id m8OBne8m044967 for ; Wed, 24 Sep 2008 11:49:40 GMT (envelope-from ed@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m8OBneIC044965 for perforce@freebsd.org; Wed, 24 Sep 2008 11:49:40 GMT (envelope-from ed@FreeBSD.org) Date: Wed, 24 Sep 2008 11:49:40 GMT Message-Id: <200809241149.m8OBneIC044965@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to ed@FreeBSD.org using -f From: Ed Schouten To: Perforce Change Reviews Cc: Subject: PERFORCE change 150382 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 24 Sep 2008 11:49:41 -0000 http://perforce.freebsd.org/chv.cgi?CH=150382 Change 150382 by ed@ed_dull on 2008/09/24 11:49:24 - Don't call ttydev_leave() when tty_unlock() is good enough. - Correct error codes of read() and write() calls. Affected files ... .. //depot/projects/mpsafetty/sys/kern/tty.c#44 edit Differences ... ==== //depot/projects/mpsafetty/sys/kern/tty.c#44 (text+ko) ==== @@ -133,11 +133,12 @@ } /* - * Because the revoke() call already calls d_close() without making sure - * all threads are purged from the TTY, we can only destroy the buffers - * and such when the last thread leaves the TTY. ttydev_enter() and - * ttydev_leave() are called from within the cdev functions, to make - * sure we can garbage collect the TTY. + * Though ttydev_enter() and ttydev_leave() seem to be related, they + * don't have to be used together. ttydev_enter() is used by the cdev + * operations to prevent an actual from being processed when the TTY has + * been abandoned. ttydev_leave() is used by ttydev_open() and + * ttydev_close() to determine whether per-TTY data should be + * deallocated. */ static __inline int @@ -287,6 +288,7 @@ done: tp->t_flags &= ~TF_OPENCLOSE; ttydev_leave(tp); + return (error); } @@ -378,22 +380,23 @@ error = ttydev_enter(tp); if (error) - return (0); + goto done; error = tty_wait_background(tp, curthread, SIGTTIN); - if (error) + if (error) { + tty_unlock(tp); goto done; + } error = ttydisc_read(tp, uio, ioflag); -done: ttydev_leave(tp); + tty_unlock(tp); /* - * The read() and write() calls should not throw an error when - * the device is ripped offline. + * The read() call should not throw an error when the device is + * being destroyed. Silently convert it to an EOF. */ - if (error == ENXIO) - return (0); - +done: if (error == ENXIO) + error = 0; return (error); } @@ -405,24 +408,19 @@ error = ttydev_enter(tp); if (error) - return (0); + return (error); if (tp->t_termios.c_lflag & TOSTOP) { error = tty_wait_background(tp, curthread, SIGTTOU); - if (error) - goto done; + if (error) { + tty_unlock(tp); + return (error); + } } error = ttydisc_write(tp, uio, ioflag); -done: ttydev_leave(tp); + tty_unlock(tp); - /* - * The read() and write() calls should not throw an error when - * the device is ripped offline. - */ - if (error == ENXIO) - return (0); - return (error); } @@ -479,7 +477,7 @@ } error = tty_ioctl(tp, cmd, data, td); -done: ttydev_leave(tp); +done: tty_unlock(tp); return (error); } @@ -518,7 +516,7 @@ selrecord(td, &tp->t_outpoll); } - ttydev_leave(tp); + tty_unlock(tp); return (revents); } @@ -535,7 +533,7 @@ if (error) return (-1); error = ttydevsw_mmap(tp, offset, paddr, nprot); - ttydev_leave(tp); + tty_unlock(tp); return (error); } @@ -623,7 +621,7 @@ break; } - ttydev_leave(tp); + tty_unlock(tp); return (error); } From owner-p4-projects@FreeBSD.ORG Wed Sep 24 11:54:46 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 487A5106567F; Wed, 24 Sep 2008 11:54:46 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0B0F2106567C for ; Wed, 24 Sep 2008 11:54:46 +0000 (UTC) (envelope-from ed@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id EE43E8FC17 for ; Wed, 24 Sep 2008 11:54:45 +0000 (UTC) (envelope-from ed@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id m8OBsjnX082569 for ; Wed, 24 Sep 2008 11:54:45 GMT (envelope-from ed@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m8OBsjdk082544 for perforce@freebsd.org; Wed, 24 Sep 2008 11:54:45 GMT (envelope-from ed@FreeBSD.org) Date: Wed, 24 Sep 2008 11:54:45 GMT Message-Id: <200809241154.m8OBsjdk082544@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to ed@FreeBSD.org using -f From: Ed Schouten To: Perforce Change Reviews Cc: Subject: PERFORCE change 150383 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 24 Sep 2008 11:54:46 -0000 http://perforce.freebsd.org/chv.cgi?CH=150383 Change 150383 by ed@ed_dull on 2008/09/24 11:54:30 IFC. Affected files ... .. //depot/projects/mpsafetty/lib/libc/powerpc/gen/syncicache.c#2 integrate .. //depot/projects/mpsafetty/sbin/bsdlabel/Makefile#2 integrate .. //depot/projects/mpsafetty/sbin/fdisk/Makefile#2 integrate .. //depot/projects/mpsafetty/share/man/man5/src.conf.5#2 integrate .. //depot/projects/mpsafetty/share/misc/committers-src.dot#6 integrate .. //depot/projects/mpsafetty/sys/amd64/amd64/elf_machdep.c#2 integrate .. //depot/projects/mpsafetty/sys/amd64/linux32/linux32_sysvec.c#2 integrate .. //depot/projects/mpsafetty/sys/arm/arm/elf_machdep.c#2 integrate .. //depot/projects/mpsafetty/sys/compat/ia32/ia32_sysvec.c#2 integrate .. //depot/projects/mpsafetty/sys/compat/svr4/svr4_sysvec.c#3 integrate .. //depot/projects/mpsafetty/sys/conf/files#16 integrate .. //depot/projects/mpsafetty/sys/conf/files.i386#8 integrate .. //depot/projects/mpsafetty/sys/conf/kern.pre.mk#2 integrate .. //depot/projects/mpsafetty/sys/dev/bge/if_bge.c#3 integrate .. //depot/projects/mpsafetty/sys/dev/bm/if_bm.c#3 integrate .. //depot/projects/mpsafetty/sys/dev/cxgb/common/cxgb_ael1002.c#4 integrate .. //depot/projects/mpsafetty/sys/dev/cxgb/common/cxgb_common.h#4 integrate .. //depot/projects/mpsafetty/sys/dev/cxgb/common/cxgb_mc5.c#3 integrate .. //depot/projects/mpsafetty/sys/dev/cxgb/common/cxgb_mv88e1xxx.c#3 integrate .. //depot/projects/mpsafetty/sys/dev/cxgb/common/cxgb_t3_hw.c#5 integrate .. //depot/projects/mpsafetty/sys/dev/cxgb/common/cxgb_tn1010.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/cxgb/common/cxgb_vsc7323.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/cxgb/common/cxgb_vsc8211.c#3 integrate .. //depot/projects/mpsafetty/sys/dev/cxgb/common/cxgb_xgmac.c#4 integrate .. //depot/projects/mpsafetty/sys/dev/cxgb/cxgb_adapter.h#7 integrate .. //depot/projects/mpsafetty/sys/dev/cxgb/cxgb_config.h#3 integrate .. //depot/projects/mpsafetty/sys/dev/cxgb/cxgb_include.h#3 integrate .. //depot/projects/mpsafetty/sys/dev/cxgb/cxgb_main.c#9 integrate .. //depot/projects/mpsafetty/sys/dev/cxgb/cxgb_multiq.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/cxgb/cxgb_offload.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/cxgb/cxgb_offload.h#3 integrate .. //depot/projects/mpsafetty/sys/dev/cxgb/cxgb_osdep.h#5 integrate .. //depot/projects/mpsafetty/sys/dev/cxgb/cxgb_sge.c#8 integrate .. //depot/projects/mpsafetty/sys/dev/cxgb/cxgb_t3fw.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/cxgb/sys/cxgb_support.c#3 integrate .. //depot/projects/mpsafetty/sys/dev/cxgb/sys/uipc_mvec.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb.c#3 integrate .. //depot/projects/mpsafetty/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_cm.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_cq.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_dbg.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_ev.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_hal.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_mem.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_provider.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_qp.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_resource.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/cxgb/ulp/toecore/toedev.c#3 integrate .. //depot/projects/mpsafetty/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c#8 integrate .. //depot/projects/mpsafetty/sys/dev/cxgb/ulp/tom/cxgb_cpl_socket.c#4 integrate .. //depot/projects/mpsafetty/sys/dev/cxgb/ulp/tom/cxgb_ddp.c#4 integrate .. //depot/projects/mpsafetty/sys/dev/cxgb/ulp/tom/cxgb_l2t.c#3 integrate .. //depot/projects/mpsafetty/sys/dev/cxgb/ulp/tom/cxgb_l2t.h#2 integrate .. //depot/projects/mpsafetty/sys/dev/cxgb/ulp/tom/cxgb_listen.c#3 integrate .. //depot/projects/mpsafetty/sys/dev/cxgb/ulp/tom/cxgb_t3_ddp.h#2 integrate .. //depot/projects/mpsafetty/sys/dev/cxgb/ulp/tom/cxgb_tcp_offload.c#4 integrate .. //depot/projects/mpsafetty/sys/dev/cxgb/ulp/tom/cxgb_toepcb.h#2 integrate .. //depot/projects/mpsafetty/sys/dev/cxgb/ulp/tom/cxgb_tom.c#5 integrate .. //depot/projects/mpsafetty/sys/dev/cxgb/ulp/tom/cxgb_tom.h#2 integrate .. //depot/projects/mpsafetty/sys/dev/cxgb/ulp/tom/cxgb_tom_sysctl.c#3 integrate .. //depot/projects/mpsafetty/sys/dev/cxgb/ulp/tom/cxgb_vm.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/kbdmux/kbdmux.c#3 integrate .. //depot/projects/mpsafetty/sys/fs/tmpfs/tmpfs.h#3 integrate .. //depot/projects/mpsafetty/sys/fs/tmpfs/tmpfs_subr.c#3 integrate .. //depot/projects/mpsafetty/sys/fs/tmpfs/tmpfs_vnops.c#5 integrate .. //depot/projects/mpsafetty/sys/i386/i386/bios.c#2 integrate .. //depot/projects/mpsafetty/sys/i386/i386/elf_machdep.c#2 integrate .. //depot/projects/mpsafetty/sys/i386/ibcs2/ibcs2_sysvec.c#2 integrate .. //depot/projects/mpsafetty/sys/i386/linux/linux_sysvec.c#2 integrate .. //depot/projects/mpsafetty/sys/ia64/ia64/efi.c#2 integrate .. //depot/projects/mpsafetty/sys/ia64/ia64/elf_machdep.c#2 integrate .. //depot/projects/mpsafetty/sys/ia64/ia64/sal.c#2 integrate .. //depot/projects/mpsafetty/sys/kern/imgact_aout.c#2 integrate .. //depot/projects/mpsafetty/sys/kern/init_main.c#5 integrate .. //depot/projects/mpsafetty/sys/kern/kern_intr.c#5 integrate .. //depot/projects/mpsafetty/sys/kern/sys_generic.c#2 integrate .. //depot/projects/mpsafetty/sys/kern/tty.c#45 edit .. //depot/projects/mpsafetty/sys/kern/tty_pts.c#23 integrate .. //depot/projects/mpsafetty/sys/libkern/memcmp.c#1 branch .. //depot/projects/mpsafetty/sys/mips/mips/elf_machdep.c#2 integrate .. //depot/projects/mpsafetty/sys/mips/mips/support.S#2 integrate .. //depot/projects/mpsafetty/sys/modules/cxgb/Makefile#2 integrate .. //depot/projects/mpsafetty/sys/modules/cxgb/cxgb/Makefile#4 integrate .. //depot/projects/mpsafetty/sys/modules/cxgb/cxgb_t3fw/Makefile#2 integrate .. //depot/projects/mpsafetty/sys/modules/cxgb/iw_cxgb/Makefile#2 integrate .. //depot/projects/mpsafetty/sys/modules/cxgb/toecore/Makefile#2 integrate .. //depot/projects/mpsafetty/sys/modules/cxgb/tom/Makefile#2 integrate .. //depot/projects/mpsafetty/sys/netinet/tcp_input.c#6 integrate .. //depot/projects/mpsafetty/sys/powerpc/aim/machdep.c#3 integrate .. //depot/projects/mpsafetty/sys/powerpc/aim/mmu_oea.c#4 integrate .. //depot/projects/mpsafetty/sys/powerpc/booke/machdep.c#3 integrate .. //depot/projects/mpsafetty/sys/powerpc/include/dbdma.h#2 integrate .. //depot/projects/mpsafetty/sys/powerpc/include/md_var.h#2 integrate .. //depot/projects/mpsafetty/sys/powerpc/include/pmap.h#2 integrate .. //depot/projects/mpsafetty/sys/powerpc/include/pte.h#2 integrate .. //depot/projects/mpsafetty/sys/powerpc/ofw/ofw_syscons.c#3 integrate .. //depot/projects/mpsafetty/sys/powerpc/powermac/dbdma.c#2 integrate .. //depot/projects/mpsafetty/sys/powerpc/powermac/dbdmavar.h#2 integrate .. //depot/projects/mpsafetty/sys/powerpc/powerpc/elf_machdep.c#2 integrate .. //depot/projects/mpsafetty/sys/powerpc/powerpc/syncicache.c#2 integrate .. //depot/projects/mpsafetty/sys/sparc64/sparc64/elf_machdep.c#2 integrate .. //depot/projects/mpsafetty/sys/sys/libkern.h#4 integrate .. //depot/projects/mpsafetty/sys/ufs/ufs/ufs_dirhash.c#3 integrate .. //depot/projects/mpsafetty/tools/build/options/WITHOUT_BSNMP#1 branch .. //depot/projects/mpsafetty/tools/build/options/WITHOUT_FLOPPY#1 branch .. //depot/projects/mpsafetty/tools/build/options/WITHOUT_NETGRAPH_SUPPORT#1 branch .. //depot/projects/mpsafetty/tools/build/options/WITHOUT_WIRELESS_SUPPORT#1 branch .. //depot/projects/mpsafetty/tools/tools/nanobsd/nanobsd.sh#10 integrate .. //depot/projects/mpsafetty/usr.sbin/timed/timed/globals.h#2 integrate Differences ... ==== //depot/projects/mpsafetty/lib/libc/powerpc/gen/syncicache.c#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* +/*- * Copyright (C) 1995-1997, 1999 Wolfgang Solfrank. * Copyright (C) 1995-1997, 1999 TooLs GmbH. * All rights reserved. @@ -33,7 +33,7 @@ #ifndef lint static const char rcsid[] = - "$FreeBSD: src/lib/libc/powerpc/gen/syncicache.c,v 1.4 2007/06/10 16:32:08 marcel Exp $"; + "$FreeBSD: src/lib/libc/powerpc/gen/syncicache.c,v 1.6 2008/09/24 01:06:11 nwhitehorn Exp $"; #endif /* not lint */ #include @@ -47,28 +47,27 @@ #include #include -#if defined(_KERNEL) || defined(_STANDALONE) -#ifndef CACHELINESIZE -#error "Must know the size of a cache line" +#ifdef _STANDALONE +int cacheline_size = 32; #endif -#else + +#if !defined(_KERNEL) && !defined(_STANDALONE) #include +int cacheline_size = 0; + static void getcachelinesize(void); -static int _cachelinesize; -#define CACHELINESIZE _cachelinesize - static void getcachelinesize() { static int cachemib[] = { CTL_MACHDEP, CPU_CACHELINE }; int clen; - clen = sizeof(_cachelinesize); + clen = sizeof(cacheline_size); if (sysctl(cachemib, sizeof(cachemib) / sizeof(cachemib[0]), - &_cachelinesize, &clen, NULL, 0) < 0 || !_cachelinesize) { + &cacheline_size, &clen, NULL, 0) < 0 || !cacheline_size) { abort(); } } @@ -81,21 +80,24 @@ char *p; #if !defined(_KERNEL) && !defined(_STANDALONE) - if (!_cachelinesize) + if (!cacheline_size) getcachelinesize(); #endif - off = (u_int)from & (CACHELINESIZE - 1); + + off = (u_int)from & (cacheline_size - 1); l = len += off; p = (char *)from - off; + do { __asm __volatile ("dcbst 0,%0" :: "r"(p)); - p += CACHELINESIZE; - } while ((l -= CACHELINESIZE) > 0); + p += cacheline_size; + } while ((l -= cacheline_size) > 0); __asm __volatile ("sync"); p = (char *)from - off; do { __asm __volatile ("icbi 0,%0" :: "r"(p)); - p += CACHELINESIZE; - } while ((len -= CACHELINESIZE) > 0); + p += cacheline_size; + } while ((len -= cacheline_size) > 0); __asm __volatile ("sync; isync"); } + ==== //depot/projects/mpsafetty/sbin/bsdlabel/Makefile#2 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.2 (Berkeley) 3/17/94 -# $FreeBSD: src/sbin/bsdlabel/Makefile,v 1.20 2006/08/22 07:51:09 ru Exp $ +# $FreeBSD: src/sbin/bsdlabel/Makefile,v 1.21 2008/09/23 13:12:51 ru Exp $ .PATH: ${.CURDIR}/../../sys/geom @@ -13,8 +13,8 @@ MLINKS= bsdlabel.8 disklabel.8 .endif -DPADD= ${LIBGEOM} -LDADD= -lgeom +DPADD= ${LIBGEOM} ${LIBBSDXML} ${LIBSBUF} +LDADD= -lgeom -lbsdxml -lsbuf .include ==== //depot/projects/mpsafetty/sbin/fdisk/Makefile#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sbin/fdisk/Makefile,v 1.12 2005/07/15 08:02:51 phk Exp $ +# $FreeBSD: src/sbin/fdisk/Makefile,v 1.13 2008/09/23 13:12:51 ru Exp $ PROG= fdisk SRCS= fdisk.c geom_mbr_enc.c @@ -7,8 +7,8 @@ .PATH: ${.CURDIR}/../../sys/geom -DPADD += ${LIBGEOM} -LDADD += -lgeom +DPADD+= ${LIBGEOM} ${LIBBSDXML} ${LIBSBUF} +LDADD+= -lgeom -lbsdxml -lsbuf .include ==== //depot/projects/mpsafetty/share/man/man5/src.conf.5#2 (text) ==== @@ -1,7 +1,7 @@ .\" DO NOT EDIT-- this file is automatically generated. .\" from FreeBSD: head/tools/build/options/makeman 174548 2007-12-12 16:39:32Z ru -.\" $FreeBSD: src/share/man/man5/src.conf.5,v 1.30 2008/06/25 21:42:23 ru Exp $ -.Dd June 26, 2008 +.\" $FreeBSD: src/share/man/man5/src.conf.5,v 1.31 2008/09/23 16:18:15 sam Exp $ +.Dd September 23, 2008 .Dt SRC.CONF 5 .Os .Sh NAME @@ -77,17 +77,39 @@ The following list provides a name and short description for variables that can be used for source builds. .Bl -tag -width indent +.It Va WITHOUT_ACCT +.\" from FreeBSD: head/tools/build/options/WITHOUT_ACCT 183242 2008-09-21 22:02:26Z sam +Set to not build process accounting tools such as +.Xr ac 8 +and +.Xr accton 8 . .It Va WITHOUT_ACPI .\" from FreeBSD: head/tools/build/options/WITHOUT_ACPI 156932 2006-03-21 07:50:50Z ru Set to not build .Xr acpiconf 8 , .Xr acpidump 8 and related programs. +.It Va WITHOUT_AMD +.\" from FreeBSD: head/tools/build/options/WITHOUT_AMD 183242 2008-09-21 22:02:26Z sam +Set to not build +.Xr amd 8 , +and related programs. +.It Va WITHOUT_APM +.\" from FreeBSD: head/tools/build/options/WITHOUT_APM 183242 2008-09-21 22:02:26Z sam +Set to not build +.Xr apm 8 , +.Xr apmd 8 +and related programs. .It Va WITHOUT_ASSERT_DEBUG .\" from FreeBSD: head/tools/build/options/WITHOUT_ASSERT_DEBUG 162215 2006-09-11 13:55:27Z ru Set to compile programs and libraries without the .Xr assert 3 checks. +.It Va WITHOUT_AT +.\" from FreeBSD: head/tools/build/options/WITHOUT_AT 183242 2008-09-21 22:02:26Z sam +Set to not build +.Xr at 1 +and related utilities. .It Va WITHOUT_ATM .\" from FreeBSD: head/tools/build/options/WITHOUT_ATM 156932 2006-03-21 07:50:50Z ru Set to not build @@ -178,6 +200,11 @@ .\" from FreeBSD: head/tools/build/options/WITHOUT_BSD_CPIO 179813 2008-06-16 05:48:15Z dougb Set to not build the BSD licensed version of cpio based on .Xr libarchive 3 . +.It Va WITHOUT_BSNMP +.\" from FreeBSD: head/tools/build/options/WITHOUT_BSNMP 183306 2008-09-23 16:15:42Z sam +Set to not build or install +.Xr bsnmpd 1 +and related libraries and data files. .It Va WITHOUT_BZIP2 .\" from FreeBSD: head/tools/build/options/WITHOUT_BZIP2 174550 2007-12-12 16:43:17Z ru Set to not build contributed bzip2 software as a part of the base system. @@ -229,6 +256,11 @@ .It .Va WITHOUT_OPENSSL .El +.It Va WITHOUT_CTM +.\" from FreeBSD: head/tools/build/options/WITHOUT_CTM 183242 2008-09-21 22:02:26Z sam +Set to not build +.Xr ctm 1 +and related utilities. .It Va WITHOUT_CVS .\" from FreeBSD: head/tools/build/options/WITHOUT_CVS 156932 2006-03-21 07:50:50Z ru Set to not build CVS. @@ -251,6 +283,10 @@ .\" from FreeBSD: head/tools/build/options/WITHOUT_EXAMPLES 156938 2006-03-21 09:06:24Z ru Set to avoid installing examples to .Pa /usr/share/examples/ . +.It Va WITHOUT_FLOPPY +.\" from FreeBSD: head/tools/build/options/WITHOUT_FLOPPY 183306 2008-09-23 16:15:42Z sam +Set to not build or install programs +for operating floppy disk driver. .It Va WITHOUT_FORTH .\" from FreeBSD: head/tools/build/options/WITHOUT_FORTH 156932 2006-03-21 07:50:50Z ru Set to build bootloaders without Forth support. @@ -259,6 +295,10 @@ Set to build .Nm libc without floating-point support. +.It Va WITHOUT_FREEBSD_UPDATE +.\" from FreeBSD: head/tools/build/options/WITHOUT_FREEBSD_UPDATE 183242 2008-09-21 22:02:26Z sam +Set to not build +.Xr freebsd-update 8 . .It Va WITHOUT_GAMES .\" from FreeBSD: head/tools/build/options/WITHOUT_GAMES 156932 2006-03-21 07:50:50Z ru Set to not build games. @@ -348,6 +388,9 @@ .It Va WITHOUT_IPFILTER .\" from FreeBSD: head/tools/build/options/WITHOUT_IPFILTER 156932 2006-03-21 07:50:50Z ru Set to not build IP Filter package. +.It Va WITHOUT_IPFW +.\" from FreeBSD: head/tools/build/options/WITHOUT_IPFW 183242 2008-09-21 22:02:26Z sam +Set to not build IPFW tools. .It Va WITHOUT_IPX .\" from FreeBSD: head/tools/build/options/WITHOUT_IPX 156932 2006-03-21 07:50:50Z ru Set to not build programs and libraries related to IPX networking. @@ -362,6 +405,10 @@ .It Va WITHOUT_IPX_SUPPORT .\" from FreeBSD: head/tools/build/options/WITHOUT_IPX_SUPPORT 156932 2006-03-21 07:50:50Z ru Set to build some programs without IPX support. +.It Va WITHOUT_JAIL +.\" from FreeBSD: head/tools/build/options/WITHOUT_JAIL 183242 2008-09-21 22:02:26Z sam +Set to not build tools for the support of jails; e.g. +.Xr jail 8 . .It Va WITHOUT_KERBEROS .\" from FreeBSD: head/tools/build/options/WITHOUT_KERBEROS 174549 2007-12-12 16:42:03Z ru Set this if you do not want to build Kerberos 5 (KTH Heimdal). @@ -403,6 +450,12 @@ Set to build some programs without optional .Nm libkvm support. +.It Va WITHOUT_LEGACY_CONSOLE +.\" from FreeBSD: head/tools/build/options/WITHOUT_LEGACY_CONSOLE 183242 2008-09-21 22:02:26Z sam +Set to not build programs that support a legacy PC console; e.g. +.Xr kbdcontrol 8 +and +.Xr vidcontrol 8 . .It Va WITHOUT_LIB32 .\" from FreeBSD: head/tools/build/options/WITHOUT_LIB32 156932 2006-03-21 07:50:50Z ru On amd64, set to not build 32-bit library set and a @@ -465,16 +518,37 @@ .\" from FreeBSD: head/tools/build/options/WITHOUT_LOCALES 156932 2006-03-21 07:50:50Z ru Set to not build localization files; see .Xr locale 1 . +.It Va WITHOUT_LOCATE +.\" from FreeBSD: head/tools/build/options/WITHOUT_LOCATE 183242 2008-09-21 22:02:26Z sam +Set to not build +.Xr locate 1 +and related programs. .It Va WITHOUT_LPR .\" from FreeBSD: head/tools/build/options/WITHOUT_LPR 156932 2006-03-21 07:50:50Z ru Set to not build .Xr lpr 1 and related programs. +.It Va WITHOUT_MAIL +.\" from FreeBSD: head/tools/build/options/WITHOUT_MAIL 183242 2008-09-21 22:02:26Z sam +Set to not build any mail support (MUA or MTA). +When set, it also enforces the following options: +.Pp +.Bl -item -compact +.It +.Va WITHOUT_MAILWRAPPER +.It +.Va WITHOUT_SENDMAIL +.El .It Va WITHOUT_MAILWRAPPER .\" from FreeBSD: head/tools/build/options/WITHOUT_MAILWRAPPER 156932 2006-03-21 07:50:50Z ru Set to not build the .Xr mailwrapper 8 MTA selector. +.It Va WITHOUT_MAKE +.\" from FreeBSD: head/tools/build/options/WITHOUT_MAKE 183242 2008-09-21 22:02:26Z sam +Set to not install +.Xr make 1 +and related support files. .It Va WITHOUT_MAN .\" from FreeBSD: head/tools/build/options/WITHOUT_MAN 156932 2006-03-21 07:50:50Z ru Set to not build manual pages. @@ -482,11 +556,28 @@ .\" from FreeBSD: head/tools/build/options/WITHOUT_NCP 156932 2006-03-21 07:50:50Z ru Set to not build programs, libraries, and kernel modules related to NetWare Core protocol. +.It Va WITHOUT_NDIS +.\" from FreeBSD: head/tools/build/options/WITHOUT_NDIS 183242 2008-09-21 22:02:26Z sam +Set to not build programs and libraries +related to NDIS emulation support. .It Va WITHOUT_NETCAT .\" from FreeBSD: head/tools/build/options/WITHOUT_NETCAT 156932 2006-03-21 07:50:50Z ru Set to not build .Xr nc 1 utility. +.It Va WITHOUT_NETGRAPH +.\" from FreeBSD: head/tools/build/options/WITHOUT_NETGRAPH 183242 2008-09-21 22:02:26Z sam +Set to not build applications to support +.Xr netgraph 4 . +When set, it also enforces the following options: +.Pp +.Bl -item -compact +.It +.Va WITHOUT_NETGRAPH_SUPPORT +.El +.It Va WITHOUT_NETGRAPH_SUPPORT +.\" from FreeBSD: head/tools/build/options/WITHOUT_NETGRAPH_SUPPORT 183305 2008-09-23 16:11:15Z sam +Set to build libraries, programs, and kernel modules without netgraph support. .It Va WITHOUT_NIS .\" from FreeBSD: head/tools/build/options/WITHOUT_NIS 156932 2006-03-21 07:50:50Z ru Set to not build @@ -512,6 +603,11 @@ The generic caching daemon, .Xr nscd 8 , will not be built either if this option is set. +.It Va WITHOUT_NTP +.\" from FreeBSD: head/tools/build/options/WITHOUT_NTP 183242 2008-09-21 22:02:26Z sam +Set to not build +.Xr ntpd 8 +and related programs. .It Va WITHOUT_OBJC .\" from FreeBSD: head/tools/build/options/WITHOUT_OBJC 156932 2006-03-21 07:50:50Z ru Set to not build Objective C support. @@ -562,9 +658,34 @@ .It .Va WITHOUT_AUTHPF .El +.It Va WITHOUT_PKGTOOLS +.\" from FreeBSD: head/tools/build/options/WITHOUT_PKGTOOLS 183242 2008-09-21 22:02:26Z sam +Set to not build +.Xr pkg_add 8 +and related programs. +.It Va WITHOUT_PMC +.\" from FreeBSD: head/tools/build/options/WITHOUT_PMC 183242 2008-09-21 22:02:26Z sam +Set to not build +.Xr pmccontrol 8 +and related programs. +.It Va WITHOUT_PORTSNAP +.\" from FreeBSD: head/tools/build/options/WITHOUT_PORTSNAP 183242 2008-09-21 22:02:26Z sam +Set to not build or install +.Xr portsnap 8 +and related files. +.It Va WITHOUT_PPP +.\" from FreeBSD: head/tools/build/options/WITHOUT_PPP 183242 2008-09-21 22:02:26Z sam +Set to not build +.Xr ppp 8 +and related programs. .It Va WITHOUT_PROFILE .\" from FreeBSD: head/tools/build/options/WITHOUT_PROFILE 156932 2006-03-21 07:50:50Z ru Set to avoid compiling profiled libraries. +.It Va WITHOUT_QUOTAS +.\" from FreeBSD: head/tools/build/options/WITHOUT_QUOTAS 183242 2008-09-21 22:02:26Z sam +Set to not build +.Xr quota 8 +and related programs. .It Va WITHOUT_RCMDS .\" from FreeBSD: head/tools/build/options/WITHOUT_RCMDS 156932 2006-03-21 07:50:50Z ru Disable building of the @@ -583,6 +704,11 @@ .\" from FreeBSD: head/tools/build/options/WITHOUT_RESCUE 156932 2006-03-21 07:50:50Z ru Set to not build .Xr rescue 8 . +.It Va WITHOUT_ROUTED +.\" from FreeBSD: head/tools/build/options/WITHOUT_ROUTED 183242 2008-09-21 22:02:26Z sam +Set to not build +.Xr routed 8 +utility. .It Va WITHOUT_SENDMAIL .\" from FreeBSD: head/tools/build/options/WITHOUT_SENDMAIL 156932 2006-03-21 07:50:50Z ru Set to not build @@ -598,6 +724,11 @@ Set to not build the .Bx 4.4 legacy docs. +.It Va WITHOUT_SLIP +.\" from FreeBSD: head/tools/build/options/WITHOUT_SLIP 183242 2008-09-21 22:02:26Z sam +Set to not build +.Xr sliplogin 8 +and related programs. .It Va WITHOUT_SSP .\" from FreeBSD: head/tools/build/options/WITHOUT_SSP 180012 2008-06-25 21:33:28Z ru Set to not build world with propolice stack smashing protection. @@ -609,12 +740,32 @@ Set to not build .Xr syscons 4 support files such as keyboard maps, fonts, and screen output maps. +.It Va WITHOUT_SYSINSTALL +.\" from FreeBSD: head/tools/build/options/WITHOUT_SYSINSTALL 183242 2008-09-21 22:02:26Z sam +Set to not build +.Xr sysinstall 8 +and related programs. .It Va WITHOUT_TCSH .\" from FreeBSD: head/tools/build/options/WITHOUT_TCSH 156932 2006-03-21 07:50:50Z ru Set to not build and install .Pa /bin/csh (which is .Xr tcsh 1 ) . +.It Va WITHOUT_TELNET +.\" from FreeBSD: head/tools/build/options/WITHOUT_TELNET 183242 2008-09-21 22:02:26Z sam +Set to not build +.Xr telnet 8 +and related programs. +.It Va WITHOUT_TEXTPROC +.\" from FreeBSD: head/tools/build/options/WITHOUT_TEXTPROC 183242 2008-09-21 22:02:26Z sam +Set to not build +programs used for text processing. +When set, it also enforces the following options: +.Pp +.Bl -item -compact +.It +.Va WITHOUT_GROFF +.El .It Va WITHOUT_TOOLCHAIN .\" from FreeBSD: head/tools/build/options/WITHOUT_TOOLCHAIN 174550 2007-12-12 16:43:17Z ru Set to not install @@ -632,6 +783,22 @@ .It Va WITHOUT_USB .\" from FreeBSD: head/tools/build/options/WITHOUT_USB 156932 2006-03-21 07:50:50Z ru Set to not build USB-related programs and libraries. +.It Va WITHOUT_WIRELESS +.\" from FreeBSD: head/tools/build/options/WITHOUT_WIRELESS 183242 2008-09-21 22:02:26Z sam +Set to not build programs used for 802.11 wireless networks; especially +.Xr wpa_supplicant 8 +and +.Xr hostapd 8 . +When set, it also enforces the following options: +.Pp +.Bl -item -compact +.It +.Va WITHOUT_WIRELESS_SUPPORT +.El +.It Va WITHOUT_WIRELESS_SUPPORT +.\" from FreeBSD: head/tools/build/options/WITHOUT_WIRELESS_SUPPORT 183305 2008-09-23 16:11:15Z sam +Set to build libraries, programs, and kernel modules without +802.11 wireless support. .It Va WITHOUT_WPA_SUPPLICANT_EAPOL .\" from FreeBSD: head/tools/build/options/WITHOUT_WPA_SUPPLICANT_EAPOL 156932 2006-03-21 07:50:50Z ru Build ==== //depot/projects/mpsafetty/share/misc/committers-src.dot#6 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/share/misc/committers-src.dot,v 1.85 2008/09/18 17:32:13 zec Exp $ +# $FreeBSD: src/share/misc/committers-src.dot,v 1.86 2008/09/22 21:53:00 rnoland Exp $ # This file is meant to list all FreeBSD src committers and describe the # mentor-mentee relationships between them. @@ -148,6 +148,7 @@ remko [label="Remko Lodder\nremko@FreeBSD.org\n2007/02/23"] rik [label="Roman Kurakin\nrik@FreeBSD.org\n2003/12/18"] rink [label="Rink Springer\nrink@FreeBSD.org\n2006/01/16"] +rnoland [label="Robert Noland\nrnoland@FreeBSD.org\n2008/09/15"] roberto [label="Ollivier Robert\nroberto@FreeBSD.org\n1995/02/22"] rpaulo [label="Rui Paulo\nrpaulo@FreeBSD.org\n2007/09/25"] rrs [label="Randall R Stewart\nrrs@FreeBSD.org\n2007/02/08"] @@ -292,6 +293,7 @@ jhb -> arr jhb -> jeff jhb -> kbyanc +jhb -> rnoland jkh -> imp jkh -> jlemon ==== //depot/projects/mpsafetty/sys/amd64/amd64/elf_machdep.c#2 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/elf_machdep.c,v 1.26 2007/05/22 02:22:57 kan Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/elf_machdep.c,v 1.27 2008/09/24 10:14:37 kib Exp $"); #include #include @@ -46,59 +46,60 @@ #include struct sysentvec elf64_freebsd_sysvec = { - SYS_MAXSYSCALL, - sysent, - 0, - 0, - NULL, - 0, - NULL, - NULL, - __elfN(freebsd_fixup), - sendsig, - sigcode, - &szsigcode, - NULL, - "FreeBSD ELF64", - __elfN(coredump), - NULL, - MINSIGSTKSZ, - PAGE_SIZE, - VM_MIN_ADDRESS, - VM_MAXUSER_ADDRESS, - USRSTACK, - PS_STRINGS, - VM_PROT_ALL, - exec_copyout_strings, - exec_setregs, - NULL + .sv_size = SYS_MAXSYSCALL, + .sv_table = sysent, + .sv_mask = 0, + .sv_sigsize = 0, + .sv_sigtbl = NULL, + .sv_errsize = 0, + .sv_errtbl = NULL, + .sv_transtrap = NULL, + .sv_fixup = __elfN(freebsd_fixup), + .sv_sendsig = sendsig, + .sv_sigcode = sigcode, + .sv_szsigcode = &szsigcode, + .sv_prepsyscall = NULL, + .sv_name = "FreeBSD ELF64", + .sv_coredump = __elfN(coredump), + .sv_imgact_try = NULL, + .sv_minsigstksz = MINSIGSTKSZ, + .sv_pagesize = PAGE_SIZE, + .sv_minuser = VM_MIN_ADDRESS, + .sv_maxuser = VM_MAXUSER_ADDRESS, + .sv_usrstack = USRSTACK, + .sv_psstrings = PS_STRINGS, + .sv_stackprot = VM_PROT_ALL, + .sv_copyout_strings = exec_copyout_strings, + .sv_setregs = exec_setregs, + .sv_fixlimit = NULL, + .sv_maxssiz = NULL }; static Elf64_Brandinfo freebsd_brand_info = { - ELFOSABI_FREEBSD, - EM_X86_64, - "FreeBSD", - NULL, - "/libexec/ld-elf.so.1", - &elf64_freebsd_sysvec, - NULL, - BI_CAN_EXEC_DYN, - }; + .brand = ELFOSABI_FREEBSD, + .machine = EM_X86_64, + .compat_3_brand = "FreeBSD", + .emul_path = NULL, + .interp_path = "/libexec/ld-elf.so.1", + .sysvec = &elf64_freebsd_sysvec, + .interp_newpath = NULL, + .flags = BI_CAN_EXEC_DYN, +}; SYSINIT(elf64, SI_SUB_EXEC, SI_ORDER_ANY, (sysinit_cfunc_t) elf64_insert_brand_entry, &freebsd_brand_info); static Elf64_Brandinfo freebsd_brand_oinfo = { - ELFOSABI_FREEBSD, - EM_X86_64, - "FreeBSD", - NULL, - "/usr/libexec/ld-elf.so.1", - &elf64_freebsd_sysvec, - NULL, - BI_CAN_EXEC_DYN, - }; + .brand = ELFOSABI_FREEBSD, + .machine = EM_X86_64, + .compat_3_brand = "FreeBSD", + .emul_path = NULL, + .interp_path = "/usr/libexec/ld-elf.so.1", + .sysvec = &elf64_freebsd_sysvec, + .interp_newpath = NULL, + .flags = BI_CAN_EXEC_DYN, +}; SYSINIT(oelf64, SI_SUB_EXEC, SI_ORDER_ANY, (sysinit_cfunc_t) elf64_insert_brand_entry, ==== //depot/projects/mpsafetty/sys/amd64/linux32/linux32_sysvec.c#2 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_sysvec.c,v 1.34 2008/04/08 09:45:47 kib Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_sysvec.c,v 1.35 2008/09/24 10:14:37 kib Exp $"); #include "opt_compat.h" #ifndef COMPAT_IA32 @@ -1000,62 +1000,62 @@ } struct sysentvec elf_linux_sysvec = { - LINUX_SYS_MAXSYSCALL, - linux_sysent, - 0, - LINUX_SIGTBLSZ, - bsd_to_linux_signal, - ELAST + 1, - bsd_to_linux_errno, - translate_traps, - elf_linux_fixup, - linux_sendsig, - linux_sigcode, - &linux_szsigcode, - linux_prepsyscall, - "Linux ELF32", - elf32_coredump, - exec_linux_imgact_try, - LINUX_MINSIGSTKSZ, - PAGE_SIZE, - VM_MIN_ADDRESS, - LINUX32_USRSTACK, - LINUX32_USRSTACK, - LINUX32_PS_STRINGS, - VM_PROT_ALL, - linux_copyout_strings, - exec_linux_setregs, - linux32_fixlimit, - &linux32_maxssiz, + .sv_size = LINUX_SYS_MAXSYSCALL, + .sv_table = linux_sysent, + .sv_mask = 0, + .sv_sigsize = LINUX_SIGTBLSZ, + .sv_sigtbl = bsd_to_linux_signal, + .sv_errsize = ELAST + 1, + .sv_errtbl = bsd_to_linux_errno, + .sv_transtrap = translate_traps, + .sv_fixup = elf_linux_fixup, + .sv_sendsig = linux_sendsig, + .sv_sigcode = linux_sigcode, + .sv_szsigcode = &linux_szsigcode, + .sv_prepsyscall = linux_prepsyscall, + .sv_name = "Linux ELF32", + .sv_coredump = elf32_coredump, + .sv_imgact_try = exec_linux_imgact_try, + .sv_minsigstksz = LINUX_MINSIGSTKSZ, + .sv_pagesize = PAGE_SIZE, + .sv_minuser = VM_MIN_ADDRESS, + .sv_maxuser = LINUX32_USRSTACK, + .sv_usrstack = LINUX32_USRSTACK, + .sv_psstrings = LINUX32_PS_STRINGS, + .sv_stackprot = VM_PROT_ALL, + .sv_copyout_strings = linux_copyout_strings, + .sv_setregs = exec_linux_setregs, + .sv_fixlimit = linux32_fixlimit, + .sv_maxssiz = &linux32_maxssiz, }; static Elf32_Brandinfo linux_brand = { - ELFOSABI_LINUX, - EM_386, - "Linux", - "/compat/linux", - "/lib/ld-linux.so.1", - &elf_linux_sysvec, - NULL, - BI_CAN_EXEC_DYN, - }; + .brand = ELFOSABI_LINUX, + .machine = EM_386, + .compat_3_brand = "Linux", + .emul_path = "/compat/linux", + .interp_path = "/lib/ld-linux.so.1", + .sysvec = &elf_linux_sysvec, + .interp_newpath = NULL, + .flags = BI_CAN_EXEC_DYN, +}; static Elf32_Brandinfo linux_glibc2brand = { - ELFOSABI_LINUX, - EM_386, - "Linux", - "/compat/linux", - "/lib/ld-linux.so.2", - &elf_linux_sysvec, - NULL, - BI_CAN_EXEC_DYN, - }; + .brand = ELFOSABI_LINUX, + .machine = EM_386, + .compat_3_brand = "Linux", + .emul_path = "/compat/linux", + .interp_path = "/lib/ld-linux.so.2", + .sysvec = &elf_linux_sysvec, + .interp_newpath = NULL, + .flags = BI_CAN_EXEC_DYN, +}; Elf32_Brandinfo *linux_brandlist[] = { - &linux_brand, - &linux_glibc2brand, - NULL - }; + &linux_brand, + &linux_glibc2brand, + NULL +}; static int linux_elf_modevent(module_t mod, int type, void *data) ==== //depot/projects/mpsafetty/sys/arm/arm/elf_machdep.c#2 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/arm/elf_machdep.c,v 1.7 2007/05/22 02:22:57 kan Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/elf_machdep.c,v 1.8 2008/09/24 10:14:37 kib Exp $"); #include #include @@ -46,59 +46,60 @@ #include struct sysentvec elf32_freebsd_sysvec = { - SYS_MAXSYSCALL, - sysent, - 0, - 0, - NULL, - 0, - NULL, - NULL, - __elfN(freebsd_fixup), - sendsig, - sigcode, - &szsigcode, - NULL, - "FreeBSD ELF32", - __elfN(coredump), - NULL, - MINSIGSTKSZ, - PAGE_SIZE, - VM_MIN_ADDRESS, - VM_MAXUSER_ADDRESS, - USRSTACK, - PS_STRINGS, - VM_PROT_ALL, - exec_copyout_strings, - exec_setregs, - NULL + .sv_size = SYS_MAXSYSCALL, + .sv_table = sysent, + .sv_mask = 0, + .sv_sigsize = 0, + .sv_sigtbl = NULL, + .sv_errsize = 0, + .sv_errtbl = NULL, + .sv_transtrap = NULL, + .sv_fixup = __elfN(freebsd_fixup), + .sv_sendsig = sendsig, + .sv_sigcode = sigcode, + .sv_szsigcode = &szsigcode, + .sv_prepsyscall = NULL, + .sv_name = "FreeBSD ELF32", + .sv_coredump = __elfN(coredump), + .sv_imgact_try = NULL, + .sv_minsigstksz = MINSIGSTKSZ, + .sv_pagesize = PAGE_SIZE, + .sv_minuser = VM_MIN_ADDRESS, + .sv_maxuser = VM_MAXUSER_ADDRESS, + .sv_usrstack = USRSTACK, + .sv_psstrings = PS_STRINGS, + .sv_stackprot = VM_PROT_ALL, + .sv_copyout_strings = exec_copyout_strings, + .sv_setregs = exec_setregs, + .sv_fixlimit = NULL, + .sv_maxssiz = NULL }; static Elf32_Brandinfo freebsd_brand_info = { - ELFOSABI_FREEBSD, - EM_ARM, - "FreeBSD", - NULL, - "/libexec/ld-elf.so.1", - &elf32_freebsd_sysvec, - NULL, - BI_CAN_EXEC_DYN, - }; + .brand = ELFOSABI_FREEBSD, + .machine = EM_ARM, + .compat_3_brand = "FreeBSD", + .emul_path = NULL, + .interp_path = "/libexec/ld-elf.so.1", + .sysvec = &elf32_freebsd_sysvec, + .interp_newpath = NULL, + .flags = BI_CAN_EXEC_DYN, +}; SYSINIT(elf32, SI_SUB_EXEC, SI_ORDER_ANY, (sysinit_cfunc_t) elf32_insert_brand_entry, &freebsd_brand_info); static Elf32_Brandinfo freebsd_brand_oinfo = { - ELFOSABI_FREEBSD, - EM_ARM, - "FreeBSD", - NULL, - "/usr/libexec/ld-elf.so.1", - &elf32_freebsd_sysvec, - NULL, - BI_CAN_EXEC_DYN, - }; + .brand = ELFOSABI_FREEBSD, + .machine = EM_ARM, + .compat_3_brand = "FreeBSD", + .emul_path = NULL, + .interp_path = "/usr/libexec/ld-elf.so.1", + .sysvec = &elf32_freebsd_sysvec, + .interp_newpath = NULL, + .flags = BI_CAN_EXEC_DYN, +}; SYSINIT(oelf32, SI_SUB_EXEC, SI_ORDER_ANY, (sysinit_cfunc_t) elf32_insert_brand_entry, ==== //depot/projects/mpsafetty/sys/compat/ia32/ia32_sysvec.c#2 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/ia32/ia32_sysvec.c,v 1.27 2007/09/24 20:49:39 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/ia32/ia32_sysvec.c,v 1.28 2008/09/24 10:14:37 kib Exp $"); #include "opt_compat.h" @@ -111,61 +111,61 @@ TUNABLE_ULONG("compat.ia32.maxvmem", &ia32_maxvmem); struct sysentvec ia32_freebsd_sysvec = { - FREEBSD32_SYS_MAXSYSCALL, - freebsd32_sysent, - 0, - 0, - NULL, - 0, - NULL, - NULL, - elf32_freebsd_fixup, - ia32_sendsig, - ia32_sigcode, - &sz_ia32_sigcode, - NULL, - "FreeBSD ELF32", - elf32_coredump, - NULL, - MINSIGSTKSZ, - IA32_PAGE_SIZE, - 0, - FREEBSD32_USRSTACK, - FREEBSD32_USRSTACK, - FREEBSD32_PS_STRINGS, - VM_PROT_ALL, - ia32_copyout_strings, - ia32_setregs, - ia32_fixlimit, - &ia32_maxssiz + .sv_size = FREEBSD32_SYS_MAXSYSCALL, + .sv_table = freebsd32_sysent, + .sv_mask = 0, + .sv_sigsize = 0, >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Sep 24 14:55:50 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 41B711065672; Wed, 24 Sep 2008 14:55:50 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D8210106568B for ; Wed, 24 Sep 2008 14:55:49 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id C59BA8FC2B for ; Wed, 24 Sep 2008 14:55:49 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id m8OEtn92017664 for ; Wed, 24 Sep 2008 14:55:49 GMT (envelope-from rene@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m8OEtnwh017662 for perforce@freebsd.org; Wed, 24 Sep 2008 14:55:49 GMT (envelope-from rene@FreeBSD.org) Date: Wed, 24 Sep 2008 14:55:49 GMT Message-Id: <200809241455.m8OEtnwh017662@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rene@FreeBSD.org using -f From: Rene Ladan To: Perforce Change Reviews Cc: Subject: PERFORCE change 150384 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 24 Sep 2008 14:55:50 -0000 http://perforce.freebsd.org/chv.cgi?CH=150384 Change 150384 by rene@rene_self on 2008/09/24 14:55:32 MFen security/chapter.sgml 1.284 -> 1.330 (plus local fixes) Checked build, spelling, whitespace (fixed a few hundred indenation errors) Affected files ... .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/security/chapter.sgml#3 edit Differences ... ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/security/chapter.sgml#3 (text+ko) ==== @@ -3,7 +3,9 @@ $FreeBSD: doc/nl_NL.ISO8859-1/books/handbook/security/chapter.sgml,v 1.14 2006/05/20 15:43:41 remko Exp $ $FreeBSDnl: doc/nl_NL.ISO8859-1/books/handbook/security/chapter.sgml,v 1.80 2006/01/05 21:13:24 siebrand Exp $ - gebaseerd op: 1.284 + + %SOURCE% en_US.ISO8859-1/books/handbook/security/chapter.sgml + %SRCID% 1.330 --> @@ -36,7 +38,7 @@ systeembeveiligingsconcepten, een aantal goede basisregels en een paar gevorderde onderwerpen binnen &os;. Veel van de onderwerpen die worden behandeld kunnen ook worden toegepast op - systemen en internet in het algemeen. Het internet is niet + systemen en Internet in het algemeen. Het Internet is niet langer een vriendelijke omgeving waar iedereen een goede buur wil zijn. Het beveiligen van een systeem is onontbeerlijk als gegevens, intellectueel eigendom, tijd en wat @@ -52,65 +54,65 @@ Van basis systeembeveiligingsconcepten in relatie tot - &os;; + &os;. Meer over verschillende versleutelingsmechanismen die beschikbaar zijn in &os; zoals DES en - MD5; + MD5. - Hoe eenmalige wachtwoordauthenticatie opgezet kan - worden; + Hoe eenmalige wachtwoordautenticatie opgezet kan + worden. Hoe TCP Wrappers in te stellen voor - gebruik met inetd; + gebruik met inetd. Hoe KerberosIV op &os; - releases eerder dan 5.0 opgezet kan worden; + uitgaven eerder dan 5.0 opgezet kan worden. - Hoe Kerberos5 op &os; 5.0 - release en verder opgezet kan worden; + Hoe Kerberos5 op &os; opgezet + kan worden. Hoe IPsec wordt ingesteld en hoe een VPN op te zetten tussen &os; en - µsoft.windows; machines; + µsoft.windows; machines. Hoe OpenSSH, &os;'s SSH implementatie, in te stellen en te - gebruiken; + gebruiken. - Wat filesysteem ACLs zijn en hoe + Wat bestandssysteem-ACLs zijn en hoe die te gebruiken; Hoe het hulpprogramma Portaudit gebruikt kan worden om - softwarepakketten uit de Portscollectie te auditen; + softwarepakketten uit de Portscollectie te auditen. Hoe om te gaan met publicaties van &os; - beveiligingswaarschuwingen; + beveiligingswaarschuwingen. - Iets van Procesaccounting en hoe dat is in te schakelen + Iets van procesaccounting en hoe dat is in te schakelen in &os;. @@ -119,7 +121,7 @@ - Basisbegrip heeft van &os; en internetconcepten. + Basisbegrip heeft van &os; en Internetconcepten. @@ -134,7 +136,7 @@ Introductie Beveiliging is een taak die begint en eindigt bij de - systeembeheerder. Hoewel alle BSD &unix; multi-user systemen + systeembeheerder. Hoewel alle BSD &unix; meergebruikerssystemen enige inherente beveiliging kennen, is het bouwen en onderhouden van additionele beveiligingsmechanismen om de gebruikers eerlijk te houden waarschijnlijk een van de @@ -150,21 +152,6 @@ netwerken en internetwerken, wordt beveiliging nog belangrijker. - Beveiliging kan het beste ingesteld worden door een gelaagde - ui-aanpak. In een notendop zijn er het beste net - zoveel lagen van beveiliging als handig is en daarna dient het - systeem zorgvuldig gemonitord te worden op inbraken. Het is niet - wenselijk beveiliging te overontwerpen, want dat doet afbreuk aan - de detectiemogelijkheden en detectie is een van de belangrijkste - aspecten van beveiligingsmechanismen. Zo heeft het bijvoorbeeld - weinig zin om de schg vlaggen (zie - &man.chflags.1;) op ieder binair bestand op een systeem te - zetten, omdat het, hoewel dit misschien tijdelijk binaire - bestanden beschermt, een inbreker in een systeem ervan kan - weerhouden een eenvoudig te detecteren wijziging te maken - waardoor beveiligingsmaatregelen de inbreker misschien - helemaal niet ontdekken. - Systeembeveiliging heeft ook te maken met het omgaan met verschillende vormen van aanvallen, zoals een poging om een systeem te crashen of op een andere manier onstabiel te maken, @@ -175,7 +162,7 @@ Ontzeggen van dienst aanvallen (Denial of - service). + Service). @@ -226,14 +213,14 @@ ongunstige omstandigheden. Omgaan met brute kracht aanvallen is lastiger. Zo is een aanval met gefingeerde pakketten (spoofed-packet) vrijwel niet te stoppen, behalve - dan door het systeem van internet los te koppelen. Misschien + dan door het systeem van Internet los te koppelen. Misschien gaat de machine er niet door plat, maar het kan wel een volledige - internetverbinding verzadigen. + Internetverbinding verzadigen. beveiliging - account compromittering + account compromitteren Een gecompromitteerde gebruikersaccount komt nog veel vaker @@ -279,7 +266,7 @@ root wachtwoord kunnen kennen, een bug kunnen ontdekken in een dienst die onder root draait en daar via een netwerkverbinding op in kunnen breken of - een aanvaller zou een probleem kunnen met een suid-root programma + een aanvaller zou een probleem kennen met een suid-root programma dat de aanvaller in staat stelt root te worden als hij eenmaal toegang heeft tot een gebruikersaccount. Als een aanvaller een manier heeft gevonden om @@ -309,7 +296,7 @@ Beveiligen van root – servers - onder root en suid/sgid binaire + onder root en suid-/sgid-binaire bestanden. @@ -363,7 +350,7 @@ In de volgende onderdelen behandelen we de methodes uit de vorige paragraaf om een - &os; systeem te beveiligen. + &os;-systeem te beveiligen. Beveiligen van <username>root</username> en @@ -421,7 +408,7 @@ <filename>/etc/group</filename>. Alleen medewerkers die ook echt toegang tot <username>root</username> nodig hebben horen in de groep <groupname>wheel</groupname> geplaatst te worden. - Het is ook mogelijk, door een authenticatiemethode als Kerberos + Het is ook mogelijk, door een autenticatiemethode als Kerberos te gebruiken, om het bestand <filename>.k5login</filename> van Kerberos in de <username>root</username> account te gebruiken om een &man.ksu.1; naar <username>root</username> toe te staan @@ -436,70 +423,48 @@ <groupname>wheel</groupname>-mechanisme beter is dan niets, is het niet per se de meest veilige optie.</para> - <!-- XXX: - This will need updating depending on the outcome of PR - bin/71147. Personally I know what I'd like to see, which - puts this in definite need of a rewrite, but we'll have to - wait and see. ceri@ - --> + <para>Om een account volledig op slot te zetten, dient het + commando &man.pw.8; gebruikt te worden:</para> + + <screen>&prompt.root; <userinput>pw lock <replaceable>staff</replaceable></userinput></screen> - <para>Een indirecte manier om de medewerkersaccounts te - beveiligen en uiteindelijk ook de toegang tot - <username>root</username>, is het gebruik van alternatieve - aanmeldmethodes en de wachtwoorden van de medewerkersaccounts, - zoals het heet <quote>uit te sterren</quote>. Met &man.vipw.8; - kan iedere instantie van een gecodeerd wachtwoord vervangen - worden door een enkel <quote><literal>*</literal></quote> - karakter. Met dit commando worden - <filename>/etc/master.passwd</filename> en de - gebruikers/wachtwoord database bijgewerkt om het aanmelden met - wachtwoord uit te schakelen.</para> + <para>Dit voorkomt dat de gebruiker zich aanmeldt via enig + mechanisme, inclusief &man.ssh.1;.</para> - <para>Een regel voor een medewerkersaccount als:</para> + <para>Een andere manier om toegang tot accounts te blokkeren is om + het versleutelde wachtwoord door een enkel + <quote><literal>*</literal></quote>-karakter te vervangen. Dit + karakter zal nooit overeenkomen met het versleutelde wachtwoord + en dus gebruikerstoegang blokkeren. Het volgende + medewerkersaccount bijvoorbeeld:</para> <programlisting>foobar:R9DT/Fa1/LV9U:1000:1000::0:0:Foo Bar:/home/foobar:/usr/local/bin/tcsh</programlisting> - <para>Zou veranderd moeten worden naar:</para> + <para>zou veranderd moeten worden in:</para> <programlisting>foobar:*:1000:1000::0:0:Foo Bar:/home/foobar:/usr/local/bin/tcsh</programlisting> - <para>Door deze wijziging kan niet langer normaal aangemeld - worden omdat het gecodeerde wachtwoord nooit gelijk is aan de - <quote><literal>*</literal></quote>. Nu dit is gebeurd, moeten - medewerkers een ander mechanisme gebruiken om zich te - authenticeren zoals &man.kerberos.1; of &man.ssh.1; met een - publiek/privaat sleutelpaar. Bij het gebruik van iets als - Kerberos moeten gewoonlijk de machines waarop de Kerberos - server draait en het desktop werkstation beveiligd worden. Bij - het gebruik van een publiek/privaat sleutelpaar met ssh, moet - in het algemeen de machine <emphasis>van</emphasis> waar wordt - aangemeld beveiligd worden (meestal een werkstation). Het is - mogelijk nog een beveiligingslaag toe te voegen door het - sleutelpaar te beschermen met een wachtwoord als het aan te - maken met &man.ssh-keygen.1;. Door accounts van medewerkers - <quote>uit te sterren</quote> is het ook gegarandeerd dat ze - alleen aan kunnen melden door gebruik te maken van de veilige - toegangsmethodes die de beheerder heeft ingesteld. Hierdoor - worden alle medewerkers gedwongen veilige, gecodeerde - verbindingen te gebruiken voor al hun sessies. Daarmee wordt - een belangrijk beveiligingsgat gesloten dat veel indringers - gebruiken: snuffelen aan het netwerk vanaf een niet-relevante - minder veilige machine.</para> + <para>Dit voorkomt dat de gebruiker <username>foobar</username> + zich aanmeldt met conventionele methoden. Deze methode om + toegang te beperken werkt niet op sites die + <application>Kerberos</application> gebruiken of in situaties + waarin de gebruiker met &man.ssh.1; sleutels heeft + geïnstalleerd.</para> - <para>Meer indirecte beveiligingsmechanismen hebben ook als - uitgangspunt dat vanaf een zwaarder beveiligde machine wordt - aangemeld op een minder beveiligd systeem. Als een - hoofdserver bijvoorbeeld allerlei servers draait, zou het - werkstation er geen moeten draaien. Om een werkstation - redelijk veilig te laten zijn, dienen er zo min mogelijk - servers op te draaien, bij voorkeur zelfs geen en er zou een - schermbeveiliging met wachtwoordbeveiliging op moeten draaien. - Maar als een aanvaller fysieke toegang heeft tot een - werkstation, dan kan hij elke beveiliging die erop is - aangebracht omzeilen. Dit probleem dient echt overwogen te - worden, net als het feit dat de meeste aanvallen van een - afstand plaatsvinden, via het netwerk, door mensen die geen - fysieke toegang hebben tot werkstations of servers.</para> + <para>Deze beveiligingsmechanismen hebben ook als uitgangspunt dat + vanaf een zwaarder beveiligde machine wordt aangemeld op een + minder beveiligd systeem. Als een hoofdserver bijvoorbeeld + allerlei servers draait, zou het werkstation er geen moeten + draaien. Om een werkstation redelijk veilig te laten zijn, + dienen er zo min mogelijk servers op te draaien, bij voorkeur + zelfs geen en er zou een schermbeveiliging met + wachtwoordbeveiliging op moeten draaien. Maar als een aanvaller + fysieke toegang heeft tot een werkstation, dan kan hij elke + beveiliging die erop is aangebracht omzeilen. Dit probleem + dient echt overwogen te worden, net als het feit dat de meeste + aanvallen van een afstand plaatsvinden, via het netwerk, door + mensen die geen fysieke toegang hebben tot werkstations of + servers.</para> <indexterm><primary>KerberosIV</primary></indexterm> @@ -522,7 +487,7 @@ <sect2> <title>Beveiligen van <username>root</username> – servers - onder <username>root</username> en suid/sgid binaire + onder <username>root</username> en suid-/sgid-binaire bestanden ntalk @@ -599,25 +564,25 @@ inbraak via die servers te detecteren. De andere grote mogelijkheid voor root - gaten in een systeem zijn de suid-root en sgid binaire + gaten in een systeem zijn de suid-root en sgid-binaire bestanden die geïnstalleerd zijn op een systeem. Veel van die bestanden, zoals rlogin, staan in /bin, /sbin, /usr/bin of /usr/sbin. Hoewel het niet 100% veilig - is, mag aangenomen worden dat de suid en sgid binaire bestanden + is, mag aangenomen worden dat de suid- en sgid-binaire bestanden van een standaardsysteem redelijk veilig zijn. Toch worden er nog wel eens root gaten gevonden in deze bestanden. Zo is er in 1998 een root gat gevonden in Xlib waardoor xterm (die normaliter suid is) kwetsbaar bleek. Een voorzichtige systeembeheerder kiest voor - better to be safe than sorry door de suid - bestanden die alleen medewerkers hoeven uit te voeren aan een - speciale groep toe te wijzen en de suid bestanden die niemand - gebruikt te lozen (chmod 000). Een server - zonder monitor heeft normaal gezien - xterm niet nodig. Sgid bestanden + better to be safe than sorry door de + suid-bestanden die alleen medewerkers hoeven uit te voeren aan + een speciale groep toe te wijzen en de suid-bestanden die + niemand gebruikt te lozen (chmod 000). Een + server zonder monitor heeft normaal gezien + xterm niet nodig. Sgid-bestanden kunnen bijna net zo gevaarlijk zijn. Als een inbreker een sgid-kmem stuk kan krijgen, dan kan hij wellicht /dev/kmem lezen en dus het gecodeerde @@ -631,7 +596,7 @@ bijna alle tty's van gebruikers schrijven. Als een gebruiker een terminalprogramma of een terminalemulator met een toetsenbordsimulatieoptie draait, dan kan de inbreker in - potentie een datastroom genereren die ervoor zorgt dat de + potentie een gegevensstroom genereren die ervoor zorgt dat de terminal van de gebruiker een commando echot, dat dan wordt uitgevoerd door die gebruiker. @@ -640,7 +605,7 @@ Beveiligen van gebruikersaccounts Gebruikersaccounts zijn gewoonlijk het meest lastig om te - beveiligen. Hoewel er allerlei Draconische maatregelen genomen + beveiligen. Hoewel er allerlei draconische maatregelen genomen kunnen worden met betrekking tot de medewerkers en hun wachtwoorden weggesterd kunnen worden, gaat dat waarschijnlijk niet lukken met de gewone gebruikersaccounts. @@ -652,14 +617,14 @@ Kerberos voor gebruikersaccounts is problematischer vanwege het extra beheer en de ondersteuning, maar nog steeds een prima oplossing in vergelijking met een - gecodeerd wachtwoordbestand. + versleuteld wachtwoordbestand. Beveiligen van het wachtwoordbestand De enige echte oplossing is zoveel mogelijk wachtwoorden - * maken en ssh + wegsterren en ssh of Kerberos gebruiken voor toegang tot die accounts. Hoewel een gecodeerd wachtwoordbestand (/etc/spwd.db) alleen gelezen kan worden @@ -680,7 +645,7 @@ Als een aanvaller toegang krijgt tot root dan kan hij ongeveer alles, maar er zijn een paar slimmigheidjes. Zo hebben bijvoorbeeld de meeste - moderne kernels een ingebouwde pakketsnuffeldriver + moderne kernels een ingebouwd pakketsnuffelstuurprogramma (packet sniffing). Bij &os; is dat het bpf apparaat. Een inbreker zal in het algemeen proberen een pakketsnuffelaar te draaien op een @@ -697,9 +662,9 @@ /dev/kmem. De inbreker kan namelijk nog schrijven naar ruwe schrijfapparaten. En er is ook nog een optie in de kernel die modulelader (module - loader) heet, &man.kldload.8;. Een ondernemende - inbreker kan een KLD module gebruiken om zijn eigen - bpf apparaat of een ander + loader) heet, &man.kldload.8;. Een ondernemende + inbreker kan een KLD-module gebruiken om zijn eigen + bpf-apparaat of een ander snuffelapparaat te installeren in een draaiende kernel. Om deze problemen te voorkomen, moet de kernel op een hoger veiligheidsniveau draaien, ten minste securelevel 1. Het @@ -717,11 +682,11 @@ draaien maar de schg vlag niet op alle systeembestanden en mappen te zetten die maar te vinden zijn. / en /usr zouden ook - als alleen-lezen gemount kunnen worden. Het is nog belangrijk - om op te merken dat als de beheerder te Draconisch omgaat - met dat wat hij wil beschermen, hij daardoor kan veroorzaken - dat die o-zo belangrijke detectie van een inbraak wordt - misgelopen. + als alleen-lezen aangekoppeld kunnen worden. Het is nog + belangrijk om op te merken dat als de beheerder te draconisch + omgaat met dat wat hij wil beschermen, hij daardoor kan + veroorzaken dat die o-zo belangrijke detectie van een inbraak + wordt misgelopen. @@ -738,83 +703,81 @@ detectie plaats kan vinden is gesloten. De laatste laag van beveiliging is waarschijnlijk de meest belangrijke: detectie. Alle overige beveiliging is vrijwel waardeloos (of nog erger: - geeft een vals gevoel van veiligheid) als een mogelijke inbraak + geeft een vals gevoel van beveiliging) als een mogelijke inbraak niet gedetecteerd kan worden. Een belangrijk doel van het meerlagenmodel is het vertragen van een aanvaller, nog meer dan - hem te stoppen, om de detectiekant van de vergelijking de kans - te geven hem op heterdaad te betrappen. + hem te stoppen, om hem op heterdaad te kunnen betrappen. De beste manier om te zoeken naar een inbraak is zoeken - naar gewijzigde, missende of onverwachte bestanden. De beste + naar gewijzigde, ontbrekende of onverwachte bestanden. De beste manier om te zoeken naar gewijzigde bestanden is vanaf een ander (vaak gecentraliseerd) systeem met beperkte toegang. Met zelfgeschreven scripts op dat extra beveiligde systeem met - beperkte toegang ben is een beheerder vrijwel onzichtbaar voor + beperkte toegang is een beheerder vrijwel onzichtbaar voor mogelijke aanvallers en dat is belangrijk. Om het nut te maximaliseren moeten in het algemeen dat systeem met beperkte toegang best veel rechten gegeven worden op de andere machines - in het netwerk, vaak via een alleen-lezen NFS export van de + in het netwerk, vaak via een alleen-lezen NFS-export van de andere machines naar het systeem met beperkte toegang of door ssh sleutelparen in te stellen om het systeem met beperkte toegang een ssh verbinding te laten maken met de andere machines. Buiten het netwerkverkeer, is NFS de minst zichtbare methode. Hierdoor kunnen de bestandssystemen - op alle client machines vrijwel ongezien gemonitord worden. - Als de server met beperkte toegang verbonden is met de client - machines via een switch, dan is de NFS methode vaak de beste - keus. Als de server met beperkte toegang met de andere + op alle cliëntmachines vrijwel ongezien gemonitord worden. + Als de server met beperkte toegang verbonden is met de + cliëntmachines via een switch, dan is de NFS-methode vaak + de beste keus. Als de server met beperkte toegang met de andere machines is verbonden via een hub of door meerdere routers, dan - is de NFS methode wellicht niet veilig genoeg (vanuit een + is de NFS-methode wellicht niet veilig genoeg (vanuit een netwerk standpunt) en kan beter ssh gebruikt worden, ondanks de audit-sporen die ssh achterlaat. Als de machine met beperkte toegang eenmaal minstens - leestoegang heeft tot een clientsysteem dat het moet gaan + leestoegang heeft tot een cliëntsysteem dat het moet gaan monitoren, dan moeten scripts gemaakt worden om dat monitoren - ook echt uit te voeren. Uitgaande van een NFS mount, kunnen + ook echt uit te voeren. Uitgaande van een NFS-koppeling, kunnen de scripts gebruik maken van eenvoudige systeem hulpprogramma's als &man.find.1; en &man.md5.1;. We adviseren minstens één keer per dag een md5 te maken van alle - bestanden op de clientmachine en van instellingenbestanden als - in /etc en + bestanden op de cliëntmachine en van instellingenbestanden + als in /etc en /usr/local/etc zelfs vaker. Als er verschillen worden aangetroffen ten opzichte van de basis md5 informatie op het systeem met beperkte toegang, dan hoort het script te gillen om een beheerder die het moet gaan uitzoeken. - Een goed beveiligingsscript controleert ook op onverwachte suid - bestanden en op nieuwe en verwijderde bestanden op + Een goed beveiligingsscript controleert ook op onverwachte + suid-bestanden en op nieuwe en verwijderde bestanden op systeempartities als / en /usr. Als ssh in plaats van NFS wordt gebruikt, dan is het schrijven van het script lastiger. Dan - moeten de scripts met scp naar de client + moeten de scripts met scp naar de cliënt verplaatst worden om ze uit te voeren, waardoor ze zichtbaar worden. Voor de veiligheid dienen ook de binaire bestanden die het script gebruikt, zoals &man.find.1;, gekopieerd te - worden. De ssh client op de client - zou al gecompromitteerd kunnen zijn. Het is misschien - noodzakelijk ssh te gebruiken over onveilige verbindingen, maar - dat maakt alles een stuk lastiger. + worden. De ssh-cliënt op de + cliënt zou al gecompromitteerd kunnen zijn. Het is + misschien noodzakelijk ssh te gebruiken over onveilige + verbindingen, maar dat maakt alles een stuk lastiger. Een goed beveiligingsscript voert ook controles uit op de instellingenbestanden van gebruikers en medewerkers: .rhosts, .shosts, - .ssh/authorized_keys, enzovoort… + .ssh/authorized_keys, enzovoort. Dat zijn bestanden die buiten het bereik van de - MD5 controle vallen. + MD5-controle vallen. - Als gebruikers veel schijfruimte hebben, dan kan het te - lang duren om alle bestanden op deze partitie te controleren. - In dat geval is het verstandig de mount vlaggen zo in te - stellen dat suid binaire bestanden en apparaten op die - partities niet zijn toegestaan. Zie daarvoor de - nodev en nosuid opties - (zie &man.mount.8;). Die partities moeten wel toch nog - minstens eens per week doorzocht worden, omdat het doel van - deze beveiligingslaag het ontdekken van een inbraak is, of die + Als gebruikers veel schijfruimte hebben, dan kan het te lang + duren om alle bestanden op deze partitie te controleren. In dat + geval is het verstandig de koppelvlaggen zo in te stellen dat + suid-binaire bestanden op die partities niet zijn toegestaan. + Zie daarvoor de optie nosuid (zie + &man.mount.8;). Die partities moeten wel toch nog minstens eens + per week doorzocht worden, omdat het doel van deze + beveiligingslaag het ontdekken van een inbraakpoging is, of die nu succesvol is of niet. Procesverantwoording (zie &man.accton.8;) kost relatief @@ -826,12 +789,12 @@ Tenslotte horen beveiligingsscripts de logboekbestanden te verwerken en de logboekbestanden zelf horen zo veilig mogelijk tot stand te komen. remote syslog kan erg - zinvol zijn. Een aanvaller probeert zijn sporen uit te wissen - en logboekbestanden zijn van groot belang voor een + zinvol zijn. Een aanvaller zal proberen zijn sporen uit te + wissen en logboekbestanden zijn van groot belang voor een systeembeheerder als het gaat om uitzoeken wanneer en hoe er is ingebroken. Een manier om logboekbestanden veilig te stellen is door het systeemconsole via een seriële poort aan te - sluiten op een veilige machine en zo continu informatie te + sluiten op een veilige machine en zo informatie te verzamelen. @@ -857,32 +820,32 @@ Ontzegging van Dienst (DoS) In deze paragraaf worden Ontzeggen van Dienst aanvallen - (Denial of Service of DoS) behandeld. Een DoS - aanval wordt meestal uitgevoerd als pakketaanval. Hoewel er + (Denial of Service of DoS) behandeld. Een + DoS-aanval wordt meestal uitgevoerd als pakketaanval. Hoewel er weinig gedaan kan worden tegen de huidige aanvallen met gefingeerde pakketten die een netwerk kunnen verzadigen, kan de schade geminimaliseerd worden door ervoor te zorgen dat - servers er niet door plat gaan. + servers er niet door plat gaan door: Limiteren van server forks. - - Limiteren van springplank (springboard) - aanvallen (ICMP response aanvallen, ping broadcast, - etc.). - + + Limiteren van springplank (springboard) + aanvallen (ICMP response aanvallen, ping broadcast, etc.). + - - Kernel Route Cache. + + De Kernel Route Cache overloaden. - Een veelvoorkomende DoS aanval tegen een server die forkt - is er een die probeert processen, file descriptors en geheugen - te gebruiken tot de machine het opgeeft. + Een veelvoorkomende DoS-aanval is om een server aan te + vallen door het zoveel kindprocessen aan te laten maken dat het + het hostsysteem uiteindelijk geen bestandsdescriptors, geheugen + enzovoort meer heeft en het dan opgeeft. inetd (zie &man.inetd.8;) kent een aantal instellingen om dit type aanval af te zwakken. Hoewel het mogelijk is ervoor te zorgen dat een machine niet plat @@ -900,14 +863,16 @@ Sendmail heeft de optie die veel beter blijkt te - werken dan het gebruik van de opties van sendmail waarmee de - werklast gelimitteerd kan worden. De parameter + werken dan het gebruik van de opties van + Sendmail waarmee de werklast + gelimiteerd kan worden. De parameter MaxDaemonChildren moet zodanig ingesteld - worden dat als sendmail start, hij + worden dat als sendmail start; deze hoog genoeg is om de te verwachten belasting aan te kunnen, maar niet zo hoog is dat de computer het aantal instanties van - sendmails niet aankan zonder plat te - gaan. Het is ook verstandig om sendmail in de wachtrij modus + Sendmails niet aankan zonder plat te + gaan. Het is ook verstandig om + Sendmail in de wachtrijmodus () te draaien en de daemon (sendmail -bd) los te koppelen van de verwerking van de wachtrij (sendmail -q15m). @@ -916,8 +881,8 @@ bijvoorbeeld op in te stellen, maar dan is een redelijke instelling van MaxDaemonChildren van belang om - die sendmail te beschermen tegen - trapsgewijze fouten (cascade failures). + die Sendmail te + beschermen tegen trapsgewijze fouten. Syslogd kan direct aangevallen worden en het is sterk aan te raden de @@ -939,13 +904,13 @@ aanval op root via het netwerk en die diensten daaraan voorkomen. Er dient altijd een exclusieve firewall te zijn, d.w.z. firewall alles - behalve poorten A, B, C, D en M-Z. + behalve poorten A, B, C, D en M-Z. Zo worden alle lage poorten gefirewalled behalve die voor specifieke diensten als named (als er een primary is voor een zone), ntalkd, sendmail en andere diensten die - vanaf internet toegankelijk moeten zijn. Als de firewall + vanaf Internet toegankelijk moeten zijn. Als de firewall andersom wordt ingesteld, als een inclusieve of tolerante firewall, dan is de kans groot dat er wordt vergeten een aantal diensten af te sluiten of dat er een nieuwe @@ -957,52 +922,51 @@ dynamische verbindingen in te stellen via de verscheidene net.inet.ip.portrange sysctls (sysctl -a | fgrep - portrange), waardoor ook de complexiteit van de + portrange), waardoor ook de complexiteit van de firewall instellingen kan vereenvoudigen. Zo kan bijvoorbeeld een normaal begin tot eindbereik ingesteld worden van 4000 tot 5000 en een hoog poortbereik van 49152 tot 65535. Daarna kan alles onder 4000 op de firewall geblokkeerd worden (met - uitzondering van bepaalde poorten die vanaf internet bereikbaar + uitzondering van bepaalde poorten die vanaf Internet bereikbaar moeten zijn natuurlijk). - Een andere veelvoorkomende DoS aanval is de springplank - aanval: een server zo aanvallen dat de respons van die server - de server zelf, het lokale netwerk of een andere machine - overbelast. De meest voorkomende aanval van dit type is de - ICMP ping broadcast aanval. De aanvaller - fingeert ping pakketten die naar het broadcast adres van het - LAN worden gezonden met als bron het IP adres - van de machine die hij eigenlijk aan wil vallen. Als de routers - aan de rand van het netwerk niet zijn ingesteld om een ping aan - een broadcast adres te blokkeren, dan kan het LAN genoeg - antwoorden produceren om de verbinding van het slachtoffer (het - gefingeerde bronadres) te verzadigen, zeker als de aanvaller - hetzelfde doet met tientallen andere netwerken. - Broadcastaanvallen met een volume van meer dan 120 megabit zijn - al voorgekomen. Een tweede springplank aanval is er een tegen - het ICMP foutmeldingssysteem. Door een pakket te maken waarop - een ICMP foutmelding komt, kan een aanvaller de inkomende - verbinding van een server verzadigen en de uitgaande verbinding - wordt verzadigd door de foutmeldingen. Dit type aanval kan een - server ook laten crashen, zeker als de server de ICMP - antwoorden niet zo snel kwijt kan als ze ontstaan. - &os; 4.X kernels kennen een compileeroptie - waarmee de effectiviteit van dit - type aanvallen afneemt. Latere kernels gebruiken de - sysctl variabele - net.inet.icmp.icmplim. De laatste - belangrijke klasse springplankaanvallen hangt samen met een - aantal interne diensten van inetd - zoals de UDP echo dienst. Een aanvaller fingeert eenvoudigweg - een UDP pakket met als bronadres de echopoort van Server A en - als bestemming de echopoort van Server B, waar Server A en B - allebei op een LAN staan. Die twee servers gaan dat pakket dan - heen en weer kaatsen. Een aanvaller kan beide servers - overbelasten door een aantal van deze pakketten te injecteren. - Soortgelijke problemen kunnen ontstaan met de - chargen poort. Een competente - systeembeheerder zal al deze interne - inetd test-diensten + Een andere veelvoorkomende DoS-aanval is de + springplankaanval: een server zo aanvallen dat de respons van + die server de server zelf, het lokale netwerk of een andere + machine overbelast. De meest voorkomende aanval van dit type is + de ICMP ping broadcast aanval. De + aanvaller fingeert ping-pakketten die naar het broadcast-adres + van het LAN worden gezonden met als bron het + IP-adres van de machine die hij eigenlijk aan + wil vallen. Als de routers aan de rand van het netwerk niet + zijn ingesteld om een ping-pakketten aan een broadcast-adres te + blokkeren, dan kan het LAN genoeg antwoorden produceren om de + verbinding van het slachtoffer (het gefingeerde bronadres) te + verzadigen, zeker als de aanvaller hetzelfde doet met tientallen + andere netwerken. Broadcastaanvallen met een volume van meer + dan 120 megabit zijn al voorgekomen. Een tweede + springplankaanval is er een tegen het ICMP-foutmeldingssysteem. + Door een pakket te maken waarop een ICMP-foutmelding komt, kan + een aanvaller de inkomende verbinding van een server verzadigen + en de uitgaande verbinding laten verzadigen met + ICMP-foutmeldingen. Dit type aanval kan een server ook laten + crashen door te zorgen dat het geheugen ervan vol zit, zeker als + de server de ICMP-antwoorden niet zo snel kwijt kan als dat het + ze genereert. Gebruik de + sysctl-variabele + net.inet.icmp.icmplim om deze aanvallen te + beperken. De laatste belangrijke klasse springplankaanvallen + hangt samen met een aantal interne diensten van + inetd zoals de UDP-echodienst. Een + aanvaller fingeert eenvoudigweg een UDP-pakket met als + bronadres de echopoort van Server A en als bestemming de + echopoort van Server B, waar Server A en B allebei op een LAN + staan. Die twee servers gaan dat pakket dan heen en weer + kaatsen. Een aanvaller kan beide servers overbelasten door een + aantal van deze pakketten te injecteren. Soortgelijke problemen + kunnen ontstaan met de poort chargen. + Een competente systeembeheerder zal al deze interne + inetd testdiensten uitschakelen. Gefingeerde pakketten kunnen ook gebruikt worden om de @@ -1010,11 +974,11 @@ net.inet.ip.rtexpire, rtminexpire en rtmaxcache sysctl parameters. Een aanval met - gefingeerde pakketten met een willekeurig bron IP zorgt ervoor - dat de kernel een tijdelijke cached route maakt in de + gefingeerde pakketten met een willekeurig bron-IP zorgt ervoor + dat de kernel een tijdelijke gecachede route maakt in de routetabel, die uitgelezen kan worden met netstat -rna - | fgrep W3. Deze routes hebben een levensduur van - ongeveer 1600 seconden. Als de kernel merkt dat de cached + | fgrep W3. Deze routes hebben een levensduur van + ongeveer 1600 seconden. Als de kernel merkt dat de gecachede routetabel te groot is geworden, dan wordt rtexpire dynamisch verkleind, maar deze waarde wordt nooit lager dan rtminexpire. @@ -1032,7 +996,7 @@ - Als servers verbonden zijn met het internet via een E3 + Als servers verbonden zijn met het Internet via een E3 of sneller, dan is het verstandig om handmatig rtexpire en rtminexpire aan te passen via &man.sysctl.8;. Als de een van de parameters @@ -1051,16 +1015,16 @@ KerberosIV Er zijn een aantal aandachtspunten die in acht genomen - moeten worden als Kerberos of ssh gebruikt worden. Kerberos V - is een prima authenticatieprotocol, maar er zitten bugs in de - kerberos versies van telnet en + moeten worden als Kerberos of ssh gebruikt worden. Kerberos 5 + is een prima autenticatieprotocol, maar er zitten bugs in de + Kerberos-versies van telnet en rlogin waardoor ze niet geschikt - zijn voor binair verkeer. Kerberos codeert standaard sessie + zijn voor binair verkeer. Kerberos codeert standaard de sessie niet, tenzij de optie wordt gebruikt. ssh codeert standaard wel alles. - ssh werkt prima, maar het stuurt coderingssleutels + Ssh werkt prima, maar het stuurt coderingssleutels standaard door. Dit betekent dat als gegeven een veilig werkstation met sleutels die toegang geven tot de rest van het systeem en ssh wordt gebruikt om verbinding te maken met een @@ -1074,14 +1038,14 @@ Het advies is ssh in combinatie met Kerberos te gebruiken voor het aanmelden door medewerkers wanneer dat ook maar - mogelijk is. ssh kan gecompileerd - worden met Kerberos ondersteuning. Dit vermindert de kans op - blootstelling van ssh sleutels en beschermt tegelijkertijd - de wachtwoorden met Kerberos. ssh sleutels zouden alleen + mogelijk is. Ssh kan gecompileerd + worden met Kerberos-ondersteuning. Dit vermindert de kans op + blootstelling van ssh-sleutels en beschermt tegelijkertijd + de wachtwoorden met Kerberos. Ssh-sleutels zouden alleen gebruikt moeten worden voor geautomatiseerde taken vanaf veilige machines (iets waar Kerberos ongeschikt voor is). Het advies is om het doorsturen van sleutels uit te schakelen in de - ssh instellingen of om de from=IP/DOMAIN + ssh-instellingen of om de from=IP/DOMAIN optie te gebruiken die ssh in staat stelt het bestand authorized_keys te gebruiken om de sleutel alleen bruikbaar te maken voor entiteiten die zich @@ -1098,17 +1062,10 @@ Delen geschreven en herschreven door - - - Siebrand - Mazeland - Vertaald door - - - DES, MD5 en crypt + DES, Blowfish, MD5, en crypt beveiliging @@ -1118,6 +1075,8 @@ crypt + Blowfish + DES MD5 @@ -1132,7 +1091,7 @@ woorden, wat net gesteld werd is helemaal niet waar: het besturingssysteem kent het echte wachtwoord niet. De enige manier om een wachtwoord in platte - tekst te verkrijgen, is door er met brute kracht naar + tekst te verkrijgen, is door er met brute kracht naar te zoeken in alle mogelijke wachtwoorden. Helaas was DES, de Data Encryption Standard, de enige @@ -1154,38 +1113,34 @@ houden. - Het crypt mechanisme herkennen + Het crypt-mechanisme herkennen - Voor &os; 4.4 was libcrypt.a een - symbolic link die wees naar de bibliotheek die gebruikt werd voor - codering. In &os; 4.4 veranderde libcrypt.a - zodat er een instelbare wachtwoordhash bibliotheek kwam. Op dit - moment ondersteunt de bibliotheek DES, MD5 en Blowfish - hashfuncties. Standaard gebruikt &os; MD5 om wachtwoorden te - coderen. + Op dit moment ondersteunt de bibliotheek DES, MD5 en + Blowfish hashfuncties. Standaard gebruikt &os; MD5 om + wachtwoorden te coderen. - Het is vrij makkelijk om uit te vinden welke - coderingsmethode &os; op een bepaald moment gebruikt. De - gecodeerde wachtwoorden in - /etc/master.passwd bekijken is een manier. - Wachtwoorden die gecodeerd zijn met MD5 zijn langer dan wanneer - ze gecodeerd zijn met DES hash. Daarnaast beginnen ze met de - karakters $1$. Wachtwoorden - die beginnen met $2a$ zijn - gecodeerd met de Blowfish hashfunctie. DES password strings - hebben geen bijzondere kenmerken, maar ze zijn korter dan MD5 - wachtwoorden en gecodeerd in een 64-karakter alfabet waar geen - $ karakter in zit. Een relatief korte - string die niet begint met een dollar teken is dus - waarschijnlijk een DES wachtwoord. + Het is vrij makkelijk om uit te vinden welke + coderingsmethode &os; op een bepaald moment gebruikt. De + gecodeerde wachtwoorden in + /etc/master.passwd bekijken is een manier. + Wachtwoorden die gecodeerd zijn met MD5 zijn langer dan wanneer + ze gecodeerd zijn met DES-hash. Daarnaast beginnen ze met de + karakters $1$. Wachtwoorden + die beginnen met $2a$ zijn + gecodeerd met de Blowfish hashfunctie. DES-wachtwoordstrings + hebben geen bijzondere kenmerken, maar ze zijn korter dan MD5 + wachtwoorden en gecodeerd in een 64-karakter alfabet waar geen + $ karakter in zit. Een relatief korte + string die niet begint met een dollar teken is dus + waarschijnlijk een DES-wachtwoord. - Het wachtwoord formaat voor nieuwe wachtwoorden wordt - ingesteld met de passwd_format - aanmeldinstelling in /etc/login.conf waar - des, md5 of - blf mag staan. Zie de &man.login.conf.5; - handleiding voor meer informatie over - aanmeldinstellingen. + Het wachtwoordformaat voor nieuwe wachtwoorden wordt + ingesteld met de passwd_format + aanmeldinstelling in /etc/login.conf waar + des, md5 of + blf mag staan. Zie de &man.login.conf.5; + handleiding voor meer informatie over + aanmeldinstellingen. @@ -1200,129 +1155,95 @@ eenmalige wachtwoorden - S/Key is een eenmalige wachtwoord methode die gebaseerd is op - de eenweg hashfunctie. &os; gebruikt een MD4 hash om aansluiting - te houden, maar andere systemen gebruiken ook wel MD5 en DES-MAC. - S/Key is al een onderdeel van het &os; basissysteem vanaf versie - 1.1.5 en wordt ook in een groeiend aantal andere - besturingssystemen gebruikt. S/Key is een geregistreerd - handelsmerk van Bell Communications Research, Inc. + Standaard biedt &os; ondersteuning voor OPIE (Eenmalige + Wachtwoorden in Alles - One-time Passwords In + Everything), wat standaard een MD5-hash gebruikt. - Vanaf versie 5.0 van &os; is S/Key vervangen door OPIE - (Eenmalige Wachtwoorden in Alles - One-time Passwords In - Everything). OPIE gebruikt standaard een MD5 hash. - Hier worden drie verschillende soorten wachtwoorden besproken. De eerste is het normale &unix; of Kerberos wachtwoord. Dit heet het &unix; wachtwoord. Het tweede type is een eenmalig wachtwoord dat wordt gemaakt met het - S/Key programma key of het OPIE - programma &man.opiekey.1; en dat wordt geaccepteerd door - keyinit of &man.opiepasswd.1; en de - aanmeldprocedure. Dit heet het eenmalige - wachtwoord. Het laatste type wachtwoord is het - wachtwoord dat wordt opgegeven aan de key/ - opiekey programma's (en soms aan de - keyinit / opiepasswd - programma's) die gebruikt worden om eenmalige wachtwoorden te - maken. Dit type heet geheim wachtwoord of gewoon - een wachtwoord zonder toevoeging. + OPIE-programma &man.opiekey.1; en dat wordt geaccepteerd door + &man.opiepasswd.1; en de aanmeldprocedure. Dit heet het + eenmalige wachtwoord. Het laatste type wachtwoord + is het wachtwoord dat wordt opgegeven aan het programma + opiekey (en soms aan het programma + opiepasswd) dat gebruikt wordt om eenmalige + wachtwoorden te maken. Dit type heet geheim + wachtwoord of gewoon een wachtwoord zonder + toevoeging. Het geheime wachtwoord heeft niets te maken met het &unix; - wachtwoord; ze kunnen hetzelfde zijn, dat wordt afgeraden. S/Key - en OPIE geheime wachtwoorden kennen niet de beperking van 8 - karakters als de oude &unix; wachtwoorden. + wachtwoord; ze kunnen hetzelfde zijn, dat wordt afgeraden. + OPIE geheime wachtwoorden kennen niet de beperking van 8 + karakters zoals de oude &unix; wachtwoorden. Bij &os; mag het wachtwoord voor aanmelden tot 128 karakters lang zijn. - Het mag onbeperkt lang zijn. Wachtwoorden van een zes of zeven + Ze mogen onbeperkt lang zijn. Wachtwoorden van een zes of zeven woorden lange zin zijn niet ongewoon. Voor het overgrote deel - werkt het S/Key of OPIE systeem volledig onafhankelijk van het - &unix; wachtwoordsysteem. + werkt het OPIE-systeem volledig onafhankelijk van het &unix; + wachtwoordsysteem. - Buiten het wachtwoord zijn er nog twee stukjes data die van - belang zijn voor S/Key en OPIE. Het eerste wordt - zaad (seed) of - sleutel (key) genoemd en bestaat - uit twee letters en vijf cijfers. Het tweede stukje data heet de - iteratieteller (iteration count), - een nummer tussen 1 en 100. S/Key maakt een eenmalig wachtwoord - door het zaad en het geheime wachtwoord aaneen te schakelen en - daarop het door de iteratieteller aangegeven keren MD4/MD5 hash - toe te passen. Daarna wordt het resultaat omgezet in zes korte - Engelse woorden. Die zes woorden zijn een eenmalige wachtwoord. - Het authenticatiesysteem (hoofdzakelijk PAM) houdt bij welk >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Sep 24 16:08:03 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 960DA1065684; Wed, 24 Sep 2008 16:08:03 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 56AD01065674 for ; Wed, 24 Sep 2008 16:08:03 +0000 (UTC) (envelope-from thompsa@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 44BDE8FC19 for ; Wed, 24 Sep 2008 16:08:03 +0000 (UTC) (envelope-from thompsa@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id m8OG83gQ059604 for ; Wed, 24 Sep 2008 16:08:03 GMT (envelope-from thompsa@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m8OG83Fm059598 for perforce@freebsd.org; Wed, 24 Sep 2008 16:08:03 GMT (envelope-from thompsa@freebsd.org) Date: Wed, 24 Sep 2008 16:08:03 GMT Message-Id: <200809241608.m8OG83Fm059598@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to thompsa@freebsd.org using -f From: Andrew Thompson To: Perforce Change Reviews Cc: Subject: PERFORCE change 150386 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 24 Sep 2008 16:08:03 -0000 http://perforce.freebsd.org/chv.cgi?CH=150386 Change 150386 by thompsa@thompsa_burger on 2008/09/24 16:07:33 Add more descriptive ddb output. 'show ttys' has been renamed to 'show all ttys' and 'show tty ' added. Affected files ... .. //depot/projects/mpsafetty/sys/kern/tty.c#46 edit Differences ... ==== //depot/projects/mpsafetty/sys/kern/tty.c#46 (text+ko) ==== @@ -1739,6 +1739,7 @@ #include "opt_ddb.h" #ifdef DDB #include +#include static struct { int flag; @@ -1774,14 +1775,141 @@ { 0, '\0' }, }; +#define TTY_FLAG_BITS \ + "\20\1NOPREFIX\2INITLOCK\3CALLOUT\4OPENED_IN\5OPENED_OUT\6GONE" \ + "\7OPENCLOSE\10ASYNC\11LITERAL\12HIWAT_IN\13HIWAT_OUT\14STOPPED" \ + "\15EXCLUDE\16BYPASS\17ZOMBIE\20HOOK" + +#define DB_PRINTSYM(name, addr) \ + db_printf("%s " #name ": ", sep); \ + db_printsym((db_addr_t) addr, DB_STGY_ANY); \ + db_printf("\n"); + +static void +_db_show_devsw(const char *sep, const struct ttydevsw *tsw) +{ + db_printf("%sdevsw: ", sep); + db_printsym((db_addr_t)tsw, DB_STGY_ANY); + db_printf(" (%p)\n", tsw); + DB_PRINTSYM(open, tsw->tsw_open); + DB_PRINTSYM(close, tsw->tsw_close); + DB_PRINTSYM(outwakeup, tsw->tsw_outwakeup); + DB_PRINTSYM(inwakeup, tsw->tsw_inwakeup); + DB_PRINTSYM(ioctl, tsw->tsw_ioctl); + DB_PRINTSYM(param, tsw->tsw_param); + DB_PRINTSYM(modem, tsw->tsw_modem); + DB_PRINTSYM(mmap, tsw->tsw_mmap); + DB_PRINTSYM(pktnotify, tsw->tsw_pktnotify); + DB_PRINTSYM(free, tsw->tsw_free); +} +static void +_db_show_hooks(const char *sep, const struct ttyhook *th) +{ + db_printf("%shook: ", sep); + db_printsym((db_addr_t)th, DB_STGY_ANY); + db_printf(" (%p)\n", th); + if (th == NULL) + return; + DB_PRINTSYM(rint, th->th_rint); + DB_PRINTSYM(rint_bypass, th->th_rint_bypass); + DB_PRINTSYM(rint_done, th->th_rint_done); + DB_PRINTSYM(rint_poll, th->th_rint_poll); + DB_PRINTSYM(getc_inject, th->th_getc_inject); + DB_PRINTSYM(getc_capture, th->th_getc_capture); + DB_PRINTSYM(getc_poll, th->th_getc_poll); + DB_PRINTSYM(close, th->th_close); +} + /* DDB command to show TTY statistics. */ -DB_SHOW_COMMAND(ttys, db_show_ttys) +DB_SHOW_COMMAND(tty, db_show_tty) +{ + struct tty *tp; + size_t isiz, osiz; + + if (!have_addr) { + db_printf("usage: show tty \n"); + return; + } + tp = (struct tty *)addr; + isiz = tp->t_inq.ti_nblocks * TTYINQ_DATASIZE; + osiz = tp->t_outq.to_nblocks * TTYOUTQ_DATASIZE; + + db_printf("0x%p: %s\n", tp, tty_devname(tp)); + db_printf("\tmtx: %p\n", tp->t_mtx); + db_printf("\tflags: %b\n", tp->t_flags, TTY_FLAG_BITS); + db_printf("\trevokecnt: %u\n", tp->t_revokecnt); + + /* Buffering mechanisms. */ + db_printf("\tinq: %p begin %u linestart %u reprint %u end %u " + "nblocks %u quota %u\n", &tp->t_inq, tp->t_inq.ti_begin, + tp->t_inq.ti_linestart, tp->t_inq.ti_reprint, tp->t_inq.ti_end, + tp->t_inq.ti_nblocks, tp->t_inq.ti_quota); + db_printf("\toutq: %p begin %u end %u nblocks %u quota %u\n", + &tp->t_outq, tp->t_outq.to_begin, tp->t_outq.to_end, + tp->t_outq.to_nblocks, tp->t_outq.to_quota); + db_printf("\tinlow: %zu\n", tp->t_inlow); + db_printf("\toutlow: %zu\n", tp->t_outlow); + db_printf("\ttermios: iflag 0x%x oflag 0x%x cflag 0x%x lflag 0x%x\n", + tp->t_termios.c_iflag, tp->t_termios.c_oflag, tp->t_termios.c_cflag, + tp->t_termios.c_lflag); + db_printf("\twinsize: row %u col %u xpixel %u ypixel %u\n", + tp->t_winsize.ws_row, tp->t_winsize.ws_col, + tp->t_winsize.ws_xpixel, tp->t_winsize.ws_ypixel); + db_printf("\tcolumn: %u\n", tp->t_column); + db_printf("\twritepos: %u\n", tp->t_writepos); + db_printf("\tcompatflags: 0x%x\n", tp->t_compatflags); + + /* Init/lock-state devices. */ + db_printf("\ttermios_init_in: iflag 0x%x oflag 0x%x cflag 0x%x lflag " + "0x%x\n", tp->t_termios_init_in.c_iflag, + tp->t_termios_init_in.c_oflag, tp->t_termios_init_in.c_cflag, + tp->t_termios_init_in.c_lflag); + db_printf("\ttermios_init_out: iflag 0x%x oflag 0x%x cflag 0x%x lflag " + "0x%x\n", tp->t_termios_init_out.c_iflag, + tp->t_termios_init_out.c_oflag, tp->t_termios_init_out.c_cflag, + tp->t_termios_init_out.c_lflag); + db_printf("\ttermios_lock_in: iflag 0x%x oflag 0x%x cflag 0x%x lflag " + "0x%x\n", tp->t_termios_lock_in.c_iflag, + tp->t_termios_lock_in.c_oflag, tp->t_termios_lock_in.c_cflag, + tp->t_termios_lock_in.c_lflag); + db_printf("\ttermios_lock_out: iflag 0x%x oflag 0x%x cflag 0x%x lflag " + "0x%x\n", tp->t_termios_lock_out.c_iflag, + tp->t_termios_lock_out.c_oflag, tp->t_termios_lock_out.c_cflag, + tp->t_termios_lock_out.c_lflag); + + /* Hooks */ + _db_show_devsw("\t", tp->t_devsw); + _db_show_hooks("\t", tp->t_hook); + + /* Process info. */ + db_printf("\tpgrp: %p gid %d jobc %d\n", tp->t_pgrp, + tp->t_pgrp ? tp->t_pgrp->pg_id : 0, + tp->t_pgrp ? tp->t_pgrp->pg_jobc : 0); + db_printf("\tsession: %p", tp->t_session); + if (tp->t_session != NULL) + db_printf(" count %u leader %p tty %p sid %d login %s", + tp->t_session->s_count, tp->t_session->s_leader, + tp->t_session->s_ttyp, tp->t_session->s_sid, + tp->t_session->s_login); + db_printf("\n"); + db_printf("\tsessioncnt: %u\n", tp->t_sessioncnt); + db_printf("\tdevswsoftc: %p\n", tp->t_devswsoftc); + db_printf("\thooksoftc: %p\n", tp->t_hooksoftc); + db_printf("\tdev: %p\n", tp->t_dev); +} + +/* DDB command to list TTYs. */ +DB_SHOW_ALL_COMMAND(ttys, db_show_all_ttys) { struct tty *tp; size_t isiz, osiz; int i, j; /* Make the output look like `pstat -t'. */ + db_printf("PTR "); +#if defined(__LP64__) + db_printf(" "); +#endif db_printf(" LINE INQ CAN LIN LOW OUTQ USE LOW " "COL SESS PGID STATE\n"); @@ -1789,7 +1917,8 @@ isiz = tp->t_inq.ti_nblocks * TTYINQ_DATASIZE; osiz = tp->t_outq.to_nblocks * TTYOUTQ_DATASIZE; - db_printf("%10s %5zu %4u %4u %4zu %5zu %4u %4zu %5u %5d %5d ", + db_printf("%p %10s %5zu %4u %4u %4zu %5zu %4u %4zu %5u %5d %5d ", + tp, tty_devname(tp), isiz, tp->t_inq.ti_linestart - tp->t_inq.ti_begin, From owner-p4-projects@FreeBSD.ORG Wed Sep 24 16:20:16 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5ED4F1065689; Wed, 24 Sep 2008 16:20:16 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 175651065688 for ; Wed, 24 Sep 2008 16:20:16 +0000 (UTC) (envelope-from thompsa@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 071B58FC21 for ; Wed, 24 Sep 2008 16:20:16 +0000 (UTC) (envelope-from thompsa@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id m8OGKFh5029683 for ; Wed, 24 Sep 2008 16:20:16 GMT (envelope-from thompsa@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m8OGKFDA029677 for perforce@freebsd.org; Wed, 24 Sep 2008 16:20:15 GMT (envelope-from thompsa@freebsd.org) Date: Wed, 24 Sep 2008 16:20:15 GMT Message-Id: <200809241620.m8OGKFDA029677@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to thompsa@freebsd.org using -f From: Andrew Thompson To: Perforce Change Reviews Cc: Subject: PERFORCE change 150387 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 24 Sep 2008 16:20:16 -0000 http://perforce.freebsd.org/chv.cgi?CH=150387 Change 150387 by thompsa@thompsa_burger on 2008/09/24 16:19:48 isiz and osiz never ended up being used. Affected files ... .. //depot/projects/mpsafetty/sys/kern/tty.c#47 edit Differences ... ==== //depot/projects/mpsafetty/sys/kern/tty.c#47 (text+ko) ==== @@ -1824,15 +1824,12 @@ DB_SHOW_COMMAND(tty, db_show_tty) { struct tty *tp; - size_t isiz, osiz; if (!have_addr) { db_printf("usage: show tty \n"); return; } tp = (struct tty *)addr; - isiz = tp->t_inq.ti_nblocks * TTYINQ_DATASIZE; - osiz = tp->t_outq.to_nblocks * TTYOUTQ_DATASIZE; db_printf("0x%p: %s\n", tp, tty_devname(tp)); db_printf("\tmtx: %p\n", tp->t_mtx); From owner-p4-projects@FreeBSD.ORG Wed Sep 24 16:44:41 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 434521065685; Wed, 24 Sep 2008 16:44:41 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 064D51065679 for ; Wed, 24 Sep 2008 16:44:41 +0000 (UTC) (envelope-from taleks@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id D11FC8FC0C for ; Wed, 24 Sep 2008 16:44:40 +0000 (UTC) (envelope-from taleks@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id m8OGieP9089041 for ; Wed, 24 Sep 2008 16:44:40 GMT (envelope-from taleks@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m8OGieCR089039 for perforce@freebsd.org; Wed, 24 Sep 2008 16:44:40 GMT (envelope-from taleks@FreeBSD.org) Date: Wed, 24 Sep 2008 16:44:40 GMT Message-Id: <200809241644.m8OGieCR089039@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to taleks@FreeBSD.org using -f From: Alexey Tarasov To: Perforce Change Reviews Cc: Subject: PERFORCE change 150388 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 24 Sep 2008 16:44:41 -0000 http://perforce.freebsd.org/chv.cgi?CH=150388 Change 150388 by taleks@taleks_th on 2008/09/24 16:44:27 Project to test idea of mapping devd notifies to dbus. Affected files ... .. //depot/projects/soc2007/taleks-pxe_http/acpi_sony/acpi_sony.c#1 add .. //depot/projects/soc2007/taleks-pxe_http/acpi_sony/acpi_sony.h#1 add .. //depot/projects/soc2007/taleks-pxe_http/devd2dbus/bsdbus.c#1 add .. //depot/projects/soc2007/taleks-pxe_http/devd2dbus/bsdbus.h#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Wed Sep 24 17:14:11 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 228B01065689; Wed, 24 Sep 2008 17:14:11 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id DBC821065681 for ; Wed, 24 Sep 2008 17:14:10 +0000 (UTC) (envelope-from ed@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id CB5938FC16 for ; Wed, 24 Sep 2008 17:14:10 +0000 (UTC) (envelope-from ed@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id m8OHEA1U082039 for ; Wed, 24 Sep 2008 17:14:10 GMT (envelope-from ed@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m8OHEAQC082037 for perforce@freebsd.org; Wed, 24 Sep 2008 17:14:10 GMT (envelope-from ed@FreeBSD.org) Date: Wed, 24 Sep 2008 17:14:10 GMT Message-Id: <200809241714.m8OHEAQC082037@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to ed@FreeBSD.org using -f From: Ed Schouten To: Perforce Change Reviews Cc: Subject: PERFORCE change 150389 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 24 Sep 2008 17:14:11 -0000 http://perforce.freebsd.org/chv.cgi?CH=150389 Change 150389 by ed@ed_dull on 2008/09/24 17:13:16 Print baud rates in debugging output. Affected files ... .. //depot/projects/mpsafetty/sys/kern/tty.c#48 edit Differences ... ==== //depot/projects/mpsafetty/sys/kern/tty.c#48 (text+ko) ==== @@ -1820,6 +1820,16 @@ DB_PRINTSYM(close, th->th_close); } +static void +_db_show_termios(const char *name, const struct termios *t) +{ + + db_printf("%s: iflag 0x%x oflag 0x%x cflag 0x%x " + "lflag 0x%x ispeed %u ospeed %u\n", name, + t->c_iflag, t->c_oflag, t->c_cflag, t->c_lflag, + t->c_ispeed, t->c_ospeed); +} + /* DDB command to show TTY statistics. */ DB_SHOW_COMMAND(tty, db_show_tty) { @@ -1846,9 +1856,7 @@ tp->t_outq.to_nblocks, tp->t_outq.to_quota); db_printf("\tinlow: %zu\n", tp->t_inlow); db_printf("\toutlow: %zu\n", tp->t_outlow); - db_printf("\ttermios: iflag 0x%x oflag 0x%x cflag 0x%x lflag 0x%x\n", - tp->t_termios.c_iflag, tp->t_termios.c_oflag, tp->t_termios.c_cflag, - tp->t_termios.c_lflag); + _db_show_termios("\ttermios", &tp->t_termios); db_printf("\twinsize: row %u col %u xpixel %u ypixel %u\n", tp->t_winsize.ws_row, tp->t_winsize.ws_col, tp->t_winsize.ws_xpixel, tp->t_winsize.ws_ypixel); @@ -1857,22 +1865,10 @@ db_printf("\tcompatflags: 0x%x\n", tp->t_compatflags); /* Init/lock-state devices. */ - db_printf("\ttermios_init_in: iflag 0x%x oflag 0x%x cflag 0x%x lflag " - "0x%x\n", tp->t_termios_init_in.c_iflag, - tp->t_termios_init_in.c_oflag, tp->t_termios_init_in.c_cflag, - tp->t_termios_init_in.c_lflag); - db_printf("\ttermios_init_out: iflag 0x%x oflag 0x%x cflag 0x%x lflag " - "0x%x\n", tp->t_termios_init_out.c_iflag, - tp->t_termios_init_out.c_oflag, tp->t_termios_init_out.c_cflag, - tp->t_termios_init_out.c_lflag); - db_printf("\ttermios_lock_in: iflag 0x%x oflag 0x%x cflag 0x%x lflag " - "0x%x\n", tp->t_termios_lock_in.c_iflag, - tp->t_termios_lock_in.c_oflag, tp->t_termios_lock_in.c_cflag, - tp->t_termios_lock_in.c_lflag); - db_printf("\ttermios_lock_out: iflag 0x%x oflag 0x%x cflag 0x%x lflag " - "0x%x\n", tp->t_termios_lock_out.c_iflag, - tp->t_termios_lock_out.c_oflag, tp->t_termios_lock_out.c_cflag, - tp->t_termios_lock_out.c_lflag); + _db_show_termios("\ttermios_init_in", &tp->t_termios_init_in); + _db_show_termios("\ttermios_init_out", &tp->t_termios_init_out); + _db_show_termios("\ttermios_lock_in", &tp->t_termios_lock_in); + _db_show_termios("\ttermios_lock_out", &tp->t_termios_lock_out); /* Hooks */ _db_show_devsw("\t", tp->t_devsw); From owner-p4-projects@FreeBSD.ORG Wed Sep 24 17:28:26 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B77A810656B0; Wed, 24 Sep 2008 17:28:26 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7AA6710656AC for ; Wed, 24 Sep 2008 17:28:26 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 67D778FC0A for ; Wed, 24 Sep 2008 17:28:26 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id m8OHSQuO071911 for ; Wed, 24 Sep 2008 17:28:26 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m8OHSPY6071909 for perforce@freebsd.org; Wed, 24 Sep 2008 17:28:25 GMT (envelope-from hselasky@FreeBSD.org) Date: Wed, 24 Sep 2008 17:28:25 GMT Message-Id: <200809241728.m8OHSPY6071909@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 150390 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 24 Sep 2008 17:28:26 -0000 http://perforce.freebsd.org/chv.cgi?CH=150390 Change 150390 by hselasky@hselasky_laptop001 on 2008/09/24 17:27:57 IFC @ 150385 Affected files ... .. //depot/projects/usb/src/sys/amd64/amd64/elf_machdep.c#3 integrate .. //depot/projects/usb/src/sys/amd64/amd64/identcpu.c#8 integrate .. //depot/projects/usb/src/sys/amd64/include/pmc_mdep.h#4 integrate .. //depot/projects/usb/src/sys/amd64/linux32/linux32_sysvec.c#9 integrate .. //depot/projects/usb/src/sys/arm/arm/elf_machdep.c#3 integrate .. //depot/projects/usb/src/sys/boot/Makefile#6 integrate .. //depot/projects/usb/src/sys/boot/ofw/libofw/Makefile#4 integrate .. //depot/projects/usb/src/sys/boot/ofw/libofw/ofw_console.c#4 integrate .. //depot/projects/usb/src/sys/cam/cam.h#2 integrate .. //depot/projects/usb/src/sys/cddl/compat/opensolaris/kern/opensolaris_atomic.c#2 integrate .. //depot/projects/usb/src/sys/cddl/compat/opensolaris/sys/atomic.h#3 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c#3 integrate .. //depot/projects/usb/src/sys/compat/freebsd32/freebsd32_ioctl.c#1 branch .. //depot/projects/usb/src/sys/compat/freebsd32/freebsd32_ioctl.h#1 branch .. //depot/projects/usb/src/sys/compat/freebsd32/freebsd32_misc.c#9 integrate .. //depot/projects/usb/src/sys/compat/freebsd32/freebsd32_proto.h#9 integrate .. //depot/projects/usb/src/sys/compat/freebsd32/freebsd32_syscall.h#9 integrate .. //depot/projects/usb/src/sys/compat/freebsd32/freebsd32_syscalls.c#9 integrate .. //depot/projects/usb/src/sys/compat/freebsd32/freebsd32_sysent.c#9 integrate .. //depot/projects/usb/src/sys/compat/freebsd32/syscalls.master#9 integrate .. //depot/projects/usb/src/sys/compat/ia32/ia32_sysvec.c#6 integrate .. //depot/projects/usb/src/sys/compat/linux/linux_misc.c#13 integrate .. //depot/projects/usb/src/sys/compat/ndis/ntoskrnl_var.h#5 integrate .. //depot/projects/usb/src/sys/compat/svr4/svr4_stream.c#4 integrate .. //depot/projects/usb/src/sys/compat/svr4/svr4_sysvec.c#4 integrate .. //depot/projects/usb/src/sys/conf/NOTES#19 integrate .. //depot/projects/usb/src/sys/conf/files#35 integrate .. //depot/projects/usb/src/sys/conf/files.amd64#10 integrate .. //depot/projects/usb/src/sys/conf/files.i386#13 integrate .. //depot/projects/usb/src/sys/conf/files.ia64#8 integrate .. //depot/projects/usb/src/sys/conf/files.mips#3 integrate .. //depot/projects/usb/src/sys/conf/files.sparc64#8 integrate .. //depot/projects/usb/src/sys/conf/kern.pre.mk#11 integrate .. //depot/projects/usb/src/sys/conf/ldscript.mips#3 integrate .. //depot/projects/usb/src/sys/conf/options.mips#2 integrate .. //depot/projects/usb/src/sys/conf/options.sparc64#4 integrate .. //depot/projects/usb/src/sys/ddb/db_command.c#5 integrate .. //depot/projects/usb/src/sys/ddb/ddb.h#4 integrate .. //depot/projects/usb/src/sys/dev/acpica/acpi_quirk.c#3 integrate .. //depot/projects/usb/src/sys/dev/aic7xxx/aic79xx_osm.c#6 integrate .. //depot/projects/usb/src/sys/dev/ata/ata-chipset.c#14 integrate .. //depot/projects/usb/src/sys/dev/ata/ata-pci.c#8 integrate .. //depot/projects/usb/src/sys/dev/ata/ata-pci.h#12 integrate .. //depot/projects/usb/src/sys/dev/ath/if_ath.c#10 integrate .. //depot/projects/usb/src/sys/dev/ath/if_athvar.h#8 integrate .. //depot/projects/usb/src/sys/dev/bge/if_bge.c#11 integrate .. //depot/projects/usb/src/sys/dev/bm/if_bm.c#4 integrate .. //depot/projects/usb/src/sys/dev/cxgb/common/cxgb_ael1002.c#6 integrate .. //depot/projects/usb/src/sys/dev/cxgb/common/cxgb_common.h#7 integrate .. //depot/projects/usb/src/sys/dev/cxgb/common/cxgb_mc5.c#6 integrate .. //depot/projects/usb/src/sys/dev/cxgb/common/cxgb_mv88e1xxx.c#5 integrate .. //depot/projects/usb/src/sys/dev/cxgb/common/cxgb_t3_hw.c#7 integrate .. //depot/projects/usb/src/sys/dev/cxgb/common/cxgb_tn1010.c#2 integrate .. //depot/projects/usb/src/sys/dev/cxgb/common/cxgb_vsc7323.c#3 integrate .. //depot/projects/usb/src/sys/dev/cxgb/common/cxgb_vsc8211.c#6 integrate .. //depot/projects/usb/src/sys/dev/cxgb/common/cxgb_xgmac.c#7 integrate .. //depot/projects/usb/src/sys/dev/cxgb/cxgb_adapter.h#7 integrate .. //depot/projects/usb/src/sys/dev/cxgb/cxgb_config.h#5 integrate .. //depot/projects/usb/src/sys/dev/cxgb/cxgb_include.h#4 integrate .. //depot/projects/usb/src/sys/dev/cxgb/cxgb_main.c#8 integrate .. //depot/projects/usb/src/sys/dev/cxgb/cxgb_multiq.c#2 integrate .. //depot/projects/usb/src/sys/dev/cxgb/cxgb_offload.c#5 integrate .. //depot/projects/usb/src/sys/dev/cxgb/cxgb_offload.h#5 integrate .. //depot/projects/usb/src/sys/dev/cxgb/cxgb_osdep.h#7 integrate .. //depot/projects/usb/src/sys/dev/cxgb/cxgb_sge.c#7 integrate .. //depot/projects/usb/src/sys/dev/cxgb/cxgb_t3fw.c#2 integrate .. //depot/projects/usb/src/sys/dev/cxgb/sys/cxgb_support.c#2 integrate .. //depot/projects/usb/src/sys/dev/cxgb/sys/mbufq.h#3 integrate .. //depot/projects/usb/src/sys/dev/cxgb/sys/uipc_mvec.c#4 integrate .. //depot/projects/usb/src/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb.c#3 integrate .. //depot/projects/usb/src/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_cm.c#2 integrate .. //depot/projects/usb/src/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_cq.c#2 integrate .. //depot/projects/usb/src/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_dbg.c#2 integrate .. //depot/projects/usb/src/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_ev.c#2 integrate .. //depot/projects/usb/src/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_hal.c#2 integrate .. //depot/projects/usb/src/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_mem.c#2 integrate .. //depot/projects/usb/src/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_provider.c#2 integrate .. //depot/projects/usb/src/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_qp.c#2 integrate .. //depot/projects/usb/src/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_resource.c#2 integrate .. //depot/projects/usb/src/sys/dev/cxgb/ulp/toecore/cxgb_toedev.h#2 integrate .. //depot/projects/usb/src/sys/dev/cxgb/ulp/toecore/toedev.c#3 integrate .. //depot/projects/usb/src/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c#5 integrate .. //depot/projects/usb/src/sys/dev/cxgb/ulp/tom/cxgb_cpl_socket.c#4 integrate .. //depot/projects/usb/src/sys/dev/cxgb/ulp/tom/cxgb_ddp.c#4 integrate .. //depot/projects/usb/src/sys/dev/cxgb/ulp/tom/cxgb_defs.h#3 integrate .. //depot/projects/usb/src/sys/dev/cxgb/ulp/tom/cxgb_l2t.c#3 integrate .. //depot/projects/usb/src/sys/dev/cxgb/ulp/tom/cxgb_l2t.h#2 integrate .. //depot/projects/usb/src/sys/dev/cxgb/ulp/tom/cxgb_listen.c#4 integrate .. //depot/projects/usb/src/sys/dev/cxgb/ulp/tom/cxgb_t3_ddp.h#3 integrate .. //depot/projects/usb/src/sys/dev/cxgb/ulp/tom/cxgb_tcp_offload.c#3 integrate .. //depot/projects/usb/src/sys/dev/cxgb/ulp/tom/cxgb_toepcb.h#3 integrate .. //depot/projects/usb/src/sys/dev/cxgb/ulp/tom/cxgb_tom.c#4 integrate .. //depot/projects/usb/src/sys/dev/cxgb/ulp/tom/cxgb_tom.h#2 integrate .. //depot/projects/usb/src/sys/dev/cxgb/ulp/tom/cxgb_tom_sysctl.c#4 integrate .. //depot/projects/usb/src/sys/dev/cxgb/ulp/tom/cxgb_vm.c#2 integrate .. //depot/projects/usb/src/sys/dev/hwpmc/hwpmc_amd.c#3 integrate .. //depot/projects/usb/src/sys/dev/hwpmc/hwpmc_mod.c#7 integrate .. //depot/projects/usb/src/sys/dev/hwpmc/hwpmc_piv.c#4 integrate .. //depot/projects/usb/src/sys/dev/hwpmc/hwpmc_ppro.c#3 integrate .. //depot/projects/usb/src/sys/dev/hwpmc/hwpmc_x86.c#4 integrate .. //depot/projects/usb/src/sys/dev/jme/if_jme.c#4 integrate .. //depot/projects/usb/src/sys/dev/jme/if_jmereg.h#3 integrate .. //depot/projects/usb/src/sys/dev/kbdmux/kbdmux.c#7 integrate .. //depot/projects/usb/src/sys/dev/pci/vga_pci.c#2 integrate .. //depot/projects/usb/src/sys/dev/ppbus/if_plip.c#5 integrate .. //depot/projects/usb/src/sys/dev/ppbus/lpt.c#3 integrate .. //depot/projects/usb/src/sys/dev/ppbus/ppbconf.c#6 integrate .. //depot/projects/usb/src/sys/dev/ppbus/ppbconf.h#3 integrate .. //depot/projects/usb/src/sys/dev/ppbus/ppi.c#3 integrate .. //depot/projects/usb/src/sys/dev/ppbus/pps.c#3 integrate .. //depot/projects/usb/src/sys/dev/ppc/ppc.c#5 integrate .. //depot/projects/usb/src/sys/dev/ppc/ppc_acpi.c#3 integrate .. //depot/projects/usb/src/sys/dev/ppc/ppc_isa.c#3 integrate .. //depot/projects/usb/src/sys/dev/ppc/ppc_pci.c#2 integrate .. //depot/projects/usb/src/sys/dev/ppc/ppc_puc.c#2 integrate .. //depot/projects/usb/src/sys/dev/ppc/ppcreg.h#3 integrate .. //depot/projects/usb/src/sys/dev/ppc/ppcvar.h#3 integrate .. //depot/projects/usb/src/sys/dev/snp/snp.c#7 integrate .. //depot/projects/usb/src/sys/dev/sound/pci/hda/hda_reg.h#2 integrate .. //depot/projects/usb/src/sys/dev/sound/pci/hda/hdac.c#10 integrate .. //depot/projects/usb/src/sys/dev/sound/pci/hda/hdac_private.h#5 integrate .. //depot/projects/usb/src/sys/dev/usb/if_zyd.c#44 integrate .. //depot/projects/usb/src/sys/dev/usb/ubsa.c#44 integrate .. //depot/projects/usb/src/sys/dev/usb/ufoma.c#43 integrate .. //depot/projects/usb/src/sys/dev/usb/usbdevs#23 integrate .. //depot/projects/usb/src/sys/dev/usb2/core/usbdevs#8 edit .. //depot/projects/usb/src/sys/dev/usb2/include/usb2_devid.h#8 edit .. //depot/projects/usb/src/sys/dev/usb2/include/usb2_devtable.h#8 edit .. //depot/projects/usb/src/sys/dev/usb2/serial/ufoma2.c#9 edit .. //depot/projects/usb/src/sys/fs/devfs/devfs_devs.c#10 integrate .. //depot/projects/usb/src/sys/fs/devfs/devfs_vnops.c#11 integrate .. //depot/projects/usb/src/sys/fs/fdescfs/fdesc_vnops.c#6 integrate .. //depot/projects/usb/src/sys/fs/hpfs/hpfs_vnops.c#6 integrate .. //depot/projects/usb/src/sys/fs/msdosfs/msdosfs_vnops.c#9 integrate .. //depot/projects/usb/src/sys/fs/ntfs/ntfs_vnops.c#5 integrate .. //depot/projects/usb/src/sys/fs/portalfs/portal_vnops.c#6 integrate .. //depot/projects/usb/src/sys/fs/pseudofs/pseudofs_vnops.c#8 integrate .. //depot/projects/usb/src/sys/fs/smbfs/smbfs_node.c#8 integrate .. //depot/projects/usb/src/sys/fs/tmpfs/tmpfs.h#5 integrate .. //depot/projects/usb/src/sys/fs/tmpfs/tmpfs_subr.c#6 integrate .. //depot/projects/usb/src/sys/fs/tmpfs/tmpfs_vnops.c#5 integrate .. //depot/projects/usb/src/sys/fs/udf/udf_vnops.c#7 integrate .. //depot/projects/usb/src/sys/geom/geom_io.c#8 integrate .. //depot/projects/usb/src/sys/gnu/fs/ext2fs/ext2_inode.c#3 integrate .. //depot/projects/usb/src/sys/gnu/fs/xfs/FreeBSD/support/kdb.c#2 integrate .. //depot/projects/usb/src/sys/gnu/fs/xfs/FreeBSD/xfs_vnops.c#6 integrate .. //depot/projects/usb/src/sys/i386/conf/GENERIC#14 integrate .. //depot/projects/usb/src/sys/i386/i386/bios.c#3 integrate .. //depot/projects/usb/src/sys/i386/i386/elf_machdep.c#3 integrate .. //depot/projects/usb/src/sys/i386/i386/identcpu.c#8 integrate .. //depot/projects/usb/src/sys/i386/i386/intr_machdep.c#9 integrate .. //depot/projects/usb/src/sys/i386/i386/pmap.c#12 integrate .. //depot/projects/usb/src/sys/i386/ibcs2/ibcs2_sysvec.c#3 integrate .. //depot/projects/usb/src/sys/i386/include/pmc_mdep.h#4 integrate .. //depot/projects/usb/src/sys/i386/include/specialreg.h#9 integrate .. //depot/projects/usb/src/sys/i386/linux/linux_sysvec.c#6 integrate .. //depot/projects/usb/src/sys/i386/xen/mp_machdep.c#2 integrate .. //depot/projects/usb/src/sys/i386/xen/xen_machdep.c#2 integrate .. //depot/projects/usb/src/sys/ia64/ia64/efi.c#2 integrate .. //depot/projects/usb/src/sys/ia64/ia64/elf_machdep.c#4 integrate .. //depot/projects/usb/src/sys/ia64/ia64/sal.c#2 integrate .. //depot/projects/usb/src/sys/kern/imgact_aout.c#4 integrate .. //depot/projects/usb/src/sys/kern/init_main.c#10 integrate .. //depot/projects/usb/src/sys/kern/kern_intr.c#12 integrate .. //depot/projects/usb/src/sys/kern/kern_pmc.c#3 integrate .. //depot/projects/usb/src/sys/kern/kern_priv.c#4 integrate .. //depot/projects/usb/src/sys/kern/kern_proc.c#10 integrate .. //depot/projects/usb/src/sys/kern/kern_syscalls.c#3 integrate .. //depot/projects/usb/src/sys/kern/subr_clist.c#3 integrate .. //depot/projects/usb/src/sys/kern/subr_pcpu.c#3 integrate .. //depot/projects/usb/src/sys/kern/subr_rman.c#7 integrate .. //depot/projects/usb/src/sys/kern/subr_sleepqueue.c#9 integrate .. //depot/projects/usb/src/sys/kern/subr_turnstile.c#9 integrate .. //depot/projects/usb/src/sys/kern/subr_witness.c#11 integrate .. //depot/projects/usb/src/sys/kern/sys_generic.c#9 integrate .. //depot/projects/usb/src/sys/kern/tty.c#10 integrate .. //depot/projects/usb/src/sys/kern/tty_pts.c#7 integrate .. //depot/projects/usb/src/sys/kern/tty_ttydisc.c#2 integrate .. //depot/projects/usb/src/sys/kern/uipc_mqueue.c#7 integrate .. //depot/projects/usb/src/sys/kern/vfs_bio.c#11 integrate .. //depot/projects/usb/src/sys/kern/vfs_cache.c#9 integrate .. //depot/projects/usb/src/sys/kern/vfs_mount.c#14 integrate .. //depot/projects/usb/src/sys/kern/vfs_vnops.c#11 integrate .. //depot/projects/usb/src/sys/libkern/memcmp.c#1 branch .. //depot/projects/usb/src/sys/mips/adm5120/obio.c#3 integrate .. //depot/projects/usb/src/sys/mips/conf/IDT#4 integrate .. //depot/projects/usb/src/sys/mips/idt/obio.c#3 integrate .. //depot/projects/usb/src/sys/mips/malta/gt_pci.c#3 integrate .. //depot/projects/usb/src/sys/mips/mips/elf_machdep.c#2 integrate .. //depot/projects/usb/src/sys/mips/mips/intr_machdep.c#3 integrate .. //depot/projects/usb/src/sys/mips/mips/support.S#2 integrate .. //depot/projects/usb/src/sys/modules/cxgb/Makefile#6 integrate .. //depot/projects/usb/src/sys/modules/cxgb/cxgb/Makefile#5 integrate .. //depot/projects/usb/src/sys/modules/cxgb/cxgb_t3fw/Makefile#2 integrate .. //depot/projects/usb/src/sys/modules/cxgb/iw_cxgb/Makefile#2 integrate .. //depot/projects/usb/src/sys/modules/cxgb/toecore/Makefile#2 integrate .. //depot/projects/usb/src/sys/modules/cxgb/tom/Makefile#3 integrate .. //depot/projects/usb/src/sys/modules/svr4/Makefile#4 integrate .. //depot/projects/usb/src/sys/modules/wlan/Makefile#6 integrate .. //depot/projects/usb/src/sys/net/if_atmsubr.c#6 integrate .. //depot/projects/usb/src/sys/net/if_clone.c#3 integrate .. //depot/projects/usb/src/sys/net/if_clone.h#3 integrate .. //depot/projects/usb/src/sys/net/if_fwsubr.c#8 integrate .. //depot/projects/usb/src/sys/net/if_iso88025subr.c#6 integrate .. //depot/projects/usb/src/sys/net/if_lagg.c#8 integrate .. //depot/projects/usb/src/sys/net/route.c#10 integrate .. //depot/projects/usb/src/sys/net/route.h#5 integrate .. //depot/projects/usb/src/sys/net80211/ieee80211.h#9 integrate .. //depot/projects/usb/src/sys/net80211/ieee80211_adhoc.c#2 integrate .. //depot/projects/usb/src/sys/net80211/ieee80211_crypto.c#5 integrate .. //depot/projects/usb/src/sys/net80211/ieee80211_crypto.h#5 integrate .. //depot/projects/usb/src/sys/net80211/ieee80211_ddb.c#3 integrate .. //depot/projects/usb/src/sys/net80211/ieee80211_freebsd.c#8 integrate .. //depot/projects/usb/src/sys/net80211/ieee80211_freebsd.h#9 integrate .. //depot/projects/usb/src/sys/net80211/ieee80211_hostap.c#3 integrate .. //depot/projects/usb/src/sys/net80211/ieee80211_ht.c#8 integrate .. //depot/projects/usb/src/sys/net80211/ieee80211_ht.h#6 integrate .. //depot/projects/usb/src/sys/net80211/ieee80211_ioctl.c#10 integrate .. //depot/projects/usb/src/sys/net80211/ieee80211_ioctl.h#7 integrate .. //depot/projects/usb/src/sys/net80211/ieee80211_node.c#10 integrate .. //depot/projects/usb/src/sys/net80211/ieee80211_node.h#7 integrate .. //depot/projects/usb/src/sys/net80211/ieee80211_output.c#10 integrate .. //depot/projects/usb/src/sys/net80211/ieee80211_sta.c#3 integrate .. //depot/projects/usb/src/sys/net80211/ieee80211_var.h#9 integrate .. //depot/projects/usb/src/sys/net80211/ieee80211_wds.c#2 integrate .. //depot/projects/usb/src/sys/netgraph/netgraph.h#7 integrate .. //depot/projects/usb/src/sys/netgraph/ng_base.c#11 integrate .. //depot/projects/usb/src/sys/netgraph/ng_source.c#4 integrate .. //depot/projects/usb/src/sys/netinet/if_ether.c#11 integrate .. //depot/projects/usb/src/sys/netinet/in_rmx.c#8 integrate .. //depot/projects/usb/src/sys/netinet/in_var.h#7 integrate .. //depot/projects/usb/src/sys/netinet/ip_fw.h#8 integrate .. //depot/projects/usb/src/sys/netinet/ip_fw2.c#12 integrate .. //depot/projects/usb/src/sys/netinet/tcp_input.c#12 integrate .. //depot/projects/usb/src/sys/netinet/tcp_output.c#12 integrate .. //depot/projects/usb/src/sys/netinet/tcp_subr.c#11 integrate .. //depot/projects/usb/src/sys/netinet/tcp_syncache.c#14 integrate .. //depot/projects/usb/src/sys/netinet6/udp6_usrreq.c#12 integrate .. //depot/projects/usb/src/sys/netipx/ipx.c#5 integrate .. //depot/projects/usb/src/sys/nfsclient/nfs_vfsops.c#12 integrate .. //depot/projects/usb/src/sys/nfsclient/nfs_vnops.c#11 integrate .. //depot/projects/usb/src/sys/nfsserver/nfs.h#6 integrate .. //depot/projects/usb/src/sys/nfsserver/nfs_serv.c#10 integrate .. //depot/projects/usb/src/sys/nfsserver/nfs_srvsock.c#7 integrate .. //depot/projects/usb/src/sys/nfsserver/nfs_srvsubs.c#8 integrate .. //depot/projects/usb/src/sys/nfsserver/nfs_syscalls.c#8 integrate .. //depot/projects/usb/src/sys/powerpc/aim/clock.c#4 integrate .. //depot/projects/usb/src/sys/powerpc/aim/machdep.c#4 integrate .. //depot/projects/usb/src/sys/powerpc/aim/mmu_oea.c#4 integrate .. //depot/projects/usb/src/sys/powerpc/aim/mp_cpudep.c#2 integrate .. //depot/projects/usb/src/sys/powerpc/aim/swtch.S#3 integrate .. //depot/projects/usb/src/sys/powerpc/aim/trap_subr.S#3 integrate .. //depot/projects/usb/src/sys/powerpc/booke/machdep.c#4 integrate .. //depot/projects/usb/src/sys/powerpc/include/cpufunc.h#4 integrate .. //depot/projects/usb/src/sys/powerpc/include/dbdma.h#2 integrate .. //depot/projects/usb/src/sys/powerpc/include/md_var.h#6 integrate .. //depot/projects/usb/src/sys/powerpc/include/pmap.h#4 integrate .. //depot/projects/usb/src/sys/powerpc/include/pte.h#3 integrate .. //depot/projects/usb/src/sys/powerpc/include/smp.h#3 integrate .. //depot/projects/usb/src/sys/powerpc/include/spr.h#4 integrate .. //depot/projects/usb/src/sys/powerpc/ofw/ofw_syscons.c#2 integrate .. //depot/projects/usb/src/sys/powerpc/powermac/dbdma.c#2 integrate .. //depot/projects/usb/src/sys/powerpc/powermac/dbdmavar.h#2 integrate .. //depot/projects/usb/src/sys/powerpc/powerpc/autoconf.c#4 integrate .. //depot/projects/usb/src/sys/powerpc/powerpc/cpu.c#5 integrate .. //depot/projects/usb/src/sys/powerpc/powerpc/elf_machdep.c#3 integrate .. //depot/projects/usb/src/sys/powerpc/powerpc/mp_machdep.c#4 integrate .. //depot/projects/usb/src/sys/powerpc/powerpc/openpic.c#6 integrate .. //depot/projects/usb/src/sys/powerpc/powerpc/syncicache.c#3 integrate .. //depot/projects/usb/src/sys/security/mac_bsdextended/mac_bsdextended.c#8 integrate .. //depot/projects/usb/src/sys/sparc64/include/smp.h#6 integrate .. //depot/projects/usb/src/sys/sparc64/include/tick.h#3 integrate .. //depot/projects/usb/src/sys/sparc64/pci/psycho.c#9 integrate .. //depot/projects/usb/src/sys/sparc64/pci/psychoreg.h#4 integrate .. //depot/projects/usb/src/sys/sparc64/sparc64/elf_machdep.c#5 integrate .. //depot/projects/usb/src/sys/sparc64/sparc64/genassym.c#5 integrate .. //depot/projects/usb/src/sys/sparc64/sparc64/intr_machdep.c#7 integrate .. //depot/projects/usb/src/sys/sparc64/sparc64/mp_machdep.c#7 integrate .. //depot/projects/usb/src/sys/sparc64/sparc64/tick.c#4 integrate .. //depot/projects/usb/src/sys/sys/clist.h#3 integrate .. //depot/projects/usb/src/sys/sys/interrupt.h#7 integrate .. //depot/projects/usb/src/sys/sys/libkern.h#7 integrate .. //depot/projects/usb/src/sys/sys/mount.h#10 integrate .. //depot/projects/usb/src/sys/sys/param.h#14 integrate .. //depot/projects/usb/src/sys/sys/pmckern.h#3 integrate .. //depot/projects/usb/src/sys/sys/priv.h#8 integrate .. //depot/projects/usb/src/sys/sys/proc.h#11 integrate .. //depot/projects/usb/src/sys/sys/procfs.h#3 integrate .. //depot/projects/usb/src/sys/sys/sysent.h#7 integrate .. //depot/projects/usb/src/sys/sys/tty.h#5 integrate .. //depot/projects/usb/src/sys/sys/ttydevsw.h#2 integrate .. //depot/projects/usb/src/sys/sys/ttydisc.h#2 integrate .. //depot/projects/usb/src/sys/sys/ttyhook.h#1 branch .. //depot/projects/usb/src/sys/sys/ttyqueue.h#2 integrate .. //depot/projects/usb/src/sys/sys/vnode.h#10 integrate .. //depot/projects/usb/src/sys/ufs/ffs/ffs_extern.h#5 integrate .. //depot/projects/usb/src/sys/ufs/ffs/ffs_inode.c#6 integrate .. //depot/projects/usb/src/sys/ufs/ffs/ffs_snapshot.c#9 integrate .. //depot/projects/usb/src/sys/ufs/ffs/ffs_softdep.c#9 integrate .. //depot/projects/usb/src/sys/ufs/ffs/ffs_vfsops.c#10 integrate .. //depot/projects/usb/src/sys/ufs/ufs/dirhash.h#3 integrate .. //depot/projects/usb/src/sys/ufs/ufs/inode.h#5 integrate .. //depot/projects/usb/src/sys/ufs/ufs/ufs_dirhash.c#3 integrate .. //depot/projects/usb/src/sys/ufs/ufs/ufs_inode.c#4 integrate .. //depot/projects/usb/src/sys/ufs/ufs/ufs_lookup.c#8 integrate .. //depot/projects/usb/src/sys/ufs/ufs/ufs_vnops.c#9 integrate .. //depot/projects/usb/src/sys/ufs/ufs/ufsmount.h#3 integrate .. //depot/projects/usb/src/sys/vm/vm_mmap.c#11 integrate .. //depot/projects/usb/src/sys/vm/vm_pageout.c#10 integrate Differences ... ==== //depot/projects/usb/src/sys/amd64/amd64/elf_machdep.c#3 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/elf_machdep.c,v 1.26 2007/05/22 02:22:57 kan Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/elf_machdep.c,v 1.27 2008/09/24 10:14:37 kib Exp $"); #include #include @@ -46,59 +46,60 @@ #include struct sysentvec elf64_freebsd_sysvec = { - SYS_MAXSYSCALL, - sysent, - 0, - 0, - NULL, - 0, - NULL, - NULL, - __elfN(freebsd_fixup), - sendsig, - sigcode, - &szsigcode, - NULL, - "FreeBSD ELF64", - __elfN(coredump), - NULL, - MINSIGSTKSZ, - PAGE_SIZE, - VM_MIN_ADDRESS, - VM_MAXUSER_ADDRESS, - USRSTACK, - PS_STRINGS, - VM_PROT_ALL, - exec_copyout_strings, - exec_setregs, - NULL + .sv_size = SYS_MAXSYSCALL, + .sv_table = sysent, + .sv_mask = 0, + .sv_sigsize = 0, + .sv_sigtbl = NULL, + .sv_errsize = 0, + .sv_errtbl = NULL, + .sv_transtrap = NULL, + .sv_fixup = __elfN(freebsd_fixup), + .sv_sendsig = sendsig, + .sv_sigcode = sigcode, + .sv_szsigcode = &szsigcode, + .sv_prepsyscall = NULL, + .sv_name = "FreeBSD ELF64", + .sv_coredump = __elfN(coredump), + .sv_imgact_try = NULL, + .sv_minsigstksz = MINSIGSTKSZ, + .sv_pagesize = PAGE_SIZE, + .sv_minuser = VM_MIN_ADDRESS, + .sv_maxuser = VM_MAXUSER_ADDRESS, + .sv_usrstack = USRSTACK, + .sv_psstrings = PS_STRINGS, + .sv_stackprot = VM_PROT_ALL, + .sv_copyout_strings = exec_copyout_strings, + .sv_setregs = exec_setregs, + .sv_fixlimit = NULL, + .sv_maxssiz = NULL }; static Elf64_Brandinfo freebsd_brand_info = { - ELFOSABI_FREEBSD, - EM_X86_64, - "FreeBSD", - NULL, - "/libexec/ld-elf.so.1", - &elf64_freebsd_sysvec, - NULL, - BI_CAN_EXEC_DYN, - }; + .brand = ELFOSABI_FREEBSD, + .machine = EM_X86_64, + .compat_3_brand = "FreeBSD", + .emul_path = NULL, + .interp_path = "/libexec/ld-elf.so.1", + .sysvec = &elf64_freebsd_sysvec, + .interp_newpath = NULL, + .flags = BI_CAN_EXEC_DYN, +}; SYSINIT(elf64, SI_SUB_EXEC, SI_ORDER_ANY, (sysinit_cfunc_t) elf64_insert_brand_entry, &freebsd_brand_info); static Elf64_Brandinfo freebsd_brand_oinfo = { - ELFOSABI_FREEBSD, - EM_X86_64, - "FreeBSD", - NULL, - "/usr/libexec/ld-elf.so.1", - &elf64_freebsd_sysvec, - NULL, - BI_CAN_EXEC_DYN, - }; + .brand = ELFOSABI_FREEBSD, + .machine = EM_X86_64, + .compat_3_brand = "FreeBSD", + .emul_path = NULL, + .interp_path = "/usr/libexec/ld-elf.so.1", + .sysvec = &elf64_freebsd_sysvec, + .interp_newpath = NULL, + .flags = BI_CAN_EXEC_DYN, +}; SYSINIT(oelf64, SI_SUB_EXEC, SI_ORDER_ANY, (sysinit_cfunc_t) elf64_insert_brand_entry, ==== //depot/projects/usb/src/sys/amd64/amd64/identcpu.c#8 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/identcpu.c,v 1.159 2008/05/23 04:03:52 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/identcpu.c,v 1.160 2008/09/18 18:51:32 stas Exp $"); #include "opt_cpu.h" @@ -249,8 +249,8 @@ "\030POPCNT" "\031" "\032" - "\033" - "\034" + "\033XSAVE" + "\034OSXSAVE" "\035" "\036" "\037" ==== //depot/projects/usb/src/sys/amd64/include/pmc_mdep.h#4 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2003-2007 Joseph Koshy + * Copyright (c) 2003-2008 Joseph Koshy * Copyright (c) 2007 The FreeBSD Foundation * All rights reserved. * @@ -27,7 +27,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/include/pmc_mdep.h,v 1.5 2008/06/20 05:22:09 alc Exp $ + * $FreeBSD: src/sys/amd64/include/pmc_mdep.h,v 1.6 2008/09/15 06:47:52 jkoshy Exp $ */ /* Machine dependent interfaces */ @@ -59,7 +59,8 @@ #define PMC_TRAPFRAME_TO_PC(TF) ((TF)->tf_rip) #define PMC_TRAPFRAME_TO_FP(TF) ((TF)->tf_rbp) -#define PMC_TRAPFRAME_TO_SP(TF) ((TF)->tf_rsp) +#define PMC_TRAPFRAME_TO_USER_SP(TF) ((TF)->tf_rsp) +#define PMC_TRAPFRAME_TO_KERNEL_SP(TF) ((TF)->tf_rsp) #define PMC_AT_FUNCTION_PROLOGUE_PUSH_BP(I) \ (((I) & 0xffffffff) == 0xe5894855) /* pushq %rbp; movq %rsp,%rbp */ ==== //depot/projects/usb/src/sys/amd64/linux32/linux32_sysvec.c#9 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_sysvec.c,v 1.34 2008/04/08 09:45:47 kib Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_sysvec.c,v 1.35 2008/09/24 10:14:37 kib Exp $"); #include "opt_compat.h" #ifndef COMPAT_IA32 @@ -1000,62 +1000,62 @@ } struct sysentvec elf_linux_sysvec = { - LINUX_SYS_MAXSYSCALL, - linux_sysent, - 0, - LINUX_SIGTBLSZ, - bsd_to_linux_signal, - ELAST + 1, - bsd_to_linux_errno, - translate_traps, - elf_linux_fixup, - linux_sendsig, - linux_sigcode, - &linux_szsigcode, - linux_prepsyscall, - "Linux ELF32", - elf32_coredump, - exec_linux_imgact_try, - LINUX_MINSIGSTKSZ, - PAGE_SIZE, - VM_MIN_ADDRESS, - LINUX32_USRSTACK, - LINUX32_USRSTACK, - LINUX32_PS_STRINGS, - VM_PROT_ALL, - linux_copyout_strings, - exec_linux_setregs, - linux32_fixlimit, - &linux32_maxssiz, + .sv_size = LINUX_SYS_MAXSYSCALL, + .sv_table = linux_sysent, + .sv_mask = 0, + .sv_sigsize = LINUX_SIGTBLSZ, + .sv_sigtbl = bsd_to_linux_signal, + .sv_errsize = ELAST + 1, + .sv_errtbl = bsd_to_linux_errno, + .sv_transtrap = translate_traps, + .sv_fixup = elf_linux_fixup, + .sv_sendsig = linux_sendsig, + .sv_sigcode = linux_sigcode, + .sv_szsigcode = &linux_szsigcode, + .sv_prepsyscall = linux_prepsyscall, + .sv_name = "Linux ELF32", + .sv_coredump = elf32_coredump, + .sv_imgact_try = exec_linux_imgact_try, + .sv_minsigstksz = LINUX_MINSIGSTKSZ, + .sv_pagesize = PAGE_SIZE, + .sv_minuser = VM_MIN_ADDRESS, + .sv_maxuser = LINUX32_USRSTACK, + .sv_usrstack = LINUX32_USRSTACK, + .sv_psstrings = LINUX32_PS_STRINGS, + .sv_stackprot = VM_PROT_ALL, + .sv_copyout_strings = linux_copyout_strings, + .sv_setregs = exec_linux_setregs, + .sv_fixlimit = linux32_fixlimit, + .sv_maxssiz = &linux32_maxssiz, }; static Elf32_Brandinfo linux_brand = { - ELFOSABI_LINUX, - EM_386, - "Linux", - "/compat/linux", - "/lib/ld-linux.so.1", - &elf_linux_sysvec, - NULL, - BI_CAN_EXEC_DYN, - }; + .brand = ELFOSABI_LINUX, + .machine = EM_386, + .compat_3_brand = "Linux", + .emul_path = "/compat/linux", + .interp_path = "/lib/ld-linux.so.1", + .sysvec = &elf_linux_sysvec, + .interp_newpath = NULL, + .flags = BI_CAN_EXEC_DYN, +}; static Elf32_Brandinfo linux_glibc2brand = { - ELFOSABI_LINUX, - EM_386, - "Linux", - "/compat/linux", - "/lib/ld-linux.so.2", - &elf_linux_sysvec, - NULL, - BI_CAN_EXEC_DYN, - }; + .brand = ELFOSABI_LINUX, + .machine = EM_386, + .compat_3_brand = "Linux", + .emul_path = "/compat/linux", + .interp_path = "/lib/ld-linux.so.2", + .sysvec = &elf_linux_sysvec, + .interp_newpath = NULL, + .flags = BI_CAN_EXEC_DYN, +}; Elf32_Brandinfo *linux_brandlist[] = { - &linux_brand, - &linux_glibc2brand, - NULL - }; + &linux_brand, + &linux_glibc2brand, + NULL +}; static int linux_elf_modevent(module_t mod, int type, void *data) ==== //depot/projects/usb/src/sys/arm/arm/elf_machdep.c#3 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/arm/elf_machdep.c,v 1.7 2007/05/22 02:22:57 kan Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/elf_machdep.c,v 1.8 2008/09/24 10:14:37 kib Exp $"); #include #include @@ -46,59 +46,60 @@ #include struct sysentvec elf32_freebsd_sysvec = { - SYS_MAXSYSCALL, - sysent, - 0, - 0, - NULL, - 0, - NULL, - NULL, - __elfN(freebsd_fixup), - sendsig, - sigcode, - &szsigcode, - NULL, - "FreeBSD ELF32", - __elfN(coredump), - NULL, - MINSIGSTKSZ, - PAGE_SIZE, - VM_MIN_ADDRESS, - VM_MAXUSER_ADDRESS, - USRSTACK, - PS_STRINGS, - VM_PROT_ALL, - exec_copyout_strings, - exec_setregs, - NULL + .sv_size = SYS_MAXSYSCALL, + .sv_table = sysent, + .sv_mask = 0, + .sv_sigsize = 0, + .sv_sigtbl = NULL, + .sv_errsize = 0, + .sv_errtbl = NULL, + .sv_transtrap = NULL, + .sv_fixup = __elfN(freebsd_fixup), + .sv_sendsig = sendsig, + .sv_sigcode = sigcode, + .sv_szsigcode = &szsigcode, + .sv_prepsyscall = NULL, + .sv_name = "FreeBSD ELF32", + .sv_coredump = __elfN(coredump), + .sv_imgact_try = NULL, + .sv_minsigstksz = MINSIGSTKSZ, + .sv_pagesize = PAGE_SIZE, + .sv_minuser = VM_MIN_ADDRESS, + .sv_maxuser = VM_MAXUSER_ADDRESS, + .sv_usrstack = USRSTACK, + .sv_psstrings = PS_STRINGS, + .sv_stackprot = VM_PROT_ALL, + .sv_copyout_strings = exec_copyout_strings, + .sv_setregs = exec_setregs, + .sv_fixlimit = NULL, + .sv_maxssiz = NULL }; static Elf32_Brandinfo freebsd_brand_info = { - ELFOSABI_FREEBSD, - EM_ARM, - "FreeBSD", - NULL, - "/libexec/ld-elf.so.1", - &elf32_freebsd_sysvec, - NULL, - BI_CAN_EXEC_DYN, - }; + .brand = ELFOSABI_FREEBSD, + .machine = EM_ARM, + .compat_3_brand = "FreeBSD", + .emul_path = NULL, + .interp_path = "/libexec/ld-elf.so.1", + .sysvec = &elf32_freebsd_sysvec, + .interp_newpath = NULL, + .flags = BI_CAN_EXEC_DYN, +}; SYSINIT(elf32, SI_SUB_EXEC, SI_ORDER_ANY, (sysinit_cfunc_t) elf32_insert_brand_entry, &freebsd_brand_info); static Elf32_Brandinfo freebsd_brand_oinfo = { - ELFOSABI_FREEBSD, - EM_ARM, - "FreeBSD", - NULL, - "/usr/libexec/ld-elf.so.1", - &elf32_freebsd_sysvec, - NULL, - BI_CAN_EXEC_DYN, - }; + .brand = ELFOSABI_FREEBSD, + .machine = EM_ARM, + .compat_3_brand = "FreeBSD", + .emul_path = NULL, + .interp_path = "/usr/libexec/ld-elf.so.1", + .sysvec = &elf32_freebsd_sysvec, + .interp_newpath = NULL, + .flags = BI_CAN_EXEC_DYN, +}; SYSINIT(oelf32, SI_SUB_EXEC, SI_ORDER_ANY, (sysinit_cfunc_t) elf32_insert_brand_entry, ==== //depot/projects/usb/src/sys/boot/Makefile#6 (text+ko) ==== @@ -1,7 +1,11 @@ -# $FreeBSD: src/sys/boot/Makefile,v 1.34 2008/07/23 07:23:33 imp Exp $ +# $FreeBSD: src/sys/boot/Makefile,v 1.35 2008/09/18 15:25:35 obrien Exp $ .include +.if ${MACHINE_ARCH} == "mips" +MK_FORTH=no # not yet +.endif + .if ${MK_FORTH} != "no" # Build the add-in FORTH interpreter. SUBDIR+= ficl ==== //depot/projects/usb/src/sys/boot/ofw/libofw/Makefile#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/boot/ofw/libofw/Makefile,v 1.11 2007/06/17 00:17:15 marius Exp $ +# $FreeBSD: src/sys/boot/ofw/libofw/Makefile,v 1.13 2008/09/19 19:49:58 sobomax Exp $ LIB= ofw INTERNALLIB= ==== //depot/projects/usb/src/sys/boot/ofw/libofw/ofw_console.c#4 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/boot/ofw/libofw/ofw_console.c,v 1.13 2008/02/06 22:04:28 grehan Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/ofw/libofw/ofw_console.c,v 1.15 2008/09/19 19:49:58 sobomax Exp $"); #include ==== //depot/projects/usb/src/sys/cam/cam.h#2 (text+ko) ==== @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/cam/cam.h,v 1.11 2005/01/05 22:34:34 imp Exp $ + * $FreeBSD: src/sys/cam/cam.h,v 1.12 2008/09/18 14:48:46 sbruno Exp $ */ #ifndef _CAM_CAM_H @@ -129,6 +129,7 @@ * requests for the target at the sim level * back into the XPT queue. */ + CAM_SCSI_IT_NEXUS_LOST, /* Initiator/Target Nexus lost. */ CAM_IDE = 0x33, /* Initiator Detected Error */ CAM_RESRC_UNAVAIL, /* Resource Unavailable */ CAM_UNACKED_EVENT, /* Unacknowledged Event by Host */ ==== //depot/projects/usb/src/sys/cddl/compat/opensolaris/kern/opensolaris_atomic.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cddl/compat/opensolaris/kern/opensolaris_atomic.c,v 1.2 2008/03/28 22:16:05 jb Exp $"); +__FBSDID("$FreeBSD: src/sys/cddl/compat/opensolaris/kern/opensolaris_atomic.c,v 1.3 2008/09/18 19:57:06 imp Exp $"); #include #include @@ -74,7 +74,8 @@ return (newval); } -#if defined(__sparc64__) || defined(__powerpc__) || defined(__arm__) +#if defined(__sparc64__) || defined(__powerpc__) || defined(__arm__) || \ + defined(__mips__) void atomic_or_8(volatile uint8_t *target, uint8_t value) { ==== //depot/projects/usb/src/sys/cddl/compat/opensolaris/sys/atomic.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/sys/cddl/compat/opensolaris/sys/atomic.h,v 1.4 2008/05/22 08:33:24 jb Exp $ + * $FreeBSD: src/sys/cddl/compat/opensolaris/sys/atomic.h,v 1.5 2008/09/18 19:57:06 imp Exp $ */ #ifndef _OPENSOLARIS_SYS_ATOMIC_H_ @@ -48,7 +48,8 @@ extern uint8_t atomic_or_8_nv(volatile uint8_t *target, uint8_t value); extern void membar_producer(void); -#if defined(__sparc64__) || defined(__powerpc__) || defined(__arm__) +#if defined(__sparc64__) || defined(__powerpc__) || defined(__arm__) || \ + defined(__mips__) extern void atomic_or_8(volatile uint8_t *target, uint8_t value); #else static __inline void ==== //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c#3 (text+ko) ==== @@ -744,6 +744,7 @@ VN_RELE(*vpp); *vpp = NULL; } + ZFS_EXIT(zfsvfs); return (err); } ==== //depot/projects/usb/src/sys/compat/freebsd32/freebsd32_misc.c#9 (text+ko) ==== @@ -25,18 +25,16 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/freebsd32/freebsd32_misc.c,v 1.77 2008/07/10 19:54:34 brooks Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/freebsd32/freebsd32_misc.c,v 1.79 2008/09/19 15:17:32 obrien Exp $"); #include "opt_compat.h" #include -#include #include #include #include #include #include -#include #include #include #include @@ -48,6 +46,7 @@ #include #include #include +#include #include #include #include @@ -65,6 +64,7 @@ #include #include #include +#include #include #include #include @@ -85,6 +85,8 @@ #include +#include + #include #include #include @@ -2552,14 +2554,58 @@ return (cpuset_setaffinity(td, &ap)); } +int +freebsd32_nmount(struct thread *td, + struct freebsd32_nmount_args /* { + struct iovec *iovp; + unsigned int iovcnt; + int flags; + } */ *uap) +{ + struct uio *auio; + struct iovec *iov; + int error, k; + + AUDIT_ARG(fflags, uap->flags); + + /* + * Filter out MNT_ROOTFS. We do not want clients of nmount() in + * userspace to set this flag, but we must filter it out if we want + * MNT_UPDATE on the root file system to work. + * MNT_ROOTFS should only be set in the kernel in vfs_mountroot_try(). + */ + uap->flags &= ~MNT_ROOTFS; + + /* + * check that we have an even number of iovec's + * and that we have at least two options. + */ + if ((uap->iovcnt & 1) || (uap->iovcnt < 4)) + return (EINVAL); + + error = freebsd32_copyinuio(uap->iovp, uap->iovcnt, &auio); + if (error) + return (error); + for (iov = auio->uio_iov, k = 0; k < uap->iovcnt; ++k, ++iov) { + if (iov->iov_len > MMAXOPTIONLEN) { + free(auio, M_IOV); + return (EINVAL); + } + } + + error = vfs_donmount(td, uap->flags, auio); + free(auio, M_IOV); + return error; +} + #if 0 - int freebsd32_xxx(struct thread *td, struct freebsd32_xxx_args *uap) { - int error; struct yyy32 *p32, s32; struct yyy *p = NULL, s; + struct xxx_arg ap; + int error; if (uap->zzz) { error = copyin(uap->zzz, &s32, sizeof(s32)); @@ -2577,5 +2623,4 @@ } return (error); } - #endif ==== //depot/projects/usb/src/sys/compat/freebsd32/freebsd32_proto.h#9 (text+ko) ==== @@ -2,8 +2,8 @@ * System call prototypes. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/freebsd32/freebsd32_proto.h,v 1.89 2008/08/24 21:23:08 rwatson Exp $ - * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 182123 2008-08-24 21:20:35Z rwatson + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_proto.h,v 1.92 2008/09/22 16:09:43 obrien Exp $ + * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 183270 2008-09-22 16:09:16Z obrien */ #ifndef _FREEBSD32_SYSPROTO_H_ @@ -63,6 +63,11 @@ char ss_l_[PADL_(struct sigaltstack32 *)]; struct sigaltstack32 * ss; char ss_r_[PADR_(struct sigaltstack32 *)]; char oss_l_[PADL_(struct sigaltstack32 *)]; struct sigaltstack32 * oss; char oss_r_[PADR_(struct sigaltstack32 *)]; }; +struct freebsd32_ioctl_args { + char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)]; + char com_l_[PADL_(uint32_t)]; uint32_t com; char com_r_[PADR_(uint32_t)]; + char data_l_[PADL_(struct md_ioctl32 *)]; struct md_ioctl32 * data; char data_r_[PADR_(struct md_ioctl32 *)]; +}; struct freebsd32_execve_args { char fname_l_[PADL_(char *)]; char * fname; char fname_r_[PADR_(char *)]; char argv_l_[PADL_(u_int32_t *)]; u_int32_t * argv; char argv_r_[PADR_(u_int32_t *)]; @@ -241,6 +246,11 @@ char nevents_l_[PADL_(int)]; int nevents; char nevents_r_[PADR_(int)]; char timeout_l_[PADL_(const struct timespec32 *)]; const struct timespec32 * timeout; char timeout_r_[PADR_(const struct timespec32 *)]; }; +struct freebsd32_nmount_args { + char iovp_l_[PADL_(struct iovec32 *)]; struct iovec32 * iovp; char iovp_r_[PADR_(struct iovec32 *)]; + char iovcnt_l_[PADL_(unsigned int)]; unsigned int iovcnt; char iovcnt_r_[PADR_(unsigned int)]; + char flags_l_[PADL_(int)]; int flags; char flags_r_[PADR_(int)]; +}; struct freebsd32_sendfile_args { char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)]; char s_l_[PADL_(int)]; int s; char s_r_[PADR_(int)]; @@ -378,6 +388,7 @@ int freebsd32_sendmsg(struct thread *, struct freebsd32_sendmsg_args *); int freebsd32_recvfrom(struct thread *, struct freebsd32_recvfrom_args *); int freebsd32_sigaltstack(struct thread *, struct freebsd32_sigaltstack_args *); +int freebsd32_ioctl(struct thread *, struct freebsd32_ioctl_args *); int freebsd32_execve(struct thread *, struct freebsd32_execve_args *); int freebsd32_setitimer(struct thread *, struct freebsd32_setitimer_args *); >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Sep 24 17:34:33 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0C0951065689; Wed, 24 Sep 2008 17:34:33 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C36C0106567D for ; Wed, 24 Sep 2008 17:34:32 +0000 (UTC) (envelope-from ed@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id B2CC18FC08 for ; Wed, 24 Sep 2008 17:34:32 +0000 (UTC) (envelope-from ed@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id m8OHYWTf009691 for ; Wed, 24 Sep 2008 17:34:32 GMT (envelope-from ed@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m8OHYWTp009688 for perforce@freebsd.org; Wed, 24 Sep 2008 17:34:32 GMT (envelope-from ed@FreeBSD.org) Date: Wed, 24 Sep 2008 17:34:32 GMT Message-Id: <200809241734.m8OHYWTp009688@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to ed@FreeBSD.org using -f From: Ed Schouten To: Perforce Change Reviews Cc: Subject: PERFORCE change 150391 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 24 Sep 2008 17:34:33 -0000 http://perforce.freebsd.org/chv.cgi?CH=150391 Change 150391 by ed@ed_dull on 2008/09/24 17:34:00 Clamp the TTY buffer sizes to 64K. It turns out we have many drivers in the tree that have no practical limit on the baud rate, which is dangerous. Affected files ... .. //depot/projects/mpsafetty/sys/kern/tty.c#49 edit Differences ... ==== //depot/projects/mpsafetty/sys/kern/tty.c#49 (text+ko) ==== @@ -92,21 +92,23 @@ * Set TTY buffer sizes. */ +#define TTYBUF_MAX 65536 + static void tty_watermarks(struct tty *tp) { - speed_t sp; + size_t bs; /* Provide an input buffer for 0.2 seconds of data. */ - sp = MAX(tp->t_termios.c_ispeed, 0); - ttyinq_setsize(&tp->t_inq, tp, sp / 5); + bs = MIN(tp->t_termios.c_ispeed / 5, TTYBUF_MAX); + ttyinq_setsize(&tp->t_inq, tp, bs); /* Set low watermark at 10% (when 90% is available). */ tp->t_inlow = (ttyinq_getsize(&tp->t_inq) * 9) / 10; /* Provide an ouput buffer for 0.2 seconds of data. */ - sp = MAX(tp->t_termios.c_ospeed, 0); - ttyoutq_setsize(&tp->t_outq, tp, sp / 5); + bs = MIN(tp->t_termios.c_ospeed / 5, TTYBUF_MAX); + ttyoutq_setsize(&tp->t_outq, tp, bs); /* Set low watermark at 10% (when 90% is available). */ tp->t_outlow = (ttyoutq_getsize(&tp->t_outq) * 9) / 10; From owner-p4-projects@FreeBSD.ORG Wed Sep 24 17:59:59 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E0FA21065695; Wed, 24 Sep 2008 17:59:58 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A458B10656A5 for ; Wed, 24 Sep 2008 17:59:58 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 90E5E8FC3A for ; Wed, 24 Sep 2008 17:59:58 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id m8OHxwKN057511 for ; Wed, 24 Sep 2008 17:59:58 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m8OHxwEa057509 for perforce@freebsd.org; Wed, 24 Sep 2008 17:59:58 GMT (envelope-from hselasky@FreeBSD.org) Date: Wed, 24 Sep 2008 17:59:58 GMT Message-Id: <200809241759.m8OHxwEa057509@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 150392 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 24 Sep 2008 17:59:59 -0000 http://perforce.freebsd.org/chv.cgi?CH=150392 Change 150392 by hselasky@hselasky_laptop001 on 2008/09/24 17:59:38 Convert USS820 pccard driver into atmelarm driver, which is more likely the most common use-case. Affected files ... .. //depot/projects/usb/src/sys/conf/files#36 edit .. //depot/projects/usb/src/sys/dev/usb2/controller/uss820dci_atmelarm.c#1 add .. //depot/projects/usb/src/sys/dev/usb2/controller/uss820dci_pccard.c#8 delete .. //depot/projects/usb/src/sys/modules/usb2/controller/Makefile#6 edit Differences ... ==== //depot/projects/usb/src/sys/conf/files#36 (text+ko) ==== @@ -1347,8 +1347,6 @@ dev/usb2/controller/uhci2.c optional usb2_core usb2_controller dev/usb2/controller/uhci2_pci.c optional usb2_core usb2_controller pci dev/usb2/controller/usb2_controller.c optional usb2_core usb2_controller -dev/usb2/controller/uss820dci.c optional usb2_core usb2_controller -dev/usb2/controller/uss820dci_pccard.c optional usb2_core usb2_controller pccard # # USB2 storage drivers # ==== //depot/projects/usb/src/sys/modules/usb2/controller/Makefile#6 (text+ko) ==== @@ -21,6 +21,7 @@ .if defined(HAS_ATMELARM) SRCS+= at91dci_atmelarm.c SRCS+= ohci2_atmelarm.c +SRCS+= uss820dci_atmelarm.c .endif SRCS+= at91dci.c @@ -32,6 +33,5 @@ SRCS+= uhci2.c SRCS+= uhci2_pci.c SRCS+= uss820dci.c -SRCS+= uss820dci_pccard.c .include From owner-p4-projects@FreeBSD.ORG Wed Sep 24 19:43:45 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 44B181065693; Wed, 24 Sep 2008 19:43:45 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E49E01065691 for ; Wed, 24 Sep 2008 19:43:44 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id CFD688FC08 for ; Wed, 24 Sep 2008 19:43:44 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id m8OJhiGk010960 for ; Wed, 24 Sep 2008 19:43:44 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m8OJhia8010958 for perforce@freebsd.org; Wed, 24 Sep 2008 19:43:44 GMT (envelope-from hselasky@FreeBSD.org) Date: Wed, 24 Sep 2008 19:43:44 GMT Message-Id: <200809241943.m8OJhia8010958@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 150397 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 24 Sep 2008 19:43:45 -0000 http://perforce.freebsd.org/chv.cgi?CH=150397 Change 150397 by hselasky@hselasky_laptop001 on 2008/09/24 19:42:56 Remove temporary bugfix in the USB WLAN drivers, because this issue has now been fixed in the IEEE80211 layer. Affected files ... .. //depot/projects/usb/src/sys/dev/usb2/wlan/if_rum2.c#16 edit .. //depot/projects/usb/src/sys/dev/usb2/wlan/if_rum2_var.h#5 edit .. //depot/projects/usb/src/sys/dev/usb2/wlan/if_ural2.c#16 edit .. //depot/projects/usb/src/sys/dev/usb2/wlan/if_ural2_var.h#5 edit .. //depot/projects/usb/src/sys/dev/usb2/wlan/if_zyd2.c#17 edit .. //depot/projects/usb/src/sys/dev/usb2/wlan/if_zyd2_reg.h#6 edit .. //depot/projects/usb/src/sys/dev/usb2/wlan/usb2_wlan.h#5 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb2/wlan/if_rum2.c#16 (text+ko) ==== @@ -502,13 +502,6 @@ struct ieee80211com *ic; struct ifnet *ifp; -#ifdef USB_WLAN_CLONE_FIX - if (sc->sc_clone[0]) { - if (if_clone_destroy(sc->sc_clone)) { - DPRINTFN(0, "Could not destroy clone!\n"); - } - } -#endif usb2_config_td_drain(&sc->sc_config_td); mtx_lock(&sc->sc_mtx); @@ -2609,15 +2602,6 @@ /* store current operation mode */ ic->ic_opmode = opmode; -#ifdef USB_WLAN_CLONE_FIX - /* - * Store a copy of the clone name so we can destroy it at - * detach! - */ - mtx_lock(&sc->sc_mtx); - snprintf(sc->sc_clone, sizeof(sc->sc_clone), "%s%u", name, unit); - mtx_unlock(&sc->sc_mtx); -#endif return (vap); } @@ -2634,9 +2618,6 @@ if (usb2_config_td_sync(&sc->sc_config_td)) { /* ignore */ } -#ifdef USB_WLAN_CLONE_FIX - sc->sc_clone[0] = 0; /* clone is gone */ -#endif mtx_unlock(&sc->sc_mtx); ieee80211_amrr_cleanup(&rvp->amrr); ==== //depot/projects/usb/src/sys/dev/usb2/wlan/if_rum2_var.h#5 (text+ko) ==== @@ -169,7 +169,4 @@ int8_t sc_rssi_5ghz_corr; char sc_name[32]; -#ifdef USB_WLAN_CLONE_FIX - char sc_clone[IFNAMSIZ]; /* name of clone */ -#endif }; ==== //depot/projects/usb/src/sys/dev/usb2/wlan/if_ural2.c#16 (text+ko) ==== @@ -495,13 +495,6 @@ struct ieee80211com *ic; struct ifnet *ifp; -#ifdef USB_WLAN_CLONE_FIX - if (sc->sc_clone[0]) { - if (if_clone_destroy(sc->sc_clone)) { - DPRINTFN(0, "Could not destroy clone!\n"); - } - } -#endif usb2_config_td_drain(&sc->sc_config_td); mtx_lock(&sc->sc_mtx); @@ -2401,15 +2394,6 @@ /* store current operation mode */ ic->ic_opmode = opmode; -#ifdef USB_WLAN_CLONE_FIX - /* - * Store a copy of the clone name so we can destroy it at - * detach! - */ - mtx_lock(&sc->sc_mtx); - snprintf(sc->sc_clone, sizeof(sc->sc_clone), "%s%u", name, unit); - mtx_unlock(&sc->sc_mtx); -#endif return (vap); } @@ -2424,9 +2408,6 @@ if (usb2_config_td_sync(&sc->sc_config_td)) { /* ignore */ } -#ifdef USB_WLAN_CLONE_FIX - sc->sc_clone[0] = 0; /* clone is gone */ -#endif mtx_unlock(&sc->sc_mtx); ieee80211_amrr_cleanup(&uvp->amrr); ==== //depot/projects/usb/src/sys/dev/usb2/wlan/if_ural2_var.h#5 (text+ko) ==== @@ -158,7 +158,4 @@ uint8_t sc_myaddr[IEEE80211_ADDR_LEN]; char sc_name[32]; -#ifdef USB_WLAN_CLONE_FIX - char sc_clone[IFNAMSIZ]; /* name of clone */ -#endif }; ==== //depot/projects/usb/src/sys/dev/usb2/wlan/if_zyd2.c#17 (text+ko) ==== @@ -2033,14 +2033,6 @@ struct ieee80211com *ic; struct ifnet *ifp; -#ifdef USB_WLAN_CLONE_FIX - if (sc->sc_clone[0]) { - if (if_clone_destroy(sc->sc_clone)) { - DPRINTFN(0, "Could not destroy clone!\n"); - } - } -#endif - usb2_config_td_drain(&sc->sc_config_td); mtx_lock(&sc->sc_mtx); @@ -3043,15 +3035,6 @@ ieee80211_vap_attach(vap, ieee80211_media_change, ieee80211_media_status); ic->ic_opmode = opmode; -#ifdef USB_WLAN_CLONE_FIX - /* - * Store a copy of the clone name so we can destroy it at - * detach! - */ - mtx_lock(&sc->sc_mtx); - snprintf(sc->sc_clone, sizeof(sc->sc_clone), "%s%u", name, unit); - mtx_unlock(&sc->sc_mtx); -#endif return (vap); } @@ -3066,9 +3049,6 @@ if (usb2_config_td_sync(&sc->sc_config_td)) { /* ignore */ } -#ifdef USB_WLAN_CLONE_FIX - sc->sc_clone[0] = 0; /* clone is gone */ -#endif mtx_unlock(&sc->sc_mtx); ieee80211_amrr_cleanup(&zvp->amrr); ==== //depot/projects/usb/src/sys/dev/usb2/wlan/if_zyd2_reg.h#6 (text+ko) ==== @@ -1277,7 +1277,4 @@ uint8_t sc_myaddr[IEEE80211_ADDR_LEN]; char sc_name[16]; -#ifdef USB_WLAN_CLONE_FIX - char sc_clone[IFNAMSIZ]; /* name of clone */ -#endif }; ==== //depot/projects/usb/src/sys/dev/usb2/wlan/usb2_wlan.h#5 (text+ko) ==== @@ -27,13 +27,6 @@ #ifndef _USB2_WLAN_H_ #define _USB2_WLAN_H_ -/* - * XXX: Until further the USB WLAN drivers need to destroy the clones - * themselves, because the network layer will not do this. Failing to - * destroy the clones will results in panics. - */ -#define USB_WLAN_CLONE_FIX - #include #include #include From owner-p4-projects@FreeBSD.ORG Wed Sep 24 21:41:46 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 54D661065687; Wed, 24 Sep 2008 21:41:46 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id F3E5F1065692 for ; Wed, 24 Sep 2008 21:41:45 +0000 (UTC) (envelope-from thompsa@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id D84698FC1E for ; Wed, 24 Sep 2008 21:41:45 +0000 (UTC) (envelope-from thompsa@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id m8OLfjvT060344 for ; Wed, 24 Sep 2008 21:41:45 GMT (envelope-from thompsa@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m8OLfjCu060337 for perforce@freebsd.org; Wed, 24 Sep 2008 21:41:45 GMT (envelope-from thompsa@freebsd.org) Date: Wed, 24 Sep 2008 21:41:45 GMT Message-Id: <200809242141.m8OLfjCu060337@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to thompsa@freebsd.org using -f From: Andrew Thompson To: Perforce Change Reviews Cc: Subject: PERFORCE change 150404 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 24 Sep 2008 21:41:46 -0000 http://perforce.freebsd.org/chv.cgi?CH=150404 Change 150404 by thompsa@thompsa_burger on 2008/09/24 21:40:48 Update for the latest hooks. Affected files ... .. //depot/projects/mpsafetty/sys/netgraph/ng_tty.c#5 edit Differences ... ==== //depot/projects/mpsafetty/sys/netgraph/ng_tty.c#5 (text+ko) ==== @@ -92,6 +92,8 @@ }; typedef struct ngt_softc *sc_p; +static int ngt_unit; + /* Flags */ #define FLG_DEBUG 0x0002 @@ -100,6 +102,7 @@ static ng_rcvmsg_t ngt_rcvmsg; static ng_shutdown_t ngt_shutdown; static ng_newhook_t ngt_newhook; +static ng_connect_t ngt_connect; static ng_rcvdata_t ngt_rcvdata; static ng_disconnect_t ngt_disconnect; @@ -109,6 +112,7 @@ static th_getc_poll_t ngt_getc_poll; static th_rint_bypass_t ngt_rint_bypass; static th_rint_poll_t ngt_rint_poll; +static th_rint_done_t ngt_rint_done; static th_close_t ngt_close; static struct ttyhook ngt_hook = { @@ -116,6 +120,7 @@ .th_getc_poll = ngt_getc_poll, .th_rint_bypass = ngt_rint_bypass, .th_rint_poll = ngt_rint_poll, + .th_rint_done = ngt_rint_done, .th_close = ngt_close, }; @@ -127,11 +132,15 @@ .rcvmsg = ngt_rcvmsg, .shutdown = ngt_shutdown, .newhook = ngt_newhook, + .connect = ngt_connect, .rcvdata = ngt_rcvdata, .disconnect = ngt_disconnect, }; NETGRAPH_INIT(tty, &typestruct); +#define NGTLOCK(sc) IF_LOCK(&sc->outq) +#define NGTUNLOCK(sc) IF_UNLOCK(&sc->outq) + /****************************************************************** NETGRAPH NODE METHODS ******************************************************************/ @@ -146,6 +155,7 @@ ngt_constructor(node_p node) { sc_p sc; + char name[sizeof(NG_TTY_NODE_TYPE) + 8]; /* Allocate private structure */ MALLOC(sc, sc_p, sizeof(*sc), M_NETGRAPH, M_NOWAIT | M_ZERO); @@ -153,10 +163,18 @@ return (ENOMEM); NG_NODE_SET_PRIVATE(node, sc); + sc->node = node; mtx_init(&sc->outq.ifq_mtx, "ng_tty node+queue", NULL, MTX_DEF); IFQ_SET_MAXLEN(&sc->outq, MAX_MBUFQ); + atomic_add_int(&ngt_unit, 1); + snprintf(name, sizeof(name), "%s%d", typestruct.name, ngt_unit); + + /* Assign node its name */ + if (ng_name_node(node, name)) + log(LOG_WARNING, "%s: can't name node %s\n", + __func__, name); /* Done */ return (0); } @@ -169,24 +187,32 @@ { const sc_p sc = NG_NODE_PRIVATE(node); - /* TTY must be attached */ - if (sc->tp == NULL) - return (EINVAL); - if (strcmp(name, NG_TTY_HOOK)) return (EINVAL); if (sc->hook) return (EISCONN); - tty_lock(sc->tp); + NGTLOCK(sc); sc->hook = hook; - tty_unlock(sc->tp); + NGTUNLOCK(sc); return (0); } /* + * Set the hook into queueing mode (for outgoing packets), + * so that we wont deliver mbuf thru the whole graph holding + * tty locks. + */ +static int +ngt_connect(hook_p hook) +{ + NG_HOOK_FORCE_QUEUE(hook); + return (0); +} + +/* * Disconnect the hook */ static int @@ -197,9 +223,9 @@ if (hook != sc->hook) panic(__func__); - tty_lock(sc->tp); + NGTLOCK(sc); sc->hook = NULL; - tty_unlock(sc->tp); + NGTUNLOCK(sc); return (0); } @@ -219,6 +245,8 @@ ttyhook_unregister(tp); } /* Free resources */ + IF_DRAIN(&sc->outq); + mtx_destroy(&(sc)->outq.ifq_mtx); NG_NODE_UNREF(sc->node); FREE(sc, M_NETGRAPH); @@ -241,7 +269,6 @@ case NGM_TTY_COOKIE: switch (msg->header.cmd) { case NGM_TTY_SET_TTY: - /* XXX Locking? or will netgraph serialize us? */ if (sc->tp != NULL) return (EBUSY); error = ttyhook_register(&sc->tp, td, *(int *)msg->data, @@ -298,6 +325,11 @@ NGI_GET_M(item, m); NG_FREE_ITEM(item); + if (tp == NULL) { + NG_FREE_M(m); + return (ENXIO); + } + IF_LOCK(&sc->outq); if (_IF_QFULL(&sc->outq)) { _IF_DROP(&sc->outq); @@ -307,11 +339,11 @@ } _IF_ENQUEUE(&sc->outq, m); + sc->outqlen += m->m_pkthdr.len; IF_UNLOCK(&sc->outq); /* notify the TTY that data is ready */ tty_lock(tp); - sc->outqlen += m->m_pkthdr.len; if (!tty_gone(tp)) ttydevsw_outwakeup(tp); tty_unlock(tp); @@ -355,8 +387,11 @@ break; } } + IF_LOCK(&sc->outq); sc->outqlen -= total; + IF_UNLOCK(&sc->outq); MPASS(sc->outqlen >= 0); + return (total); } @@ -410,9 +445,17 @@ } static void +ngt_rint_done(struct tty *tp) +{ + /* Do nothing */ +} + +static void ngt_close(struct tty *tp) { - /* XXX ??? */ - ttyhook_unregister(tp); + sc_p sc = ttyhook_softc(tp); + + /* Must be queued to drop the tty lock */ + ng_rmnode_flags(sc->node, NG_QUEUE); } From owner-p4-projects@FreeBSD.ORG Wed Sep 24 21:57:02 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4E8AD106568C; Wed, 24 Sep 2008 21:57:02 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 104E31065688 for ; Wed, 24 Sep 2008 21:57:02 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id EAE108FC25 for ; Wed, 24 Sep 2008 21:57:01 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id m8OLv1jd067713 for ; Wed, 24 Sep 2008 21:57:01 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m8OLv1XC067649 for perforce@freebsd.org; Wed, 24 Sep 2008 21:57:01 GMT (envelope-from jhb@freebsd.org) Date: Wed, 24 Sep 2008 21:57:01 GMT Message-Id: <200809242157.m8OLv1XC067649@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 150405 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 24 Sep 2008 21:57:02 -0000 http://perforce.freebsd.org/chv.cgi?CH=150405 Change 150405 by jhb@jhb_mutex on 2008/09/24 21:56:18 IFC @150398 Affected files ... .. //depot/projects/smpng/sys/amd64/amd64/elf_machdep.c#13 integrate .. //depot/projects/smpng/sys/amd64/amd64/identcpu.c#27 integrate .. //depot/projects/smpng/sys/amd64/linux32/linux32_sysvec.c#31 integrate .. //depot/projects/smpng/sys/arm/arm/elf_machdep.c#8 integrate .. //depot/projects/smpng/sys/boot/Makefile#27 integrate .. //depot/projects/smpng/sys/boot/ofw/libofw/Makefile#9 integrate .. //depot/projects/smpng/sys/boot/ofw/libofw/ofw_console.c#9 integrate .. //depot/projects/smpng/sys/cam/cam.h#4 integrate .. //depot/projects/smpng/sys/cddl/compat/opensolaris/kern/opensolaris_atomic.c#2 integrate .. //depot/projects/smpng/sys/cddl/compat/opensolaris/sys/atomic.h#3 integrate .. //depot/projects/smpng/sys/compat/freebsd32/freebsd32_ioctl.c#1 branch .. //depot/projects/smpng/sys/compat/freebsd32/freebsd32_ioctl.h#1 branch .. //depot/projects/smpng/sys/compat/freebsd32/freebsd32_misc.c#50 integrate .. //depot/projects/smpng/sys/compat/freebsd32/freebsd32_proto.h#45 integrate .. //depot/projects/smpng/sys/compat/freebsd32/freebsd32_syscall.h#45 integrate .. //depot/projects/smpng/sys/compat/freebsd32/freebsd32_syscalls.c#45 integrate .. //depot/projects/smpng/sys/compat/freebsd32/freebsd32_sysent.c#45 integrate .. //depot/projects/smpng/sys/compat/freebsd32/syscalls.master#49 integrate .. //depot/projects/smpng/sys/compat/ia32/ia32_sysvec.c#19 integrate .. //depot/projects/smpng/sys/compat/linux/linux_misc.c#91 integrate .. //depot/projects/smpng/sys/compat/svr4/svr4_sysvec.c#27 integrate .. //depot/projects/smpng/sys/conf/files#219 integrate .. //depot/projects/smpng/sys/conf/files.amd64#56 integrate .. //depot/projects/smpng/sys/conf/files.i386#113 integrate .. //depot/projects/smpng/sys/conf/files.ia64#60 integrate .. //depot/projects/smpng/sys/conf/files.mips#3 integrate .. //depot/projects/smpng/sys/conf/files.sparc64#68 integrate .. //depot/projects/smpng/sys/conf/kern.pre.mk#60 integrate .. //depot/projects/smpng/sys/conf/ldscript.mips#2 integrate .. //depot/projects/smpng/sys/conf/options.mips#2 integrate .. //depot/projects/smpng/sys/conf/options.sparc64#16 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_quirk.c#5 integrate .. //depot/projects/smpng/sys/dev/ata/ata-chipset.c#87 integrate .. //depot/projects/smpng/sys/dev/ata/ata-pci.c#68 integrate .. //depot/projects/smpng/sys/dev/ata/ata-pci.h#56 integrate .. //depot/projects/smpng/sys/dev/ath/if_ath.c#57 integrate .. //depot/projects/smpng/sys/dev/ath/if_athvar.h#35 integrate .. //depot/projects/smpng/sys/dev/bge/if_bge.c#99 integrate .. //depot/projects/smpng/sys/dev/bm/if_bm.c#3 integrate .. //depot/projects/smpng/sys/dev/cxgb/common/cxgb_ael1002.c#7 integrate .. //depot/projects/smpng/sys/dev/cxgb/common/cxgb_common.h#7 integrate .. //depot/projects/smpng/sys/dev/cxgb/common/cxgb_mc5.c#5 integrate .. //depot/projects/smpng/sys/dev/cxgb/common/cxgb_mv88e1xxx.c#5 integrate .. //depot/projects/smpng/sys/dev/cxgb/common/cxgb_t3_hw.c#7 integrate .. //depot/projects/smpng/sys/dev/cxgb/common/cxgb_tn1010.c#2 integrate .. //depot/projects/smpng/sys/dev/cxgb/common/cxgb_vsc7323.c#2 integrate .. //depot/projects/smpng/sys/dev/cxgb/common/cxgb_vsc8211.c#5 integrate .. //depot/projects/smpng/sys/dev/cxgb/common/cxgb_xgmac.c#6 integrate .. //depot/projects/smpng/sys/dev/cxgb/cxgb_adapter.h#11 integrate .. //depot/projects/smpng/sys/dev/cxgb/cxgb_config.h#5 integrate .. //depot/projects/smpng/sys/dev/cxgb/cxgb_include.h#3 integrate .. //depot/projects/smpng/sys/dev/cxgb/cxgb_main.c#13 integrate .. //depot/projects/smpng/sys/dev/cxgb/cxgb_multiq.c#3 integrate .. //depot/projects/smpng/sys/dev/cxgb/cxgb_offload.c#4 integrate .. //depot/projects/smpng/sys/dev/cxgb/cxgb_offload.h#5 integrate .. //depot/projects/smpng/sys/dev/cxgb/cxgb_osdep.h#8 integrate .. //depot/projects/smpng/sys/dev/cxgb/cxgb_sge.c#12 integrate .. //depot/projects/smpng/sys/dev/cxgb/cxgb_t3fw.c#2 integrate .. //depot/projects/smpng/sys/dev/cxgb/sys/cxgb_support.c#6 integrate .. //depot/projects/smpng/sys/dev/cxgb/sys/uipc_mvec.c#6 integrate .. //depot/projects/smpng/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb.c#3 integrate .. //depot/projects/smpng/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_cm.c#2 integrate .. //depot/projects/smpng/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_cq.c#2 integrate .. //depot/projects/smpng/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_dbg.c#2 integrate .. //depot/projects/smpng/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_ev.c#2 integrate .. //depot/projects/smpng/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_hal.c#2 integrate .. //depot/projects/smpng/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_mem.c#2 integrate .. //depot/projects/smpng/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_provider.c#2 integrate .. //depot/projects/smpng/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_qp.c#2 integrate .. //depot/projects/smpng/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_resource.c#2 integrate .. //depot/projects/smpng/sys/dev/cxgb/ulp/toecore/toedev.c#3 integrate .. //depot/projects/smpng/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c#10 integrate .. //depot/projects/smpng/sys/dev/cxgb/ulp/tom/cxgb_cpl_socket.c#8 integrate .. //depot/projects/smpng/sys/dev/cxgb/ulp/tom/cxgb_ddp.c#6 integrate .. //depot/projects/smpng/sys/dev/cxgb/ulp/tom/cxgb_defs.h#5 integrate .. //depot/projects/smpng/sys/dev/cxgb/ulp/tom/cxgb_l2t.c#3 integrate .. //depot/projects/smpng/sys/dev/cxgb/ulp/tom/cxgb_l2t.h#2 integrate .. //depot/projects/smpng/sys/dev/cxgb/ulp/tom/cxgb_listen.c#5 integrate .. //depot/projects/smpng/sys/dev/cxgb/ulp/tom/cxgb_t3_ddp.h#4 integrate .. //depot/projects/smpng/sys/dev/cxgb/ulp/tom/cxgb_tcp_offload.c#3 integrate .. //depot/projects/smpng/sys/dev/cxgb/ulp/tom/cxgb_toepcb.h#4 integrate .. //depot/projects/smpng/sys/dev/cxgb/ulp/tom/cxgb_tom.c#6 integrate .. //depot/projects/smpng/sys/dev/cxgb/ulp/tom/cxgb_tom.h#3 integrate .. //depot/projects/smpng/sys/dev/cxgb/ulp/tom/cxgb_tom_sysctl.c#5 integrate .. //depot/projects/smpng/sys/dev/cxgb/ulp/tom/cxgb_vm.c#2 integrate .. //depot/projects/smpng/sys/dev/hwpmc/hwpmc_amd.c#10 integrate .. //depot/projects/smpng/sys/dev/hwpmc/hwpmc_mod.c#25 integrate .. //depot/projects/smpng/sys/dev/hwpmc/hwpmc_piv.c#10 integrate .. //depot/projects/smpng/sys/dev/hwpmc/hwpmc_ppro.c#6 integrate .. //depot/projects/smpng/sys/dev/jme/if_jme.c#4 integrate .. //depot/projects/smpng/sys/dev/jme/if_jmereg.h#3 integrate .. //depot/projects/smpng/sys/dev/kbdmux/kbdmux.c#10 integrate .. //depot/projects/smpng/sys/dev/pci/vga_pci.c#5 integrate .. //depot/projects/smpng/sys/dev/snp/snp.c#31 integrate .. //depot/projects/smpng/sys/dev/usb/if_zyd.c#6 integrate .. //depot/projects/smpng/sys/dev/usb/usbdevs#116 integrate .. //depot/projects/smpng/sys/fs/devfs/devfs_devs.c#29 integrate .. //depot/projects/smpng/sys/fs/devfs/devfs_vnops.c#71 integrate .. //depot/projects/smpng/sys/fs/fdescfs/fdesc_vnops.c#32 integrate .. //depot/projects/smpng/sys/fs/hpfs/hpfs_vnops.c#36 integrate .. //depot/projects/smpng/sys/fs/msdosfs/msdosfs_vnops.c#45 integrate .. //depot/projects/smpng/sys/fs/ntfs/ntfs_vnops.c#30 integrate .. //depot/projects/smpng/sys/fs/portalfs/portal_vnops.c#30 integrate .. //depot/projects/smpng/sys/fs/pseudofs/pseudofs_vnops.c#51 integrate .. //depot/projects/smpng/sys/fs/smbfs/smbfs_node.c#32 integrate .. //depot/projects/smpng/sys/fs/tmpfs/tmpfs.h#4 integrate .. //depot/projects/smpng/sys/fs/tmpfs/tmpfs_subr.c#6 integrate .. //depot/projects/smpng/sys/fs/tmpfs/tmpfs_vnops.c#7 integrate .. //depot/projects/smpng/sys/fs/udf/udf_vnops.c#42 integrate .. //depot/projects/smpng/sys/geom/geom_io.c#49 integrate .. //depot/projects/smpng/sys/gnu/fs/xfs/FreeBSD/xfs_vnops.c#7 integrate .. //depot/projects/smpng/sys/i386/bios/apm.h#6 integrate .. //depot/projects/smpng/sys/i386/i386/bios.c#25 integrate .. //depot/projects/smpng/sys/i386/i386/elf_machdep.c#15 integrate .. //depot/projects/smpng/sys/i386/i386/identcpu.c#59 integrate .. //depot/projects/smpng/sys/i386/i386/intr_machdep.c#33 integrate .. //depot/projects/smpng/sys/i386/i386/pmap.c#127 integrate .. //depot/projects/smpng/sys/i386/ibcs2/ibcs2_sysvec.c#11 integrate .. //depot/projects/smpng/sys/i386/linux/linux_sysvec.c#61 integrate .. //depot/projects/smpng/sys/i386/xen/mp_machdep.c#2 integrate .. //depot/projects/smpng/sys/ia64/ia64/efi.c#5 integrate .. //depot/projects/smpng/sys/ia64/ia64/elf_machdep.c#22 integrate .. //depot/projects/smpng/sys/ia64/ia64/sal.c#13 integrate .. //depot/projects/smpng/sys/kern/imgact_aout.c#32 integrate .. //depot/projects/smpng/sys/kern/init_main.c#74 integrate .. //depot/projects/smpng/sys/kern/kern_intr.c#97 integrate .. //depot/projects/smpng/sys/kern/kern_pmc.c#6 integrate .. //depot/projects/smpng/sys/kern/kern_syscalls.c#7 integrate .. //depot/projects/smpng/sys/kern/subr_clist.c#3 integrate .. //depot/projects/smpng/sys/kern/subr_witness.c#172 integrate .. //depot/projects/smpng/sys/kern/sys_generic.c#54 integrate .. //depot/projects/smpng/sys/kern/tty.c#76 integrate .. //depot/projects/smpng/sys/kern/tty_pts.c#12 integrate .. //depot/projects/smpng/sys/kern/tty_ttydisc.c#3 integrate .. //depot/projects/smpng/sys/kern/uipc_mqueue.c#18 integrate .. //depot/projects/smpng/sys/kern/vfs_cache.c#43 integrate .. //depot/projects/smpng/sys/kern/vfs_mount.c#83 integrate .. //depot/projects/smpng/sys/kern/vfs_vnops.c#86 integrate .. //depot/projects/smpng/sys/libkern/memcmp.c#1 branch .. //depot/projects/smpng/sys/mips/adm5120/obio.c#3 integrate .. //depot/projects/smpng/sys/mips/conf/IDT#3 integrate .. //depot/projects/smpng/sys/mips/idt/obio.c#3 integrate .. //depot/projects/smpng/sys/mips/malta/gt_pci.c#3 integrate .. //depot/projects/smpng/sys/mips/mips/elf_machdep.c#2 integrate .. //depot/projects/smpng/sys/mips/mips/intr_machdep.c#3 integrate .. //depot/projects/smpng/sys/mips/mips/support.S#2 integrate .. //depot/projects/smpng/sys/modules/cxgb/Makefile#6 integrate .. //depot/projects/smpng/sys/modules/cxgb/cxgb/Makefile#6 integrate .. //depot/projects/smpng/sys/modules/cxgb/cxgb_t3fw/Makefile#2 integrate .. //depot/projects/smpng/sys/modules/cxgb/iw_cxgb/Makefile#2 integrate .. //depot/projects/smpng/sys/modules/cxgb/toecore/Makefile#2 integrate .. //depot/projects/smpng/sys/modules/cxgb/tom/Makefile#4 integrate .. //depot/projects/smpng/sys/net/if_clone.c#11 integrate .. //depot/projects/smpng/sys/net/if_clone.h#5 integrate .. //depot/projects/smpng/sys/net/if_lagg.c#12 integrate .. //depot/projects/smpng/sys/net/route.c#39 integrate .. //depot/projects/smpng/sys/net/route.h#28 integrate .. //depot/projects/smpng/sys/net80211/ieee80211.h#15 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_adhoc.c#2 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_crypto.c#13 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_crypto.h#11 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_ddb.c#4 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_freebsd.c#15 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_freebsd.h#13 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_hostap.c#3 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_ht.c#6 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_ht.h#5 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_ioctl.c#37 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_ioctl.h#17 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_node.c#36 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_node.h#22 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_output.c#33 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_sta.c#3 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_var.h#29 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_wds.c#2 integrate .. //depot/projects/smpng/sys/netgraph/netgraph.h#31 integrate .. //depot/projects/smpng/sys/netgraph/ng_base.c#58 integrate .. //depot/projects/smpng/sys/netgraph/ng_source.c#18 integrate .. //depot/projects/smpng/sys/netinet/ip_fw.h#41 integrate .. //depot/projects/smpng/sys/netinet/tcp_input.c#115 integrate .. //depot/projects/smpng/sys/netinet6/udp6_usrreq.c#50 integrate .. //depot/projects/smpng/sys/nfsclient/nfs_vnops.c#75 integrate .. //depot/projects/smpng/sys/powerpc/aim/machdep.c#7 integrate .. //depot/projects/smpng/sys/powerpc/aim/mmu_oea.c#4 integrate .. //depot/projects/smpng/sys/powerpc/booke/machdep.c#5 integrate .. //depot/projects/smpng/sys/powerpc/include/dbdma.h#2 integrate .. //depot/projects/smpng/sys/powerpc/include/md_var.h#12 integrate .. //depot/projects/smpng/sys/powerpc/include/pmap.h#20 integrate .. //depot/projects/smpng/sys/powerpc/include/pte.h#7 integrate .. //depot/projects/smpng/sys/powerpc/ofw/ofw_syscons.c#10 integrate .. //depot/projects/smpng/sys/powerpc/powermac/dbdma.c#2 integrate .. //depot/projects/smpng/sys/powerpc/powermac/dbdmavar.h#2 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/cpu.c#10 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/elf_machdep.c#15 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/syncicache.c#7 integrate .. //depot/projects/smpng/sys/sparc64/include/smp.h#21 integrate .. //depot/projects/smpng/sys/sparc64/include/tick.h#6 integrate .. //depot/projects/smpng/sys/sparc64/pci/psycho.c#47 integrate .. //depot/projects/smpng/sys/sparc64/pci/psychoreg.h#13 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/elf_machdep.c#21 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/genassym.c#45 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/intr_machdep.c#31 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/mp_machdep.c#35 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/tick.c#22 integrate .. //depot/projects/smpng/sys/sys/clist.h#4 integrate .. //depot/projects/smpng/sys/sys/libkern.h#27 integrate .. //depot/projects/smpng/sys/sys/mount.h#66 integrate .. //depot/projects/smpng/sys/sys/param.h#128 integrate .. //depot/projects/smpng/sys/sys/pmckern.h#7 integrate .. //depot/projects/smpng/sys/sys/sysent.h#29 integrate .. //depot/projects/smpng/sys/sys/tty.h#25 integrate .. //depot/projects/smpng/sys/sys/ttydevsw.h#3 integrate .. //depot/projects/smpng/sys/sys/ttydisc.h#3 integrate .. //depot/projects/smpng/sys/sys/ttyhook.h#1 branch .. //depot/projects/smpng/sys/sys/ttyqueue.h#3 integrate .. //depot/projects/smpng/sys/ufs/ffs/ffs_vfsops.c#104 integrate .. //depot/projects/smpng/sys/ufs/ufs/ufs_dirhash.c#26 integrate .. //depot/projects/smpng/sys/ufs/ufs/ufs_vnops.c#70 integrate .. //depot/projects/smpng/sys/vm/vm_mmap.c#70 integrate .. //depot/projects/smpng/sys/vm/vm_pageout.c#67 integrate Differences ... ==== //depot/projects/smpng/sys/amd64/amd64/elf_machdep.c#13 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/elf_machdep.c,v 1.26 2007/05/22 02:22:57 kan Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/elf_machdep.c,v 1.27 2008/09/24 10:14:37 kib Exp $"); #include #include @@ -46,59 +46,60 @@ #include struct sysentvec elf64_freebsd_sysvec = { - SYS_MAXSYSCALL, - sysent, - 0, - 0, - NULL, - 0, - NULL, - NULL, - __elfN(freebsd_fixup), - sendsig, - sigcode, - &szsigcode, - NULL, - "FreeBSD ELF64", - __elfN(coredump), - NULL, - MINSIGSTKSZ, - PAGE_SIZE, - VM_MIN_ADDRESS, - VM_MAXUSER_ADDRESS, - USRSTACK, - PS_STRINGS, - VM_PROT_ALL, - exec_copyout_strings, - exec_setregs, - NULL + .sv_size = SYS_MAXSYSCALL, + .sv_table = sysent, + .sv_mask = 0, + .sv_sigsize = 0, + .sv_sigtbl = NULL, + .sv_errsize = 0, + .sv_errtbl = NULL, + .sv_transtrap = NULL, + .sv_fixup = __elfN(freebsd_fixup), + .sv_sendsig = sendsig, + .sv_sigcode = sigcode, + .sv_szsigcode = &szsigcode, + .sv_prepsyscall = NULL, + .sv_name = "FreeBSD ELF64", + .sv_coredump = __elfN(coredump), + .sv_imgact_try = NULL, + .sv_minsigstksz = MINSIGSTKSZ, + .sv_pagesize = PAGE_SIZE, + .sv_minuser = VM_MIN_ADDRESS, + .sv_maxuser = VM_MAXUSER_ADDRESS, + .sv_usrstack = USRSTACK, + .sv_psstrings = PS_STRINGS, + .sv_stackprot = VM_PROT_ALL, + .sv_copyout_strings = exec_copyout_strings, + .sv_setregs = exec_setregs, + .sv_fixlimit = NULL, + .sv_maxssiz = NULL }; static Elf64_Brandinfo freebsd_brand_info = { - ELFOSABI_FREEBSD, - EM_X86_64, - "FreeBSD", - NULL, - "/libexec/ld-elf.so.1", - &elf64_freebsd_sysvec, - NULL, - BI_CAN_EXEC_DYN, - }; + .brand = ELFOSABI_FREEBSD, + .machine = EM_X86_64, + .compat_3_brand = "FreeBSD", + .emul_path = NULL, + .interp_path = "/libexec/ld-elf.so.1", + .sysvec = &elf64_freebsd_sysvec, + .interp_newpath = NULL, + .flags = BI_CAN_EXEC_DYN, +}; SYSINIT(elf64, SI_SUB_EXEC, SI_ORDER_ANY, (sysinit_cfunc_t) elf64_insert_brand_entry, &freebsd_brand_info); static Elf64_Brandinfo freebsd_brand_oinfo = { - ELFOSABI_FREEBSD, - EM_X86_64, - "FreeBSD", - NULL, - "/usr/libexec/ld-elf.so.1", - &elf64_freebsd_sysvec, - NULL, - BI_CAN_EXEC_DYN, - }; + .brand = ELFOSABI_FREEBSD, + .machine = EM_X86_64, + .compat_3_brand = "FreeBSD", + .emul_path = NULL, + .interp_path = "/usr/libexec/ld-elf.so.1", + .sysvec = &elf64_freebsd_sysvec, + .interp_newpath = NULL, + .flags = BI_CAN_EXEC_DYN, +}; SYSINIT(oelf64, SI_SUB_EXEC, SI_ORDER_ANY, (sysinit_cfunc_t) elf64_insert_brand_entry, ==== //depot/projects/smpng/sys/amd64/amd64/identcpu.c#27 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/identcpu.c,v 1.159 2008/05/23 04:03:52 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/identcpu.c,v 1.160 2008/09/18 18:51:32 stas Exp $"); #include "opt_cpu.h" @@ -249,8 +249,8 @@ "\030POPCNT" "\031" "\032" - "\033" - "\034" + "\033XSAVE" + "\034OSXSAVE" "\035" "\036" "\037" ==== //depot/projects/smpng/sys/amd64/linux32/linux32_sysvec.c#31 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_sysvec.c,v 1.34 2008/04/08 09:45:47 kib Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_sysvec.c,v 1.35 2008/09/24 10:14:37 kib Exp $"); #include "opt_compat.h" #ifndef COMPAT_IA32 @@ -1000,62 +1000,62 @@ } struct sysentvec elf_linux_sysvec = { - LINUX_SYS_MAXSYSCALL, - linux_sysent, - 0, - LINUX_SIGTBLSZ, - bsd_to_linux_signal, - ELAST + 1, - bsd_to_linux_errno, - translate_traps, - elf_linux_fixup, - linux_sendsig, - linux_sigcode, - &linux_szsigcode, - linux_prepsyscall, - "Linux ELF32", - elf32_coredump, - exec_linux_imgact_try, - LINUX_MINSIGSTKSZ, - PAGE_SIZE, - VM_MIN_ADDRESS, - LINUX32_USRSTACK, - LINUX32_USRSTACK, - LINUX32_PS_STRINGS, - VM_PROT_ALL, - linux_copyout_strings, - exec_linux_setregs, - linux32_fixlimit, - &linux32_maxssiz, + .sv_size = LINUX_SYS_MAXSYSCALL, + .sv_table = linux_sysent, + .sv_mask = 0, + .sv_sigsize = LINUX_SIGTBLSZ, + .sv_sigtbl = bsd_to_linux_signal, + .sv_errsize = ELAST + 1, + .sv_errtbl = bsd_to_linux_errno, + .sv_transtrap = translate_traps, + .sv_fixup = elf_linux_fixup, + .sv_sendsig = linux_sendsig, + .sv_sigcode = linux_sigcode, + .sv_szsigcode = &linux_szsigcode, + .sv_prepsyscall = linux_prepsyscall, + .sv_name = "Linux ELF32", + .sv_coredump = elf32_coredump, + .sv_imgact_try = exec_linux_imgact_try, + .sv_minsigstksz = LINUX_MINSIGSTKSZ, + .sv_pagesize = PAGE_SIZE, + .sv_minuser = VM_MIN_ADDRESS, + .sv_maxuser = LINUX32_USRSTACK, + .sv_usrstack = LINUX32_USRSTACK, + .sv_psstrings = LINUX32_PS_STRINGS, + .sv_stackprot = VM_PROT_ALL, + .sv_copyout_strings = linux_copyout_strings, + .sv_setregs = exec_linux_setregs, + .sv_fixlimit = linux32_fixlimit, + .sv_maxssiz = &linux32_maxssiz, }; static Elf32_Brandinfo linux_brand = { - ELFOSABI_LINUX, - EM_386, - "Linux", - "/compat/linux", - "/lib/ld-linux.so.1", - &elf_linux_sysvec, - NULL, - BI_CAN_EXEC_DYN, - }; + .brand = ELFOSABI_LINUX, + .machine = EM_386, + .compat_3_brand = "Linux", + .emul_path = "/compat/linux", + .interp_path = "/lib/ld-linux.so.1", + .sysvec = &elf_linux_sysvec, + .interp_newpath = NULL, + .flags = BI_CAN_EXEC_DYN, +}; static Elf32_Brandinfo linux_glibc2brand = { - ELFOSABI_LINUX, - EM_386, - "Linux", - "/compat/linux", - "/lib/ld-linux.so.2", - &elf_linux_sysvec, - NULL, - BI_CAN_EXEC_DYN, - }; + .brand = ELFOSABI_LINUX, + .machine = EM_386, + .compat_3_brand = "Linux", + .emul_path = "/compat/linux", + .interp_path = "/lib/ld-linux.so.2", + .sysvec = &elf_linux_sysvec, + .interp_newpath = NULL, + .flags = BI_CAN_EXEC_DYN, +}; Elf32_Brandinfo *linux_brandlist[] = { - &linux_brand, - &linux_glibc2brand, - NULL - }; + &linux_brand, + &linux_glibc2brand, + NULL +}; static int linux_elf_modevent(module_t mod, int type, void *data) ==== //depot/projects/smpng/sys/arm/arm/elf_machdep.c#8 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/arm/elf_machdep.c,v 1.7 2007/05/22 02:22:57 kan Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/elf_machdep.c,v 1.8 2008/09/24 10:14:37 kib Exp $"); #include #include @@ -46,59 +46,60 @@ #include struct sysentvec elf32_freebsd_sysvec = { - SYS_MAXSYSCALL, - sysent, - 0, - 0, - NULL, - 0, - NULL, - NULL, - __elfN(freebsd_fixup), - sendsig, - sigcode, - &szsigcode, - NULL, - "FreeBSD ELF32", - __elfN(coredump), - NULL, - MINSIGSTKSZ, - PAGE_SIZE, - VM_MIN_ADDRESS, - VM_MAXUSER_ADDRESS, - USRSTACK, - PS_STRINGS, - VM_PROT_ALL, - exec_copyout_strings, - exec_setregs, - NULL + .sv_size = SYS_MAXSYSCALL, + .sv_table = sysent, + .sv_mask = 0, + .sv_sigsize = 0, + .sv_sigtbl = NULL, + .sv_errsize = 0, + .sv_errtbl = NULL, + .sv_transtrap = NULL, + .sv_fixup = __elfN(freebsd_fixup), + .sv_sendsig = sendsig, + .sv_sigcode = sigcode, + .sv_szsigcode = &szsigcode, + .sv_prepsyscall = NULL, + .sv_name = "FreeBSD ELF32", + .sv_coredump = __elfN(coredump), + .sv_imgact_try = NULL, + .sv_minsigstksz = MINSIGSTKSZ, + .sv_pagesize = PAGE_SIZE, + .sv_minuser = VM_MIN_ADDRESS, + .sv_maxuser = VM_MAXUSER_ADDRESS, + .sv_usrstack = USRSTACK, + .sv_psstrings = PS_STRINGS, + .sv_stackprot = VM_PROT_ALL, + .sv_copyout_strings = exec_copyout_strings, + .sv_setregs = exec_setregs, + .sv_fixlimit = NULL, + .sv_maxssiz = NULL }; static Elf32_Brandinfo freebsd_brand_info = { - ELFOSABI_FREEBSD, - EM_ARM, - "FreeBSD", - NULL, - "/libexec/ld-elf.so.1", - &elf32_freebsd_sysvec, - NULL, - BI_CAN_EXEC_DYN, - }; + .brand = ELFOSABI_FREEBSD, + .machine = EM_ARM, + .compat_3_brand = "FreeBSD", + .emul_path = NULL, + .interp_path = "/libexec/ld-elf.so.1", + .sysvec = &elf32_freebsd_sysvec, + .interp_newpath = NULL, + .flags = BI_CAN_EXEC_DYN, +}; SYSINIT(elf32, SI_SUB_EXEC, SI_ORDER_ANY, (sysinit_cfunc_t) elf32_insert_brand_entry, &freebsd_brand_info); static Elf32_Brandinfo freebsd_brand_oinfo = { - ELFOSABI_FREEBSD, - EM_ARM, - "FreeBSD", - NULL, - "/usr/libexec/ld-elf.so.1", - &elf32_freebsd_sysvec, - NULL, - BI_CAN_EXEC_DYN, - }; + .brand = ELFOSABI_FREEBSD, + .machine = EM_ARM, + .compat_3_brand = "FreeBSD", + .emul_path = NULL, + .interp_path = "/usr/libexec/ld-elf.so.1", + .sysvec = &elf32_freebsd_sysvec, + .interp_newpath = NULL, + .flags = BI_CAN_EXEC_DYN, +}; SYSINIT(oelf32, SI_SUB_EXEC, SI_ORDER_ANY, (sysinit_cfunc_t) elf32_insert_brand_entry, ==== //depot/projects/smpng/sys/boot/Makefile#27 (text+ko) ==== @@ -1,7 +1,11 @@ -# $FreeBSD: src/sys/boot/Makefile,v 1.34 2008/07/23 07:23:33 imp Exp $ +# $FreeBSD: src/sys/boot/Makefile,v 1.35 2008/09/18 15:25:35 obrien Exp $ .include +.if ${MACHINE_ARCH} == "mips" +MK_FORTH=no # not yet +.endif + .if ${MK_FORTH} != "no" # Build the add-in FORTH interpreter. SUBDIR+= ficl ==== //depot/projects/smpng/sys/boot/ofw/libofw/Makefile#9 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/boot/ofw/libofw/Makefile,v 1.11 2007/06/17 00:17:15 marius Exp $ +# $FreeBSD: src/sys/boot/ofw/libofw/Makefile,v 1.13 2008/09/19 19:49:58 sobomax Exp $ LIB= ofw INTERNALLIB= ==== //depot/projects/smpng/sys/boot/ofw/libofw/ofw_console.c#9 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/boot/ofw/libofw/ofw_console.c,v 1.13 2008/02/06 22:04:28 grehan Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/ofw/libofw/ofw_console.c,v 1.15 2008/09/19 19:49:58 sobomax Exp $"); #include ==== //depot/projects/smpng/sys/cam/cam.h#4 (text+ko) ==== @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/cam/cam.h,v 1.11 2005/01/05 22:34:34 imp Exp $ + * $FreeBSD: src/sys/cam/cam.h,v 1.12 2008/09/18 14:48:46 sbruno Exp $ */ #ifndef _CAM_CAM_H @@ -129,6 +129,7 @@ * requests for the target at the sim level * back into the XPT queue. */ + CAM_SCSI_IT_NEXUS_LOST, /* Initiator/Target Nexus lost. */ CAM_IDE = 0x33, /* Initiator Detected Error */ CAM_RESRC_UNAVAIL, /* Resource Unavailable */ CAM_UNACKED_EVENT, /* Unacknowledged Event by Host */ ==== //depot/projects/smpng/sys/cddl/compat/opensolaris/kern/opensolaris_atomic.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cddl/compat/opensolaris/kern/opensolaris_atomic.c,v 1.2 2008/03/28 22:16:05 jb Exp $"); +__FBSDID("$FreeBSD: src/sys/cddl/compat/opensolaris/kern/opensolaris_atomic.c,v 1.3 2008/09/18 19:57:06 imp Exp $"); #include #include @@ -74,7 +74,8 @@ return (newval); } -#if defined(__sparc64__) || defined(__powerpc__) || defined(__arm__) +#if defined(__sparc64__) || defined(__powerpc__) || defined(__arm__) || \ + defined(__mips__) void atomic_or_8(volatile uint8_t *target, uint8_t value) { ==== //depot/projects/smpng/sys/cddl/compat/opensolaris/sys/atomic.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/sys/cddl/compat/opensolaris/sys/atomic.h,v 1.4 2008/05/22 08:33:24 jb Exp $ + * $FreeBSD: src/sys/cddl/compat/opensolaris/sys/atomic.h,v 1.5 2008/09/18 19:57:06 imp Exp $ */ #ifndef _OPENSOLARIS_SYS_ATOMIC_H_ @@ -48,7 +48,8 @@ extern uint8_t atomic_or_8_nv(volatile uint8_t *target, uint8_t value); extern void membar_producer(void); -#if defined(__sparc64__) || defined(__powerpc__) || defined(__arm__) +#if defined(__sparc64__) || defined(__powerpc__) || defined(__arm__) || \ + defined(__mips__) extern void atomic_or_8(volatile uint8_t *target, uint8_t value); #else static __inline void ==== //depot/projects/smpng/sys/compat/freebsd32/freebsd32_misc.c#50 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/freebsd32/freebsd32_misc.c,v 1.78 2008/09/15 17:39:40 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/freebsd32/freebsd32_misc.c,v 1.79 2008/09/19 15:17:32 obrien Exp $"); #include "opt_compat.h" @@ -85,6 +85,8 @@ #include +#include + #include #include #include @@ -2552,8 +2554,51 @@ return (cpuset_setaffinity(td, &ap)); } +int +freebsd32_nmount(struct thread *td, + struct freebsd32_nmount_args /* { + struct iovec *iovp; + unsigned int iovcnt; + int flags; + } */ *uap) +{ + struct uio *auio; + struct iovec *iov; + int error, k; + + AUDIT_ARG(fflags, uap->flags); + + /* + * Filter out MNT_ROOTFS. We do not want clients of nmount() in + * userspace to set this flag, but we must filter it out if we want + * MNT_UPDATE on the root file system to work. + * MNT_ROOTFS should only be set in the kernel in vfs_mountroot_try(). + */ + uap->flags &= ~MNT_ROOTFS; + + /* + * check that we have an even number of iovec's + * and that we have at least two options. + */ + if ((uap->iovcnt & 1) || (uap->iovcnt < 4)) + return (EINVAL); + + error = freebsd32_copyinuio(uap->iovp, uap->iovcnt, &auio); + if (error) + return (error); + for (iov = auio->uio_iov, k = 0; k < uap->iovcnt; ++k, ++iov) { + if (iov->iov_len > MMAXOPTIONLEN) { + free(auio, M_IOV); + return (EINVAL); + } + } + + error = vfs_donmount(td, uap->flags, auio); + free(auio, M_IOV); + return error; +} + #if 0 - int freebsd32_xxx(struct thread *td, struct freebsd32_xxx_args *uap) { @@ -2578,5 +2623,4 @@ } return (error); } - #endif ==== //depot/projects/smpng/sys/compat/freebsd32/freebsd32_proto.h#45 (text+ko) ==== @@ -2,8 +2,8 @@ * System call prototypes. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/freebsd32/freebsd32_proto.h,v 1.90 2008/09/15 17:39:01 obrien Exp $ - * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 183042 2008-09-15 17:37:41Z obrien + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_proto.h,v 1.92 2008/09/22 16:09:43 obrien Exp $ + * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 183270 2008-09-22 16:09:16Z obrien */ #ifndef _FREEBSD32_SYSPROTO_H_ @@ -63,6 +63,11 @@ char ss_l_[PADL_(struct sigaltstack32 *)]; struct sigaltstack32 * ss; char ss_r_[PADR_(struct sigaltstack32 *)]; char oss_l_[PADL_(struct sigaltstack32 *)]; struct sigaltstack32 * oss; char oss_r_[PADR_(struct sigaltstack32 *)]; }; +struct freebsd32_ioctl_args { + char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)]; + char com_l_[PADL_(uint32_t)]; uint32_t com; char com_r_[PADR_(uint32_t)]; + char data_l_[PADL_(struct md_ioctl32 *)]; struct md_ioctl32 * data; char data_r_[PADR_(struct md_ioctl32 *)]; +}; struct freebsd32_execve_args { char fname_l_[PADL_(char *)]; char * fname; char fname_r_[PADR_(char *)]; char argv_l_[PADL_(u_int32_t *)]; u_int32_t * argv; char argv_r_[PADR_(u_int32_t *)]; @@ -241,6 +246,11 @@ char nevents_l_[PADL_(int)]; int nevents; char nevents_r_[PADR_(int)]; char timeout_l_[PADL_(const struct timespec32 *)]; const struct timespec32 * timeout; char timeout_r_[PADR_(const struct timespec32 *)]; }; +struct freebsd32_nmount_args { + char iovp_l_[PADL_(struct iovec32 *)]; struct iovec32 * iovp; char iovp_r_[PADR_(struct iovec32 *)]; + char iovcnt_l_[PADL_(unsigned int)]; unsigned int iovcnt; char iovcnt_r_[PADR_(unsigned int)]; + char flags_l_[PADL_(int)]; int flags; char flags_r_[PADR_(int)]; +}; struct freebsd32_sendfile_args { char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)]; char s_l_[PADL_(int)]; int s; char s_r_[PADR_(int)]; @@ -378,6 +388,7 @@ int freebsd32_sendmsg(struct thread *, struct freebsd32_sendmsg_args *); int freebsd32_recvfrom(struct thread *, struct freebsd32_recvfrom_args *); int freebsd32_sigaltstack(struct thread *, struct freebsd32_sigaltstack_args *); +int freebsd32_ioctl(struct thread *, struct freebsd32_ioctl_args *); int freebsd32_execve(struct thread *, struct freebsd32_execve_args *); int freebsd32_setitimer(struct thread *, struct freebsd32_setitimer_args *); int freebsd32_getitimer(struct thread *, struct freebsd32_getitimer_args *); @@ -413,6 +424,7 @@ int freebsd32_sigtimedwait(struct thread *, struct freebsd32_sigtimedwait_args *); int freebsd32_sigwaitinfo(struct thread *, struct freebsd32_sigwaitinfo_args *); int freebsd32_kevent(struct thread *, struct freebsd32_kevent_args *); +int freebsd32_nmount(struct thread *, struct freebsd32_nmount_args *); int freebsd32_sendfile(struct thread *, struct freebsd32_sendfile_args *); int freebsd32_sigaction(struct thread *, struct freebsd32_sigaction_args *); int freebsd32_sigreturn(struct thread *, struct freebsd32_sigreturn_args *); @@ -588,6 +600,7 @@ #define FREEBSD32_SYS_AUE_freebsd32_sendmsg AUE_SENDMSG #define FREEBSD32_SYS_AUE_freebsd32_recvfrom AUE_RECVFROM #define FREEBSD32_SYS_AUE_freebsd32_sigaltstack AUE_SIGALTSTACK +#define FREEBSD32_SYS_AUE_freebsd32_ioctl AUE_NULL #define FREEBSD32_SYS_AUE_freebsd32_execve AUE_EXECVE #define FREEBSD32_SYS_AUE_freebsd32_setitimer AUE_SETITIMER #define FREEBSD32_SYS_AUE_freebsd32_getitimer AUE_GETITIMER @@ -623,6 +636,7 @@ #define FREEBSD32_SYS_AUE_freebsd32_sigtimedwait AUE_SIGWAIT #define FREEBSD32_SYS_AUE_freebsd32_sigwaitinfo AUE_NULL #define FREEBSD32_SYS_AUE_freebsd32_kevent AUE_NULL +#define FREEBSD32_SYS_AUE_freebsd32_nmount AUE_NMOUNT #define FREEBSD32_SYS_AUE_freebsd32_sendfile AUE_SENDFILE #define FREEBSD32_SYS_AUE_freebsd32_sigaction AUE_SIGACTION #define FREEBSD32_SYS_AUE_freebsd32_sigreturn AUE_SIGRETURN ==== //depot/projects/smpng/sys/compat/freebsd32/freebsd32_syscall.h#45 (text+ko) ==== @@ -2,8 +2,8 @@ * System call numbers. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscall.h,v 1.89 2008/09/15 17:39:01 obrien Exp $ - * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 183042 2008-09-15 17:37:41Z obrien + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscall.h,v 1.91 2008/09/22 16:09:43 obrien Exp $ + * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 183270 2008-09-22 16:09:16Z obrien */ #define FREEBSD32_SYS_syscall 0 @@ -58,7 +58,7 @@ #define FREEBSD32_SYS_acct 51 /* 52 is old freebsd32_sigpending */ #define FREEBSD32_SYS_freebsd32_sigaltstack 53 -#define FREEBSD32_SYS_ioctl 54 +#define FREEBSD32_SYS_freebsd32_ioctl 54 #define FREEBSD32_SYS_reboot 55 #define FREEBSD32_SYS_revoke 56 #define FREEBSD32_SYS_symlink 57 @@ -283,7 +283,7 @@ #define FREEBSD32_SYS_extattr_delete_fd 373 #define FREEBSD32_SYS___setugid 374 #define FREEBSD32_SYS_eaccess 376 -#define FREEBSD32_SYS_nmount 378 +#define FREEBSD32_SYS_freebsd32_nmount 378 #define FREEBSD32_SYS_kenv 390 #define FREEBSD32_SYS_lchflags 391 #define FREEBSD32_SYS_uuidgen 392 ==== //depot/projects/smpng/sys/compat/freebsd32/freebsd32_syscalls.c#45 (text+ko) ==== @@ -2,8 +2,8 @@ * System call names. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscalls.c,v 1.80 2008/09/15 17:39:01 obrien Exp $ - * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 183042 2008-09-15 17:37:41Z obrien + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscalls.c,v 1.82 2008/09/22 16:09:43 obrien Exp $ + * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 183270 2008-09-22 16:09:16Z obrien */ const char *freebsd32_syscallnames[] = { @@ -61,7 +61,7 @@ "acct", /* 51 = acct */ "compat.freebsd32_sigpending", /* 52 = old freebsd32_sigpending */ "freebsd32_sigaltstack", /* 53 = freebsd32_sigaltstack */ - "ioctl", /* 54 = ioctl */ + "freebsd32_ioctl", /* 54 = freebsd32_ioctl */ "reboot", /* 55 = reboot */ "revoke", /* 56 = revoke */ "symlink", /* 57 = symlink */ @@ -385,7 +385,7 @@ "#375", /* 375 = nfsclnt */ "eaccess", /* 376 = eaccess */ "#377", /* 377 = afs_syscall */ - "nmount", /* 378 = nmount */ + "freebsd32_nmount", /* 378 = freebsd32_nmount */ "#379", /* 379 = kse_exit */ "#380", /* 380 = kse_wakeup */ "#381", /* 381 = kse_create */ ==== //depot/projects/smpng/sys/compat/freebsd32/freebsd32_sysent.c#45 (text+ko) ==== @@ -2,8 +2,8 @@ * System call switch table. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/freebsd32/freebsd32_sysent.c,v 1.90 2008/09/15 17:39:01 obrien Exp $ - * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 183042 2008-09-15 17:37:41Z obrien + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_sysent.c,v 1.92 2008/09/22 16:09:43 obrien Exp $ + * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 183270 2008-09-22 16:09:16Z obrien */ #include "opt_compat.h" @@ -92,7 +92,7 @@ { AS(acct_args), (sy_call_t *)acct, AUE_ACCT, NULL, 0, 0 }, /* 51 = acct */ { compat(0,freebsd32_sigpending), AUE_SIGPENDING, NULL, 0, 0 }, /* 52 = old freebsd32_sigpending */ { AS(freebsd32_sigaltstack_args), (sy_call_t *)freebsd32_sigaltstack, AUE_SIGALTSTACK, NULL, 0, 0 }, /* 53 = freebsd32_sigaltstack */ - { AS(ioctl_args), (sy_call_t *)ioctl, AUE_IOCTL, NULL, 0, 0 }, /* 54 = ioctl */ + { AS(freebsd32_ioctl_args), (sy_call_t *)freebsd32_ioctl, AUE_NULL, NULL, 0, 0 }, /* 54 = freebsd32_ioctl */ { AS(reboot_args), (sy_call_t *)reboot, AUE_REBOOT, NULL, 0, 0 }, /* 55 = reboot */ { AS(revoke_args), (sy_call_t *)revoke, AUE_REVOKE, NULL, 0, 0 }, /* 56 = revoke */ { AS(symlink_args), (sy_call_t *)symlink, AUE_SYMLINK, NULL, 0, 0 }, /* 57 = symlink */ @@ -416,7 +416,7 @@ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 375 = nfsclnt */ { AS(eaccess_args), (sy_call_t *)eaccess, AUE_EACCESS, NULL, 0, 0 }, /* 376 = eaccess */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 377 = afs_syscall */ - { AS(nmount_args), (sy_call_t *)nmount, AUE_NMOUNT, NULL, 0, 0 }, /* 378 = nmount */ + { AS(freebsd32_nmount_args), (sy_call_t *)freebsd32_nmount, AUE_NMOUNT, NULL, 0, 0 }, /* 378 = freebsd32_nmount */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 379 = kse_exit */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 380 = kse_wakeup */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 381 = kse_create */ ==== //depot/projects/smpng/sys/compat/freebsd32/syscalls.master#49 (text+ko) ==== @@ -1,4 +1,4 @@ - $FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.105 2008/09/15 17:37:41 obrien Exp $ + $FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.107 2008/09/22 16:09:16 obrien Exp $ ; from: @(#)syscalls.master 8.2 (Berkeley) 1/13/94 ; from: src/sys/kern/syscalls.master 1.107 ; @@ -134,8 +134,8 @@ 53 AUE_SIGALTSTACK STD { int freebsd32_sigaltstack( \ struct sigaltstack32 *ss, \ struct sigaltstack32 *oss); } -54 AUE_IOCTL NOPROTO { int ioctl(int fd, u_long com, \ - caddr_t data); } +54 AUE_NULL STD { int freebsd32_ioctl(int fd, uint32_t com, \ + struct md_ioctl32 *data); } 55 AUE_REBOOT NOPROTO { int reboot(int opt); } 56 AUE_REVOKE NOPROTO { int revoke(char *path); } 57 AUE_SYMLINK NOPROTO { int symlink(char *path, char *link); } @@ -651,7 +651,7 @@ 375 AUE_NULL UNIMPL nfsclnt 376 AUE_EACCESS NOPROTO { int eaccess(char *path, int flags); } 377 AUE_NULL UNIMPL afs_syscall -378 AUE_NMOUNT NOPROTO { int nmount(struct iovec *iovp, \ +378 AUE_NMOUNT STD { int freebsd32_nmount(struct iovec32 *iovp, \ unsigned int iovcnt, int flags); } 379 AUE_NULL UNIMPL kse_exit 380 AUE_NULL UNIMPL kse_wakeup ==== //depot/projects/smpng/sys/compat/ia32/ia32_sysvec.c#19 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/ia32/ia32_sysvec.c,v 1.27 2007/09/24 20:49:39 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/ia32/ia32_sysvec.c,v 1.28 2008/09/24 10:14:37 kib Exp $"); #include "opt_compat.h" @@ -111,61 +111,61 @@ TUNABLE_ULONG("compat.ia32.maxvmem", &ia32_maxvmem); >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Sep 24 21:58:03 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5EE10106568E; Wed, 24 Sep 2008 21:58:03 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 2243A1065687 for ; Wed, 24 Sep 2008 21:58:03 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 0931A8FC0A for ; Wed, 24 Sep 2008 21:58:03 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id m8OLw3bH075911 for ; Wed, 24 Sep 2008 21:58:03 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m8OLw3aR075909 for perforce@freebsd.org; Wed, 24 Sep 2008 21:58:03 GMT (envelope-from jhb@freebsd.org) Date: Wed, 24 Sep 2008 21:58:03 GMT Message-Id: <200809242158.m8OLw3aR075909@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 150406 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 24 Sep 2008 21:58:03 -0000 http://perforce.freebsd.org/chv.cgi?CH=150406 Change 150406 by jhb@jhb_mutex on 2008/09/24 21:57:22 IFC @150403 Affected files ... .. //depot/projects/smpng/sys/dev/le/if_le_cbus.c#4 integrate .. //depot/projects/smpng/sys/dev/le/if_le_isa.c#4 integrate .. //depot/projects/smpng/sys/dev/le/if_le_lebuffer.c#3 integrate .. //depot/projects/smpng/sys/dev/le/if_le_pci.c#5 integrate .. //depot/projects/smpng/sys/dev/le/lebuffer_sbus.c#2 integrate Differences ... ==== //depot/projects/smpng/sys/dev/le/if_le_cbus.c#4 (text) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/le/if_le_cbus.c,v 1.5 2007/02/23 12:18:45 piso Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/le/if_le_cbus.c,v 1.6 2008/09/24 21:26:46 marius Exp $"); #include #include @@ -70,12 +70,8 @@ struct le_cbus_softc { struct am7990_softc sc_am7990; /* glue to MI code */ - int sc_rrid; struct resource *sc_rres; - bus_space_tag_t sc_regt; - bus_space_handle_t sc_regh; - int sc_irid; struct resource *sc_ires; void *sc_ih; @@ -128,10 +124,9 @@ { struct le_cbus_softc *lesc = (struct le_cbus_softc *)sc; - bus_space_write_2(lesc->sc_regt, lesc->sc_regh, CNET98S_RAP, port); - bus_space_barrier(lesc->sc_regt, lesc->sc_regh, CNET98S_RAP, 2, - BUS_SPACE_BARRIER_WRITE); - bus_space_write_2(lesc->sc_regt, lesc->sc_regh, CNET98S_BDP, val); + bus_write_2(lesc->sc_rres, CNET98S_RAP, port); + bus_barrier(lesc->sc_rres, CNET98S_RAP, 2, BUS_SPACE_BARRIER_WRITE); + bus_write_2(lesc->sc_rres, CNET98S_BDP, val); } #ifdef LEDEBUG @@ -140,10 +135,9 @@ { struct le_cbus_softc *lesc = (struct le_cbus_softc *)sc; - bus_space_write_2(lesc->sc_regt, lesc->sc_regh, CNET98S_RAP, port); - bus_space_barrier(lesc->sc_regt, lesc->sc_regh, CNET98S_RAP, 2, - BUS_SPACE_BARRIER_WRITE); - return (bus_space_read_2(lesc->sc_regt, lesc->sc_regh, CNET98S_BDP)); + bus_write_2(lesc->sc_rres, CNET98S_RAP, port); + bus_barrier(lesc->sc_rres, CNET98S_RAP, 2, BUS_SPACE_BARRIER_WRITE); + return (bus_read_2(lesc->sc_rres, CNET98S_BDP)); } #endif @@ -152,10 +146,9 @@ { struct le_cbus_softc *lesc = (struct le_cbus_softc *)sc; - bus_space_write_2(lesc->sc_regt, lesc->sc_regh, CNET98S_RAP, port); - bus_space_barrier(lesc->sc_regt, lesc->sc_regh, CNET98S_RAP, 2, - BUS_SPACE_BARRIER_WRITE); - bus_space_write_2(lesc->sc_regt, lesc->sc_regh, CNET98S_RDP, val); + bus_write_2(lesc->sc_rres, CNET98S_RAP, port); + bus_barrier(lesc->sc_rres, CNET98S_RAP, 2, BUS_SPACE_BARRIER_WRITE); + bus_write_2(lesc->sc_rres, CNET98S_RDP, val); } static uint16_t @@ -163,10 +156,9 @@ { struct le_cbus_softc *lesc = (struct le_cbus_softc *)sc; - bus_space_write_2(lesc->sc_regt, lesc->sc_regh, CNET98S_RAP, port); - bus_space_barrier(lesc->sc_regt, lesc->sc_regh, CNET98S_RAP, 2, - BUS_SPACE_BARRIER_WRITE); - return (bus_space_read_2(lesc->sc_regt, lesc->sc_regh, CNET98S_RDP)); + bus_write_2(lesc->sc_rres, CNET98S_RAP, port); + bus_barrier(lesc->sc_rres, CNET98S_RAP, 2, BUS_SPACE_BARRIER_WRITE); + return (bus_read_2(lesc->sc_rres, CNET98S_RDP)); } static void @@ -179,16 +171,16 @@ */ /* Reset the chip. */ - bus_space_write_2(lesc->sc_regt, lesc->sc_regh, CNET98S_RESET, - bus_space_read_2(lesc->sc_regt, lesc->sc_regh, CNET98S_RESET)); + bus_write_2(lesc->sc_rres, CNET98S_RESET, + bus_read_2(lesc->sc_rres, CNET98S_RESET)); DELAY(500); /* ISA bus configuration */ /* ISACSR0 - set Master Mode Read Active time to 300ns. */ - le_cbus_wrbcr(sc, LE_BCR0, 0x0006); + le_cbus_wrbcr(sc, LE_BCR0, 0x0006); /* ISACSR1 - set Master Mode Write Active time to 300ns. */ - le_cbus_wrbcr(sc, LE_BCR1, 0x0006); -#ifdef LEDEBUG + le_cbus_wrbcr(sc, LE_BCR1, 0x0006); +#ifdef LEDEBUG device_printf(dev, "ISACSR2=0x%x\n", le_cbus_rdbcr(sc, LE_BCR2)); #endif /* ISACSR5 - LED1 */ @@ -215,7 +207,7 @@ { struct le_cbus_softc *lesc; struct lance_softc *sc; - int error; + int error, i; /* * Skip PnP devices as some wedge when trying to probe them as @@ -227,18 +219,16 @@ lesc = device_get_softc(dev); sc = &lesc->sc_am7990.lsc; - lesc->sc_rrid = 0; - lesc->sc_rres = isa_alloc_resourcev(dev, SYS_RES_IOPORT, &lesc->sc_rrid, + i = 0; + lesc->sc_rres = isa_alloc_resourcev(dev, SYS_RES_IOPORT, &i, le_ioaddr_cnet98s, CNET98S_IOSIZE, RF_ACTIVE); if (lesc->sc_rres == NULL) return (ENXIO); isa_load_resourcev(lesc->sc_rres, le_ioaddr_cnet98s, CNET98S_IOSIZE); - lesc->sc_regt = rman_get_bustag(lesc->sc_rres); - lesc->sc_regh = rman_get_bushandle(lesc->sc_rres); /* Reset the chip. */ - bus_space_write_2(lesc->sc_regt, lesc->sc_regh, CNET98S_RESET, - bus_space_read_2(lesc->sc_regt, lesc->sc_regh, CNET98S_RESET)); + bus_write_2(lesc->sc_rres, CNET98S_RESET, + bus_read_2(lesc->sc_rres, CNET98S_RESET)); DELAY(500); /* Stop the chip and put it in a known state. */ @@ -253,7 +243,8 @@ error = BUS_PROBE_DEFAULT; fail: - bus_release_resource(dev, SYS_RES_IOPORT, lesc->sc_rrid, lesc->sc_rres); + bus_release_resource(dev, SYS_RES_IOPORT, + rman_get_rid(lesc->sc_rres), lesc->sc_rres); return (error); } @@ -269,8 +260,8 @@ LE_LOCK_INIT(sc, device_get_nameunit(dev)); - lesc->sc_rrid = 0; - lesc->sc_rres = isa_alloc_resourcev(dev, SYS_RES_IOPORT, &lesc->sc_rrid, + i = 0; + lesc->sc_rres = isa_alloc_resourcev(dev, SYS_RES_IOPORT, &i, le_ioaddr_cnet98s, CNET98S_IOSIZE, RF_ACTIVE); if (lesc->sc_rres == NULL) { device_printf(dev, "cannot allocate registers\n"); @@ -278,12 +269,10 @@ goto fail_mtx; } isa_load_resourcev(lesc->sc_rres, le_ioaddr_cnet98s, CNET98S_IOSIZE); - lesc->sc_regt = rman_get_bustag(lesc->sc_rres); - lesc->sc_regh = rman_get_bushandle(lesc->sc_rres); - lesc->sc_irid = 0; + i = 0; if ((lesc->sc_ires = bus_alloc_resource_any(dev, SYS_RES_IRQ, - &lesc->sc_irid, RF_SHAREABLE | RF_ACTIVE)) == NULL) { + &i, RF_SHAREABLE | RF_ACTIVE)) == NULL) { device_printf(dev, "cannot allocate interrupt\n"); error = ENXIO; goto fail_rres; @@ -339,7 +328,7 @@ error = bus_dmamap_load(lesc->sc_dmat, lesc->sc_dmam, sc->sc_mem, sc->sc_memsize, le_cbus_dma_callback, sc, 0); if (error != 0 || sc->sc_addr == 0) { - device_printf(dev, "cannot load DMA buffer map\n"); + device_printf(dev, "cannot load DMA buffer map\n"); goto fail_dmem; } @@ -350,8 +339,7 @@ * Extract the physical MAC address from the ROM. */ for (i = 0; i < sizeof(sc->sc_enaddr); i++) - sc->sc_enaddr[i] = bus_space_read_1(lesc->sc_regt, - lesc->sc_regh, i * 2); + sc->sc_enaddr[i] = bus_read_1(lesc->sc_rres, i * 2); sc->sc_copytodesc = lance_copytobuf_contig; sc->sc_copyfromdesc = lance_copyfrombuf_contig; @@ -396,9 +384,11 @@ fail_pdtag: bus_dma_tag_destroy(lesc->sc_pdmat); fail_ires: - bus_release_resource(dev, SYS_RES_IRQ, lesc->sc_irid, lesc->sc_ires); + bus_release_resource(dev, SYS_RES_IRQ, + rman_get_rid(lesc->sc_ires), lesc->sc_ires); fail_rres: - bus_release_resource(dev, SYS_RES_IOPORT, lesc->sc_rrid, lesc->sc_rres); + bus_release_resource(dev, SYS_RES_IOPORT, + rman_get_rid(lesc->sc_rres), lesc->sc_rres); fail_mtx: LE_LOCK_DESTROY(sc); return (error); @@ -419,8 +409,10 @@ bus_dmamem_free(lesc->sc_dmat, sc->sc_mem, lesc->sc_dmam); bus_dma_tag_destroy(lesc->sc_dmat); bus_dma_tag_destroy(lesc->sc_pdmat); - bus_release_resource(dev, SYS_RES_IRQ, lesc->sc_irid, lesc->sc_ires); - bus_release_resource(dev, SYS_RES_IOPORT, lesc->sc_rrid, lesc->sc_rres); + bus_release_resource(dev, SYS_RES_IRQ, + rman_get_rid(lesc->sc_ires), lesc->sc_ires); + bus_release_resource(dev, SYS_RES_IOPORT, + rman_get_rid(lesc->sc_rres), lesc->sc_rres); LE_LOCK_DESTROY(sc); return (0); ==== //depot/projects/smpng/sys/dev/le/if_le_isa.c#4 (text) ==== @@ -72,7 +72,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/le/if_le_isa.c,v 1.4 2007/02/23 12:18:45 piso Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/le/if_le_isa.c,v 1.5 2008/09/24 21:26:46 marius Exp $"); #include #include @@ -109,15 +109,10 @@ bus_size_t sc_rap; /* offsets to LANCE... */ bus_size_t sc_rdp; /* ...registers */ - int sc_rrid; struct resource *sc_rres; - bus_space_tag_t sc_regt; - bus_space_handle_t sc_regh; - int sc_drid; struct resource *sc_dres; - int sc_irid; struct resource *sc_ires; void *sc_ih; @@ -184,10 +179,9 @@ { struct le_isa_softc *lesc = (struct le_isa_softc *)sc; - bus_space_write_2(lesc->sc_regt, lesc->sc_regh, lesc->sc_rap, port); - bus_space_barrier(lesc->sc_regt, lesc->sc_regh, lesc->sc_rap, 2, - BUS_SPACE_BARRIER_WRITE); - bus_space_write_2(lesc->sc_regt, lesc->sc_regh, lesc->sc_rdp, val); + bus_write_2(lesc->sc_rres, lesc->sc_rap, port); + bus_barrier(lesc->sc_rres, lesc->sc_rap, 2, BUS_SPACE_BARRIER_WRITE); + bus_write_2(lesc->sc_rres, lesc->sc_rdp, val); } static uint16_t @@ -195,10 +189,9 @@ { struct le_isa_softc *lesc = (struct le_isa_softc *)sc; - bus_space_write_2(lesc->sc_regt, lesc->sc_regh, lesc->sc_rap, port); - bus_space_barrier(lesc->sc_regt, lesc->sc_regh, lesc->sc_rap, 2, - BUS_SPACE_BARRIER_WRITE); - return (bus_space_read_2(lesc->sc_regt, lesc->sc_regh, lesc->sc_rdp)); + bus_write_2(lesc->sc_rres, lesc->sc_rap, port); + bus_barrier(lesc->sc_rres, lesc->sc_rap, 2, BUS_SPACE_BARRIER_WRITE); + return (bus_read_2(lesc->sc_rres, lesc->sc_rdp)); } static void @@ -217,18 +210,16 @@ { struct le_isa_softc *lesc; struct lance_softc *sc; - int error; + int error, i; lesc = device_get_softc(dev); sc = &lesc->sc_am7990.lsc; - lesc->sc_rrid = 0; - lesc->sc_rres = bus_alloc_resource(dev, SYS_RES_IOPORT, &lesc->sc_rrid, - 0, ~0, leip->iosize, RF_ACTIVE); + i = 0; + lesc->sc_rres = bus_alloc_resource(dev, SYS_RES_IOPORT, &i, 0, ~0, + leip->iosize, RF_ACTIVE); if (lesc->sc_rres == NULL) return (ENXIO); - lesc->sc_regt = rman_get_bustag(lesc->sc_rres); - lesc->sc_regh = rman_get_bushandle(lesc->sc_rres); lesc->sc_rap = leip->rap; lesc->sc_rdp = leip->rdp; @@ -243,7 +234,8 @@ error = 0; fail: - bus_release_resource(dev, SYS_RES_IOPORT, lesc->sc_rrid, lesc->sc_rres); + bus_release_resource(dev, SYS_RES_IOPORT, + rman_get_rid(lesc->sc_rres), lesc->sc_rres); return (error); } @@ -276,18 +268,18 @@ struct le_isa_softc *lesc; struct lance_softc *sc; bus_size_t macstart, rap, rdp; - int error, i, macstride; + int error, i, j, macstride; lesc = device_get_softc(dev); sc = &lesc->sc_am7990.lsc; LE_LOCK_INIT(sc, device_get_nameunit(dev)); - lesc->sc_rrid = 0; + j = 0; switch (ISA_PNP_PROBE(device_get_parent(dev), dev, le_isa_ids)) { case 0: lesc->sc_rres = bus_alloc_resource_any(dev, SYS_RES_IOPORT, - &lesc->sc_rrid, RF_ACTIVE); + &j, RF_ACTIVE); rap = PCNET_RAP; rdp = PCNET_RDP; macstart = 0; @@ -298,7 +290,7 @@ sizeof(le_isa_params[0]); i++) { if (le_isa_probe_legacy(dev, &le_isa_params[i]) == 0) { lesc->sc_rres = bus_alloc_resource(dev, - SYS_RES_IOPORT, &lesc->sc_rrid, 0, ~0, + SYS_RES_IOPORT, &j, 0, ~0, le_isa_params[i].iosize, RF_ACTIVE); rap = le_isa_params[i].rap; rdp = le_isa_params[i].rdp; @@ -321,22 +313,20 @@ error = ENXIO; goto fail_mtx; } - lesc->sc_regt = rman_get_bustag(lesc->sc_rres); - lesc->sc_regh = rman_get_bushandle(lesc->sc_rres); lesc->sc_rap = rap; lesc->sc_rdp = rdp; - lesc->sc_drid = 0; + i = 0; if ((lesc->sc_dres = bus_alloc_resource_any(dev, SYS_RES_DRQ, - &lesc->sc_drid, RF_ACTIVE)) == NULL) { + &i, RF_ACTIVE)) == NULL) { device_printf(dev, "cannot allocate DMA channel\n"); error = ENXIO; goto fail_rres; } - lesc->sc_irid = 0; + i = 0; if ((lesc->sc_ires = bus_alloc_resource_any(dev, SYS_RES_IRQ, - &lesc->sc_irid, RF_SHAREABLE | RF_ACTIVE)) == NULL) { + &i, RF_SHAREABLE | RF_ACTIVE)) == NULL) { device_printf(dev, "cannot allocate interrupt\n"); error = ENXIO; goto fail_dres; @@ -392,7 +382,7 @@ error = bus_dmamap_load(lesc->sc_dmat, lesc->sc_dmam, sc->sc_mem, sc->sc_memsize, le_isa_dma_callback, sc, 0); if (error != 0 || sc->sc_addr == 0) { - device_printf(dev, "cannot load DMA buffer map\n"); + device_printf(dev, "cannot load DMA buffer map\n"); goto fail_dmem; } @@ -405,8 +395,8 @@ * Extract the physical MAC address from the ROM. */ for (i = 0; i < sizeof(sc->sc_enaddr); i++) - sc->sc_enaddr[i] = bus_space_read_1(lesc->sc_regt, - lesc->sc_regh, macstart + i * macstride); + sc->sc_enaddr[i] = bus_read_1(lesc->sc_rres, + macstart + i * macstride); sc->sc_copytodesc = lance_copytobuf_contig; sc->sc_copyfromdesc = lance_copyfrombuf_contig; @@ -451,11 +441,14 @@ fail_pdtag: bus_dma_tag_destroy(lesc->sc_pdmat); fail_ires: - bus_release_resource(dev, SYS_RES_IRQ, lesc->sc_irid, lesc->sc_ires); + bus_release_resource(dev, SYS_RES_IRQ, + rman_get_rid(lesc->sc_ires), lesc->sc_ires); fail_dres: - bus_release_resource(dev, SYS_RES_DRQ, lesc->sc_drid, lesc->sc_dres); + bus_release_resource(dev, SYS_RES_DRQ, + rman_get_rid(lesc->sc_dres), lesc->sc_dres); fail_rres: - bus_release_resource(dev, SYS_RES_IOPORT, lesc->sc_rrid, lesc->sc_rres); + bus_release_resource(dev, SYS_RES_IOPORT, + rman_get_rid(lesc->sc_rres), lesc->sc_rres); fail_mtx: LE_LOCK_DESTROY(sc); return (error); @@ -476,9 +469,12 @@ bus_dmamem_free(lesc->sc_dmat, sc->sc_mem, lesc->sc_dmam); bus_dma_tag_destroy(lesc->sc_dmat); bus_dma_tag_destroy(lesc->sc_pdmat); - bus_release_resource(dev, SYS_RES_IRQ, lesc->sc_irid, lesc->sc_ires); - bus_release_resource(dev, SYS_RES_DRQ, lesc->sc_drid, lesc->sc_dres); - bus_release_resource(dev, SYS_RES_IOPORT, lesc->sc_rrid, lesc->sc_rres); + bus_release_resource(dev, SYS_RES_IRQ, + rman_get_rid(lesc->sc_ires), lesc->sc_ires); + bus_release_resource(dev, SYS_RES_DRQ, + rman_get_rid(lesc->sc_dres), lesc->sc_dres); + bus_release_resource(dev, SYS_RES_IOPORT, + rman_get_rid(lesc->sc_rres), lesc->sc_rres); LE_LOCK_DESTROY(sc); return (0); ==== //depot/projects/smpng/sys/dev/le/if_le_lebuffer.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/le/if_le_lebuffer.c,v 1.2 2007/02/23 12:18:45 piso Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/le/if_le_lebuffer.c,v 1.3 2008/09/24 21:26:46 marius Exp $"); #include #include @@ -63,17 +63,10 @@ struct le_lebuffer_softc { struct am7990_softc sc_am7990; /* glue to MI code */ - int sc_brid; struct resource *sc_bres; - bus_space_tag_t sc_buft; - bus_space_handle_t sc_bufh; - int sc_rrid; struct resource *sc_rres; - bus_space_tag_t sc_regt; - bus_space_handle_t sc_regh; - int sc_irid; struct resource *sc_ires; void *sc_ih; }; @@ -103,6 +96,7 @@ sizeof(struct le_lebuffer_softc)); DRIVER_MODULE(le, lebuffer, le_lebuffer_driver, le_lebuffer_devclass, 0, 0); MODULE_DEPEND(le, ether, 1, 1, 1); +MODULE_DEPEND(le, lebuffer, 1, 1, 1); /* * Media types supported @@ -126,10 +120,9 @@ { struct le_lebuffer_softc *lesc = (struct le_lebuffer_softc *)sc; - bus_space_write_2(lesc->sc_regt, lesc->sc_regh, LEREG1_RAP, port); - bus_space_barrier(lesc->sc_regt, lesc->sc_regh, LEREG1_RAP, 2, - BUS_SPACE_BARRIER_WRITE); - bus_space_write_2(lesc->sc_regt, lesc->sc_regh, LEREG1_RDP, val); + bus_write_2(lesc->sc_rres, LEREG1_RAP, port); + bus_barrier(lesc->sc_rres, LEREG1_RAP, 2, BUS_SPACE_BARRIER_WRITE); + bus_write_2(lesc->sc_rres, LEREG1_RDP, val); } static uint16_t @@ -137,10 +130,9 @@ { struct le_lebuffer_softc *lesc = (struct le_lebuffer_softc *)sc; - bus_space_write_2(lesc->sc_regt, lesc->sc_regh, LEREG1_RAP, port); - bus_space_barrier(lesc->sc_regt, lesc->sc_regh, LEREG1_RAP, 2, - BUS_SPACE_BARRIER_WRITE); - return (bus_space_read_2(lesc->sc_regt, lesc->sc_regh, LEREG1_RDP)); + bus_write_2(lesc->sc_rres, LEREG1_RAP, port); + bus_barrier(lesc->sc_rres, LEREG1_RAP, 2, BUS_SPACE_BARRIER_WRITE); + return (bus_read_2(lesc->sc_rres, LEREG1_RDP)); } /* @@ -163,17 +155,13 @@ caddr_t from = fromv; for (; len >= 8; len -= 8, off += 8, from += 8) - bus_space_write_8(lesc->sc_buft, lesc->sc_bufh, off, - be64dec(from)); + bus_write_8(lesc->sc_bres, off, be64dec(from)); for (; len >= 4; len -= 4, off += 4, from += 4) - bus_space_write_4(lesc->sc_buft, lesc->sc_bufh, off, - be32dec(from)); + bus_write_4(lesc->sc_bres, off, be32dec(from)); for (; len >= 2; len -= 2, off += 2, from += 2) - bus_space_write_2(lesc->sc_buft, lesc->sc_bufh, off, - be16dec(from)); + bus_write_2(lesc->sc_bres, off, be16dec(from)); if (len == 1) - bus_space_write_1(lesc->sc_buft, lesc->sc_bufh, off, - *from); + bus_write_1(lesc->sc_bres, off, *from); } static void @@ -184,16 +172,15 @@ for (; len >= 8; len -= 8, off += 8, to += 8) be64enc(to, - bus_space_read_8(lesc->sc_buft, lesc->sc_bufh, off)); + bus_read_8(lesc->sc_bres, off)); for (; len >= 4; len -= 4, off += 4, to += 4) be32enc(to, - bus_space_read_4(lesc->sc_buft, lesc->sc_bufh, off)); + bus_read_4(lesc->sc_bres, off)); for (; len >= 2; len -= 2, off += 2, to += 2) be16enc(to, - bus_space_read_2(lesc->sc_buft, lesc->sc_bufh, off)); + bus_read_2(lesc->sc_bres, off)); if (len == 1) - *to = - bus_space_read_1(lesc->sc_buft, lesc->sc_bufh, off); + *to = bus_read_1(lesc->sc_bres, off); } static void @@ -203,11 +190,9 @@ caddr_t from = fromv; for (; len >= 2; len -= 2, off += 2, from += 2) - bus_space_write_2(lesc->sc_buft, lesc->sc_bufh, off, - le16dec(from)); + bus_write_2(lesc->sc_bres, off, le16dec(from)); if (len == 1) - bus_space_write_1(lesc->sc_buft, lesc->sc_bufh, off + 1, - *from); + bus_write_1(lesc->sc_bres, off + 1, *from); } static void @@ -218,10 +203,9 @@ for (; len >= 2; len -= 2, off += 2, to += 2) le16enc(to, - bus_space_read_2(lesc->sc_buft, lesc->sc_bufh, off)); + bus_read_2(lesc->sc_bres, off)); if (len == 1) - *to = - bus_space_read_1(lesc->sc_buft, lesc->sc_bufh, off + 1); + *to = bus_read_1(lesc->sc_bres, off + 1); } static void @@ -230,9 +214,9 @@ struct le_lebuffer_softc *lesc = (struct le_lebuffer_softc *)sc; for (; len >= 2; len -= 2, off += 2) - bus_space_write_2(lesc->sc_buft, lesc->sc_bufh, off, 0); + bus_write_2(lesc->sc_bres, off, 0); if (len == 1) - bus_space_write_1(lesc->sc_buft, lesc->sc_bufh, off + 1, 0); + bus_write_1(lesc->sc_bres, off + 1, 0); } static int @@ -251,7 +235,7 @@ { struct le_lebuffer_softc *lesc; struct lance_softc *sc; - int error; + int error, i; lesc = device_get_softc(dev); sc = &lesc->sc_am7990.lsc; @@ -262,33 +246,29 @@ * The "register space" of the parent is just a buffer where the * the LANCE descriptor rings and the RX/TX buffers can be stored. */ - lesc->sc_brid = 0; + i = 0; lesc->sc_bres = bus_alloc_resource_any(device_get_parent(dev), - SYS_RES_MEMORY, &lesc->sc_brid, RF_ACTIVE); + SYS_RES_MEMORY, &i, RF_ACTIVE); if (lesc->sc_bres == NULL) { device_printf(dev, "cannot allocate LANCE buffer\n"); error = ENXIO; goto fail_mtx; } - lesc->sc_buft = rman_get_bustag(lesc->sc_bres); - lesc->sc_bufh = rman_get_bushandle(lesc->sc_bres); /* Allocate LANCE registers. */ - lesc->sc_rrid = 0; + i = 0; lesc->sc_rres = bus_alloc_resource_any(dev, SYS_RES_MEMORY, - &lesc->sc_rrid, RF_ACTIVE); + &i, RF_ACTIVE); if (lesc->sc_rres == NULL) { device_printf(dev, "cannot allocate LANCE registers\n"); error = ENXIO; goto fail_bres; } - lesc->sc_regt = rman_get_bustag(lesc->sc_rres); - lesc->sc_regh = rman_get_bushandle(lesc->sc_rres); /* Allocate LANCE interrupt. */ - lesc->sc_irid = 0; + i = 0; if ((lesc->sc_ires = bus_alloc_resource_any(dev, SYS_RES_IRQ, - &lesc->sc_irid, RF_SHAREABLE | RF_ACTIVE)) == NULL) { + &i, RF_SHAREABLE | RF_ACTIVE)) == NULL) { device_printf(dev, "cannot allocate interrupt\n"); error = ENXIO; goto fail_rres; @@ -352,12 +332,14 @@ fail_am7990: am7990_detach(&lesc->sc_am7990); fail_ires: - bus_release_resource(dev, SYS_RES_IRQ, lesc->sc_irid, lesc->sc_ires); + bus_release_resource(dev, SYS_RES_IRQ, + rman_get_rid(lesc->sc_ires), lesc->sc_ires); fail_rres: - bus_release_resource(dev, SYS_RES_MEMORY, lesc->sc_rrid, lesc->sc_rres); + bus_release_resource(dev, SYS_RES_MEMORY, + rman_get_rid(lesc->sc_rres), lesc->sc_rres); fail_bres: bus_release_resource(device_get_parent(dev), SYS_RES_MEMORY, - lesc->sc_brid, lesc->sc_bres); + rman_get_rid(lesc->sc_bres), lesc->sc_bres); fail_mtx: LE_LOCK_DESTROY(sc); return (error); @@ -374,10 +356,12 @@ bus_teardown_intr(dev, lesc->sc_ires, lesc->sc_ih); am7990_detach(&lesc->sc_am7990); - bus_release_resource(dev, SYS_RES_IRQ, lesc->sc_irid, lesc->sc_ires); - bus_release_resource(dev, SYS_RES_MEMORY, lesc->sc_rrid, lesc->sc_rres); + bus_release_resource(dev, SYS_RES_IRQ, + rman_get_rid(lesc->sc_ires), lesc->sc_ires); + bus_release_resource(dev, SYS_RES_MEMORY, + rman_get_rid(lesc->sc_rres), lesc->sc_rres); bus_release_resource(device_get_parent(dev), SYS_RES_MEMORY, - lesc->sc_brid, lesc->sc_bres); + rman_get_rid(lesc->sc_bres), lesc->sc_bres); LE_LOCK_DESTROY(sc); return (0); ==== //depot/projects/smpng/sys/dev/le/if_le_pci.c#5 (text+ko) ==== @@ -72,7 +72,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/le/if_le_pci.c,v 1.7 2007/02/23 12:18:45 piso Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/le/if_le_pci.c,v 1.8 2008/09/24 21:26:46 marius Exp $"); #include #include @@ -111,12 +111,8 @@ struct le_pci_softc { struct am79900_softc sc_am79900; /* glue to MI code */ - int sc_rrid; struct resource *sc_rres; - bus_space_tag_t sc_regt; - bus_space_handle_t sc_regh; - int sc_irid; struct resource *sc_ires; void *sc_ih; @@ -174,10 +170,9 @@ { struct le_pci_softc *lesc = (struct le_pci_softc *)sc; - bus_space_write_2(lesc->sc_regt, lesc->sc_regh, PCNET_PCI_RAP, port); - bus_space_barrier(lesc->sc_regt, lesc->sc_regh, PCNET_PCI_RAP, 2, - BUS_SPACE_BARRIER_WRITE); - bus_space_write_2(lesc->sc_regt, lesc->sc_regh, PCNET_PCI_BDP, val); + bus_write_2(lesc->sc_rres, PCNET_PCI_RAP, port); + bus_barrier(lesc->sc_rres, PCNET_PCI_RAP, 2, BUS_SPACE_BARRIER_WRITE); + bus_write_2(lesc->sc_rres, PCNET_PCI_BDP, val); } static uint16_t @@ -185,10 +180,9 @@ { struct le_pci_softc *lesc = (struct le_pci_softc *)sc; - bus_space_write_2(lesc->sc_regt, lesc->sc_regh, PCNET_PCI_RAP, port); - bus_space_barrier(lesc->sc_regt, lesc->sc_regh, PCNET_PCI_RAP, 2, - BUS_SPACE_BARRIER_WRITE); - return (bus_space_read_2(lesc->sc_regt, lesc->sc_regh, PCNET_PCI_BDP)); + bus_write_2(lesc->sc_rres, PCNET_PCI_RAP, port); + bus_barrier(lesc->sc_rres, PCNET_PCI_RAP, 2, BUS_SPACE_BARRIER_WRITE); + return (bus_read_2(lesc->sc_rres, PCNET_PCI_BDP)); } static void @@ -196,10 +190,9 @@ { struct le_pci_softc *lesc = (struct le_pci_softc *)sc; - bus_space_write_2(lesc->sc_regt, lesc->sc_regh, PCNET_PCI_RAP, port); - bus_space_barrier(lesc->sc_regt, lesc->sc_regh, PCNET_PCI_RAP, 2, - BUS_SPACE_BARRIER_WRITE); - bus_space_write_2(lesc->sc_regt, lesc->sc_regh, PCNET_PCI_RDP, val); + bus_write_2(lesc->sc_rres, PCNET_PCI_RAP, port); + bus_barrier(lesc->sc_rres, PCNET_PCI_RAP, 2, BUS_SPACE_BARRIER_WRITE); + bus_write_2(lesc->sc_rres, PCNET_PCI_RDP, val); } static uint16_t @@ -207,10 +200,9 @@ { struct le_pci_softc *lesc = (struct le_pci_softc *)sc; - bus_space_write_2(lesc->sc_regt, lesc->sc_regh, PCNET_PCI_RAP, port); - bus_space_barrier(lesc->sc_regt, lesc->sc_regh, PCNET_PCI_RAP, 2, - BUS_SPACE_BARRIER_WRITE); - return (bus_space_read_2(lesc->sc_regt, lesc->sc_regh, PCNET_PCI_RDP)); + bus_write_2(lesc->sc_rres, PCNET_PCI_RAP, port); + bus_barrier(lesc->sc_rres, PCNET_PCI_RAP, 2, BUS_SPACE_BARRIER_WRITE); + return (bus_read_2(lesc->sc_rres, PCNET_PCI_RDP)); } static int @@ -322,20 +314,18 @@ pci_enable_busmaster(dev); pci_enable_io(dev, PCIM_CMD_PORTEN); - lesc->sc_rrid = PCIR_BAR(0); + i = PCIR_BAR(0); lesc->sc_rres = bus_alloc_resource_any(dev, SYS_RES_IOPORT, - &lesc->sc_rrid, RF_ACTIVE); + &i, RF_ACTIVE); if (lesc->sc_rres == NULL) { device_printf(dev, "cannot allocate registers\n"); error = ENXIO; goto fail_mtx; } - lesc->sc_regt = rman_get_bustag(lesc->sc_rres); - lesc->sc_regh = rman_get_bushandle(lesc->sc_rres); - lesc->sc_irid = 0; + i = 0; if ((lesc->sc_ires = bus_alloc_resource_any(dev, SYS_RES_IRQ, - &lesc->sc_irid, RF_SHAREABLE | RF_ACTIVE)) == NULL) { + &i, RF_SHAREABLE | RF_ACTIVE)) == NULL) { device_printf(dev, "cannot allocate interrupt\n"); error = ENXIO; goto fail_rres; @@ -392,7 +382,7 @@ error = bus_dmamap_load(lesc->sc_dmat, lesc->sc_dmam, sc->sc_mem, sc->sc_memsize, le_pci_dma_callback, sc, 0); if (error != 0 || sc->sc_addr == 0) { - device_printf(dev, "cannot load DMA buffer map\n"); + device_printf(dev, "cannot load DMA buffer map\n"); goto fail_dmem; } @@ -417,9 +407,8 @@ /* * Extract the physical MAC address from the ROM. */ - for (i = 0; i < sizeof(sc->sc_enaddr); i++) - sc->sc_enaddr[i] = - bus_space_read_1(lesc->sc_regt, lesc->sc_regh, i); + bus_read_region_1(lesc->sc_rres, 0, sc->sc_enaddr, + sizeof(sc->sc_enaddr)); sc->sc_copytodesc = lance_copytobuf_contig; sc->sc_copyfromdesc = lance_copyfrombuf_contig; @@ -461,9 +450,11 @@ fail_pdtag: bus_dma_tag_destroy(lesc->sc_pdmat); fail_ires: - bus_release_resource(dev, SYS_RES_IRQ, lesc->sc_irid, lesc->sc_ires); + bus_release_resource(dev, SYS_RES_IRQ, + rman_get_rid(lesc->sc_ires), lesc->sc_ires); fail_rres: - bus_release_resource(dev, SYS_RES_IOPORT, lesc->sc_rrid, lesc->sc_rres); + bus_release_resource(dev, SYS_RES_IOPORT, + rman_get_rid(lesc->sc_rres), lesc->sc_rres); fail_mtx: LE_LOCK_DESTROY(sc); return (error); @@ -484,8 +475,10 @@ bus_dmamem_free(lesc->sc_dmat, sc->sc_mem, lesc->sc_dmam); bus_dma_tag_destroy(lesc->sc_dmat); bus_dma_tag_destroy(lesc->sc_pdmat); - bus_release_resource(dev, SYS_RES_IRQ, lesc->sc_irid, lesc->sc_ires); - bus_release_resource(dev, SYS_RES_IOPORT, lesc->sc_rrid, lesc->sc_rres); + bus_release_resource(dev, SYS_RES_IRQ, + rman_get_rid(lesc->sc_ires), lesc->sc_ires); + bus_release_resource(dev, SYS_RES_IOPORT, + rman_get_rid(lesc->sc_rres), lesc->sc_rres); LE_LOCK_DESTROY(sc); return (0); ==== //depot/projects/smpng/sys/dev/le/lebuffer_sbus.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/le/lebuffer_sbus.c,v 1.1 2007/01/20 12:53:30 marius Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/le/lebuffer_sbus.c,v 1.2 2008/09/24 21:26:46 marius Exp $"); #include #include @@ -100,6 +100,8 @@ DEFINE_CLASS_0(lebuffer, lebuffer_driver, lebuffer_methods, 1); DRIVER_MODULE(lebuffer, sbus, lebuffer_driver, lebuffer_devclass, 0, 0); +MODULE_DEPEND(lebuffer, sbus, 1, 1, 1); +MODULE_VERSION(lebuffer, 1); static int lebuffer_probe(device_t dev) From owner-p4-projects@FreeBSD.ORG Wed Sep 24 23:29:39 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5E6B31065689; Wed, 24 Sep 2008 23:29:39 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 20A581065688 for ; Wed, 24 Sep 2008 23:29:39 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 0B1D08FC12 for ; Wed, 24 Sep 2008 23:29:39 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id m8ONTcZu041954 for ; Wed, 24 Sep 2008 23:29:38 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m8ONTceS041952 for perforce@freebsd.org; Wed, 24 Sep 2008 23:29:38 GMT (envelope-from hselasky@FreeBSD.org) Date: Wed, 24 Sep 2008 23:29:38 GMT Message-Id: <200809242329.m8ONTceS041952@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 150409 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 24 Sep 2008 23:29:39 -0000 http://perforce.freebsd.org/chv.cgi?CH=150409 Change 150409 by hselasky@hselasky_laptop001 on 2008/09/24 23:29:31 Fix USB regression issue. The AT91 UDP needs the extra SYNC point else the hardware seems to hang. Tested and works. Affected files ... .. //depot/projects/usb/src/sys/dev/usb2/controller/at91dci.c#13 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb2/controller/at91dci.c#13 (text+ko) ==== @@ -917,6 +917,7 @@ struct at91dci_td *td; uint32_t x; uint8_t ep_no; + uint8_t need_sync; DPRINTFN(9, "addr=%d endpt=%d sumlen=%d speed=%d\n", xfer->address, UE_GET_ADDR(xfer->endpoint), @@ -958,12 +959,16 @@ if (x != xfer->nframes) { if (xfer->endpoint & UE_DIR_IN) { temp.func = &at91dci_data_tx; + need_sync = 1; } else { temp.func = &at91dci_data_rx; + need_sync = 0; } /* setup "pc" pointer */ temp.pc = xfer->frbuffers + x; + } else { + need_sync = 0; } while (x != xfer->nframes) { @@ -1002,11 +1007,19 @@ /* always setup a valid "pc" pointer for status and sync */ temp.pc = xfer->frbuffers + 0; + /* check if we need to sync */ + if (need_sync && xfer->flags_int.control_xfr) { + + /* we need a SYNC point after TX */ + temp.func = &at91dci_data_tx_sync; + temp.len = 0; + temp.short_pkt = 0; + + at91dci_setup_standard_chain_sub(&temp); + } /* check if we should append a status stage */ - if (xfer->flags_int.control_xfr && !xfer->flags_int.control_act) { - uint8_t need_sync; /* * Send a DATA1 message and invert the current @@ -2375,7 +2388,8 @@ */ if (parm->methods == &at91dci_device_ctrl_methods) { - ntd = xfer->nframes + 1 /* STATUS */ + 1 /* SYNC */ ; + ntd = xfer->nframes + 1 /* STATUS */ + 1 /* SYNC 1 */ + + 1 /* SYNC 2 */ ; } else if (parm->methods == &at91dci_device_bulk_methods) { From owner-p4-projects@FreeBSD.ORG Wed Sep 24 23:31:41 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C3FAF1065690; Wed, 24 Sep 2008 23:31:41 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 886A2106568C for ; Wed, 24 Sep 2008 23:31:41 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 732ED8FC15 for ; Wed, 24 Sep 2008 23:31:41 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id m8ONVfoq049901 for ; Wed, 24 Sep 2008 23:31:41 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m8ONVfqb049894 for perforce@freebsd.org; Wed, 24 Sep 2008 23:31:41 GMT (envelope-from hselasky@FreeBSD.org) Date: Wed, 24 Sep 2008 23:31:41 GMT Message-Id: <200809242331.m8ONVfqb049894@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 150410 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 24 Sep 2008 23:31:42 -0000 http://perforce.freebsd.org/chv.cgi?CH=150410 Change 150410 by hselasky@hselasky_laptop001 on 2008/09/24 23:31:30 Fix endpoint allocation for simplex profiles in the USB template module. Tested and works. Affected files ... .. //depot/projects/usb/src/sys/dev/usb2/template/usb2_template.c#11 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb2/template/usb2_template.c#11 (text+ko) ==== @@ -507,17 +507,13 @@ return (0); /* we are done */ } if (ep->needs_ep_type == UE_CONTROL) { - ep->needs_in = 0; - ep->needs_out = 0; dir_in = 1; dir_out = 1; } else { if (ep->needs_in) { - ep->needs_in = 0; dir_in = 1; dir_out = 0; } else { - ep->needs_out = 0; dir_in = 0; dir_out = 1; } @@ -525,26 +521,26 @@ for (n = 1; n != (USB_EP_MAX / 2); n++) { + /* get HW endpoint profile */ + (ues->methods->get_hw_ep_profile) (ues->udev, &pf, n); + if (pf == NULL) { + /* end of profiles */ + break; + } /* check if IN-endpoint is reserved */ - if (dir_in) { + if (dir_in || pf->is_simplex) { if (ues->bmInAlloc[n / 8] & (1 << (n % 8))) { /* mismatch */ continue; } } /* check if OUT-endpoint is reserved */ - if (dir_out) { + if (dir_out || pf->is_simplex) { if (ues->bmOutAlloc[n / 8] & (1 << (n % 8))) { /* mismatch */ continue; } } - /* get HW endpoint profile */ - (ues->methods->get_hw_ep_profile) (ues->udev, &pf, n); - if (pf == NULL) { - /* end of profiles */ - break; - } /* check simplex */ if (pf->is_simplex == is_simplex) { /* mismatch */ @@ -578,16 +574,18 @@ pf = ep->pf; /* reserve IN-endpoint */ - if (dir_in || pf->is_simplex) { + if (dir_in) { ues->bmInAlloc[best_n / 8] |= (1 << (best_n % 8)); ep->hw_endpoint_in = best_n | UE_DIR_IN; + ep->needs_in = 0; } /* reserve OUT-endpoint */ - if (dir_out || pf->is_simplex) { + if (dir_out) { ues->bmOutAlloc[best_n / 8] |= (1 << (best_n % 8)); ep->hw_endpoint_out = best_n | UE_DIR_OUT; + ep->needs_out = 0; } return (0); /* got a match */ } From owner-p4-projects@FreeBSD.ORG Thu Sep 25 00:05:15 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AC397106568C; Thu, 25 Sep 2008 00:05:15 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 703C91065686 for ; Thu, 25 Sep 2008 00:05:15 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 5BCA88FC16 for ; Thu, 25 Sep 2008 00:05:15 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id m8P05FK3066425 for ; Thu, 25 Sep 2008 00:05:15 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m8P05FGp066423 for perforce@freebsd.org; Thu, 25 Sep 2008 00:05:15 GMT (envelope-from hselasky@FreeBSD.org) Date: Thu, 25 Sep 2008 00:05:15 GMT Message-Id: <200809250005.m8P05FGp066423@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 150411 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 25 Sep 2008 00:05:15 -0000 http://perforce.freebsd.org/chv.cgi?CH=150411 Change 150411 by hselasky@hselasky_laptop001 on 2008/09/25 00:04:55 Use correct boundary when allocating DMA memory. Affected files ... .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_busdma.c#7 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_busdma.c#7 (text+ko) ==== @@ -339,7 +339,7 @@ if (bus_dma_tag_create ( /* parent */ udt->tag_parent->tag, /* alignment */ align, - /* boundary */ 0, + /* boundary */ USB_PAGE_SIZE, /* lowaddr */ (2ULL << (udt->tag_parent->dma_bits - 1)) - 1, /* highaddr */ BUS_SPACE_MAXADDR, /* filter */ NULL, @@ -403,7 +403,6 @@ struct usb2_page *pg; uint32_t rem; uint8_t owned; - uint8_t ext_seg; /* extend last segment */ pc = arg; uptag = pc->tag_parent; @@ -423,12 +422,6 @@ rem = segs->ds_addr & (USB_PAGE_SIZE - 1); pc->page_offset_buf = rem; pc->page_offset_end += rem; - if (nseg < ((pc->page_offset_end + - (USB_PAGE_SIZE - 1)) / USB_PAGE_SIZE)) { - ext_seg = 1; - } else { - ext_seg = 0; - } nseg--; while (nseg > 0) { @@ -438,14 +431,6 @@ pg->physaddr = segs->ds_addr & ~(USB_PAGE_SIZE - 1); } - /* - * XXX The segments we get from BUS-DMA are not aligned, - * XXX so we need to extend the last segment if we are - * XXX unaligned and cross the segment boundary! - */ - if (ext_seg && pc->ismultiseg) { - (pg + 1)->physaddr = pg->physaddr + USB_PAGE_SIZE; - } done: owned = mtx_owned(uptag->mtx); if (!owned) From owner-p4-projects@FreeBSD.ORG Thu Sep 25 08:36:01 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E183C1065691; Thu, 25 Sep 2008 08:36:00 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A53991065690 for ; Thu, 25 Sep 2008 08:36:00 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 93D1E8FC19 for ; Thu, 25 Sep 2008 08:36:00 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id m8P8a0Z8018962 for ; Thu, 25 Sep 2008 08:36:00 GMT (envelope-from rene@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m8P8a02v018952 for perforce@freebsd.org; Thu, 25 Sep 2008 08:36:00 GMT (envelope-from rene@FreeBSD.org) Date: Thu, 25 Sep 2008 08:36:00 GMT Message-Id: <200809250836.m8P8a02v018952@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rene@FreeBSD.org using -f From: Rene Ladan To: Perforce Change Reviews Cc: Subject: PERFORCE change 150423 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 25 Sep 2008 08:36:01 -0000 http://perforce.freebsd.org/chv.cgi?CH=150423 Change 150423 by rene@rene_self on 2008/09/25 08:35:13 Fix typo (k5destroy -> kdestroy) in chapter 14.8.2 of English version Remove reminder in Dutch version Affected files ... .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/security/chapter.sgml#7 edit .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/security/chapter.sgml#4 edit Differences ... ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/security/chapter.sgml#7 (text+ko) ==== @@ -2277,7 +2277,7 @@ The ticket can then be revoked when you have finished: - &prompt.user; k5destroy + &prompt.user; kdestroy ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/security/chapter.sgml#4 (text+ko) ==== @@ -2455,7 +2455,6 @@ Het ticket kan worden ingenomen wanneer u klaar bent: &prompt.user; kdestroy - From owner-p4-projects@FreeBSD.ORG Thu Sep 25 08:41:06 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 007A4106568C; Thu, 25 Sep 2008 08:41:06 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B8A3B1065688 for ; Thu, 25 Sep 2008 08:41:05 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id A5A268FC17 for ; Thu, 25 Sep 2008 08:41:05 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id m8P8f5OG040610 for ; Thu, 25 Sep 2008 08:41:05 GMT (envelope-from rene@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m8P8f5PW040600 for perforce@freebsd.org; Thu, 25 Sep 2008 08:41:05 GMT (envelope-from rene@FreeBSD.org) Date: Thu, 25 Sep 2008 08:41:05 GMT Message-Id: <200809250841.m8P8f5PW040600@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rene@FreeBSD.org using -f From: Rene Ladan To: Perforce Change Reviews Cc: Subject: PERFORCE change 150424 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 25 Sep 2008 08:41:06 -0000 http://perforce.freebsd.org/chv.cgi?CH=150424 Change 150424 by rene@rene_self on 2008/09/25 08:40:38 IFC Affected files ... .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/eresources/chapter.sgml#5 integrate .. //depot/projects/docproj_nl/www/en/cgi/cvsweb.cgi#2 integrate .. //depot/projects/docproj_nl/www/en/cgi/mid.cgi#2 integrate .. //depot/projects/docproj_nl/www/en/donations/donors.sgml#6 integrate .. //depot/projects/docproj_nl/www/en/search/opensearch/Makefile#2 integrate .. //depot/projects/docproj_nl/www/en/search/opensearch/cvsweb.xml#1 branch .. //depot/projects/docproj_nl/www/en/search/opensearch/markmail.xml#1 branch .. //depot/projects/docproj_nl/www/en/search/opensearch/message-id.xml#1 branch .. //depot/projects/docproj_nl/www/en/search/opensearch/opensearch.sgml#2 integrate .. //depot/projects/docproj_nl/www/en/search/opensearch/rambler.xml#1 branch .. //depot/projects/docproj_nl/www/en/search/opensearch/web-all.xml#1 branch .. //depot/projects/docproj_nl/www/en/search/opensearch/web.xml#1 branch .. //depot/projects/docproj_nl/www/en/search/search.sgml#4 integrate Differences ... ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/eresources/chapter.sgml#5 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -78,11 +78,6 @@ - &a.cvsall.name; - Changes made to the FreeBSD source tree - - - &a.advocacy.name; FreeBSD Evangelism ==== //depot/projects/docproj_nl/www/en/cgi/cvsweb.cgi#2 (text+ko) ==== @@ -45,7 +45,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: www/en/cgi/cvsweb.cgi,v 1.91 2007/03/17 22:28:31 simon Exp $ +# $FreeBSD: www/en/cgi/cvsweb.cgi,v 1.92 2008/09/23 16:31:45 wosch Exp $ # $Id: cvsweb.cgi,v 1.112 2001/07/24 13:03:16 hzeller Exp $ # $Idaemons: /home/cvs/cvsweb/cvsweb.cgi,v 1.84 2001/10/07 20:50:10 knu Exp $ # @@ -142,7 +142,7 @@ $CheckoutMagic = '~checkout~'; $cgi_style::hsty_base = 'http://www.FreeBSD.org'; - $_ = q$FreeBSD: www/en/cgi/cvsweb.cgi,v 1.91 2007/03/17 22:28:31 simon Exp $; + $_ = q$FreeBSD: www/en/cgi/cvsweb.cgi,v 1.92 2008/09/23 16:31:45 wosch Exp $; @_ = split; $cgi_style::hsty_date = "@_[3,4]"; @@ -151,6 +151,7 @@ package cgi_style; require "./cgi-style.pl"; + $cgi_style::t_style = qq{\n\n}; package main; } ==== //depot/projects/docproj_nl/www/en/cgi/mid.cgi#2 (text+ko) ==== @@ -26,7 +26,7 @@ # # Search a mail by Message-ID, References or In-Reply-To field # -# $FreeBSD: www/en/cgi/mid.cgi,v 1.16 2006/03/15 04:07:54 kuriyama Exp $ +# $FreeBSD: www/en/cgi/mid.cgi,v 1.17 2008/09/23 12:42:17 wosch Exp $ require "./cgi-lib.pl"; require "./cgi-style.pl"; @@ -41,6 +41,8 @@ $lookCommand = "/usr/bin/look"; $ENV{PATH} = '/bin:/usr/bin'; +$main::t_style .= qq{\n\n}; + sub escape($) { $_ = $_[0]; s/&/&/g; s//>/g; $_; } sub get_id { ==== //depot/projects/docproj_nl/www/en/donations/donors.sgml#6 (text+ko) ==== @@ -1,6 +1,6 @@ - + %developers; @@ -2500,7 +2500,7 @@ Charles Smeijer AMD Opteron 250 CPU des - Shipped + Received ==== //depot/projects/docproj_nl/www/en/search/opensearch/Makefile#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: www/en/search/opensearch/Makefile,v 1.2 2008/09/22 20:00:09 wosch Exp $ +# $FreeBSD: www/en/search/opensearch/Makefile,v 1.5 2008/09/23 16:31:45 wosch Exp $ .if exists(../Makefile.conf) .include "../Makefile.conf" @@ -16,5 +16,13 @@ DATA+= man.xml DATA+= ports.xml DATA+= query-pr.xml +DATA+= web.xml +DATA+= web-all.xml +DATA+= message-id.xml +DATA+= cvsweb.xml + +# external sites +DATA+= markmail.xml +DATA+= rambler.xml .include "${WEB_PREFIX}/share/mk/web.site.mk" ==== //depot/projects/docproj_nl/www/en/search/opensearch/opensearch.sgml#2 (text+ko) ==== @@ -1,6 +1,6 @@ - + ]> @@ -27,11 +27,21 @@ in the upper-right corner of Firefox. Click on a item to add the FreeBSD Search Services to your Firefox Search Bar.

- +

By the FreeBSD.org web site

+ +

External Plugins

+

Supported browsers:: Firefox 2.x, 3.x and IE 7.x or later

==== //depot/projects/docproj_nl/www/en/search/search.sgml#4 (text+ko) ==== @@ -1,6 +1,6 @@ - + ]> @@ -18,15 +18,17 @@
  • Manual Pages
  • Ports Changes
    • + + +

    +

    List of FreeBSD OpenSearch Plugins

    From owner-p4-projects@FreeBSD.ORG Thu Sep 25 08:49:14 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5D4CF106568C; Thu, 25 Sep 2008 08:49:14 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 218CD1065686 for ; Thu, 25 Sep 2008 08:49:14 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 10A9C8FC1C for ; Thu, 25 Sep 2008 08:49:14 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id m8P8nDPZ003759 for ; Thu, 25 Sep 2008 08:49:13 GMT (envelope-from rene@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m8P8nDQ2003757 for perforce@freebsd.org; Thu, 25 Sep 2008 08:49:13 GMT (envelope-from rene@FreeBSD.org) Date: Thu, 25 Sep 2008 08:49:13 GMT Message-Id: <200809250849.m8P8nDQ2003757@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rene@FreeBSD.org using -f From: Rene Ladan To: Perforce Change Reviews Cc: Subject: PERFORCE change 150425 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 25 Sep 2008 08:49:14 -0000 http://perforce.freebsd.org/chv.cgi?CH=150425 Change 150425 by rene@rene_self on 2008/09/25 08:48:27 MFen eresources 1.187 -> 1.188 Checked build Affected files ... .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/eresources/chapter.sgml#6 edit Differences ... ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/eresources/chapter.sgml#6 (text+ko) ==== @@ -6,7 +6,7 @@ Vertaald door: Siebrand Mazeland %SOURCE% en_US.ISO8859-1/books/handbook/eresources/chapter.sgml - %SRCID% 1.187 + %SRCID% 1.188 --> @@ -93,13 +93,6 @@ - &a.cvsall.name; - - Wijzigen die aan de &os; broncode zijn - gemaakt - - - &a.advocacy.name; &os; Evangelisatie From owner-p4-projects@FreeBSD.ORG Thu Sep 25 11:55:24 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C14821065696; Thu, 25 Sep 2008 11:55:24 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 82F5E106568F for ; Thu, 25 Sep 2008 11:55:24 +0000 (UTC) (envelope-from zec@tel.fer.hr) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 2E7F38FC17 for ; Thu, 25 Sep 2008 11:55:24 +0000 (UTC) (envelope-from zec@tel.fer.hr) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id m8PBtNOo052294 for ; Thu, 25 Sep 2008 11:55:23 GMT (envelope-from zec@tel.fer.hr) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m8PBtNrn052210 for perforce@freebsd.org; Thu, 25 Sep 2008 11:55:23 GMT (envelope-from zec@tel.fer.hr) Date: Thu, 25 Sep 2008 11:55:23 GMT Message-Id: <200809251155.m8PBtNrn052210@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@tel.fer.hr using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 150429 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 25 Sep 2008 11:55:25 -0000 http://perforce.freebsd.org/chv.cgi?CH=150429 Change 150429 by zec@zec_tpx32 on 2008/09/25 11:55:09 Integrate from vimage-commit2. Affected files ... .. //depot/projects/vimage/src/sys/compat/linux/linux_socket.c#11 integrate .. //depot/projects/vimage/src/sys/compat/svr4/svr4_sockio.c#7 integrate .. //depot/projects/vimage/src/sys/contrib/pf/net/pf.c#15 integrate .. //depot/projects/vimage/src/sys/contrib/pf/net/pf_if.c#10 integrate .. //depot/projects/vimage/src/sys/contrib/pf/net/pf_ioctl.c#16 integrate .. //depot/projects/vimage/src/sys/contrib/pf/net/pfvar.h#7 integrate .. //depot/projects/vimage/src/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c#13 integrate .. //depot/projects/vimage/src/sys/kern/kern_xxx.c#11 integrate .. //depot/projects/vimage/src/sys/net/bridgestp.c#13 integrate .. //depot/projects/vimage/src/sys/net/if.c#38 integrate .. //depot/projects/vimage/src/sys/net/if_bridge.c#17 integrate .. //depot/projects/vimage/src/sys/net/if_gif.h#6 integrate .. //depot/projects/vimage/src/sys/net/if_spppsubr.c#9 integrate .. //depot/projects/vimage/src/sys/net/if_var.h#17 integrate .. //depot/projects/vimage/src/sys/net/route.c#26 integrate .. //depot/projects/vimage/src/sys/net/vnet.h#12 integrate .. //depot/projects/vimage/src/sys/netgraph/netgraph.h#10 integrate .. //depot/projects/vimage/src/sys/netgraph/ng_eiface.c#14 integrate .. //depot/projects/vimage/src/sys/netgraph/ng_iface.c#11 integrate .. //depot/projects/vimage/src/sys/netgraph/vnetgraph.h#9 delete .. //depot/projects/vimage/src/sys/netinet/igmp.c#17 integrate .. //depot/projects/vimage/src/sys/netinet/in.h#6 integrate .. //depot/projects/vimage/src/sys/netinet/in_mcast.c#11 integrate .. //depot/projects/vimage/src/sys/netinet/in_pcb.c#31 integrate .. //depot/projects/vimage/src/sys/netinet/ip6.h#4 integrate .. //depot/projects/vimage/src/sys/netinet/ip_divert.c#14 integrate .. //depot/projects/vimage/src/sys/netinet/ip_fw.h#15 integrate .. //depot/projects/vimage/src/sys/netinet/ip_fw2.c#44 integrate .. //depot/projects/vimage/src/sys/netinet/ip_icmp.c#17 integrate .. //depot/projects/vimage/src/sys/netinet/ip_input.c#34 integrate .. //depot/projects/vimage/src/sys/netinet/ip_mroute.c#13 integrate .. //depot/projects/vimage/src/sys/netinet/tcp_input.c#35 integrate .. //depot/projects/vimage/src/sys/netinet/tcp_offload.c#8 integrate .. //depot/projects/vimage/src/sys/netinet/tcp_output.c#23 integrate .. //depot/projects/vimage/src/sys/netinet/tcp_subr.c#51 integrate .. //depot/projects/vimage/src/sys/netinet/tcp_syncache.c#40 integrate .. //depot/projects/vimage/src/sys/netinet/tcp_timewait.c#17 integrate .. //depot/projects/vimage/src/sys/netinet/tcp_usrreq.c#23 integrate .. //depot/projects/vimage/src/sys/netinet/vinet.h#28 integrate .. //depot/projects/vimage/src/sys/netinet6/in6_rmx.c#20 integrate .. //depot/projects/vimage/src/sys/netinet6/in6_src.c#21 integrate .. //depot/projects/vimage/src/sys/netinet6/ip6_input.c#34 integrate .. //depot/projects/vimage/src/sys/netinet6/nd6.c#31 integrate .. //depot/projects/vimage/src/sys/netinet6/nd6_nbr.c#20 integrate .. //depot/projects/vimage/src/sys/netinet6/nd6_rtr.c#18 integrate .. //depot/projects/vimage/src/sys/netinet6/raw_ip6.c#23 integrate .. //depot/projects/vimage/src/sys/netinet6/scope6.c#16 integrate .. //depot/projects/vimage/src/sys/netinet6/vinet6.h#20 integrate .. //depot/projects/vimage/src/sys/netipsec/ipsec_output.c#17 integrate .. //depot/projects/vimage/src/sys/netipsec/key.c#22 integrate .. //depot/projects/vimage/src/sys/netipsec/keysock.c#13 integrate .. //depot/projects/vimage/src/sys/netipsec/vipsec.h#13 integrate .. //depot/projects/vimage/src/sys/netipsec/xform_esp.c#15 integrate .. //depot/projects/vimage/src/sys/sys/sysctl.h#25 integrate .. //depot/projects/vimage/src/sys/sys/vimage.h#65 integrate Differences ... ==== //depot/projects/vimage/src/sys/compat/linux/linux_socket.c#11 (text+ko) ==== ==== //depot/projects/vimage/src/sys/compat/svr4/svr4_sockio.c#7 (text+ko) ==== ==== //depot/projects/vimage/src/sys/contrib/pf/net/pf.c#15 (text+ko) ==== ==== //depot/projects/vimage/src/sys/contrib/pf/net/pf_if.c#10 (text+ko) ==== @@ -126,6 +126,7 @@ pfi_initialize(void) { INIT_VNET_NET(curvnet); + if (pfi_all != NULL) /* already initialized */ return; ==== //depot/projects/vimage/src/sys/contrib/pf/net/pf_ioctl.c#16 (text+ko) ==== @@ -3708,6 +3708,7 @@ struct inpcb *inp) { INIT_VNET_NET(curvnet); + /* * IPv6 is not affected by ip_len/ip_off byte order changes. */ ==== //depot/projects/vimage/src/sys/contrib/pf/net/pfvar.h#7 (text+ko) ==== @@ -1867,9 +1867,9 @@ /* * Symbol translation macros */ -#define INIT_VNET_PF(vnet) \ +#define INIT_VNET_PF(vnet) \ INIT_FROM_VNET(vnet, VNET_MOD_PF, struct vnet_pf, vnet_pf) -#define VNET_PF(sym) VSYM(vnet_pf, sym) +#define VNET_PF(sym) VSYM(vnet_pf, sym) #endif /* _NET_PFVAR_H_ */ ==== //depot/projects/vimage/src/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c#13 (text+ko) ==== ==== //depot/projects/vimage/src/sys/kern/kern_xxx.c#11 (text+ko) ==== ==== //depot/projects/vimage/src/sys/net/bridgestp.c#13 (text+ko) ==== ==== //depot/projects/vimage/src/sys/net/if.c#38 (text+ko) ==== @@ -201,6 +201,7 @@ void ifnet_setbyindex(u_short idx, struct ifnet *ifp) { + INIT_VNET_NET(curvnet); INIT_VNET_NET(curvnet); IFNET_WLOCK_ASSERT(); @@ -211,6 +212,7 @@ struct ifaddr * ifaddr_byindex(u_short idx) { + INIT_VNET_NET(curvnet); struct ifaddr *ifa; IFNET_RLOCK(); @@ -234,6 +236,7 @@ static void ifdev_setbyindex(u_short idx, struct cdev *cdev) { + INIT_VNET_NET(curvnet); INIT_VNET_NET(curvnet); IFNET_WLOCK(); ==== //depot/projects/vimage/src/sys/net/if_bridge.c#17 (text+ko) ==== @@ -3044,6 +3044,7 @@ if (IPFW_LOADED && pfil_ipfw != 0 && dir == PFIL_OUT && ifp != NULL) { INIT_VNET_IPFW(curvnet); + error = -1; args.rule = ip_dn_claim_rule(*mp); if (args.rule != NULL && V_fw_one_pass) @@ -3379,6 +3380,7 @@ bridge_fragment(struct ifnet *ifp, struct mbuf *m, struct ether_header *eh, int snap, struct llc *llc) { + INIT_VNET_INET(curvnet); struct mbuf *m0; struct ip *ip; int error = -1; ==== //depot/projects/vimage/src/sys/net/if_gif.h#6 (text+ko) ==== @@ -114,10 +114,10 @@ * Virtualization support */ -#define INIT_VNET_GIF(vnet) \ +#define INIT_VNET_GIF(vnet) \ INIT_FROM_VNET(vnet, VNET_MOD_GIF, struct vnet_gif, vnet_gif) -#define VNET_GIF(sym) VSYM(vnet_gif, sym) +#define VNET_GIF(sym) VSYM(vnet_gif, sym) struct vnet_gif { LIST_HEAD(, gif_softc) _gif_softc_list; @@ -127,11 +127,11 @@ int _ip6_gif_hlim; }; -#define V_gif_softc_list VNET_GIF(gif_softc_list) -#define V_max_gif_nesting VNET_GIF(max_gif_nesting) -#define V_parallel_tunnels VNET_GIF(parallel_tunnels) -#define V_ip_gif_ttl VNET_GIF(ip_gif_ttl) -#define V_ip6_gif_hlim VNET_GIF(ip6_gif_hlim) +#define V_gif_softc_list VNET_GIF(gif_softc_list) +#define V_max_gif_nesting VNET_GIF(max_gif_nesting) +#define V_parallel_tunnels VNET_GIF(parallel_tunnels) +#define V_ip_gif_ttl VNET_GIF(ip_gif_ttl) +#define V_ip6_gif_hlim VNET_GIF(ip6_gif_hlim) #endif /* _KERNEL */ ==== //depot/projects/vimage/src/sys/net/if_spppsubr.c#9 (text+ko) ==== ==== //depot/projects/vimage/src/sys/net/if_var.h#17 (text+ko) ==== @@ -722,6 +722,8 @@ int ether_poll_deregister(struct ifnet *ifp); #endif /* DEVICE_POLLING */ +#include + #endif /* _KERNEL */ #endif /* !_NET_IF_VAR_H_ */ ==== //depot/projects/vimage/src/sys/net/route.c#26 (text+ko) ==== @@ -303,6 +303,7 @@ rtalloc1_fib(struct sockaddr *dst, int report, u_long ignflags, u_int fibnum) { + INIT_VNET_NET(curvnet); struct radix_node_head *rnh; INIT_VNET_NET(curvnet); struct rtentry *rt; ==== //depot/projects/vimage/src/sys/net/vnet.h#12 (text+ko) ==== @@ -26,12 +26,13 @@ * 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. + * + * $FreeBSD$ */ #ifndef _NET_VNET_H_ #define _NET_VNET_H_ - #ifdef VIMAGE #include "opt_route.h" @@ -44,14 +45,6 @@ #include #include - -/* calculate this the same as in route.c */ -#ifndef ROUTETABLES - #define RT_MAXFIBS 1 -#else - #define RT_MAXFIBS 16 -#endif - struct vnet_net { int _if_index; struct ifindex_entry *_ifindex_table; @@ -78,23 +71,23 @@ /* * Symbol translation macros */ -#define INIT_VNET_NET(vnet) \ +#define INIT_VNET_NET(vnet) \ INIT_FROM_VNET(vnet, VNET_MOD_NET, struct vnet_net, vnet_net) -#define VNET_NET(sym) VSYM(vnet_net, sym) +#define VNET_NET(sym) VSYM(vnet_net, sym) -#define V_if_index VNET_NET(if_index) -#define V_ifindex_table VNET_NET(ifindex_table) -#define V_ifnet VNET_NET(ifnet) -#define V_ifg_head VNET_NET(ifg_head) -#define V_if_indexlim VNET_NET(if_indexlim) -#define V_ifklist VNET_NET(ifklist) -#define V_rtstat VNET_NET(rtstat) -#define V_rt_tables VNET_NET(rt_tables) -#define V_rttrash VNET_NET(rttrash) -#define V_loif VNET_NET(loif) -#define V_lo_list VNET_NET(lo_list) -#define V_rawcb_list VNET_NET(rawcb_list) -#define V_ether_ipfw VNET_NET(ether_ipfw) +#define V_ether_ipfw VNET_NET(ether_ipfw) +#define V_if_index VNET_NET(if_index) +#define V_if_indexlim VNET_NET(if_indexlim) +#define V_ifg_head VNET_NET(ifg_head) +#define V_ifindex_table VNET_NET(ifindex_table) +#define V_ifklist VNET_NET(ifklist) +#define V_ifnet VNET_NET(ifnet) +#define V_lo_list VNET_NET(lo_list) +#define V_loif VNET_NET(loif) +#define V_rawcb_list VNET_NET(rawcb_list) +#define V_rt_tables VNET_NET(rt_tables) +#define V_rtstat VNET_NET(rtstat) +#define V_rttrash VNET_NET(rttrash) #endif /* !_NET_VNET_H_ */ ==== //depot/projects/vimage/src/sys/netgraph/netgraph.h#10 (text+ko) ==== @@ -1185,4 +1185,23 @@ #define NGI_GET_META(i,m) #define ng_copy_meta(meta) NULL +/* Hash related definitions */ +#define NG_ID_HASH_SIZE 128 /* most systems wont need even this many */ + +/* Virtualization macros */ +#define INIT_VNET_NETGRAPH(vnet) \ + INIT_FROM_VNET(vnet, VNET_MOD_NETGRAPH, \ + struct vnet_netgraph, vnet_netgraph) + +#define VNET_NETGRAPH(sym) VSYM(vnet_netgraph, sym) + +/* Symbol translation macros */ +#define V_nextID VNET_NETGRAPH(nextID) +#define V_ng_ID_hash VNET_NETGRAPH(ng_ID_hash) +#define V_ng_eiface_unit VNET_NETGRAPH(ng_eiface_unit) +#define V_ng_iface_unit VNET_NETGRAPH(ng_iface_unit) +#define V_ng_name_hash VNET_NETGRAPH(ng_name_hash) +#define V_ng_nodelist VNET_NETGRAPH(ng_nodelist) +#define V_ng_wormhole_unit VNET_NETGRAPH(ng_wormhole_unit) + #endif /* _NETGRAPH_NETGRAPH_H_ */ ==== //depot/projects/vimage/src/sys/netgraph/ng_eiface.c#14 (text+ko) ==== @@ -570,6 +570,10 @@ const priv_p priv = NG_NODE_PRIVATE(node); struct ifnet *const ifp = priv->ifp; + /* + * the ifnet may be in a different vnet than the netgraph node, + * hence we have to change the current vnet context here. + */ CURVNET_SET_QUIET(ifp->if_vnet); ether_ifdetach(ifp); if_free(ifp); ==== //depot/projects/vimage/src/sys/netgraph/ng_iface.c#11 (text+ko) ==== @@ -818,6 +818,10 @@ INIT_VNET_NETGRAPH(curvnet); const priv_p priv = NG_NODE_PRIVATE(node); + /* + * The ifnet may be in a different vnet than the netgraph node, + * hence we have to change the current vnet context here. + */ CURVNET_SET_QUIET(priv->ifp->if_vnet); bpfdetach(priv->ifp); if_detach(priv->ifp); ==== //depot/projects/vimage/src/sys/netinet/igmp.c#17 (text+ko) ==== ==== //depot/projects/vimage/src/sys/netinet/in.h#6 (text+ko) ==== @@ -743,4 +743,8 @@ #undef __KAME_NETINET_IN_H_INCLUDED_ #endif +#ifdef _KERNEL +#include +#endif + #endif /* !_NETINET_IN_H_*/ ==== //depot/projects/vimage/src/sys/netinet/in_mcast.c#11 (text+ko) ==== ==== //depot/projects/vimage/src/sys/netinet/in_pcb.c#31 (text+ko) ==== ==== //depot/projects/vimage/src/sys/netinet/ip6.h#4 (text+ko) ==== @@ -346,6 +346,9 @@ } \ } \ } while (/*CONSTCOND*/ 0) + +#include + #endif /*_KERNEL*/ #endif /* not _NETINET_IP6_H_ */ ==== //depot/projects/vimage/src/sys/netinet/ip_divert.c#14 (text+ko) ==== @@ -189,6 +189,7 @@ div_input(struct mbuf *m, int off) { INIT_VNET_INET(curvnet); + V_ipstat.ips_noproto++; m_freem(m); } @@ -561,6 +562,7 @@ struct mbuf *control, struct thread *td) { INIT_VNET_INET(so->so_vnet); + /* Packet must have a header (but that's about it) */ if (m->m_len < sizeof (struct ip) && (m = m_pullup(m, sizeof (struct ip))) == 0) { ==== //depot/projects/vimage/src/sys/netinet/ip_fw.h#15 (text+ko) ==== @@ -28,8 +28,6 @@ #ifndef _IPFW2_H #define _IPFW2_H -#include -#include /* * The default rule number. By the design of ip_fw, the default rule * is the last one, so its number can also serve as the highest number @@ -560,34 +558,6 @@ */ #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, @@ -674,6 +644,14 @@ #ifdef IPFW_INTERNAL +#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) @@ -704,19 +682,16 @@ int _fw_one_pass; int _fw_enable; int _fw6_enable; - 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; @@ -730,9 +705,7 @@ u_int32_t _static_len; u_int32_t _dyn_count; u_int32_t _dyn_max; - u_int64_t _norule_counter; - struct callout _ipfw_timeout; eventhandler_tag _ifaddr_event_tag; }; @@ -741,41 +714,40 @@ /* * Symbol translation macros */ - -#define INIT_VNET_IPFW(vnet) \ +#define INIT_VNET_IPFW(vnet) \ INIT_FROM_VNET(vnet, VNET_MOD_IPFW, struct vnet_ipfw, vnet_ipfw) -#define VNET_IPFW(sym) VSYM(vnet_ipfw, sym) +#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_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) -#define V_ifaddr_event_tag VNET_IPFW(ifaddr_event_tag) +#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_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) +#define V_ifaddr_event_tag VNET_IPFW(ifaddr_event_tag) #endif /* _KERNEL */ #endif /* _IPFW2_H */ ==== //depot/projects/vimage/src/sys/netinet/ip_fw2.c#44 (text+ko) ==== @@ -4187,8 +4187,8 @@ static int ipfw_ctl(struct sockopt *sopt) { +#define RULE_MAXSIZE (256*sizeof(u_int32_t)) INIT_VNET_IPFW(curvnet); -#define RULE_MAXSIZE (256*sizeof(u_int32_t)) int error; size_t size; struct ip_fw *buf, *rule; ==== //depot/projects/vimage/src/sys/netinet/ip_icmp.c#17 (text+ko) ==== @@ -45,12 +45,10 @@ #include #include -#include #include #include #include -#include #include #include #include @@ -79,50 +77,47 @@ * host table maintenance routines. */ -#ifndef VIMAGE struct icmpstat icmpstat; -static int icmpmaskrepl = 0; -static u_int icmpmaskfake = 0; -static int drop_redirect = 0; -static int log_redirect = 0; -static int icmplim = 200; -static int icmplim_output = 1; -static char reply_src[IFNAMSIZ]; -static int icmp_rfi = 0; -static int icmp_quotelen = 8; -static int icmpbmcastecho = 0; -#endif SYSCTL_V_STRUCT(V_NET, vnet_inet, _net_inet_icmp, ICMPCTL_STATS, stats, CTLFLAG_RW, icmpstat, icmpstat, ""); +static int icmpmaskrepl = 0; SYSCTL_V_INT(V_NET, vnet_inet, _net_inet_icmp, ICMPCTL_MASKREPL, maskrepl, CTLFLAG_RW, icmpmaskrepl, 0, "Reply to ICMP Address Mask Request packets."); +static u_int icmpmaskfake = 0; SYSCTL_V_UINT(V_NET, vnet_inet, _net_inet_icmp, OID_AUTO, maskfake, CTLFLAG_RW, icmpmaskfake, 0, "Fake reply to ICMP Address Mask Request packets."); +static int drop_redirect = 0; SYSCTL_V_INT(V_NET, vnet_inet, _net_inet_icmp, OID_AUTO, drop_redirect, CTLFLAG_RW, drop_redirect, 0, "Ignore ICMP redirects"); +static int log_redirect = 0; SYSCTL_V_INT(V_NET, vnet_inet, _net_inet_icmp, OID_AUTO, log_redirect, CTLFLAG_RW, log_redirect, 0, "Log ICMP redirects to the console"); +static int icmplim = 200; SYSCTL_V_INT(V_NET, vnet_inet, _net_inet_icmp, ICMPCTL_ICMPLIM, icmplim, CTLFLAG_RW, icmplim, 0, "Maximum number of ICMP responses per second"); +static int icmplim_output = 1; SYSCTL_V_INT(V_NET, vnet_inet, _net_inet_icmp, OID_AUTO, icmplim_output, CTLFLAG_RW, icmplim_output, 0, "Enable rate limiting of ICMP responses"); +static char reply_src[IFNAMSIZ]; SYSCTL_V_STRING(V_NET, vnet_inet, _net_inet_icmp, OID_AUTO, reply_src, CTLFLAG_RW, reply_src, IFNAMSIZ, "icmp reply source for non-local packets."); +static int icmp_rfi = 0; SYSCTL_V_INT(V_NET, vnet_inet, _net_inet_icmp, OID_AUTO, reply_from_interface, CTLFLAG_RW, icmp_rfi, 0, "ICMP reply from incoming interface for " "non-local packets"); +static int icmp_quotelen = 8; SYSCTL_V_INT(V_NET, vnet_inet, _net_inet_icmp, OID_AUTO, quotelen, CTLFLAG_RW, icmp_quotelen, 0, "Number of bytes from original packet to " "quote in ICMP reply"); @@ -130,6 +125,8 @@ /* * ICMP broadcast echo sysctl */ + +static int icmpbmcastecho = 0; SYSCTL_V_INT(V_NET, vnet_inet, _net_inet_icmp, OID_AUTO, bmcastecho, CTLFLAG_RW, icmpbmcastecho, 0, ""); ==== //depot/projects/vimage/src/sys/netinet/ip_input.c#34 (text+ko) ==== ==== //depot/projects/vimage/src/sys/netinet/ip_mroute.c#13 (text+ko) ==== @@ -3044,6 +3044,7 @@ ip_mroute_modevent(module_t mod, int type, void *unused) { INIT_VNET_INET(curvnet); + switch (type) { case MOD_LOAD: MROUTER_LOCK_INIT(); ==== //depot/projects/vimage/src/sys/netinet/tcp_input.c#35 (text+ko) ==== ==== //depot/projects/vimage/src/sys/netinet/tcp_offload.c#8 (text+ko) ==== ==== //depot/projects/vimage/src/sys/netinet/tcp_output.c#23 (text+ko) ==== ==== //depot/projects/vimage/src/sys/netinet/tcp_subr.c#51 (text+ko) ==== @@ -76,7 +76,7 @@ #endif #include #include -#ifdef IET6 +#ifdef INET6 #include #include #include @@ -160,7 +160,7 @@ static int sysctl_net_inet_tcp_mss_v6_check(SYSCTL_HANDLER_ARGS) { - INIT_VNET_INET(TD_TO_VNET(curthread)); + INIT_VNET_INET(curvnet); int error, new; new = V_tcp_v6mssdflt; @@ -718,7 +718,6 @@ tcp_newtcpcb(struct inpcb *inp) { INIT_VNET_INET(inp->inp_vnet); - struct tcpcb_mem *tm; struct tcpcb *tp; #ifdef INET6 ==== //depot/projects/vimage/src/sys/netinet/tcp_syncache.c#40 (text+ko) ==== ==== //depot/projects/vimage/src/sys/netinet/tcp_timewait.c#17 (text+ko) ==== ==== //depot/projects/vimage/src/sys/netinet/tcp_usrreq.c#23 (text+ko) ==== @@ -1100,10 +1100,10 @@ { struct inpcb *inp = tp->t_inpcb, *oinp; struct socket *so = inp->inp_socket; + INIT_VNET_INET(so->so_vnet); struct in_addr laddr; u_short lport; int error; - INIT_VNET_INET(so->so_vnet); INP_INFO_WLOCK_ASSERT(&V_tcbinfo); INP_WLOCK_ASSERT(inp); @@ -1156,10 +1156,10 @@ { struct inpcb *inp = tp->t_inpcb, *oinp; struct socket *so = inp->inp_socket; + INIT_VNET_INET(so->so_vnet); struct sockaddr_in6 *sin6 = (struct sockaddr_in6 *)nam; struct in6_addr *addr6; int error; - INIT_VNET_INET(so->so_vnet); INP_INFO_WLOCK_ASSERT(&V_tcbinfo); INP_WLOCK_ASSERT(inp); ==== //depot/projects/vimage/src/sys/netinet/vinet.h#28 (text+ko) ==== @@ -26,6 +26,8 @@ * 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. + * + * $FreeBSD$ */ #ifndef _NETINET_VINET_H_ @@ -196,134 +198,134 @@ /* * Symbol translation macros */ -#define INIT_VNET_INET(vnet) \ +#define INIT_VNET_INET(vnet) \ INIT_FROM_VNET(vnet, VNET_MOD_INET, struct vnet_inet, vnet_inet) -#define VNET_INET(sym) VSYM(vnet_inet, sym) +#define VNET_INET(sym) VSYM(vnet_inet, sym) + +#define V_arp_maxtries VNET_INET(arp_maxtries) +#define V_arp_proxyall VNET_INET(arp_proxyall) +#define V_arpt_keep VNET_INET(arpt_keep) +#define V_arpt_prune VNET_INET(arpt_prune) +#define V_blackhole VNET_INET(blackhole) +#define V_divcb VNET_INET(divcb) +#define V_divcbinfo VNET_INET(divcbinfo) +#define V_drop_redirect VNET_INET(drop_redirect) +#define V_drop_synfin VNET_INET(drop_synfin) +#define V_icmp_may_rst VNET_INET(icmp_may_rst) +#define V_icmp_quotelen VNET_INET(icmp_quotelen) +#define V_icmp_rfi VNET_INET(icmp_rfi) +#define V_icmpbmcastecho VNET_INET(icmpbmcastecho) +#define V_icmplim VNET_INET(icmplim) +#define V_icmplim_output VNET_INET(icmplim_output) +#define V_icmpmaskfake VNET_INET(icmpmaskfake) +#define V_icmpmaskrepl VNET_INET(icmpmaskrepl) +#define V_icmpstat VNET_INET(icmpstat) +#define V_igmpstat VNET_INET(igmpstat) +#define V_in_ifaddrhashtbl VNET_INET(in_ifaddrhashtbl) +#define V_in_ifaddrhead VNET_INET(in_ifaddrhead) +#define V_in_ifaddrhmask VNET_INET(in_ifaddrhmask) +#define V_in_multihead VNET_INET(in_multihead) +#define V_ip_checkinterface VNET_INET(ip_checkinterface) +#define V_ip_defttl VNET_INET(ip_defttl) +#define V_ip_do_randomid VNET_INET(ip_do_randomid) +#define V_ip_id VNET_INET(ip_id) +#define V_ip_keepfaith VNET_INET(ip_keepfaith) +#define V_ip_mrouter VNET_INET(ip_mrouter) +#define V_ip_rsvp_on VNET_INET(ip_rsvp_on) +#define V_ip_rsvpd VNET_INET(ip_rsvpd) +#define V_ip_sendsourcequench VNET_INET(ip_sendsourcequench) +#define V_ipfastforward_active VNET_INET(ipfastforward_active) +#define V_ipforwarding VNET_INET(ipforwarding) +#define V_ipport_firstauto VNET_INET(ipport_firstauto) +#define V_ipport_hifirstauto VNET_INET(ipport_hifirstauto) +#define V_ipport_hilastauto VNET_INET(ipport_hilastauto) +#define V_ipport_lastauto VNET_INET(ipport_lastauto) +#define V_ipport_lowfirstauto VNET_INET(ipport_lowfirstauto) +#define V_ipport_lowlastauto VNET_INET(ipport_lowlastauto) +#define V_ipport_randomcps VNET_INET(ipport_randomcps) +#define V_ipport_randomized VNET_INET(ipport_randomized) +#define V_ipport_randomtime VNET_INET(ipport_randomtime) +#define V_ipport_reservedhigh VNET_INET(ipport_reservedhigh) +#define V_ipport_reservedlow VNET_INET(ipport_reservedlow) +#define V_ipport_stoprandom VNET_INET(ipport_stoprandom) +#define V_ipport_tcpallocs VNET_INET(ipport_tcpallocs) +#define V_ipport_tcplastcount VNET_INET(ipport_tcplastcount) +#define V_ipq VNET_INET(ipq) +#define V_ipq_zone VNET_INET(ipq_zone) +#define V_ipsendredirects VNET_INET(ipsendredirects) +#define V_ipstat VNET_INET(ipstat) +#define V_ipstealth VNET_INET(ipstealth) +#define V_isn_ctx VNET_INET(isn_ctx) +#define V_isn_last_reseed VNET_INET(isn_last_reseed) +#define V_isn_offset VNET_INET(isn_offset) +#define V_isn_offset_old VNET_INET(isn_offset_old) +#define V_isn_secret VNET_INET(isn_secret) +#define V_llinfo_arp VNET_INET(llinfo_arp) +#define V_log_redirect VNET_INET(log_redirect) +#define V_maxfragsperpacket VNET_INET(maxfragsperpacket) +#define V_maxnipq VNET_INET(maxnipq) +#define V_nipq VNET_INET(nipq) +#define V_nolocaltimewait VNET_INET(nolocaltimewait) +#define V_path_mtu_discovery VNET_INET(path_mtu_discovery) +#define V_reply_src VNET_INET(reply_src) +#define V_ripcb VNET_INET(ripcb) +#define V_ripcbinfo VNET_INET(ripcbinfo) +#define V_router_info_head VNET_INET(router_info_head) +#define V_rsvp_on VNET_INET(rsvp_on) +#define V_rtq_minreallyold VNET_INET(rtq_minreallyold) +#define V_rtq_reallyold VNET_INET(rtq_reallyold) +#define V_rtq_timeout VNET_INET(rtq_timeout) +#define V_rtq_timer VNET_INET(rtq_timer) +#define V_rtq_toomany VNET_INET(rtq_toomany) +#define V_sameprefixcarponly VNET_INET(sameprefixcarponly) +#define V_ss_fltsz VNET_INET(ss_fltsz) +#define V_ss_fltsz_local VNET_INET(ss_fltsz_local) +#define V_subnetsarelocal VNET_INET(subnetsarelocal) +#define V_tcb VNET_INET(tcb) +#define V_tcbinfo VNET_INET(tcbinfo) +#define V_tcp_autorcvbuf_inc VNET_INET(tcp_autorcvbuf_inc) +#define V_tcp_autorcvbuf_max VNET_INET(tcp_autorcvbuf_max) +#define V_tcp_autosndbuf_inc VNET_INET(tcp_autosndbuf_inc) +#define V_tcp_autosndbuf_max VNET_INET(tcp_autosndbuf_max) +#define V_tcp_delack_enabled VNET_INET(tcp_delack_enabled) +#define V_tcp_do_autorcvbuf VNET_INET(tcp_do_autorcvbuf) +#define V_tcp_do_autosndbuf VNET_INET(tcp_do_autosndbuf) +#define V_tcp_do_ecn VNET_INET(tcp_do_ecn) +#define V_tcp_do_newreno VNET_INET(tcp_do_newreno) +#define V_tcp_do_rfc1323 VNET_INET(tcp_do_rfc1323) +#define V_tcp_do_rfc3042 VNET_INET(tcp_do_rfc3042) +#define V_tcp_do_rfc3390 VNET_INET(tcp_do_rfc3390) +#define V_tcp_do_sack VNET_INET(tcp_do_sack) +#define V_tcp_do_tso VNET_INET(tcp_do_tso) +#define V_tcp_ecn_maxretries VNET_INET(tcp_ecn_maxretries) +#define V_tcp_hc_callout VNET_INET(tcp_hc_callout) +#define V_tcp_hostcache VNET_INET(tcp_hostcache) +#define V_tcp_inflight_enable VNET_INET(tcp_inflight_enable) +#define V_tcp_inflight_max VNET_INET(tcp_inflight_max) +#define V_tcp_inflight_min VNET_INET(tcp_inflight_min) +#define V_tcp_inflight_rttthresh VNET_INET(tcp_inflight_rttthresh) +#define V_tcp_inflight_stab VNET_INET(tcp_inflight_stab) +#define V_tcp_insecure_rst VNET_INET(tcp_insecure_rst) +#define V_tcp_isn_reseed_interval VNET_INET(tcp_isn_reseed_interval) +#define V_tcp_minmss VNET_INET(tcp_minmss) +#define V_tcp_mssdflt VNET_INET(tcp_mssdflt) +#define V_tcp_reass_maxqlen VNET_INET(tcp_reass_maxqlen) +#define V_tcp_reass_maxseg VNET_INET(tcp_reass_maxseg) +#define V_tcp_reass_overflows VNET_INET(tcp_reass_overflows) +#define V_tcp_reass_qsize VNET_INET(tcp_reass_qsize) +#define V_tcp_sack_globalholes VNET_INET(tcp_sack_globalholes) +#define V_tcp_sack_globalmaxholes VNET_INET(tcp_sack_globalmaxholes) +#define V_tcp_sack_maxholes VNET_INET(tcp_sack_maxholes) +#define V_tcp_sc_rst_sock_fail VNET_INET(tcp_sc_rst_sock_fail) +#define V_tcp_syncache VNET_INET(tcp_syncache) +#define V_tcp_v6mssdflt VNET_INET(tcp_v6mssdflt) +#define V_tcpstat VNET_INET(tcpstat) +#define V_twq_2msl VNET_INET(twq_2msl) +#define V_udb VNET_INET(udb) +#define V_udbinfo VNET_INET(udbinfo) +#define V_udp_blackhole VNET_INET(udp_blackhole) +#define V_udpstat VNET_INET(udpstat) +#define V_useloopback VNET_INET(useloopback) -#define V_in_ifaddrhead VNET_INET(in_ifaddrhead) -#define V_in_ifaddrhashtbl VNET_INET(in_ifaddrhashtbl) -#define V_in_ifaddrhmask VNET_INET(in_ifaddrhmask) -#define V_in_multihead VNET_INET(in_multihead) -#define V_llinfo_arp VNET_INET(llinfo_arp) -#define V_arpt_prune VNET_INET(arpt_prune) -#define V_arpt_keep VNET_INET(arpt_keep) -#define V_arp_maxtries VNET_INET(arp_maxtries) -#define V_useloopback VNET_INET(useloopback) -#define V_arp_proxyall VNET_INET(arp_proxyall) -#define V_subnetsarelocal VNET_INET(subnetsarelocal) -#define V_sameprefixcarponly VNET_INET(sameprefixcarponly) -#define V_ipforwarding VNET_INET(ipforwarding) -#define V_ipstealth VNET_INET(ipstealth) -#define V_ipfastforward_active VNET_INET(ipfastforward_active) -#define V_ipsendredirects VNET_INET(ipsendredirects) -#define V_ip_defttl VNET_INET(ip_defttl) -#define V_ip_keepfaith VNET_INET(ip_keepfaith) -#define V_ip_sendsourcequench VNET_INET(ip_sendsourcequench) -#define V_ip_id VNET_INET(ip_id) -#define V_ip_do_randomid VNET_INET(ip_do_randomid) -#define V_ip_checkinterface VNET_INET(ip_checkinterface) -#define V_ipq VNET_INET(ipq) -#define V_ipq_zone VNET_INET(ipq_zone) -#define V_nipq VNET_INET(nipq) -#define V_maxnipq VNET_INET(maxnipq) -#define V_maxfragsperpacket VNET_INET(maxfragsperpacket) -#define V_tcb VNET_INET(tcb) -#define V_tcbinfo VNET_INET(tcbinfo) -#define V_tcpstat VNET_INET(tcpstat) -#define V_twq_2msl VNET_INET(twq_2msl) -#define V_tcp_hostcache VNET_INET(tcp_hostcache) -#define V_tcp_hc_callout VNET_INET(tcp_hc_callout) -#define V_tcp_syncache VNET_INET(tcp_syncache) -#define V_tcp_sc_rst_sock_fail VNET_INET(tcp_sc_rst_sock_fail) -#define V_tcp_mssdflt VNET_INET(tcp_mssdflt) -#define V_tcp_v6mssdflt VNET_INET(tcp_v6mssdflt) -#define V_tcp_minmss VNET_INET(tcp_minmss) -#define V_tcp_do_rfc1323 VNET_INET(tcp_do_rfc1323) -#define V_icmp_may_rst VNET_INET(icmp_may_rst) -#define V_tcp_isn_reseed_interval VNET_INET(tcp_isn_reseed_interval) -#define V_tcp_inflight_enable VNET_INET(tcp_inflight_enable) -#define V_tcp_inflight_rttthresh VNET_INET(tcp_inflight_rttthresh) -#define V_tcp_inflight_min VNET_INET(tcp_inflight_min) -#define V_tcp_inflight_max VNET_INET(tcp_inflight_max) -#define V_tcp_inflight_stab VNET_INET(tcp_inflight_stab) -#define V_nolocaltimewait VNET_INET(nolocaltimewait) -#define V_path_mtu_discovery VNET_INET(path_mtu_discovery) -#define V_ss_fltsz VNET_INET(ss_fltsz) -#define V_ss_fltsz_local VNET_INET(ss_fltsz_local) -#define V_tcp_do_newreno VNET_INET(tcp_do_newreno) -#define V_tcp_do_tso VNET_INET(tcp_do_tso) -#define V_tcp_do_autosndbuf VNET_INET(tcp_do_autosndbuf) -#define V_tcp_autosndbuf_inc VNET_INET(tcp_autosndbuf_inc) -#define V_tcp_autosndbuf_max VNET_INET(tcp_autosndbuf_max) -#define V_tcp_do_sack VNET_INET(tcp_do_sack) -#define V_tcp_sack_maxholes VNET_INET(tcp_sack_maxholes) -#define V_tcp_sack_globalmaxholes VNET_INET(tcp_sack_globalmaxholes) -#define V_tcp_sack_globalholes VNET_INET(tcp_sack_globalholes) -#define V_blackhole VNET_INET(blackhole) -#define V_tcp_delack_enabled VNET_INET(tcp_delack_enabled) -#define V_drop_synfin VNET_INET(drop_synfin) -#define V_tcp_do_rfc3042 VNET_INET(tcp_do_rfc3042) -#define V_tcp_do_rfc3390 VNET_INET(tcp_do_rfc3390) -#define V_tcp_do_ecn VNET_INET(tcp_do_ecn) -#define V_tcp_ecn_maxretries VNET_INET(tcp_ecn_maxretries) -#define V_tcp_insecure_rst VNET_INET(tcp_insecure_rst) -#define V_tcp_do_autorcvbuf VNET_INET(tcp_do_autorcvbuf) -#define V_tcp_autorcvbuf_inc VNET_INET(tcp_autorcvbuf_inc) -#define V_tcp_autorcvbuf_max VNET_INET(tcp_autorcvbuf_max) -#define V_tcp_reass_maxseg VNET_INET(tcp_reass_maxseg) -#define V_tcp_reass_qsize VNET_INET(tcp_reass_qsize) -#define V_tcp_reass_maxqlen VNET_INET(tcp_reass_maxqlen) -#define V_tcp_reass_overflows VNET_INET(tcp_reass_overflows) -/* pf needs to get to these (!?) */ -#define V_isn_secret VNET_INET(isn_secret) -#define V_isn_last_reseed VNET_INET(isn_last_reseed) -#define V_isn_offset VNET_INET(isn_offset) -#define V_isn_offset_old VNET_INET(isn_offset_old) -#define V_isn_ctx VNET_INET(isn_ctx) -#define V_udb VNET_INET(udb) -#define V_udbinfo VNET_INET(udbinfo) -#define V_udpstat VNET_INET(udpstat) -#define V_udp_blackhole VNET_INET(udp_blackhole) -#define V_ripcb VNET_INET(ripcb) -#define V_ripcbinfo VNET_INET(ripcbinfo) -#define V_ip_mrouter VNET_INET(ip_mrouter) -#define V_rsvp_on VNET_INET(rsvp_on) -#define V_ip_rsvp_on VNET_INET(ip_rsvp_on) -#define V_ip_rsvpd VNET_INET(ip_rsvpd) -#define V_icmpstat VNET_INET(icmpstat) -#define V_ipstat VNET_INET(ipstat) -#define V_igmpstat VNET_INET(igmpstat) -#define V_router_info_head VNET_INET(router_info_head) -#define V_rtq_timeout VNET_INET(rtq_timeout) -#define V_rtq_reallyold VNET_INET(rtq_reallyold) -#define V_rtq_minreallyold VNET_INET(rtq_minreallyold) -#define V_rtq_toomany VNET_INET(rtq_toomany) -#define V_rtq_timer VNET_INET(rtq_timer) -#define V_ipport_lowfirstauto VNET_INET(ipport_lowfirstauto) -#define V_ipport_lowlastauto VNET_INET(ipport_lowlastauto) >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Sep 25 12:00:30 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D927F1065695; Thu, 25 Sep 2008 12:00:29 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 9D317106568C for ; Thu, 25 Sep 2008 12:00:29 +0000 (UTC) (envelope-from bz@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 73D0C8FC1C for ; Thu, 25 Sep 2008 12:00:29 +0000 (UTC) (envelope-from bz@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id m8PC0TU3070332 for ; Thu, 25 Sep 2008 12:00:29 GMT (envelope-from bz@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m8PC0TOr070330 for perforce@freebsd.org; Thu, 25 Sep 2008 12:00:29 GMT (envelope-from bz@freebsd.org) Date: Thu, 25 Sep 2008 12:00:29 GMT Message-Id: <200809251200.m8PC0TOr070330@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bz@freebsd.org using -f From: "Bjoern A. Zeeb" To: Perforce Change Reviews Cc: Subject: PERFORCE change 150430 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 25 Sep 2008 12:00:30 -0000 http://perforce.freebsd.org/chv.cgi?CH=150430 Change 150430 by bz@bz_dumpster on 2008/09/25 12:00:20 NO need to include vinet.h; will be included via other paths already. Affected files ... .. //depot/projects/vimage-commit2/src/sys/contrib/rdma/rdma_cma.c#8 edit Differences ... ==== //depot/projects/vimage-commit2/src/sys/contrib/rdma/rdma_cma.c#8 (text+ko) ==== @@ -51,7 +51,6 @@ #include #include #include -#include #include #include From owner-p4-projects@FreeBSD.ORG Thu Sep 25 12:02:35 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B65C510657B3; Thu, 25 Sep 2008 12:02:32 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C1843106579C for ; Thu, 25 Sep 2008 12:02:31 +0000 (UTC) (envelope-from bz@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id A5D7E8FC1F for ; Thu, 25 Sep 2008 12:02:31 +0000 (UTC) (envelope-from bz@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id m8PC2V5N086193 for ; Thu, 25 Sep 2008 12:02:31 GMT (envelope-from bz@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m8PC2Vn0086186 for perforce@freebsd.org; Thu, 25 Sep 2008 12:02:31 GMT (envelope-from bz@freebsd.org) Date: Thu, 25 Sep 2008 12:02:31 GMT Message-Id: <200809251202.m8PC2Vn0086186@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bz@freebsd.org using -f From: "Bjoern A. Zeeb" To: Perforce Change Reviews Cc: Subject: PERFORCE change 150431 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 25 Sep 2008 12:02:42 -0000 http://perforce.freebsd.org/chv.cgi?CH=150431 Change 150431 by bz@bz_dumpster on 2008/09/25 12:01:59 Hide functional changes or structs under#ifdef VIMAGE. Remove two extra fileds from a sysctl struct as they change the size of objects and are not yet needed. Affected files ... .. //depot/projects/vimage-commit2/src/sys/net/if_gif.h#4 edit .. //depot/projects/vimage-commit2/src/sys/netinet6/vinet6.h#4 edit .. //depot/projects/vimage-commit2/src/sys/sys/sysctl.h#8 edit Differences ... ==== //depot/projects/vimage-commit2/src/sys/net/if_gif.h#4 (text+ko) ==== @@ -113,12 +113,7 @@ /* * Virtualization support */ - -#define INIT_VNET_GIF(vnet) \ - INIT_FROM_VNET(vnet, VNET_MOD_GIF, struct vnet_gif, vnet_gif) - -#define VNET_GIF(sym) VSYM(vnet_gif, sym) - +#ifdef VIMAGE struct vnet_gif { LIST_HEAD(, gif_softc) _gif_softc_list; int _max_gif_nesting; @@ -126,6 +121,12 @@ int _ip_gif_ttl; int _ip6_gif_hlim; }; +#endif + +#define INIT_VNET_GIF(vnet) \ + INIT_FROM_VNET(vnet, VNET_MOD_GIF, struct vnet_gif, vnet_gif) + +#define VNET_GIF(sym) VSYM(vnet_gif, sym) #define V_gif_softc_list VNET_GIF(gif_softc_list) #define V_max_gif_nesting VNET_GIF(max_gif_nesting) ==== //depot/projects/vimage-commit2/src/sys/netinet6/vinet6.h#4 (text+ko) ==== @@ -33,6 +33,7 @@ #ifndef _NETINET6_VINET6_H_ #define _NETINET6_VINET6_H_ +#ifdef VIMAGE #include #include #include @@ -45,13 +46,6 @@ #include #include -#define INIT_VNET_INET6(vnet) \ - INIT_FROM_VNET(vnet, VNET_MOD_INET6, struct vnet_inet6, vnet_inet6) - -#define VNET_INET6(sym) VSYM(vnet_inet6, sym) - - -#ifdef VIMAGE struct vnet_inet6 { struct in6_ifaddr * _in6_ifaddr; @@ -162,6 +156,12 @@ #endif +#define INIT_VNET_INET6(vnet) \ + INIT_FROM_VNET(vnet, VNET_MOD_INET6, struct vnet_inet6, vnet_inet6) + +#define VNET_INET6(sym) VSYM(vnet_inet6, sym) + + /* * Symbol translation macros */ ==== //depot/projects/vimage-commit2/src/sys/sys/sysctl.h#8 (text+ko) ==== @@ -162,8 +162,6 @@ const char *oid_fmt; int oid_refcnt; const char *oid_descr; - short oid_v_subs; - short oid_v_mod; }; #define SYSCTL_IN(r, p, l) (r->newfunc)(r, p, l) @@ -177,9 +175,11 @@ int sysctl_handle_string(SYSCTL_HANDLER_ARGS); int sysctl_handle_opaque(SYSCTL_HANDLER_ARGS); +#ifdef VIMAGE int sysctl_handle_v_int(SYSCTL_HANDLER_ARGS); int sysctl_handle_v_string(SYSCTL_HANDLER_ARGS); int sysctl_handle_v_opaque(SYSCTL_HANDLER_ARGS); +#endif /* * These functions are used to add/remove an oid from the mib. @@ -406,30 +406,6 @@ #define FEATURE(name, desc) \ SYSCTL_INT(_kern_features, OID_AUTO, name, CTLFLAG_RD, 0, 1, desc) -/* - * Resolve void *arg1 in a proper virtualization container. - */ -#ifdef VIMAGE -#define SYSCTL_RESOLVE_V_ARG1() do { \ - char *cp; \ - switch (oidp->oid_v_subs) { \ - case V_NET: \ - cp = (char *) \ - TD_TO_VNET(curthread)->mod_data[oidp->oid_v_mod]; \ - break; \ - case V_PROCG: \ - cp = (char *) TD_TO_VPROCG(curthread); \ - break; \ - case V_CPU: \ - cp = (char *) TD_TO_VCPU(curthread); \ - break; \ - default: \ - panic("unsupported module id %d", oidp->oid_v_subs); \ - } \ - arg1 = cp + (size_t) arg1; \ -} while (0) -#endif - #endif /* _KERNEL */ /* From owner-p4-projects@FreeBSD.ORG Thu Sep 25 16:56:33 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9A2EB1065691; Thu, 25 Sep 2008 16:56:33 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 5C60A1065686 for ; Thu, 25 Sep 2008 16:56:33 +0000 (UTC) (envelope-from thompsa@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 4A9A18FC0C for ; Thu, 25 Sep 2008 16:56:33 +0000 (UTC) (envelope-from thompsa@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id m8PGuXKu021346 for ; Thu, 25 Sep 2008 16:56:33 GMT (envelope-from thompsa@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m8PGuXfq021340 for perforce@freebsd.org; Thu, 25 Sep 2008 16:56:33 GMT (envelope-from thompsa@freebsd.org) Date: Thu, 25 Sep 2008 16:56:33 GMT Message-Id: <200809251656.m8PGuXfq021340@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to thompsa@freebsd.org using -f From: Andrew Thompson To: Perforce Change Reviews Cc: Subject: PERFORCE change 150449 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 25 Sep 2008 16:56:33 -0000 http://perforce.freebsd.org/chv.cgi?CH=150449 Change 150449 by thompsa@thompsa_burger on 2008/09/25 16:55:33 Add a comment about db_show_tty printing these flags. Affected files ... .. //depot/projects/mpsafetty/sys/sys/tty.h#20 edit Differences ... ==== //depot/projects/mpsafetty/sys/sys/tty.h#20 (text+ko) ==== @@ -63,6 +63,7 @@ struct mtx t_mtxobj; /* Per-TTY lock (when not borrowing). */ TAILQ_ENTRY(tty) t_list; /* (l) TTY list entry. */ unsigned int t_flags; /* (t) Terminal option flags. */ +/* Keep flags in sync with db_show_tty */ #define TF_NOPREFIX 0x0001 /* Don't prepend "tty" to device name. */ #define TF_INITLOCK 0x0002 /* Create init/lock state devices. */ #define TF_CALLOUT 0x0004 /* Create "cua" devices. */ From owner-p4-projects@FreeBSD.ORG Thu Sep 25 19:00:46 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BDAB01065690; Thu, 25 Sep 2008 19:00:46 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 80F18106569E for ; Thu, 25 Sep 2008 19:00:46 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 6E0748FC1A for ; Thu, 25 Sep 2008 19:00:46 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id m8PJ0kjM066900 for ; Thu, 25 Sep 2008 19:00:46 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m8PJ0kh7066894 for perforce@freebsd.org; Thu, 25 Sep 2008 19:00:46 GMT (envelope-from hselasky@FreeBSD.org) Date: Thu, 25 Sep 2008 19:00:46 GMT Message-Id: <200809251900.m8PJ0kh7066894@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 150457 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 25 Sep 2008 19:00:47 -0000 http://perforce.freebsd.org/chv.cgi?CH=150457 Change 150457 by hselasky@hselasky_laptop001 on 2008/09/25 19:00:15 Pre IFC @ 150453 The Huawei IDs have been moved to UGENSA. They are not compatible with the UBSA driver. Add automatic removal of Huawei auto-install disk. Affected files ... .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_device.c#26 edit .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_msctest.c#8 edit .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_msctest.h#4 edit .. //depot/projects/usb/src/sys/dev/usb2/serial/ubsa2.c#9 edit .. //depot/projects/usb/src/sys/dev/usb2/serial/ugensa2.c#10 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_device.c#26 (text+ko) ==== @@ -29,6 +29,7 @@ #include #include #include +#include #define USB_DEBUG_VAR usb2_debug @@ -1579,8 +1580,9 @@ config_index, usb2_errstr(err), udev->port_no, udev->address); - } else if ((!config_quirk) && - ((config_index + 1) < udev->ddesc.bNumConfigurations)) { + } else if (config_quirk) { + /* user quirk selects configuration index */ + } else if ((config_index + 1) < udev->ddesc.bNumConfigurations) { if ((udev->cdesc->bNumInterface < 2) && (usb2_get_no_endpoints(udev->cdesc) == 0)) { @@ -1601,6 +1603,11 @@ goto repeat_set_config; } } + } else if (UGETW(udev->ddesc.idVendor) == USB_VENDOR_HUAWEI) { + if (usb2_test_huawei(udev, 0) == 0) { + DPRINTFN(0, "Found Huawei auto-install disk!\n"); + err = USB_ERR_STALLED; /* fake an error */ + } } } else { err = 0; /* set success */ ==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_msctest.c#8 (text+ko) ==== @@ -564,3 +564,49 @@ free(sc, M_USB); return (err); } + +/* + * Huawei Exxx radio devices have a built in flash disk which is their + * default power up configuration. This allows the device to carry its + * own installation software. + * + * Instead of following the USB spec, and create multiple + * configuration descriptors for this, the devices expects the driver + * to send UF_DEVICE_REMOTE_WAKEUP to endpoint 2 to reset the device, + * so it reprobes, now with the radio exposed. + */ + +usb2_error_t +usb2_test_huawei(struct usb2_device *udev, uint8_t iface_index) +{ + struct usb2_device_request req; + struct usb2_interface *iface; + struct usb2_interface_descriptor *id; + usb2_error_t err; + + if (udev == NULL) { + return (USB_ERR_INVAL); + } + iface = usb2_get_iface(udev, iface_index); + if (iface == NULL) { + return (USB_ERR_INVAL); + } + id = iface->idesc; + if (id == NULL) { + return (USB_ERR_INVAL); + } + if (id->bInterfaceClass != UICLASS_MASS) { + return (USB_ERR_INVAL); + } + /* Bend it like Beckham */ + req.bmRequestType = UT_WRITE_DEVICE; + req.bRequest = UR_SET_FEATURE; + USETW(req.wValue, UF_DEVICE_REMOTE_WAKEUP); + USETW(req.wIndex, 2); + USETW(req.wLength, 0); + + /* We get error at return, but it works */ + err = usb2_do_request_flags(udev, NULL, &req, NULL, 0, NULL, 1 * USB_MS_HZ); + + return (0); /* success */ +} ==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_msctest.h#4 (text+ko) ==== @@ -28,5 +28,6 @@ #define _USB2_MSCTEST_H_ usb2_error_t usb2_test_autoinstall(struct usb2_device *udev, uint8_t iface_index); +usb2_error_t usb2_test_huawei(struct usb2_device *udev, uint8_t iface_index); #endif /* _USB2_MSCTEST_H_ */ ==== //depot/projects/usb/src/sys/dev/usb2/serial/ubsa2.c#9 (text+ko) ==== @@ -289,8 +289,6 @@ {USB_VPI(USB_VENDOR_OPTION, USB_PRODUCT_OPTION_GTMAX36, 0)}, /* Option GlobeTrotter 3G QUAD */ {USB_VPI(USB_VENDOR_OPTION, USB_PRODUCT_OPTION_GT3GQUAD, 0)}, - /* Huawei Mobile */ - {USB_VPI(USB_VENDOR_HUAWEI, USB_PRODUCT_HUAWEI_MOBILE, 0)}, /* Sierra Wireless LENOVO UMTS card */ {USB_VPI(USB_VENDOR_SIERRA, USB_PRODUCT_SIERRA_MC8755_3, 0)}, /* Qualcomm, Inc. ZTE CDMA */ ==== //depot/projects/usb/src/sys/dev/usb2/serial/ugensa2.c#10 (text+ko) ==== @@ -179,6 +179,7 @@ {USB_VPI(USB_VENDOR_KYOCERA2, USB_PRODUCT_KYOCERA2_CDMA_MSM_K, 0)}, {USB_VPI(USB_VENDOR_HP, USB_PRODUCT_HP_49GPLUS, 0)}, {USB_VPI(USB_VENDOR_HUAWEI, USB_PRODUCT_HUAWEI_E270, 0)}, + {USB_VPI(USB_VENDOR_HUAWEI, USB_PRODUCT_HUAWEI_MOBILE, 0)}, {USB_VPI(USB_VENDOR_MERLIN, USB_PRODUCT_MERLIN_V620, 0)}, {USB_VPI(USB_VENDOR_NOVATEL, USB_PRODUCT_NOVATEL_CDMA_MODEM, 0)}, {USB_VPI(USB_VENDOR_NOVATEL, USB_PRODUCT_NOVATEL_ES620, 0)}, From owner-p4-projects@FreeBSD.ORG Thu Sep 25 19:02:49 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4F8B51065689; Thu, 25 Sep 2008 19:02:49 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 122B71065687 for ; Thu, 25 Sep 2008 19:02:49 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id EE5858FC1E for ; Thu, 25 Sep 2008 19:02:48 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id m8PJ2mWM083183 for ; Thu, 25 Sep 2008 19:02:48 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m8PJ2mP0083159 for perforce@freebsd.org; Thu, 25 Sep 2008 19:02:48 GMT (envelope-from hselasky@FreeBSD.org) Date: Thu, 25 Sep 2008 19:02:48 GMT Message-Id: <200809251902.m8PJ2mP0083159@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 150458 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 25 Sep 2008 19:02:49 -0000 http://perforce.freebsd.org/chv.cgi?CH=150458 Change 150458 by hselasky@hselasky_laptop001 on 2008/09/25 19:02:40 IFC @ 150453, catch up with some mpsafe TTY changes. Affected files ... .. //depot/projects/usb/src/sys/dev/cxgb/sys/mvec.h#5 integrate .. //depot/projects/usb/src/sys/dev/cxgb/sys/uipc_mvec.c#5 integrate .. //depot/projects/usb/src/sys/dev/le/if_le_cbus.c#4 integrate .. //depot/projects/usb/src/sys/dev/le/if_le_isa.c#4 integrate .. //depot/projects/usb/src/sys/dev/le/if_le_lebuffer.c#3 integrate .. //depot/projects/usb/src/sys/dev/le/if_le_pci.c#5 integrate .. //depot/projects/usb/src/sys/dev/le/lebuffer_sbus.c#2 integrate .. //depot/projects/usb/src/sys/dev/msk/if_msk.c#6 integrate .. //depot/projects/usb/src/sys/dev/msk/if_mskreg.h#6 integrate .. //depot/projects/usb/src/sys/dev/usb/ubsa.c#45 integrate .. //depot/projects/usb/src/sys/dev/usb/umass.c#51 integrate .. //depot/projects/usb/src/sys/dev/xen/netfront/netfront.c#2 integrate .. //depot/projects/usb/src/sys/i386/bios/apm.h#2 integrate .. //depot/projects/usb/src/sys/i386/include/param.h#3 integrate .. //depot/projects/usb/src/sys/i386/include/smp.h#6 integrate .. //depot/projects/usb/src/sys/i386/xen/mp_machdep.c#3 integrate .. //depot/projects/usb/src/sys/i386/xen/pmap.c#2 integrate .. //depot/projects/usb/src/sys/i386/xen/xen_machdep.c#3 integrate .. //depot/projects/usb/src/sys/kern/kern_condvar.c#10 integrate .. //depot/projects/usb/src/sys/kern/kern_synch.c#13 integrate .. //depot/projects/usb/src/sys/kern/subr_witness.c#12 integrate .. //depot/projects/usb/src/sys/kern/vfs_cache.c#10 integrate .. //depot/projects/usb/src/sys/net/if_stf.c#7 integrate .. //depot/projects/usb/src/sys/net80211/ieee80211_ddb.c#4 integrate .. //depot/projects/usb/src/sys/netinet/tcp_input.c#13 integrate .. //depot/projects/usb/src/sys/nfsclient/nfs_vnops.c#12 integrate .. //depot/projects/usb/src/sys/sys/tty.h#6 integrate .. //depot/projects/usb/src/sys/ufs/ffs/ffs_vfsops.c#11 integrate .. //depot/projects/usb/src/sys/xen/evtchn/evtchn.c#2 integrate .. //depot/projects/usb/src/sys/xen/gnttab.c#2 integrate .. //depot/projects/usb/src/sys/xen/gnttab.h#2 integrate .. //depot/projects/usb/src/sys/xen/interface/arch-x86/xen-x86_32.h#2 integrate .. //depot/projects/usb/src/sys/xen/interface/arch-x86/xen-x86_64.h#2 integrate .. //depot/projects/usb/src/sys/xen/interface/arch-x86/xen.h#2 integrate .. //depot/projects/usb/src/sys/xen/interface/callback.h#2 integrate .. //depot/projects/usb/src/sys/xen/interface/domctl.h#2 integrate .. //depot/projects/usb/src/sys/xen/interface/features.h#2 integrate .. //depot/projects/usb/src/sys/xen/interface/grant_table.h#2 integrate .. //depot/projects/usb/src/sys/xen/interface/memory.h#2 integrate .. //depot/projects/usb/src/sys/xen/interface/physdev.h#2 integrate .. //depot/projects/usb/src/sys/xen/interface/vcpu.h#2 integrate Differences ... ==== //depot/projects/usb/src/sys/dev/cxgb/sys/mvec.h#5 (text+ko) ==== @@ -25,7 +25,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/cxgb/sys/mvec.h,v 1.15 2008/02/23 01:06:17 kmacy Exp $ + * $FreeBSD: src/sys/dev/cxgb/sys/mvec.h,v 1.16 2008/09/25 06:46:28 kmacy Exp $ * ***************************************************************************/ @@ -62,8 +62,12 @@ caddr_t ext_buf; /* start of buffer */ void (*ext_free) /* free routine if not the usual */ (void *, void *); +#if __FreeBSD_version >= 800016 void *ext_arg1; /* optional argument pointer */ void *ext_arg2; /* optional argument pointer */ +#else + void *ext_args; /* optional argument pointer */ +#endif u_int ext_size; /* size of buffer, for ext_free */ volatile u_int *ref_cnt; /* pointer to ref count info */ int ext_type; /* type of external storage */ ==== //depot/projects/usb/src/sys/dev/cxgb/sys/uipc_mvec.c#5 (text+ko) ==== @@ -29,7 +29,7 @@ ***************************************************************************/ #include -__FBSDID("$FreeBSD: src/sys/dev/cxgb/sys/uipc_mvec.c,v 1.26 2008/09/23 03:16:54 kmacy Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/cxgb/sys/uipc_mvec.c,v 1.27 2008/09/25 06:46:28 kmacy Exp $"); #include #include @@ -405,8 +405,13 @@ case EXT_EXTREF: KASSERT(mi->mi_ext.ext_free != NULL, ("%s: ext_free not set", __func__)); +#if __FreeBSD_version >= 800016 (*(mi->mi_ext.ext_free))(mi->mi_ext.ext_arg1, mi->mi_ext.ext_arg2); +#else + (*(mi->mi_ext.ext_free))(mi->mi_ext.ext_buf, + mi->mi_ext.ext_args); +#endif break; default: dump_mi(mi); ==== //depot/projects/usb/src/sys/dev/le/if_le_cbus.c#4 (text) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/le/if_le_cbus.c,v 1.5 2007/02/23 12:18:45 piso Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/le/if_le_cbus.c,v 1.6 2008/09/24 21:26:46 marius Exp $"); #include #include @@ -70,12 +70,8 @@ struct le_cbus_softc { struct am7990_softc sc_am7990; /* glue to MI code */ - int sc_rrid; struct resource *sc_rres; - bus_space_tag_t sc_regt; - bus_space_handle_t sc_regh; - int sc_irid; struct resource *sc_ires; void *sc_ih; @@ -128,10 +124,9 @@ { struct le_cbus_softc *lesc = (struct le_cbus_softc *)sc; - bus_space_write_2(lesc->sc_regt, lesc->sc_regh, CNET98S_RAP, port); - bus_space_barrier(lesc->sc_regt, lesc->sc_regh, CNET98S_RAP, 2, - BUS_SPACE_BARRIER_WRITE); - bus_space_write_2(lesc->sc_regt, lesc->sc_regh, CNET98S_BDP, val); + bus_write_2(lesc->sc_rres, CNET98S_RAP, port); + bus_barrier(lesc->sc_rres, CNET98S_RAP, 2, BUS_SPACE_BARRIER_WRITE); + bus_write_2(lesc->sc_rres, CNET98S_BDP, val); } #ifdef LEDEBUG @@ -140,10 +135,9 @@ { struct le_cbus_softc *lesc = (struct le_cbus_softc *)sc; - bus_space_write_2(lesc->sc_regt, lesc->sc_regh, CNET98S_RAP, port); - bus_space_barrier(lesc->sc_regt, lesc->sc_regh, CNET98S_RAP, 2, - BUS_SPACE_BARRIER_WRITE); - return (bus_space_read_2(lesc->sc_regt, lesc->sc_regh, CNET98S_BDP)); + bus_write_2(lesc->sc_rres, CNET98S_RAP, port); + bus_barrier(lesc->sc_rres, CNET98S_RAP, 2, BUS_SPACE_BARRIER_WRITE); + return (bus_read_2(lesc->sc_rres, CNET98S_BDP)); } #endif @@ -152,10 +146,9 @@ { struct le_cbus_softc *lesc = (struct le_cbus_softc *)sc; - bus_space_write_2(lesc->sc_regt, lesc->sc_regh, CNET98S_RAP, port); - bus_space_barrier(lesc->sc_regt, lesc->sc_regh, CNET98S_RAP, 2, - BUS_SPACE_BARRIER_WRITE); - bus_space_write_2(lesc->sc_regt, lesc->sc_regh, CNET98S_RDP, val); + bus_write_2(lesc->sc_rres, CNET98S_RAP, port); + bus_barrier(lesc->sc_rres, CNET98S_RAP, 2, BUS_SPACE_BARRIER_WRITE); + bus_write_2(lesc->sc_rres, CNET98S_RDP, val); } static uint16_t @@ -163,10 +156,9 @@ { struct le_cbus_softc *lesc = (struct le_cbus_softc *)sc; - bus_space_write_2(lesc->sc_regt, lesc->sc_regh, CNET98S_RAP, port); - bus_space_barrier(lesc->sc_regt, lesc->sc_regh, CNET98S_RAP, 2, - BUS_SPACE_BARRIER_WRITE); - return (bus_space_read_2(lesc->sc_regt, lesc->sc_regh, CNET98S_RDP)); + bus_write_2(lesc->sc_rres, CNET98S_RAP, port); + bus_barrier(lesc->sc_rres, CNET98S_RAP, 2, BUS_SPACE_BARRIER_WRITE); + return (bus_read_2(lesc->sc_rres, CNET98S_RDP)); } static void @@ -179,16 +171,16 @@ */ /* Reset the chip. */ - bus_space_write_2(lesc->sc_regt, lesc->sc_regh, CNET98S_RESET, - bus_space_read_2(lesc->sc_regt, lesc->sc_regh, CNET98S_RESET)); + bus_write_2(lesc->sc_rres, CNET98S_RESET, + bus_read_2(lesc->sc_rres, CNET98S_RESET)); DELAY(500); /* ISA bus configuration */ /* ISACSR0 - set Master Mode Read Active time to 300ns. */ - le_cbus_wrbcr(sc, LE_BCR0, 0x0006); + le_cbus_wrbcr(sc, LE_BCR0, 0x0006); /* ISACSR1 - set Master Mode Write Active time to 300ns. */ - le_cbus_wrbcr(sc, LE_BCR1, 0x0006); -#ifdef LEDEBUG + le_cbus_wrbcr(sc, LE_BCR1, 0x0006); +#ifdef LEDEBUG device_printf(dev, "ISACSR2=0x%x\n", le_cbus_rdbcr(sc, LE_BCR2)); #endif /* ISACSR5 - LED1 */ @@ -215,7 +207,7 @@ { struct le_cbus_softc *lesc; struct lance_softc *sc; - int error; + int error, i; /* * Skip PnP devices as some wedge when trying to probe them as @@ -227,18 +219,16 @@ lesc = device_get_softc(dev); sc = &lesc->sc_am7990.lsc; - lesc->sc_rrid = 0; - lesc->sc_rres = isa_alloc_resourcev(dev, SYS_RES_IOPORT, &lesc->sc_rrid, + i = 0; + lesc->sc_rres = isa_alloc_resourcev(dev, SYS_RES_IOPORT, &i, le_ioaddr_cnet98s, CNET98S_IOSIZE, RF_ACTIVE); if (lesc->sc_rres == NULL) return (ENXIO); isa_load_resourcev(lesc->sc_rres, le_ioaddr_cnet98s, CNET98S_IOSIZE); - lesc->sc_regt = rman_get_bustag(lesc->sc_rres); - lesc->sc_regh = rman_get_bushandle(lesc->sc_rres); /* Reset the chip. */ - bus_space_write_2(lesc->sc_regt, lesc->sc_regh, CNET98S_RESET, - bus_space_read_2(lesc->sc_regt, lesc->sc_regh, CNET98S_RESET)); + bus_write_2(lesc->sc_rres, CNET98S_RESET, + bus_read_2(lesc->sc_rres, CNET98S_RESET)); DELAY(500); /* Stop the chip and put it in a known state. */ @@ -253,7 +243,8 @@ error = BUS_PROBE_DEFAULT; fail: - bus_release_resource(dev, SYS_RES_IOPORT, lesc->sc_rrid, lesc->sc_rres); + bus_release_resource(dev, SYS_RES_IOPORT, + rman_get_rid(lesc->sc_rres), lesc->sc_rres); return (error); } @@ -269,8 +260,8 @@ LE_LOCK_INIT(sc, device_get_nameunit(dev)); - lesc->sc_rrid = 0; - lesc->sc_rres = isa_alloc_resourcev(dev, SYS_RES_IOPORT, &lesc->sc_rrid, + i = 0; + lesc->sc_rres = isa_alloc_resourcev(dev, SYS_RES_IOPORT, &i, le_ioaddr_cnet98s, CNET98S_IOSIZE, RF_ACTIVE); if (lesc->sc_rres == NULL) { device_printf(dev, "cannot allocate registers\n"); @@ -278,12 +269,10 @@ goto fail_mtx; } isa_load_resourcev(lesc->sc_rres, le_ioaddr_cnet98s, CNET98S_IOSIZE); - lesc->sc_regt = rman_get_bustag(lesc->sc_rres); - lesc->sc_regh = rman_get_bushandle(lesc->sc_rres); - lesc->sc_irid = 0; + i = 0; if ((lesc->sc_ires = bus_alloc_resource_any(dev, SYS_RES_IRQ, - &lesc->sc_irid, RF_SHAREABLE | RF_ACTIVE)) == NULL) { + &i, RF_SHAREABLE | RF_ACTIVE)) == NULL) { device_printf(dev, "cannot allocate interrupt\n"); error = ENXIO; goto fail_rres; @@ -339,7 +328,7 @@ error = bus_dmamap_load(lesc->sc_dmat, lesc->sc_dmam, sc->sc_mem, sc->sc_memsize, le_cbus_dma_callback, sc, 0); if (error != 0 || sc->sc_addr == 0) { - device_printf(dev, "cannot load DMA buffer map\n"); + device_printf(dev, "cannot load DMA buffer map\n"); goto fail_dmem; } @@ -350,8 +339,7 @@ * Extract the physical MAC address from the ROM. */ for (i = 0; i < sizeof(sc->sc_enaddr); i++) - sc->sc_enaddr[i] = bus_space_read_1(lesc->sc_regt, - lesc->sc_regh, i * 2); + sc->sc_enaddr[i] = bus_read_1(lesc->sc_rres, i * 2); sc->sc_copytodesc = lance_copytobuf_contig; sc->sc_copyfromdesc = lance_copyfrombuf_contig; @@ -396,9 +384,11 @@ fail_pdtag: bus_dma_tag_destroy(lesc->sc_pdmat); fail_ires: - bus_release_resource(dev, SYS_RES_IRQ, lesc->sc_irid, lesc->sc_ires); + bus_release_resource(dev, SYS_RES_IRQ, + rman_get_rid(lesc->sc_ires), lesc->sc_ires); fail_rres: - bus_release_resource(dev, SYS_RES_IOPORT, lesc->sc_rrid, lesc->sc_rres); + bus_release_resource(dev, SYS_RES_IOPORT, + rman_get_rid(lesc->sc_rres), lesc->sc_rres); fail_mtx: LE_LOCK_DESTROY(sc); return (error); @@ -419,8 +409,10 @@ bus_dmamem_free(lesc->sc_dmat, sc->sc_mem, lesc->sc_dmam); bus_dma_tag_destroy(lesc->sc_dmat); bus_dma_tag_destroy(lesc->sc_pdmat); - bus_release_resource(dev, SYS_RES_IRQ, lesc->sc_irid, lesc->sc_ires); - bus_release_resource(dev, SYS_RES_IOPORT, lesc->sc_rrid, lesc->sc_rres); + bus_release_resource(dev, SYS_RES_IRQ, + rman_get_rid(lesc->sc_ires), lesc->sc_ires); + bus_release_resource(dev, SYS_RES_IOPORT, + rman_get_rid(lesc->sc_rres), lesc->sc_rres); LE_LOCK_DESTROY(sc); return (0); ==== //depot/projects/usb/src/sys/dev/le/if_le_isa.c#4 (text) ==== @@ -72,7 +72,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/le/if_le_isa.c,v 1.4 2007/02/23 12:18:45 piso Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/le/if_le_isa.c,v 1.5 2008/09/24 21:26:46 marius Exp $"); #include #include @@ -109,15 +109,10 @@ bus_size_t sc_rap; /* offsets to LANCE... */ bus_size_t sc_rdp; /* ...registers */ - int sc_rrid; struct resource *sc_rres; - bus_space_tag_t sc_regt; - bus_space_handle_t sc_regh; - int sc_drid; struct resource *sc_dres; - int sc_irid; struct resource *sc_ires; void *sc_ih; @@ -184,10 +179,9 @@ { struct le_isa_softc *lesc = (struct le_isa_softc *)sc; - bus_space_write_2(lesc->sc_regt, lesc->sc_regh, lesc->sc_rap, port); - bus_space_barrier(lesc->sc_regt, lesc->sc_regh, lesc->sc_rap, 2, - BUS_SPACE_BARRIER_WRITE); - bus_space_write_2(lesc->sc_regt, lesc->sc_regh, lesc->sc_rdp, val); + bus_write_2(lesc->sc_rres, lesc->sc_rap, port); + bus_barrier(lesc->sc_rres, lesc->sc_rap, 2, BUS_SPACE_BARRIER_WRITE); + bus_write_2(lesc->sc_rres, lesc->sc_rdp, val); } static uint16_t @@ -195,10 +189,9 @@ { struct le_isa_softc *lesc = (struct le_isa_softc *)sc; - bus_space_write_2(lesc->sc_regt, lesc->sc_regh, lesc->sc_rap, port); - bus_space_barrier(lesc->sc_regt, lesc->sc_regh, lesc->sc_rap, 2, - BUS_SPACE_BARRIER_WRITE); - return (bus_space_read_2(lesc->sc_regt, lesc->sc_regh, lesc->sc_rdp)); + bus_write_2(lesc->sc_rres, lesc->sc_rap, port); + bus_barrier(lesc->sc_rres, lesc->sc_rap, 2, BUS_SPACE_BARRIER_WRITE); + return (bus_read_2(lesc->sc_rres, lesc->sc_rdp)); } static void @@ -217,18 +210,16 @@ { struct le_isa_softc *lesc; struct lance_softc *sc; - int error; + int error, i; lesc = device_get_softc(dev); sc = &lesc->sc_am7990.lsc; - lesc->sc_rrid = 0; - lesc->sc_rres = bus_alloc_resource(dev, SYS_RES_IOPORT, &lesc->sc_rrid, - 0, ~0, leip->iosize, RF_ACTIVE); + i = 0; + lesc->sc_rres = bus_alloc_resource(dev, SYS_RES_IOPORT, &i, 0, ~0, + leip->iosize, RF_ACTIVE); if (lesc->sc_rres == NULL) return (ENXIO); - lesc->sc_regt = rman_get_bustag(lesc->sc_rres); - lesc->sc_regh = rman_get_bushandle(lesc->sc_rres); lesc->sc_rap = leip->rap; lesc->sc_rdp = leip->rdp; @@ -243,7 +234,8 @@ error = 0; fail: - bus_release_resource(dev, SYS_RES_IOPORT, lesc->sc_rrid, lesc->sc_rres); + bus_release_resource(dev, SYS_RES_IOPORT, + rman_get_rid(lesc->sc_rres), lesc->sc_rres); return (error); } @@ -276,18 +268,18 @@ struct le_isa_softc *lesc; struct lance_softc *sc; bus_size_t macstart, rap, rdp; - int error, i, macstride; + int error, i, j, macstride; lesc = device_get_softc(dev); sc = &lesc->sc_am7990.lsc; LE_LOCK_INIT(sc, device_get_nameunit(dev)); - lesc->sc_rrid = 0; + j = 0; switch (ISA_PNP_PROBE(device_get_parent(dev), dev, le_isa_ids)) { case 0: lesc->sc_rres = bus_alloc_resource_any(dev, SYS_RES_IOPORT, - &lesc->sc_rrid, RF_ACTIVE); + &j, RF_ACTIVE); rap = PCNET_RAP; rdp = PCNET_RDP; macstart = 0; @@ -298,7 +290,7 @@ sizeof(le_isa_params[0]); i++) { if (le_isa_probe_legacy(dev, &le_isa_params[i]) == 0) { lesc->sc_rres = bus_alloc_resource(dev, - SYS_RES_IOPORT, &lesc->sc_rrid, 0, ~0, + SYS_RES_IOPORT, &j, 0, ~0, le_isa_params[i].iosize, RF_ACTIVE); rap = le_isa_params[i].rap; rdp = le_isa_params[i].rdp; @@ -321,22 +313,20 @@ error = ENXIO; goto fail_mtx; } - lesc->sc_regt = rman_get_bustag(lesc->sc_rres); - lesc->sc_regh = rman_get_bushandle(lesc->sc_rres); lesc->sc_rap = rap; lesc->sc_rdp = rdp; - lesc->sc_drid = 0; + i = 0; if ((lesc->sc_dres = bus_alloc_resource_any(dev, SYS_RES_DRQ, - &lesc->sc_drid, RF_ACTIVE)) == NULL) { + &i, RF_ACTIVE)) == NULL) { device_printf(dev, "cannot allocate DMA channel\n"); error = ENXIO; goto fail_rres; } - lesc->sc_irid = 0; + i = 0; if ((lesc->sc_ires = bus_alloc_resource_any(dev, SYS_RES_IRQ, - &lesc->sc_irid, RF_SHAREABLE | RF_ACTIVE)) == NULL) { + &i, RF_SHAREABLE | RF_ACTIVE)) == NULL) { device_printf(dev, "cannot allocate interrupt\n"); error = ENXIO; goto fail_dres; @@ -392,7 +382,7 @@ error = bus_dmamap_load(lesc->sc_dmat, lesc->sc_dmam, sc->sc_mem, sc->sc_memsize, le_isa_dma_callback, sc, 0); if (error != 0 || sc->sc_addr == 0) { - device_printf(dev, "cannot load DMA buffer map\n"); + device_printf(dev, "cannot load DMA buffer map\n"); goto fail_dmem; } @@ -405,8 +395,8 @@ * Extract the physical MAC address from the ROM. */ for (i = 0; i < sizeof(sc->sc_enaddr); i++) - sc->sc_enaddr[i] = bus_space_read_1(lesc->sc_regt, - lesc->sc_regh, macstart + i * macstride); + sc->sc_enaddr[i] = bus_read_1(lesc->sc_rres, + macstart + i * macstride); sc->sc_copytodesc = lance_copytobuf_contig; sc->sc_copyfromdesc = lance_copyfrombuf_contig; @@ -451,11 +441,14 @@ fail_pdtag: bus_dma_tag_destroy(lesc->sc_pdmat); fail_ires: - bus_release_resource(dev, SYS_RES_IRQ, lesc->sc_irid, lesc->sc_ires); + bus_release_resource(dev, SYS_RES_IRQ, + rman_get_rid(lesc->sc_ires), lesc->sc_ires); fail_dres: - bus_release_resource(dev, SYS_RES_DRQ, lesc->sc_drid, lesc->sc_dres); + bus_release_resource(dev, SYS_RES_DRQ, + rman_get_rid(lesc->sc_dres), lesc->sc_dres); fail_rres: - bus_release_resource(dev, SYS_RES_IOPORT, lesc->sc_rrid, lesc->sc_rres); + bus_release_resource(dev, SYS_RES_IOPORT, + rman_get_rid(lesc->sc_rres), lesc->sc_rres); fail_mtx: LE_LOCK_DESTROY(sc); return (error); @@ -476,9 +469,12 @@ bus_dmamem_free(lesc->sc_dmat, sc->sc_mem, lesc->sc_dmam); bus_dma_tag_destroy(lesc->sc_dmat); bus_dma_tag_destroy(lesc->sc_pdmat); - bus_release_resource(dev, SYS_RES_IRQ, lesc->sc_irid, lesc->sc_ires); - bus_release_resource(dev, SYS_RES_DRQ, lesc->sc_drid, lesc->sc_dres); - bus_release_resource(dev, SYS_RES_IOPORT, lesc->sc_rrid, lesc->sc_rres); + bus_release_resource(dev, SYS_RES_IRQ, + rman_get_rid(lesc->sc_ires), lesc->sc_ires); + bus_release_resource(dev, SYS_RES_DRQ, + rman_get_rid(lesc->sc_dres), lesc->sc_dres); + bus_release_resource(dev, SYS_RES_IOPORT, + rman_get_rid(lesc->sc_rres), lesc->sc_rres); LE_LOCK_DESTROY(sc); return (0); ==== //depot/projects/usb/src/sys/dev/le/if_le_lebuffer.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/le/if_le_lebuffer.c,v 1.2 2007/02/23 12:18:45 piso Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/le/if_le_lebuffer.c,v 1.3 2008/09/24 21:26:46 marius Exp $"); #include #include @@ -63,17 +63,10 @@ struct le_lebuffer_softc { struct am7990_softc sc_am7990; /* glue to MI code */ - int sc_brid; struct resource *sc_bres; - bus_space_tag_t sc_buft; - bus_space_handle_t sc_bufh; - int sc_rrid; struct resource *sc_rres; - bus_space_tag_t sc_regt; - bus_space_handle_t sc_regh; - int sc_irid; struct resource *sc_ires; void *sc_ih; }; @@ -103,6 +96,7 @@ sizeof(struct le_lebuffer_softc)); DRIVER_MODULE(le, lebuffer, le_lebuffer_driver, le_lebuffer_devclass, 0, 0); MODULE_DEPEND(le, ether, 1, 1, 1); +MODULE_DEPEND(le, lebuffer, 1, 1, 1); /* * Media types supported @@ -126,10 +120,9 @@ { struct le_lebuffer_softc *lesc = (struct le_lebuffer_softc *)sc; - bus_space_write_2(lesc->sc_regt, lesc->sc_regh, LEREG1_RAP, port); - bus_space_barrier(lesc->sc_regt, lesc->sc_regh, LEREG1_RAP, 2, - BUS_SPACE_BARRIER_WRITE); - bus_space_write_2(lesc->sc_regt, lesc->sc_regh, LEREG1_RDP, val); + bus_write_2(lesc->sc_rres, LEREG1_RAP, port); + bus_barrier(lesc->sc_rres, LEREG1_RAP, 2, BUS_SPACE_BARRIER_WRITE); + bus_write_2(lesc->sc_rres, LEREG1_RDP, val); } static uint16_t @@ -137,10 +130,9 @@ { struct le_lebuffer_softc *lesc = (struct le_lebuffer_softc *)sc; - bus_space_write_2(lesc->sc_regt, lesc->sc_regh, LEREG1_RAP, port); - bus_space_barrier(lesc->sc_regt, lesc->sc_regh, LEREG1_RAP, 2, - BUS_SPACE_BARRIER_WRITE); - return (bus_space_read_2(lesc->sc_regt, lesc->sc_regh, LEREG1_RDP)); + bus_write_2(lesc->sc_rres, LEREG1_RAP, port); + bus_barrier(lesc->sc_rres, LEREG1_RAP, 2, BUS_SPACE_BARRIER_WRITE); + return (bus_read_2(lesc->sc_rres, LEREG1_RDP)); } /* @@ -163,17 +155,13 @@ caddr_t from = fromv; for (; len >= 8; len -= 8, off += 8, from += 8) - bus_space_write_8(lesc->sc_buft, lesc->sc_bufh, off, - be64dec(from)); + bus_write_8(lesc->sc_bres, off, be64dec(from)); for (; len >= 4; len -= 4, off += 4, from += 4) - bus_space_write_4(lesc->sc_buft, lesc->sc_bufh, off, - be32dec(from)); + bus_write_4(lesc->sc_bres, off, be32dec(from)); for (; len >= 2; len -= 2, off += 2, from += 2) - bus_space_write_2(lesc->sc_buft, lesc->sc_bufh, off, - be16dec(from)); + bus_write_2(lesc->sc_bres, off, be16dec(from)); if (len == 1) - bus_space_write_1(lesc->sc_buft, lesc->sc_bufh, off, - *from); + bus_write_1(lesc->sc_bres, off, *from); } static void @@ -184,16 +172,15 @@ for (; len >= 8; len -= 8, off += 8, to += 8) be64enc(to, - bus_space_read_8(lesc->sc_buft, lesc->sc_bufh, off)); + bus_read_8(lesc->sc_bres, off)); for (; len >= 4; len -= 4, off += 4, to += 4) be32enc(to, - bus_space_read_4(lesc->sc_buft, lesc->sc_bufh, off)); + bus_read_4(lesc->sc_bres, off)); for (; len >= 2; len -= 2, off += 2, to += 2) be16enc(to, - bus_space_read_2(lesc->sc_buft, lesc->sc_bufh, off)); + bus_read_2(lesc->sc_bres, off)); if (len == 1) - *to = - bus_space_read_1(lesc->sc_buft, lesc->sc_bufh, off); + *to = bus_read_1(lesc->sc_bres, off); } static void @@ -203,11 +190,9 @@ caddr_t from = fromv; for (; len >= 2; len -= 2, off += 2, from += 2) - bus_space_write_2(lesc->sc_buft, lesc->sc_bufh, off, - le16dec(from)); + bus_write_2(lesc->sc_bres, off, le16dec(from)); if (len == 1) - bus_space_write_1(lesc->sc_buft, lesc->sc_bufh, off + 1, - *from); + bus_write_1(lesc->sc_bres, off + 1, *from); } static void @@ -218,10 +203,9 @@ for (; len >= 2; len -= 2, off += 2, to += 2) le16enc(to, - bus_space_read_2(lesc->sc_buft, lesc->sc_bufh, off)); + bus_read_2(lesc->sc_bres, off)); if (len == 1) - *to = - bus_space_read_1(lesc->sc_buft, lesc->sc_bufh, off + 1); + *to = bus_read_1(lesc->sc_bres, off + 1); } static void @@ -230,9 +214,9 @@ struct le_lebuffer_softc *lesc = (struct le_lebuffer_softc *)sc; for (; len >= 2; len -= 2, off += 2) - bus_space_write_2(lesc->sc_buft, lesc->sc_bufh, off, 0); + bus_write_2(lesc->sc_bres, off, 0); if (len == 1) - bus_space_write_1(lesc->sc_buft, lesc->sc_bufh, off + 1, 0); + bus_write_1(lesc->sc_bres, off + 1, 0); } static int @@ -251,7 +235,7 @@ { struct le_lebuffer_softc *lesc; struct lance_softc *sc; - int error; + int error, i; lesc = device_get_softc(dev); sc = &lesc->sc_am7990.lsc; @@ -262,33 +246,29 @@ * The "register space" of the parent is just a buffer where the * the LANCE descriptor rings and the RX/TX buffers can be stored. */ - lesc->sc_brid = 0; + i = 0; lesc->sc_bres = bus_alloc_resource_any(device_get_parent(dev), - SYS_RES_MEMORY, &lesc->sc_brid, RF_ACTIVE); + SYS_RES_MEMORY, &i, RF_ACTIVE); if (lesc->sc_bres == NULL) { device_printf(dev, "cannot allocate LANCE buffer\n"); error = ENXIO; goto fail_mtx; } - lesc->sc_buft = rman_get_bustag(lesc->sc_bres); - lesc->sc_bufh = rman_get_bushandle(lesc->sc_bres); /* Allocate LANCE registers. */ - lesc->sc_rrid = 0; + i = 0; lesc->sc_rres = bus_alloc_resource_any(dev, SYS_RES_MEMORY, - &lesc->sc_rrid, RF_ACTIVE); + &i, RF_ACTIVE); if (lesc->sc_rres == NULL) { device_printf(dev, "cannot allocate LANCE registers\n"); error = ENXIO; goto fail_bres; } - lesc->sc_regt = rman_get_bustag(lesc->sc_rres); - lesc->sc_regh = rman_get_bushandle(lesc->sc_rres); /* Allocate LANCE interrupt. */ - lesc->sc_irid = 0; + i = 0; if ((lesc->sc_ires = bus_alloc_resource_any(dev, SYS_RES_IRQ, - &lesc->sc_irid, RF_SHAREABLE | RF_ACTIVE)) == NULL) { + &i, RF_SHAREABLE | RF_ACTIVE)) == NULL) { device_printf(dev, "cannot allocate interrupt\n"); error = ENXIO; goto fail_rres; @@ -352,12 +332,14 @@ fail_am7990: am7990_detach(&lesc->sc_am7990); fail_ires: - bus_release_resource(dev, SYS_RES_IRQ, lesc->sc_irid, lesc->sc_ires); + bus_release_resource(dev, SYS_RES_IRQ, + rman_get_rid(lesc->sc_ires), lesc->sc_ires); fail_rres: - bus_release_resource(dev, SYS_RES_MEMORY, lesc->sc_rrid, lesc->sc_rres); + bus_release_resource(dev, SYS_RES_MEMORY, + rman_get_rid(lesc->sc_rres), lesc->sc_rres); fail_bres: bus_release_resource(device_get_parent(dev), SYS_RES_MEMORY, - lesc->sc_brid, lesc->sc_bres); + rman_get_rid(lesc->sc_bres), lesc->sc_bres); fail_mtx: LE_LOCK_DESTROY(sc); return (error); @@ -374,10 +356,12 @@ bus_teardown_intr(dev, lesc->sc_ires, lesc->sc_ih); am7990_detach(&lesc->sc_am7990); - bus_release_resource(dev, SYS_RES_IRQ, lesc->sc_irid, lesc->sc_ires); - bus_release_resource(dev, SYS_RES_MEMORY, lesc->sc_rrid, lesc->sc_rres); + bus_release_resource(dev, SYS_RES_IRQ, + rman_get_rid(lesc->sc_ires), lesc->sc_ires); + bus_release_resource(dev, SYS_RES_MEMORY, + rman_get_rid(lesc->sc_rres), lesc->sc_rres); bus_release_resource(device_get_parent(dev), SYS_RES_MEMORY, - lesc->sc_brid, lesc->sc_bres); + rman_get_rid(lesc->sc_bres), lesc->sc_bres); LE_LOCK_DESTROY(sc); return (0); ==== //depot/projects/usb/src/sys/dev/le/if_le_pci.c#5 (text+ko) ==== @@ -72,7 +72,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/le/if_le_pci.c,v 1.7 2007/02/23 12:18:45 piso Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/le/if_le_pci.c,v 1.8 2008/09/24 21:26:46 marius Exp $"); #include #include @@ -111,12 +111,8 @@ struct le_pci_softc { struct am79900_softc sc_am79900; /* glue to MI code */ - int sc_rrid; struct resource *sc_rres; - bus_space_tag_t sc_regt; - bus_space_handle_t sc_regh; - int sc_irid; struct resource *sc_ires; void *sc_ih; @@ -174,10 +170,9 @@ { struct le_pci_softc *lesc = (struct le_pci_softc *)sc; - bus_space_write_2(lesc->sc_regt, lesc->sc_regh, PCNET_PCI_RAP, port); - bus_space_barrier(lesc->sc_regt, lesc->sc_regh, PCNET_PCI_RAP, 2, - BUS_SPACE_BARRIER_WRITE); - bus_space_write_2(lesc->sc_regt, lesc->sc_regh, PCNET_PCI_BDP, val); + bus_write_2(lesc->sc_rres, PCNET_PCI_RAP, port); + bus_barrier(lesc->sc_rres, PCNET_PCI_RAP, 2, BUS_SPACE_BARRIER_WRITE); + bus_write_2(lesc->sc_rres, PCNET_PCI_BDP, val); } static uint16_t @@ -185,10 +180,9 @@ { struct le_pci_softc *lesc = (struct le_pci_softc *)sc; - bus_space_write_2(lesc->sc_regt, lesc->sc_regh, PCNET_PCI_RAP, port); - bus_space_barrier(lesc->sc_regt, lesc->sc_regh, PCNET_PCI_RAP, 2, - BUS_SPACE_BARRIER_WRITE); - return (bus_space_read_2(lesc->sc_regt, lesc->sc_regh, PCNET_PCI_BDP)); + bus_write_2(lesc->sc_rres, PCNET_PCI_RAP, port); + bus_barrier(lesc->sc_rres, PCNET_PCI_RAP, 2, BUS_SPACE_BARRIER_WRITE); + return (bus_read_2(lesc->sc_rres, PCNET_PCI_BDP)); } static void @@ -196,10 +190,9 @@ { struct le_pci_softc *lesc = (struct le_pci_softc *)sc; - bus_space_write_2(lesc->sc_regt, lesc->sc_regh, PCNET_PCI_RAP, port); - bus_space_barrier(lesc->sc_regt, lesc->sc_regh, PCNET_PCI_RAP, 2, - BUS_SPACE_BARRIER_WRITE); - bus_space_write_2(lesc->sc_regt, lesc->sc_regh, PCNET_PCI_RDP, val); + bus_write_2(lesc->sc_rres, PCNET_PCI_RAP, port); + bus_barrier(lesc->sc_rres, PCNET_PCI_RAP, 2, BUS_SPACE_BARRIER_WRITE); + bus_write_2(lesc->sc_rres, PCNET_PCI_RDP, val); } static uint16_t @@ -207,10 +200,9 @@ { struct le_pci_softc *lesc = (struct le_pci_softc *)sc; - bus_space_write_2(lesc->sc_regt, lesc->sc_regh, PCNET_PCI_RAP, port); - bus_space_barrier(lesc->sc_regt, lesc->sc_regh, PCNET_PCI_RAP, 2, - BUS_SPACE_BARRIER_WRITE); - return (bus_space_read_2(lesc->sc_regt, lesc->sc_regh, PCNET_PCI_RDP)); + bus_write_2(lesc->sc_rres, PCNET_PCI_RAP, port); + bus_barrier(lesc->sc_rres, PCNET_PCI_RAP, 2, BUS_SPACE_BARRIER_WRITE); + return (bus_read_2(lesc->sc_rres, PCNET_PCI_RDP)); } static int @@ -322,20 +314,18 @@ pci_enable_busmaster(dev); pci_enable_io(dev, PCIM_CMD_PORTEN); - lesc->sc_rrid = PCIR_BAR(0); + i = PCIR_BAR(0); lesc->sc_rres = bus_alloc_resource_any(dev, SYS_RES_IOPORT, - &lesc->sc_rrid, RF_ACTIVE); + &i, RF_ACTIVE); if (lesc->sc_rres == NULL) { device_printf(dev, "cannot allocate registers\n"); error = ENXIO; goto fail_mtx; } - lesc->sc_regt = rman_get_bustag(lesc->sc_rres); - lesc->sc_regh = rman_get_bushandle(lesc->sc_rres); - lesc->sc_irid = 0; + i = 0; if ((lesc->sc_ires = bus_alloc_resource_any(dev, SYS_RES_IRQ, - &lesc->sc_irid, RF_SHAREABLE | RF_ACTIVE)) == NULL) { + &i, RF_SHAREABLE | RF_ACTIVE)) == NULL) { device_printf(dev, "cannot allocate interrupt\n"); error = ENXIO; goto fail_rres; @@ -392,7 +382,7 @@ error = bus_dmamap_load(lesc->sc_dmat, lesc->sc_dmam, sc->sc_mem, sc->sc_memsize, le_pci_dma_callback, sc, 0); if (error != 0 || sc->sc_addr == 0) { - device_printf(dev, "cannot load DMA buffer map\n"); + device_printf(dev, "cannot load DMA buffer map\n"); goto fail_dmem; } @@ -417,9 +407,8 @@ /* * Extract the physical MAC address from the ROM. */ - for (i = 0; i < sizeof(sc->sc_enaddr); i++) - sc->sc_enaddr[i] = - bus_space_read_1(lesc->sc_regt, lesc->sc_regh, i); + bus_read_region_1(lesc->sc_rres, 0, sc->sc_enaddr, + sizeof(sc->sc_enaddr)); sc->sc_copytodesc = lance_copytobuf_contig; sc->sc_copyfromdesc = lance_copyfrombuf_contig; @@ -461,9 +450,11 @@ fail_pdtag: bus_dma_tag_destroy(lesc->sc_pdmat); fail_ires: - bus_release_resource(dev, SYS_RES_IRQ, lesc->sc_irid, lesc->sc_ires); + bus_release_resource(dev, SYS_RES_IRQ, + rman_get_rid(lesc->sc_ires), lesc->sc_ires); fail_rres: - bus_release_resource(dev, SYS_RES_IOPORT, lesc->sc_rrid, lesc->sc_rres); + bus_release_resource(dev, SYS_RES_IOPORT, + rman_get_rid(lesc->sc_rres), lesc->sc_rres); fail_mtx: LE_LOCK_DESTROY(sc); return (error); @@ -484,8 +475,10 @@ bus_dmamem_free(lesc->sc_dmat, sc->sc_mem, lesc->sc_dmam); bus_dma_tag_destroy(lesc->sc_dmat); bus_dma_tag_destroy(lesc->sc_pdmat); - bus_release_resource(dev, SYS_RES_IRQ, lesc->sc_irid, lesc->sc_ires); - bus_release_resource(dev, SYS_RES_IOPORT, lesc->sc_rrid, lesc->sc_rres); + bus_release_resource(dev, SYS_RES_IRQ, + rman_get_rid(lesc->sc_ires), lesc->sc_ires); + bus_release_resource(dev, SYS_RES_IOPORT, + rman_get_rid(lesc->sc_rres), lesc->sc_rres); LE_LOCK_DESTROY(sc); return (0); ==== //depot/projects/usb/src/sys/dev/le/lebuffer_sbus.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/le/lebuffer_sbus.c,v 1.1 2007/01/20 12:53:30 marius Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/le/lebuffer_sbus.c,v 1.2 2008/09/24 21:26:46 marius Exp $"); #include #include @@ -100,6 +100,8 @@ DEFINE_CLASS_0(lebuffer, lebuffer_driver, lebuffer_methods, 1); DRIVER_MODULE(lebuffer, sbus, lebuffer_driver, lebuffer_devclass, 0, 0); +MODULE_DEPEND(lebuffer, sbus, 1, 1, 1); +MODULE_VERSION(lebuffer, 1); static int lebuffer_probe(device_t dev) ==== //depot/projects/usb/src/sys/dev/msk/if_msk.c#6 (text+ko) ==== @@ -99,7 +99,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/msk/if_msk.c,v 1.31 2008/03/11 02:39:52 yongari Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/msk/if_msk.c,v 1.32 2008/09/25 07:31:45 yongari Exp $"); #include #include @@ -244,6 +244,9 @@ static int msk_handle_events(struct msk_softc *); static void msk_handle_hwerr(struct msk_if_softc *, uint32_t); static void msk_intr_hwerr(struct msk_softc *); +#ifndef __NO_STRICT_ALIGNMENT +static __inline void msk_fixup_rx(struct mbuf *); +#endif static void msk_rxeof(struct msk_if_softc *, uint32_t, int); static void msk_jumbo_rxeof(struct msk_if_softc *, uint32_t, int); static void msk_txeof(struct msk_if_softc *, int); @@ -783,7 +786,12 @@ return (ENOBUFS); m->m_len = m->m_pkthdr.len = MCLBYTES; - m_adj(m, ETHER_ALIGN); + if ((sc_if->msk_flags & MSK_FLAG_RAMBUF) == 0) + m_adj(m, ETHER_ALIGN); +#ifndef __NO_STRICT_ALIGNMENT + else + m_adj(m, MSK_RX_BUF_ALIGN); +#endif if (bus_dmamap_load_mbuf_sg(sc_if->msk_cdata.msk_rx_tag, sc_if->msk_cdata.msk_rx_sparemap, m, segs, &nsegs, @@ -840,7 +848,12 @@ return (ENOBUFS); } m->m_pkthdr.len = m->m_len = MSK_JLEN; - m_adj(m, ETHER_ALIGN); + if ((sc_if->msk_flags & MSK_FLAG_RAMBUF) == 0) + m_adj(m, ETHER_ALIGN); +#ifndef __NO_STRICT_ALIGNMENT + else + m_adj(m, MSK_RX_BUF_ALIGN); +#endif if (bus_dmamap_load_mbuf_sg(sc_if->msk_cdata.msk_jumbo_rx_tag, sc_if->msk_cdata.msk_jumbo_rx_sparemap, m, segs, &nsegs, @@ -1041,14 +1054,16 @@ { int next; int i; - uint8_t val; /* Get adapter SRAM size. */ - val = CSR_READ_1(sc, B2_E_0); - sc->msk_ramsize = (val == 0) ? 128 : val * 4; + sc->msk_ramsize = CSR_READ_1(sc, B2_E_0) * 4; if (bootverbose) device_printf(sc->msk_dev, "RAM buffer size : %dKB\n", sc->msk_ramsize); + if (sc->msk_ramsize == 0) + return (0); + + sc->msk_pflags |= MSK_FLAG_RAMBUF; /* * Give receiver 2/3 of memory and round down to the multiple * of 1024. Tx/Rx RAM buffer size of Yukon II shoud be multiple @@ -1412,6 +1427,7 @@ sc_if->msk_if_dev = dev; sc_if->msk_port = port; sc_if->msk_softc = sc; + sc_if->msk_flags = sc->msk_pflags; >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Sep 25 20:47:37 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3C32C1065693; Thu, 25 Sep 2008 20:47:37 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id F22CF1065688 for ; Thu, 25 Sep 2008 20:47:36 +0000 (UTC) (envelope-from zec@tel.fer.hr) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id E06128FC17 for ; Thu, 25 Sep 2008 20:47:36 +0000 (UTC) (envelope-from zec@tel.fer.hr) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id m8PKlaZX065468 for ; Thu, 25 Sep 2008 20:47:36 GMT (envelope-from zec@tel.fer.hr) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m8PKlaex065416 for perforce@freebsd.org; Thu, 25 Sep 2008 20:47:36 GMT (envelope-from zec@tel.fer.hr) Date: Thu, 25 Sep 2008 20:47:36 GMT Message-Id: <200809252047.m8PKlaex065416@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@tel.fer.hr using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 150468 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 25 Sep 2008 20:47:37 -0000 http://perforce.freebsd.org/chv.cgi?CH=150468 Change 150468 by zec@zec_tpx32 on 2008/09/25 20:46:55 Unbreak kernel build (modulo modules). Not tested. Contains junk. Needs revision. XXX. Affected files ... .. //depot/projects/vimage/src/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c#10 edit .. //depot/projects/vimage/src/sys/contrib/ipfilter/netinet/mlfk_ipl.c#4 edit .. //depot/projects/vimage/src/sys/kern/kern_vimage.c#68 edit .. //depot/projects/vimage/src/sys/net/if.c#39 edit .. //depot/projects/vimage/src/sys/net/if_bridge.c#18 edit .. //depot/projects/vimage/src/sys/net/if_ethersubr.c#25 edit .. //depot/projects/vimage/src/sys/net/route.c#27 edit .. //depot/projects/vimage/src/sys/net/vnet.h#13 edit .. //depot/projects/vimage/src/sys/netinet/in.c#16 edit .. //depot/projects/vimage/src/sys/netinet/in_var.h#10 edit .. //depot/projects/vimage/src/sys/netinet/ip_fw.h#16 edit .. //depot/projects/vimage/src/sys/netinet/ip_fw2.c#45 edit .. //depot/projects/vimage/src/sys/netinet/ip_icmp.c#18 edit .. //depot/projects/vimage/src/sys/netinet/ip_id.c#6 edit .. //depot/projects/vimage/src/sys/netinet/vinet.h#29 edit .. //depot/projects/vimage/src/sys/netinet6/in6_cksum.c#5 edit .. //depot/projects/vimage/src/sys/netinet6/in6_ifattach.c#24 edit .. //depot/projects/vimage/src/sys/netinet6/in6_src.c#22 edit .. //depot/projects/vimage/src/sys/netinet6/raw_ip6.c#24 edit .. //depot/projects/vimage/src/sys/nlm/nlm_prot.h#3 edit .. //depot/projects/vimage/src/sys/rpc/rpc.h#2 edit Differences ... ==== //depot/projects/vimage/src/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c#10 (text+ko) ==== @@ -127,11 +127,6 @@ # include # include #endif -#if (__FreeBSD_version > 460000) -#ifndef VIMAGE -extern int path_mtu_discovery; -#endif -#endif # ifdef IPFILTER_M_IPFILTER MALLOC_DEFINE(M_IPFILTER, "ipfilter", "IP Filter packet filter data structures"); ==== //depot/projects/vimage/src/sys/contrib/ipfilter/netinet/mlfk_ipl.c#4 (text+ko) ==== @@ -43,7 +43,6 @@ static int ipf_modload(void); static int ipf_modunload(void); -SYSCTL_DECL(_net_inet); #define SYSCTL_IPF(parent, nbr, name, access, ptr, val, descr) \ SYSCTL_OID(parent, nbr, name, CTLTYPE_INT|access, \ ptr, val, sysctl_ipf_int, "I", descr); ==== //depot/projects/vimage/src/sys/kern/kern_vimage.c#68 (text+ko) ==== @@ -504,7 +504,7 @@ struct vimage *vip = TD_TO_VIMAGE(td); struct vimage *vip_r = NULL; - error = suser(td); /* XXX replace with priv(9) */ + error = priv_check(td, PRIV_ROOT); if (error) return (error); ==== //depot/projects/vimage/src/sys/net/if.c#39 (text+ko) ==== @@ -203,7 +203,6 @@ { INIT_VNET_NET(curvnet); - INIT_VNET_NET(curvnet); IFNET_WLOCK_ASSERT(); V_ifindex_table[idx].ife_ifnet = ifp; @@ -212,7 +211,6 @@ struct ifaddr * ifaddr_byindex(u_short idx) { - INIT_VNET_NET(curvnet); struct ifaddr *ifa; IFNET_RLOCK(); @@ -238,7 +236,6 @@ { INIT_VNET_NET(curvnet); - INIT_VNET_NET(curvnet); IFNET_WLOCK(); V_ifindex_table[idx].ife_dev = cdev; IFNET_WUNLOCK(); @@ -2038,7 +2035,7 @@ switch (cmd) { #ifdef VIMAGE case SIOCSIFVIMAGE: - error = suser(td); + error = priv_check(td, PRIV_ROOT); if (error == 0) error = vi_if_move((struct vi_req *) data, NULL, TD_TO_VIMAGE(td)); ==== //depot/projects/vimage/src/sys/net/if_bridge.c#18 (text+ko) ==== @@ -3380,7 +3380,6 @@ bridge_fragment(struct ifnet *ifp, struct mbuf *m, struct ether_header *eh, int snap, struct llc *llc) { - INIT_VNET_INET(curvnet); struct mbuf *m0; struct ip *ip; int error = -1; ==== //depot/projects/vimage/src/sys/net/if_ethersubr.c#25 (text+ko) ==== @@ -42,10 +42,12 @@ #include #include #include +#include #include #include #include #include +#include #include #include #include ==== //depot/projects/vimage/src/sys/net/route.c#27 (text+ko) ==== @@ -305,7 +305,6 @@ { INIT_VNET_NET(curvnet); struct radix_node_head *rnh; - INIT_VNET_NET(curvnet); struct rtentry *rt; struct radix_node *rn; struct rtentry *newrt; ==== //depot/projects/vimage/src/sys/net/vnet.h#13 (text+ko) ==== @@ -33,7 +33,6 @@ #ifndef _NET_VNET_H_ #define _NET_VNET_H_ -#ifdef VIMAGE #include "opt_route.h" #include @@ -45,6 +44,8 @@ #include #include +#ifdef VIMAGE + struct vnet_net { int _if_index; struct ifindex_entry *_ifindex_table; ==== //depot/projects/vimage/src/sys/netinet/in.c#16 (text+ko) ==== @@ -72,7 +72,6 @@ static int subnetsarelocal; static int sameprefixcarponly; extern struct inpcbinfo ripcbinfo; -extern struct inpcbinfo udbinfo; #endif SYSCTL_V_INT(V_NET, vnet_inet, _net_inet_ip, OID_AUTO, subnets_are_local, ==== //depot/projects/vimage/src/sys/netinet/in_var.h#10 (text+ko) ==== ==== //depot/projects/vimage/src/sys/netinet/ip_fw.h#16 (text+ko) ==== @@ -642,8 +642,6 @@ extern ip_fw_chk_t *ip_fw_chk_ptr; #define IPFW_LOADED (ip_fw_chk_ptr != NULL) -#ifdef IPFW_INTERNAL - #define IPFW_TABLES_MAX 128 struct ip_fw_chain { struct ip_fw *rules; /* list of rules */ @@ -652,6 +650,9 @@ struct radix_node_head *tables[IPFW_TABLES_MAX]; struct rwlock rwmtx; }; + +#ifdef IPFW_INTERNAL + #define IPFW_LOCK_INIT(_chain) \ rw_init(&(_chain)->rwmtx, "IPFW static rules") #define IPFW_LOCK_DESTROY(_chain) rw_destroy(&(_chain)->rwmtx) ==== //depot/projects/vimage/src/sys/netinet/ip_fw2.c#45 (text+ko) ==== @@ -2161,7 +2161,9 @@ * these types of constraints, as well as decrease contention * on pcb related locks. */ - struct ip_fw_ugid fw_ugid_cache; +#if 0 + struct ip_fw_ugid fw_ugid_cache; /* XXX Marko revisit this */ +#endif int ugid_lookup = 0; /* ==== //depot/projects/vimage/src/sys/netinet/ip_icmp.c#18 (text+ko) ==== @@ -77,47 +77,51 @@ * host table maintenance routines. */ +#ifndef VIMAGE struct icmpstat icmpstat; +static int icmpmaskrepl = 0; +static u_int icmpmaskfake = 0; +static int drop_redirect = 0; +static int log_redirect = 0; +static int icmplim = 200; +static int icmplim_output = 1; +static char reply_src[IFNAMSIZ]; +static int icmp_rfi = 0; +static int icmp_quotelen = 8; +static int icmpbmcastecho = 0; +#endif + SYSCTL_V_STRUCT(V_NET, vnet_inet, _net_inet_icmp, ICMPCTL_STATS, stats, CTLFLAG_RW, icmpstat, icmpstat, ""); -static int icmpmaskrepl = 0; SYSCTL_V_INT(V_NET, vnet_inet, _net_inet_icmp, ICMPCTL_MASKREPL, maskrepl, CTLFLAG_RW, icmpmaskrepl, 0, "Reply to ICMP Address Mask Request packets."); -static u_int icmpmaskfake = 0; SYSCTL_V_UINT(V_NET, vnet_inet, _net_inet_icmp, OID_AUTO, maskfake, CTLFLAG_RW, icmpmaskfake, 0, "Fake reply to ICMP Address Mask Request packets."); -static int drop_redirect = 0; SYSCTL_V_INT(V_NET, vnet_inet, _net_inet_icmp, OID_AUTO, drop_redirect, CTLFLAG_RW, drop_redirect, 0, "Ignore ICMP redirects"); -static int log_redirect = 0; SYSCTL_V_INT(V_NET, vnet_inet, _net_inet_icmp, OID_AUTO, log_redirect, CTLFLAG_RW, log_redirect, 0, "Log ICMP redirects to the console"); -static int icmplim = 200; SYSCTL_V_INT(V_NET, vnet_inet, _net_inet_icmp, ICMPCTL_ICMPLIM, icmplim, CTLFLAG_RW, icmplim, 0, "Maximum number of ICMP responses per second"); -static int icmplim_output = 1; SYSCTL_V_INT(V_NET, vnet_inet, _net_inet_icmp, OID_AUTO, icmplim_output, CTLFLAG_RW, icmplim_output, 0, "Enable rate limiting of ICMP responses"); -static char reply_src[IFNAMSIZ]; SYSCTL_V_STRING(V_NET, vnet_inet, _net_inet_icmp, OID_AUTO, reply_src, CTLFLAG_RW, reply_src, IFNAMSIZ, "icmp reply source for non-local packets."); -static int icmp_rfi = 0; SYSCTL_V_INT(V_NET, vnet_inet, _net_inet_icmp, OID_AUTO, reply_from_interface, CTLFLAG_RW, icmp_rfi, 0, "ICMP reply from incoming interface for " "non-local packets"); -static int icmp_quotelen = 8; SYSCTL_V_INT(V_NET, vnet_inet, _net_inet_icmp, OID_AUTO, quotelen, CTLFLAG_RW, icmp_quotelen, 0, "Number of bytes from original packet to " "quote in ICMP reply"); @@ -125,8 +129,6 @@ /* * ICMP broadcast echo sysctl */ - -static int icmpbmcastecho = 0; SYSCTL_V_INT(V_NET, vnet_inet, _net_inet_icmp, OID_AUTO, bmcastecho, CTLFLAG_RW, icmpbmcastecho, 0, ""); ==== //depot/projects/vimage/src/sys/netinet/ip_id.c#6 (text+ko) ==== @@ -85,9 +85,11 @@ #include #include #include +#include + #include +#include #include -#include static MALLOC_DEFINE(M_IPID, "ipid", "randomized ip id state"); @@ -104,7 +106,6 @@ MTX_SYSINIT(ip_id_mtx, &ip_id_mtx, "ip_id_mtx", MTX_DEF); -SYSCTL_DECL(_net_inet_ip); SYSCTL_PROC(_net_inet_ip, OID_AUTO, random_id_period, CTLTYPE_INT|CTLFLAG_RW, &array_size, 0, sysctl_ip_id_change, "IU", "IP ID Array size"); SYSCTL_INT(_net_inet_ip, OID_AUTO, random_id_collisions, CTLFLAG_RD, ==== //depot/projects/vimage/src/sys/netinet/vinet.h#29 (text+ko) ==== @@ -33,11 +33,12 @@ #ifndef _NETINET_VINET_H_ #define _NETINET_VINET_H_ -#ifdef VIMAGE #include #include #include +#include /* XXX revisit this! */ + #include #include #include @@ -54,6 +55,8 @@ #include #include +#ifdef VIMAGE + struct vnet_inet { struct in_ifaddrhashhead *_in_ifaddrhashtbl; struct in_ifaddrhead _in_ifaddrhead; ==== //depot/projects/vimage/src/sys/netinet6/in6_cksum.c#5 (text+ko) ==== @@ -66,6 +66,9 @@ #include #include #include + +#include + #include #include #include ==== //depot/projects/vimage/src/sys/netinet6/in6_ifattach.c#24 (text+ko) ==== @@ -69,7 +69,6 @@ int ip6_auto_linklocal; struct callout in6_tmpaddrtimer_ch; extern struct inpcbinfo ripcbinfo; -extern struct inpcbinfo udbinfo; #endif static int get_rand_ifid(struct ifnet *, struct in6_addr *); ==== //depot/projects/vimage/src/sys/netinet6/in6_src.c#22 (text+ko) ==== @@ -463,7 +463,6 @@ struct ifnet **retifp, struct rtentry **retrt, int clone, int norouteok) { - INIT_VNET_NET(curvnet); INIT_VNET_INET6(curvnet); int error = 0; struct ifnet *ifp = NULL; ==== //depot/projects/vimage/src/sys/netinet6/raw_ip6.c#24 (text+ko) ==== @@ -770,7 +770,6 @@ rip6_send(struct socket *so, int flags, struct mbuf *m, struct sockaddr *nam, struct mbuf *control, struct thread *td) { - INIT_VNET_INET(so->so_vnet); struct inpcb *inp; struct sockaddr_in6 tmp; struct sockaddr_in6 *dst; ==== //depot/projects/vimage/src/sys/nlm/nlm_prot.h#3 (text+ko) ==== ==== //depot/projects/vimage/src/sys/rpc/rpc.h#2 (text+ko) ==== @@ -42,6 +42,7 @@ #ifndef _RPC_RPC_H #define _RPC_RPC_H +#include #include /* some typedefs */ #include #include From owner-p4-projects@FreeBSD.ORG Thu Sep 25 21:06:57 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8FC83106568D; Thu, 25 Sep 2008 21:06:57 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 520F3106568C for ; Thu, 25 Sep 2008 21:06:57 +0000 (UTC) (envelope-from zec@tel.fer.hr) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 3FDAE8FC1E for ; Thu, 25 Sep 2008 21:06:57 +0000 (UTC) (envelope-from zec@tel.fer.hr) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id m8PL6vl6087940 for ; Thu, 25 Sep 2008 21:06:57 GMT (envelope-from zec@tel.fer.hr) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m8PL6uZm087890 for perforce@freebsd.org; Thu, 25 Sep 2008 21:06:56 GMT (envelope-from zec@tel.fer.hr) Date: Thu, 25 Sep 2008 21:06:56 GMT Message-Id: <200809252106.m8PL6uZm087890@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@tel.fer.hr using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 150470 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 25 Sep 2008 21:06:57 -0000 http://perforce.freebsd.org/chv.cgi?CH=150470 Change 150470 by zec@zec_tpx32 on 2008/09/25 21:06:23 IFC @ 150469 Affected files ... .. //depot/projects/vimage/src/sys/amd64/amd64/elf_machdep.c#3 integrate .. //depot/projects/vimage/src/sys/amd64/linux32/linux32_sysvec.c#8 integrate .. //depot/projects/vimage/src/sys/arm/arm/elf_machdep.c#3 integrate .. //depot/projects/vimage/src/sys/compat/freebsd32/freebsd32_ioctl.c#1 branch .. //depot/projects/vimage/src/sys/compat/freebsd32/freebsd32_ioctl.h#1 branch .. //depot/projects/vimage/src/sys/compat/freebsd32/freebsd32_misc.c#12 integrate .. //depot/projects/vimage/src/sys/compat/freebsd32/freebsd32_proto.h#13 integrate .. //depot/projects/vimage/src/sys/compat/freebsd32/freebsd32_syscall.h#13 integrate .. //depot/projects/vimage/src/sys/compat/freebsd32/freebsd32_syscalls.c#13 integrate .. //depot/projects/vimage/src/sys/compat/freebsd32/freebsd32_sysent.c#13 integrate .. //depot/projects/vimage/src/sys/compat/freebsd32/freebsd32_util.h#2 integrate .. //depot/projects/vimage/src/sys/compat/freebsd32/syscalls.master#14 integrate .. //depot/projects/vimage/src/sys/compat/ia32/ia32_sysvec.c#6 integrate .. //depot/projects/vimage/src/sys/compat/linux/linux_misc.c#24 integrate .. //depot/projects/vimage/src/sys/compat/svr4/svr4_sysvec.c#4 integrate .. //depot/projects/vimage/src/sys/conf/files#37 integrate .. //depot/projects/vimage/src/sys/conf/files.amd64#13 integrate .. //depot/projects/vimage/src/sys/conf/files.i386#20 integrate .. //depot/projects/vimage/src/sys/conf/files.ia64#6 integrate .. //depot/projects/vimage/src/sys/conf/files.sparc64#12 integrate .. //depot/projects/vimage/src/sys/conf/kern.pre.mk#12 integrate .. //depot/projects/vimage/src/sys/conf/options.sparc64#3 integrate .. //depot/projects/vimage/src/sys/ddb/db_command.c#8 integrate .. //depot/projects/vimage/src/sys/ddb/db_command.h#3 integrate .. //depot/projects/vimage/src/sys/ddb/db_main.c#3 integrate .. //depot/projects/vimage/src/sys/dev/ath/if_ath.c#19 integrate .. //depot/projects/vimage/src/sys/dev/ath/if_athvar.h#10 integrate .. //depot/projects/vimage/src/sys/dev/bge/if_bge.c#15 integrate .. //depot/projects/vimage/src/sys/dev/bm/if_bm.c#4 integrate .. //depot/projects/vimage/src/sys/dev/cxgb/common/cxgb_ael1002.c#7 integrate .. //depot/projects/vimage/src/sys/dev/cxgb/common/cxgb_common.h#9 integrate .. //depot/projects/vimage/src/sys/dev/cxgb/common/cxgb_mc5.c#6 integrate .. //depot/projects/vimage/src/sys/dev/cxgb/common/cxgb_mv88e1xxx.c#5 integrate .. //depot/projects/vimage/src/sys/dev/cxgb/common/cxgb_t3_hw.c#10 integrate .. //depot/projects/vimage/src/sys/dev/cxgb/common/cxgb_tn1010.c#2 integrate .. //depot/projects/vimage/src/sys/dev/cxgb/common/cxgb_vsc7323.c#4 integrate .. //depot/projects/vimage/src/sys/dev/cxgb/common/cxgb_vsc8211.c#6 integrate .. //depot/projects/vimage/src/sys/dev/cxgb/common/cxgb_xgmac.c#8 integrate .. //depot/projects/vimage/src/sys/dev/cxgb/cxgb_adapter.h#14 integrate .. //depot/projects/vimage/src/sys/dev/cxgb/cxgb_config.h#6 integrate .. //depot/projects/vimage/src/sys/dev/cxgb/cxgb_include.h#5 integrate .. //depot/projects/vimage/src/sys/dev/cxgb/cxgb_main.c#16 integrate .. //depot/projects/vimage/src/sys/dev/cxgb/cxgb_multiq.c#2 integrate .. //depot/projects/vimage/src/sys/dev/cxgb/cxgb_offload.c#7 integrate .. //depot/projects/vimage/src/sys/dev/cxgb/cxgb_offload.h#8 integrate .. //depot/projects/vimage/src/sys/dev/cxgb/cxgb_osdep.h#12 integrate .. //depot/projects/vimage/src/sys/dev/cxgb/cxgb_sge.c#16 integrate .. //depot/projects/vimage/src/sys/dev/cxgb/cxgb_t3fw.c#2 integrate .. //depot/projects/vimage/src/sys/dev/cxgb/sys/cxgb_support.c#5 integrate .. //depot/projects/vimage/src/sys/dev/cxgb/sys/mvec.h#6 integrate .. //depot/projects/vimage/src/sys/dev/cxgb/sys/uipc_mvec.c#5 integrate .. //depot/projects/vimage/src/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb.c#6 integrate .. //depot/projects/vimage/src/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_cm.c#3 integrate .. //depot/projects/vimage/src/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_cq.c#2 integrate .. //depot/projects/vimage/src/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_dbg.c#2 integrate .. //depot/projects/vimage/src/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_ev.c#2 integrate .. //depot/projects/vimage/src/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_hal.c#2 integrate .. //depot/projects/vimage/src/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_mem.c#2 integrate .. //depot/projects/vimage/src/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_provider.c#2 integrate .. //depot/projects/vimage/src/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_qp.c#2 integrate .. //depot/projects/vimage/src/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_resource.c#2 integrate .. //depot/projects/vimage/src/sys/dev/cxgb/ulp/toecore/toedev.c#3 integrate .. //depot/projects/vimage/src/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c#14 integrate .. //depot/projects/vimage/src/sys/dev/cxgb/ulp/tom/cxgb_cpl_socket.c#6 integrate .. //depot/projects/vimage/src/sys/dev/cxgb/ulp/tom/cxgb_ddp.c#5 integrate .. //depot/projects/vimage/src/sys/dev/cxgb/ulp/tom/cxgb_l2t.c#3 integrate .. //depot/projects/vimage/src/sys/dev/cxgb/ulp/tom/cxgb_l2t.h#2 integrate .. //depot/projects/vimage/src/sys/dev/cxgb/ulp/tom/cxgb_listen.c#5 integrate .. //depot/projects/vimage/src/sys/dev/cxgb/ulp/tom/cxgb_t3_ddp.h#4 integrate .. //depot/projects/vimage/src/sys/dev/cxgb/ulp/tom/cxgb_tcp_offload.c#4 integrate .. //depot/projects/vimage/src/sys/dev/cxgb/ulp/tom/cxgb_toepcb.h#4 integrate .. //depot/projects/vimage/src/sys/dev/cxgb/ulp/tom/cxgb_tom.c#7 integrate .. //depot/projects/vimage/src/sys/dev/cxgb/ulp/tom/cxgb_tom.h#3 integrate .. //depot/projects/vimage/src/sys/dev/cxgb/ulp/tom/cxgb_tom_sysctl.c#5 integrate .. //depot/projects/vimage/src/sys/dev/cxgb/ulp/tom/cxgb_vm.c#2 integrate .. //depot/projects/vimage/src/sys/dev/hwpmc/hwpmc_amd.c#4 integrate .. //depot/projects/vimage/src/sys/dev/hwpmc/hwpmc_mod.c#8 integrate .. //depot/projects/vimage/src/sys/dev/hwpmc/hwpmc_piv.c#4 integrate .. //depot/projects/vimage/src/sys/dev/hwpmc/hwpmc_ppro.c#3 integrate .. //depot/projects/vimage/src/sys/dev/jme/if_jme.c#5 integrate .. //depot/projects/vimage/src/sys/dev/jme/if_jmereg.h#3 integrate .. //depot/projects/vimage/src/sys/dev/kbdmux/kbdmux.c#5 integrate .. //depot/projects/vimage/src/sys/dev/le/if_le_cbus.c#4 integrate .. //depot/projects/vimage/src/sys/dev/le/if_le_isa.c#4 integrate .. //depot/projects/vimage/src/sys/dev/le/if_le_lebuffer.c#3 integrate .. //depot/projects/vimage/src/sys/dev/le/if_le_pci.c#4 integrate .. //depot/projects/vimage/src/sys/dev/le/lebuffer_sbus.c#2 integrate .. //depot/projects/vimage/src/sys/dev/msk/if_msk.c#13 integrate .. //depot/projects/vimage/src/sys/dev/msk/if_mskreg.h#8 integrate .. //depot/projects/vimage/src/sys/dev/usb/ubsa.c#11 integrate .. //depot/projects/vimage/src/sys/dev/usb/umass.c#12 integrate .. //depot/projects/vimage/src/sys/dev/xen/netfront/netfront.c#3 integrate .. //depot/projects/vimage/src/sys/fs/devfs/devfs_devs.c#6 integrate .. //depot/projects/vimage/src/sys/fs/devfs/devfs_vnops.c#18 integrate .. //depot/projects/vimage/src/sys/fs/fdescfs/fdesc_vnops.c#8 integrate .. //depot/projects/vimage/src/sys/fs/hpfs/hpfs_vnops.c#5 integrate .. //depot/projects/vimage/src/sys/fs/msdosfs/msdosfs_vnops.c#13 integrate .. //depot/projects/vimage/src/sys/fs/ntfs/ntfs_vnops.c#4 integrate .. //depot/projects/vimage/src/sys/fs/portalfs/portal_vnops.c#5 integrate .. //depot/projects/vimage/src/sys/fs/pseudofs/pseudofs_vnops.c#7 integrate .. //depot/projects/vimage/src/sys/fs/smbfs/smbfs_node.c#8 integrate .. //depot/projects/vimage/src/sys/fs/tmpfs/tmpfs.h#8 integrate .. //depot/projects/vimage/src/sys/fs/tmpfs/tmpfs_subr.c#10 integrate .. //depot/projects/vimage/src/sys/fs/tmpfs/tmpfs_vnops.c#13 integrate .. //depot/projects/vimage/src/sys/fs/udf/udf_vnops.c#8 integrate .. //depot/projects/vimage/src/sys/gnu/fs/xfs/FreeBSD/xfs_vnops.c#6 integrate .. //depot/projects/vimage/src/sys/i386/bios/apm.h#2 integrate .. //depot/projects/vimage/src/sys/i386/i386/bios.c#3 integrate .. //depot/projects/vimage/src/sys/i386/i386/elf_machdep.c#3 integrate .. //depot/projects/vimage/src/sys/i386/i386/pmap.c#21 integrate .. //depot/projects/vimage/src/sys/i386/ibcs2/ibcs2_sysvec.c#3 integrate .. //depot/projects/vimage/src/sys/i386/include/param.h#3 integrate .. //depot/projects/vimage/src/sys/i386/include/smp.h#6 integrate .. //depot/projects/vimage/src/sys/i386/linux/linux_sysvec.c#5 integrate .. //depot/projects/vimage/src/sys/i386/xen/mp_machdep.c#3 integrate .. //depot/projects/vimage/src/sys/i386/xen/pmap.c#5 integrate .. //depot/projects/vimage/src/sys/i386/xen/xen_machdep.c#7 integrate .. //depot/projects/vimage/src/sys/ia64/ia64/efi.c#2 integrate .. //depot/projects/vimage/src/sys/ia64/ia64/elf_machdep.c#4 integrate .. //depot/projects/vimage/src/sys/ia64/ia64/sal.c#2 integrate .. //depot/projects/vimage/src/sys/kern/imgact_aout.c#4 integrate .. //depot/projects/vimage/src/sys/kern/init_main.c#22 integrate .. //depot/projects/vimage/src/sys/kern/init_sysent.c#8 integrate .. //depot/projects/vimage/src/sys/kern/kern_condvar.c#8 integrate .. //depot/projects/vimage/src/sys/kern/kern_intr.c#14 integrate .. //depot/projects/vimage/src/sys/kern/kern_pmc.c#3 integrate .. //depot/projects/vimage/src/sys/kern/kern_synch.c#22 integrate .. //depot/projects/vimage/src/sys/kern/makesyscalls.sh#4 integrate .. //depot/projects/vimage/src/sys/kern/subr_clist.c#3 integrate .. //depot/projects/vimage/src/sys/kern/subr_witness.c#15 integrate .. //depot/projects/vimage/src/sys/kern/sys_generic.c#11 integrate .. //depot/projects/vimage/src/sys/kern/syscalls.c#8 integrate .. //depot/projects/vimage/src/sys/kern/syscalls.master#9 integrate .. //depot/projects/vimage/src/sys/kern/systrace_args.c#7 integrate .. //depot/projects/vimage/src/sys/kern/tty.c#21 integrate .. //depot/projects/vimage/src/sys/kern/tty_pts.c#8 integrate .. //depot/projects/vimage/src/sys/kern/tty_ttydisc.c#4 integrate .. //depot/projects/vimage/src/sys/kern/uipc_mqueue.c#10 integrate .. //depot/projects/vimage/src/sys/kern/vfs_cache.c#13 integrate .. //depot/projects/vimage/src/sys/kern/vfs_vnops.c#13 integrate .. //depot/projects/vimage/src/sys/libkern/memcmp.c#1 branch .. //depot/projects/vimage/src/sys/mips/mips/elf_machdep.c#2 integrate .. //depot/projects/vimage/src/sys/mips/mips/support.S#2 integrate .. //depot/projects/vimage/src/sys/modules/cxgb/Makefile#9 integrate .. //depot/projects/vimage/src/sys/modules/cxgb/cxgb/Makefile#6 integrate .. //depot/projects/vimage/src/sys/modules/cxgb/cxgb_t3fw/Makefile#3 integrate .. //depot/projects/vimage/src/sys/modules/cxgb/iw_cxgb/Makefile#2 integrate .. //depot/projects/vimage/src/sys/modules/cxgb/toecore/Makefile#2 integrate .. //depot/projects/vimage/src/sys/modules/cxgb/tom/Makefile#4 integrate .. //depot/projects/vimage/src/sys/net/if_clone.c#10 integrate .. //depot/projects/vimage/src/sys/net/if_clone.h#2 integrate .. //depot/projects/vimage/src/sys/net/if_stf.c#12 integrate .. //depot/projects/vimage/src/sys/net80211/ieee80211.h#10 integrate .. //depot/projects/vimage/src/sys/net80211/ieee80211_adhoc.c#3 integrate .. //depot/projects/vimage/src/sys/net80211/ieee80211_crypto.c#6 integrate .. //depot/projects/vimage/src/sys/net80211/ieee80211_crypto.h#6 integrate .. //depot/projects/vimage/src/sys/net80211/ieee80211_ddb.c#11 integrate .. //depot/projects/vimage/src/sys/net80211/ieee80211_freebsd.c#14 integrate .. //depot/projects/vimage/src/sys/net80211/ieee80211_freebsd.h#11 integrate .. //depot/projects/vimage/src/sys/net80211/ieee80211_hostap.c#3 integrate .. //depot/projects/vimage/src/sys/net80211/ieee80211_ht.c#11 integrate .. //depot/projects/vimage/src/sys/net80211/ieee80211_ht.h#8 integrate .. //depot/projects/vimage/src/sys/net80211/ieee80211_ioctl.c#13 integrate .. //depot/projects/vimage/src/sys/net80211/ieee80211_ioctl.h#8 integrate .. //depot/projects/vimage/src/sys/net80211/ieee80211_node.c#13 integrate .. //depot/projects/vimage/src/sys/net80211/ieee80211_node.h#8 integrate .. //depot/projects/vimage/src/sys/net80211/ieee80211_output.c#13 integrate .. //depot/projects/vimage/src/sys/net80211/ieee80211_sta.c#3 integrate .. //depot/projects/vimage/src/sys/net80211/ieee80211_var.h#15 integrate .. //depot/projects/vimage/src/sys/net80211/ieee80211_wds.c#3 integrate .. //depot/projects/vimage/src/sys/netgraph/netgraph.h#11 integrate .. //depot/projects/vimage/src/sys/netgraph/ng_base.c#37 integrate .. //depot/projects/vimage/src/sys/netgraph/ng_source.c#5 integrate .. //depot/projects/vimage/src/sys/netinet/ip_fw.h#17 integrate .. //depot/projects/vimage/src/sys/netinet/tcp_input.c#36 integrate .. //depot/projects/vimage/src/sys/netinet6/udp6_usrreq.c#29 integrate .. //depot/projects/vimage/src/sys/nfsclient/nfs_vnops.c#18 integrate .. //depot/projects/vimage/src/sys/powerpc/aim/machdep.c#6 integrate .. //depot/projects/vimage/src/sys/powerpc/aim/mmu_oea.c#6 integrate .. //depot/projects/vimage/src/sys/powerpc/booke/machdep.c#4 integrate .. //depot/projects/vimage/src/sys/powerpc/include/dbdma.h#2 integrate .. //depot/projects/vimage/src/sys/powerpc/include/md_var.h#6 integrate .. //depot/projects/vimage/src/sys/powerpc/include/pmap.h#4 integrate .. //depot/projects/vimage/src/sys/powerpc/include/pte.h#3 integrate .. //depot/projects/vimage/src/sys/powerpc/ofw/ofw_syscons.c#3 integrate .. //depot/projects/vimage/src/sys/powerpc/powermac/dbdma.c#2 integrate .. //depot/projects/vimage/src/sys/powerpc/powermac/dbdmavar.h#2 integrate .. //depot/projects/vimage/src/sys/powerpc/powerpc/cpu.c#7 integrate .. //depot/projects/vimage/src/sys/powerpc/powerpc/elf_machdep.c#3 integrate .. //depot/projects/vimage/src/sys/powerpc/powerpc/syncicache.c#3 integrate .. //depot/projects/vimage/src/sys/sparc64/include/tick.h#3 integrate .. //depot/projects/vimage/src/sys/sparc64/sparc64/elf_machdep.c#5 integrate .. //depot/projects/vimage/src/sys/sparc64/sparc64/mp_machdep.c#9 integrate .. //depot/projects/vimage/src/sys/sparc64/sparc64/tick.c#5 integrate .. //depot/projects/vimage/src/sys/sys/clist.h#3 integrate .. //depot/projects/vimage/src/sys/sys/libkern.h#5 integrate .. //depot/projects/vimage/src/sys/sys/param.h#28 integrate .. //depot/projects/vimage/src/sys/sys/pmckern.h#3 integrate .. //depot/projects/vimage/src/sys/sys/syscall.h#8 integrate .. //depot/projects/vimage/src/sys/sys/syscall.mk#8 integrate .. //depot/projects/vimage/src/sys/sys/sysent.h#7 integrate .. //depot/projects/vimage/src/sys/sys/sysproto.h#8 integrate .. //depot/projects/vimage/src/sys/sys/tty.h#6 integrate .. //depot/projects/vimage/src/sys/sys/ttydevsw.h#3 integrate .. //depot/projects/vimage/src/sys/sys/ttydisc.h#4 integrate .. //depot/projects/vimage/src/sys/sys/ttyhook.h#1 branch .. //depot/projects/vimage/src/sys/sys/ttyqueue.h#3 integrate .. //depot/projects/vimage/src/sys/ufs/ffs/ffs_vfsops.c#13 integrate .. //depot/projects/vimage/src/sys/ufs/ufs/ufs_dirhash.c#4 integrate .. //depot/projects/vimage/src/sys/ufs/ufs/ufs_vnops.c#11 integrate .. //depot/projects/vimage/src/sys/vm/vm_mmap.c#13 integrate .. //depot/projects/vimage/src/sys/vm/vm_pageout.c#11 integrate .. //depot/projects/vimage/src/sys/xen/evtchn/evtchn.c#2 integrate .. //depot/projects/vimage/src/sys/xen/gnttab.c#3 integrate .. //depot/projects/vimage/src/sys/xen/gnttab.h#2 integrate .. //depot/projects/vimage/src/sys/xen/interface/arch-x86/xen-x86_32.h#2 integrate .. //depot/projects/vimage/src/sys/xen/interface/arch-x86/xen-x86_64.h#2 integrate .. //depot/projects/vimage/src/sys/xen/interface/arch-x86/xen.h#2 integrate .. //depot/projects/vimage/src/sys/xen/interface/callback.h#2 integrate .. //depot/projects/vimage/src/sys/xen/interface/domctl.h#2 integrate .. //depot/projects/vimage/src/sys/xen/interface/features.h#2 integrate .. //depot/projects/vimage/src/sys/xen/interface/grant_table.h#2 integrate .. //depot/projects/vimage/src/sys/xen/interface/memory.h#2 integrate .. //depot/projects/vimage/src/sys/xen/interface/physdev.h#2 integrate .. //depot/projects/vimage/src/sys/xen/interface/vcpu.h#2 integrate Differences ... ==== //depot/projects/vimage/src/sys/amd64/amd64/elf_machdep.c#3 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/elf_machdep.c,v 1.26 2007/05/22 02:22:57 kan Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/elf_machdep.c,v 1.27 2008/09/24 10:14:37 kib Exp $"); #include #include @@ -46,59 +46,60 @@ #include struct sysentvec elf64_freebsd_sysvec = { - SYS_MAXSYSCALL, - sysent, - 0, - 0, - NULL, - 0, - NULL, - NULL, - __elfN(freebsd_fixup), - sendsig, - sigcode, - &szsigcode, - NULL, - "FreeBSD ELF64", - __elfN(coredump), - NULL, - MINSIGSTKSZ, - PAGE_SIZE, - VM_MIN_ADDRESS, - VM_MAXUSER_ADDRESS, - USRSTACK, - PS_STRINGS, - VM_PROT_ALL, - exec_copyout_strings, - exec_setregs, - NULL + .sv_size = SYS_MAXSYSCALL, + .sv_table = sysent, + .sv_mask = 0, + .sv_sigsize = 0, + .sv_sigtbl = NULL, + .sv_errsize = 0, + .sv_errtbl = NULL, + .sv_transtrap = NULL, + .sv_fixup = __elfN(freebsd_fixup), + .sv_sendsig = sendsig, + .sv_sigcode = sigcode, + .sv_szsigcode = &szsigcode, + .sv_prepsyscall = NULL, + .sv_name = "FreeBSD ELF64", + .sv_coredump = __elfN(coredump), + .sv_imgact_try = NULL, + .sv_minsigstksz = MINSIGSTKSZ, + .sv_pagesize = PAGE_SIZE, + .sv_minuser = VM_MIN_ADDRESS, + .sv_maxuser = VM_MAXUSER_ADDRESS, + .sv_usrstack = USRSTACK, + .sv_psstrings = PS_STRINGS, + .sv_stackprot = VM_PROT_ALL, + .sv_copyout_strings = exec_copyout_strings, + .sv_setregs = exec_setregs, + .sv_fixlimit = NULL, + .sv_maxssiz = NULL }; static Elf64_Brandinfo freebsd_brand_info = { - ELFOSABI_FREEBSD, - EM_X86_64, - "FreeBSD", - NULL, - "/libexec/ld-elf.so.1", - &elf64_freebsd_sysvec, - NULL, - BI_CAN_EXEC_DYN, - }; + .brand = ELFOSABI_FREEBSD, + .machine = EM_X86_64, + .compat_3_brand = "FreeBSD", + .emul_path = NULL, + .interp_path = "/libexec/ld-elf.so.1", + .sysvec = &elf64_freebsd_sysvec, + .interp_newpath = NULL, + .flags = BI_CAN_EXEC_DYN, +}; SYSINIT(elf64, SI_SUB_EXEC, SI_ORDER_ANY, (sysinit_cfunc_t) elf64_insert_brand_entry, &freebsd_brand_info); static Elf64_Brandinfo freebsd_brand_oinfo = { - ELFOSABI_FREEBSD, - EM_X86_64, - "FreeBSD", - NULL, - "/usr/libexec/ld-elf.so.1", - &elf64_freebsd_sysvec, - NULL, - BI_CAN_EXEC_DYN, - }; + .brand = ELFOSABI_FREEBSD, + .machine = EM_X86_64, + .compat_3_brand = "FreeBSD", + .emul_path = NULL, + .interp_path = "/usr/libexec/ld-elf.so.1", + .sysvec = &elf64_freebsd_sysvec, + .interp_newpath = NULL, + .flags = BI_CAN_EXEC_DYN, +}; SYSINIT(oelf64, SI_SUB_EXEC, SI_ORDER_ANY, (sysinit_cfunc_t) elf64_insert_brand_entry, ==== //depot/projects/vimage/src/sys/amd64/linux32/linux32_sysvec.c#8 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_sysvec.c,v 1.34 2008/04/08 09:45:47 kib Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_sysvec.c,v 1.35 2008/09/24 10:14:37 kib Exp $"); #include "opt_compat.h" #ifndef COMPAT_IA32 @@ -1000,62 +1000,62 @@ } struct sysentvec elf_linux_sysvec = { - LINUX_SYS_MAXSYSCALL, - linux_sysent, - 0, - LINUX_SIGTBLSZ, - bsd_to_linux_signal, - ELAST + 1, - bsd_to_linux_errno, - translate_traps, - elf_linux_fixup, - linux_sendsig, - linux_sigcode, - &linux_szsigcode, - linux_prepsyscall, - "Linux ELF32", - elf32_coredump, - exec_linux_imgact_try, - LINUX_MINSIGSTKSZ, - PAGE_SIZE, - VM_MIN_ADDRESS, - LINUX32_USRSTACK, - LINUX32_USRSTACK, - LINUX32_PS_STRINGS, - VM_PROT_ALL, - linux_copyout_strings, - exec_linux_setregs, - linux32_fixlimit, - &linux32_maxssiz, + .sv_size = LINUX_SYS_MAXSYSCALL, + .sv_table = linux_sysent, + .sv_mask = 0, + .sv_sigsize = LINUX_SIGTBLSZ, + .sv_sigtbl = bsd_to_linux_signal, + .sv_errsize = ELAST + 1, + .sv_errtbl = bsd_to_linux_errno, + .sv_transtrap = translate_traps, + .sv_fixup = elf_linux_fixup, + .sv_sendsig = linux_sendsig, + .sv_sigcode = linux_sigcode, + .sv_szsigcode = &linux_szsigcode, + .sv_prepsyscall = linux_prepsyscall, + .sv_name = "Linux ELF32", + .sv_coredump = elf32_coredump, + .sv_imgact_try = exec_linux_imgact_try, + .sv_minsigstksz = LINUX_MINSIGSTKSZ, + .sv_pagesize = PAGE_SIZE, + .sv_minuser = VM_MIN_ADDRESS, + .sv_maxuser = LINUX32_USRSTACK, + .sv_usrstack = LINUX32_USRSTACK, + .sv_psstrings = LINUX32_PS_STRINGS, + .sv_stackprot = VM_PROT_ALL, + .sv_copyout_strings = linux_copyout_strings, + .sv_setregs = exec_linux_setregs, + .sv_fixlimit = linux32_fixlimit, + .sv_maxssiz = &linux32_maxssiz, }; static Elf32_Brandinfo linux_brand = { - ELFOSABI_LINUX, - EM_386, - "Linux", - "/compat/linux", - "/lib/ld-linux.so.1", - &elf_linux_sysvec, - NULL, - BI_CAN_EXEC_DYN, - }; + .brand = ELFOSABI_LINUX, + .machine = EM_386, + .compat_3_brand = "Linux", + .emul_path = "/compat/linux", + .interp_path = "/lib/ld-linux.so.1", + .sysvec = &elf_linux_sysvec, + .interp_newpath = NULL, + .flags = BI_CAN_EXEC_DYN, +}; static Elf32_Brandinfo linux_glibc2brand = { - ELFOSABI_LINUX, - EM_386, - "Linux", - "/compat/linux", - "/lib/ld-linux.so.2", - &elf_linux_sysvec, - NULL, - BI_CAN_EXEC_DYN, - }; + .brand = ELFOSABI_LINUX, + .machine = EM_386, + .compat_3_brand = "Linux", + .emul_path = "/compat/linux", + .interp_path = "/lib/ld-linux.so.2", + .sysvec = &elf_linux_sysvec, + .interp_newpath = NULL, + .flags = BI_CAN_EXEC_DYN, +}; Elf32_Brandinfo *linux_brandlist[] = { - &linux_brand, - &linux_glibc2brand, - NULL - }; + &linux_brand, + &linux_glibc2brand, + NULL +}; static int linux_elf_modevent(module_t mod, int type, void *data) ==== //depot/projects/vimage/src/sys/arm/arm/elf_machdep.c#3 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/arm/elf_machdep.c,v 1.7 2007/05/22 02:22:57 kan Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/elf_machdep.c,v 1.8 2008/09/24 10:14:37 kib Exp $"); #include #include @@ -46,59 +46,60 @@ #include struct sysentvec elf32_freebsd_sysvec = { - SYS_MAXSYSCALL, - sysent, - 0, - 0, - NULL, - 0, - NULL, - NULL, - __elfN(freebsd_fixup), - sendsig, - sigcode, - &szsigcode, - NULL, - "FreeBSD ELF32", - __elfN(coredump), - NULL, - MINSIGSTKSZ, - PAGE_SIZE, - VM_MIN_ADDRESS, - VM_MAXUSER_ADDRESS, - USRSTACK, - PS_STRINGS, - VM_PROT_ALL, - exec_copyout_strings, - exec_setregs, - NULL + .sv_size = SYS_MAXSYSCALL, + .sv_table = sysent, + .sv_mask = 0, + .sv_sigsize = 0, + .sv_sigtbl = NULL, + .sv_errsize = 0, + .sv_errtbl = NULL, + .sv_transtrap = NULL, + .sv_fixup = __elfN(freebsd_fixup), + .sv_sendsig = sendsig, + .sv_sigcode = sigcode, + .sv_szsigcode = &szsigcode, + .sv_prepsyscall = NULL, + .sv_name = "FreeBSD ELF32", + .sv_coredump = __elfN(coredump), + .sv_imgact_try = NULL, + .sv_minsigstksz = MINSIGSTKSZ, + .sv_pagesize = PAGE_SIZE, + .sv_minuser = VM_MIN_ADDRESS, + .sv_maxuser = VM_MAXUSER_ADDRESS, + .sv_usrstack = USRSTACK, + .sv_psstrings = PS_STRINGS, + .sv_stackprot = VM_PROT_ALL, + .sv_copyout_strings = exec_copyout_strings, + .sv_setregs = exec_setregs, + .sv_fixlimit = NULL, + .sv_maxssiz = NULL }; static Elf32_Brandinfo freebsd_brand_info = { - ELFOSABI_FREEBSD, - EM_ARM, - "FreeBSD", - NULL, - "/libexec/ld-elf.so.1", - &elf32_freebsd_sysvec, - NULL, - BI_CAN_EXEC_DYN, - }; + .brand = ELFOSABI_FREEBSD, + .machine = EM_ARM, + .compat_3_brand = "FreeBSD", + .emul_path = NULL, + .interp_path = "/libexec/ld-elf.so.1", + .sysvec = &elf32_freebsd_sysvec, + .interp_newpath = NULL, + .flags = BI_CAN_EXEC_DYN, +}; SYSINIT(elf32, SI_SUB_EXEC, SI_ORDER_ANY, (sysinit_cfunc_t) elf32_insert_brand_entry, &freebsd_brand_info); static Elf32_Brandinfo freebsd_brand_oinfo = { - ELFOSABI_FREEBSD, - EM_ARM, - "FreeBSD", - NULL, - "/usr/libexec/ld-elf.so.1", - &elf32_freebsd_sysvec, - NULL, - BI_CAN_EXEC_DYN, - }; + .brand = ELFOSABI_FREEBSD, + .machine = EM_ARM, + .compat_3_brand = "FreeBSD", + .emul_path = NULL, + .interp_path = "/usr/libexec/ld-elf.so.1", + .sysvec = &elf32_freebsd_sysvec, + .interp_newpath = NULL, + .flags = BI_CAN_EXEC_DYN, +}; SYSINIT(oelf32, SI_SUB_EXEC, SI_ORDER_ANY, (sysinit_cfunc_t) elf32_insert_brand_entry, ==== //depot/projects/vimage/src/sys/compat/freebsd32/freebsd32_misc.c#12 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/freebsd32/freebsd32_misc.c,v 1.79 2008/09/19 15:17:32 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/freebsd32/freebsd32_misc.c,v 1.80 2008/09/25 20:50:21 jhb Exp $"); #include "opt_compat.h" @@ -2624,3 +2624,83 @@ return (error); } #endif + +int +syscall32_register(int *offset, struct sysent *new_sysent, + struct sysent *old_sysent) +{ + if (*offset == NO_SYSCALL) { + int i; + + for (i = 1; i < SYS_MAXSYSCALL; ++i) + if (freebsd32_sysent[i].sy_call == + (sy_call_t *)lkmnosys) + break; + if (i == SYS_MAXSYSCALL) + return (ENFILE); + *offset = i; + } else if (*offset < 0 || *offset >= SYS_MAXSYSCALL) + return (EINVAL); + else if (freebsd32_sysent[*offset].sy_call != (sy_call_t *)lkmnosys && + freebsd32_sysent[*offset].sy_call != (sy_call_t *)lkmressys) + return (EEXIST); + + *old_sysent = freebsd32_sysent[*offset]; + freebsd32_sysent[*offset] = *new_sysent; + return 0; +} + +int +syscall32_deregister(int *offset, struct sysent *old_sysent) +{ + + if (*offset) + freebsd32_sysent[*offset] = *old_sysent; + return 0; +} + +int +syscall32_module_handler(struct module *mod, int what, void *arg) +{ + struct syscall_module_data *data = (struct syscall_module_data*)arg; + modspecific_t ms; + int error; + + switch (what) { + case MOD_LOAD: + error = syscall32_register(data->offset, data->new_sysent, + &data->old_sysent); + if (error) { + /* Leave a mark so we know to safely unload below. */ + data->offset = NULL; + return error; + } + ms.intval = *data->offset; + MOD_XLOCK; + module_setspecific(mod, &ms); + MOD_XUNLOCK; + if (data->chainevh) + error = data->chainevh(mod, what, data->chainarg); + return (error); + case MOD_UNLOAD: + /* + * MOD_LOAD failed, so just return without calling the + * chained handler since we didn't pass along the MOD_LOAD + * event. + */ + if (data->offset == NULL) + return (0); + if (data->chainevh) { + error = data->chainevh(mod, what, data->chainarg); + if (error) + return (error); + } + error = syscall_deregister(data->offset, &data->old_sysent); + return (error); + default: + error = EOPNOTSUPP; + if (data->chainevh) + error = data->chainevh(mod, what, data->chainarg); + return (error); + } +} ==== //depot/projects/vimage/src/sys/compat/freebsd32/freebsd32_proto.h#13 (text+ko) ==== @@ -2,8 +2,8 @@ * System call prototypes. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/freebsd32/freebsd32_proto.h,v 1.91 2008/09/19 15:21:40 obrien Exp $ - * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 183188 2008-09-19 15:17:32Z obrien + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_proto.h,v 1.93 2008/09/25 20:08:36 jhb Exp $ + * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 183361 2008-09-25 20:07:42Z jhb */ #ifndef _FREEBSD32_SYSPROTO_H_ @@ -63,6 +63,11 @@ char ss_l_[PADL_(struct sigaltstack32 *)]; struct sigaltstack32 * ss; char ss_r_[PADR_(struct sigaltstack32 *)]; char oss_l_[PADL_(struct sigaltstack32 *)]; struct sigaltstack32 * oss; char oss_r_[PADR_(struct sigaltstack32 *)]; }; +struct freebsd32_ioctl_args { + char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)]; + char com_l_[PADL_(uint32_t)]; uint32_t com; char com_r_[PADR_(uint32_t)]; + char data_l_[PADL_(struct md_ioctl32 *)]; struct md_ioctl32 * data; char data_r_[PADR_(struct md_ioctl32 *)]; +}; struct freebsd32_execve_args { char fname_l_[PADL_(char *)]; char * fname; char fname_r_[PADR_(char *)]; char argv_l_[PADL_(u_int32_t *)]; u_int32_t * argv; char argv_r_[PADR_(u_int32_t *)]; @@ -383,6 +388,7 @@ int freebsd32_sendmsg(struct thread *, struct freebsd32_sendmsg_args *); int freebsd32_recvfrom(struct thread *, struct freebsd32_recvfrom_args *); int freebsd32_sigaltstack(struct thread *, struct freebsd32_sigaltstack_args *); +int freebsd32_ioctl(struct thread *, struct freebsd32_ioctl_args *); int freebsd32_execve(struct thread *, struct freebsd32_execve_args *); int freebsd32_setitimer(struct thread *, struct freebsd32_setitimer_args *); int freebsd32_getitimer(struct thread *, struct freebsd32_getitimer_args *); @@ -594,6 +600,7 @@ #define FREEBSD32_SYS_AUE_freebsd32_sendmsg AUE_SENDMSG #define FREEBSD32_SYS_AUE_freebsd32_recvfrom AUE_RECVFROM #define FREEBSD32_SYS_AUE_freebsd32_sigaltstack AUE_SIGALTSTACK +#define FREEBSD32_SYS_AUE_freebsd32_ioctl AUE_NULL #define FREEBSD32_SYS_AUE_freebsd32_execve AUE_EXECVE #define FREEBSD32_SYS_AUE_freebsd32_setitimer AUE_SETITIMER #define FREEBSD32_SYS_AUE_freebsd32_getitimer AUE_GETITIMER ==== //depot/projects/vimage/src/sys/compat/freebsd32/freebsd32_syscall.h#13 (text+ko) ==== @@ -2,8 +2,8 @@ * System call numbers. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscall.h,v 1.90 2008/09/19 15:21:40 obrien Exp $ - * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 183188 2008-09-19 15:17:32Z obrien + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscall.h,v 1.92 2008/09/25 20:08:36 jhb Exp $ + * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 183361 2008-09-25 20:07:42Z jhb */ #define FREEBSD32_SYS_syscall 0 @@ -58,7 +58,7 @@ #define FREEBSD32_SYS_acct 51 /* 52 is old freebsd32_sigpending */ #define FREEBSD32_SYS_freebsd32_sigaltstack 53 -#define FREEBSD32_SYS_ioctl 54 +#define FREEBSD32_SYS_freebsd32_ioctl 54 #define FREEBSD32_SYS_reboot 55 #define FREEBSD32_SYS_revoke 56 #define FREEBSD32_SYS_symlink 57 ==== //depot/projects/vimage/src/sys/compat/freebsd32/freebsd32_syscalls.c#13 (text+ko) ==== @@ -2,8 +2,8 @@ * System call names. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscalls.c,v 1.81 2008/09/19 15:21:40 obrien Exp $ - * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 183188 2008-09-19 15:17:32Z obrien + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscalls.c,v 1.83 2008/09/25 20:08:36 jhb Exp $ + * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 183361 2008-09-25 20:07:42Z jhb */ const char *freebsd32_syscallnames[] = { @@ -61,7 +61,7 @@ "acct", /* 51 = acct */ "compat.freebsd32_sigpending", /* 52 = old freebsd32_sigpending */ "freebsd32_sigaltstack", /* 53 = freebsd32_sigaltstack */ - "ioctl", /* 54 = ioctl */ + "freebsd32_ioctl", /* 54 = freebsd32_ioctl */ "reboot", /* 55 = reboot */ "revoke", /* 56 = revoke */ "symlink", /* 57 = symlink */ @@ -217,16 +217,16 @@ "getpgid", /* 207 = getpgid */ "#208", /* 208 = newreboot */ "poll", /* 209 = poll */ - "#210", /* 210 = */ - "#211", /* 211 = */ - "#212", /* 212 = */ - "#213", /* 213 = */ - "#214", /* 214 = */ - "#215", /* 215 = */ - "#216", /* 216 = */ - "#217", /* 217 = */ - "#218", /* 218 = */ - "#219", /* 219 = */ + "lkmnosys", /* 210 = lkmnosys */ + "lkmnosys", /* 211 = lkmnosys */ + "lkmnosys", /* 212 = lkmnosys */ + "lkmnosys", /* 213 = lkmnosys */ + "lkmnosys", /* 214 = lkmnosys */ + "lkmnosys", /* 215 = lkmnosys */ + "lkmnosys", /* 216 = lkmnosys */ + "lkmnosys", /* 217 = lkmnosys */ + "lkmnosys", /* 218 = lkmnosys */ + "lkmnosys", /* 219 = lkmnosys */ "freebsd32_semctl", /* 220 = freebsd32_semctl */ "semget", /* 221 = semget */ "semop", /* 222 = semop */ @@ -377,7 +377,7 @@ "#367", /* 367 = __cap_get_file */ "#368", /* 368 = __cap_set_fd */ "#369", /* 369 = __cap_set_file */ - "#370", /* 370 = lkmressys */ + "#370", /* 370 = nosys */ "extattr_set_fd", /* 371 = extattr_set_fd */ "extattr_get_fd", /* 372 = extattr_get_fd */ "extattr_delete_fd", /* 373 = extattr_delete_fd */ ==== //depot/projects/vimage/src/sys/compat/freebsd32/freebsd32_sysent.c#13 (text+ko) ==== @@ -2,8 +2,8 @@ * System call switch table. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/freebsd32/freebsd32_sysent.c,v 1.91 2008/09/19 15:21:40 obrien Exp $ - * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 183188 2008-09-19 15:17:32Z obrien + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_sysent.c,v 1.93 2008/09/25 20:08:36 jhb Exp $ + * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 183361 2008-09-25 20:07:42Z jhb */ #include "opt_compat.h" @@ -92,7 +92,7 @@ { AS(acct_args), (sy_call_t *)acct, AUE_ACCT, NULL, 0, 0 }, /* 51 = acct */ { compat(0,freebsd32_sigpending), AUE_SIGPENDING, NULL, 0, 0 }, /* 52 = old freebsd32_sigpending */ { AS(freebsd32_sigaltstack_args), (sy_call_t *)freebsd32_sigaltstack, AUE_SIGALTSTACK, NULL, 0, 0 }, /* 53 = freebsd32_sigaltstack */ - { AS(ioctl_args), (sy_call_t *)ioctl, AUE_IOCTL, NULL, 0, 0 }, /* 54 = ioctl */ + { AS(freebsd32_ioctl_args), (sy_call_t *)freebsd32_ioctl, AUE_NULL, NULL, 0, 0 }, /* 54 = freebsd32_ioctl */ { AS(reboot_args), (sy_call_t *)reboot, AUE_REBOOT, NULL, 0, 0 }, /* 55 = reboot */ { AS(revoke_args), (sy_call_t *)revoke, AUE_REVOKE, NULL, 0, 0 }, /* 56 = revoke */ { AS(symlink_args), (sy_call_t *)symlink, AUE_SYMLINK, NULL, 0, 0 }, /* 57 = symlink */ @@ -248,16 +248,16 @@ { AS(getpgid_args), (sy_call_t *)getpgid, AUE_GETPGID, NULL, 0, 0 }, /* 207 = getpgid */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 208 = newreboot */ { AS(poll_args), (sy_call_t *)poll, AUE_POLL, NULL, 0, 0 }, /* 209 = poll */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 210 = */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 211 = */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 212 = */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 213 = */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 214 = */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 215 = */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 216 = */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 217 = */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 218 = */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 219 = */ + { AS(nosys_args), (sy_call_t *)lkmnosys, AUE_NULL, NULL, 0, 0 }, /* 210 = lkmnosys */ + { AS(nosys_args), (sy_call_t *)lkmnosys, AUE_NULL, NULL, 0, 0 }, /* 211 = lkmnosys */ + { AS(nosys_args), (sy_call_t *)lkmnosys, AUE_NULL, NULL, 0, 0 }, /* 212 = lkmnosys */ + { AS(nosys_args), (sy_call_t *)lkmnosys, AUE_NULL, NULL, 0, 0 }, /* 213 = lkmnosys */ + { AS(nosys_args), (sy_call_t *)lkmnosys, AUE_NULL, NULL, 0, 0 }, /* 214 = lkmnosys */ + { AS(nosys_args), (sy_call_t *)lkmnosys, AUE_NULL, NULL, 0, 0 }, /* 215 = lkmnosys */ + { AS(nosys_args), (sy_call_t *)lkmnosys, AUE_NULL, NULL, 0, 0 }, /* 216 = lkmnosys */ + { AS(nosys_args), (sy_call_t *)lkmnosys, AUE_NULL, NULL, 0, 0 }, /* 217 = lkmnosys */ + { AS(nosys_args), (sy_call_t *)lkmnosys, AUE_NULL, NULL, 0, 0 }, /* 218 = lkmnosys */ + { AS(nosys_args), (sy_call_t *)lkmnosys, AUE_NULL, NULL, 0, 0 }, /* 219 = lkmnosys */ { AS(freebsd32_semctl_args), (sy_call_t *)freebsd32_semctl, AUE_SEMCTL, NULL, 0, 0 }, /* 220 = freebsd32_semctl */ { AS(semget_args), (sy_call_t *)semget, AUE_SEMGET, NULL, 0, 0 }, /* 221 = semget */ { AS(semop_args), (sy_call_t *)semop, AUE_SEMOP, NULL, 0, 0 }, /* 222 = semop */ @@ -408,7 +408,7 @@ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 367 = __cap_get_file */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 368 = __cap_set_fd */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 369 = __cap_set_file */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 370 = lkmressys */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 370 = nosys */ { AS(extattr_set_fd_args), (sy_call_t *)extattr_set_fd, AUE_EXTATTR_SET_FD, NULL, 0, 0 }, /* 371 = extattr_set_fd */ { AS(extattr_get_fd_args), (sy_call_t *)extattr_get_fd, AUE_EXTATTR_GET_FD, NULL, 0, 0 }, /* 372 = extattr_get_fd */ { AS(extattr_delete_fd_args), (sy_call_t *)extattr_delete_fd, AUE_EXTATTR_DELETE_FD, NULL, 0, 0 }, /* 373 = extattr_delete_fd */ ==== //depot/projects/vimage/src/sys/compat/freebsd32/freebsd32_util.h#2 (text+ko) ==== @@ -25,18 +25,20 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/compat/freebsd32/freebsd32_util.h,v 1.10 2005/06/29 15:16:20 jhb Exp $ + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_util.h,v 1.12 2008/09/25 20:50:21 jhb Exp $ */ +#ifndef _COMPAT_FREEBSD32_FREEBSD32_UTIL_H_ +#define _COMPAT_FREEBSD32_FREEBSD32_UTIL_H_ + +#include +#include +#include + #include #include #include - -#include -#include -#include - struct freebsd32_ps_strings { u_int32_t ps_argvstr; /* first of 0 or more argument strings */ int ps_nargvstr; /* the number of argument strings */ @@ -50,3 +52,35 @@ #define FREEBSD32_PS_STRINGS \ (FREEBSD32_USRSTACK - sizeof(struct freebsd32_ps_strings)) + +extern struct sysent freebsd32_sysent[]; + +#define SYSCALL32_MODULE(name, offset, new_sysent, evh, arg) \ +static struct syscall_module_data name##_syscall32_mod = { \ + evh, arg, offset, new_sysent, { 0, NULL } \ +}; \ + \ +static moduledata_t name##32_mod = { \ + #name, \ + syscall32_module_handler, \ + &name##_syscall32_mod \ +}; \ +DECLARE_MODULE(name##32, name##32_mod, SI_SUB_SYSCALLS, SI_ORDER_MIDDLE) + +#define SYSCALL32_MODULE_HELPER(syscallname) \ +static int syscallname##_syscall32 = FREEBSD32_SYS_##syscallname; \ +static struct sysent syscallname##_sysent32 = { \ + (sizeof(struct syscallname ## _args ) \ + / sizeof(register_t)), \ + (sy_call_t *)& syscallname \ +}; \ +SYSCALL32_MODULE(syscallname, \ + & syscallname##_syscall32, & syscallname##_sysent32,\ + NULL, NULL); + +int syscall32_register(int *offset, struct sysent *new_sysent, + struct sysent *old_sysent); +int syscall32_deregister(int *offset, struct sysent *old_sysent); +int syscall32_module_handler(struct module *mod, int what, void *arg); + +#endif /* !_COMPAT_FREEBSD32_FREEBSD32_UTIL_H_ */ ==== //depot/projects/vimage/src/sys/compat/freebsd32/syscalls.master#14 (text+ko) ==== @@ -1,4 +1,4 @@ - $FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.106 2008/09/19 15:17:32 obrien Exp $ + $FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.108 2008/09/25 20:07:42 jhb Exp $ ; from: @(#)syscalls.master 8.2 (Berkeley) 1/13/94 ; from: src/sys/kern/syscalls.master 1.107 ; @@ -33,7 +33,7 @@ ; so the SYSCALL_MODULE macro works ; NOARGS same as STD except do not create structure in sys/sysproto.h ; NODEF same as STD except only have the entry in the syscall table -; added. Meaning - do do not create structure or function +; added. Meaning - do not create structure or function ; prototype in sys/sysproto.h ; NOPROTO same as STD except do not create structure or ; function prototype in sys/sysproto.h. Does add a @@ -134,8 +134,8 @@ 53 AUE_SIGALTSTACK STD { int freebsd32_sigaltstack( \ struct sigaltstack32 *ss, \ struct sigaltstack32 *oss); } -54 AUE_IOCTL NOPROTO { int ioctl(int fd, u_long com, \ - caddr_t data); } +54 AUE_NULL STD { int freebsd32_ioctl(int fd, uint32_t com, \ + struct md_ioctl32 *data); } 55 AUE_REBOOT NOPROTO { int reboot(int opt); } 56 AUE_REVOKE NOPROTO { int revoke(char *path); } 57 AUE_SYMLINK NOPROTO { int symlink(char *path, char *link); } @@ -388,16 +388,16 @@ ; ; The following are reserved for loadable syscalls ; -210 AUE_NULL UNIMPL -211 AUE_NULL UNIMPL -212 AUE_NULL UNIMPL -213 AUE_NULL UNIMPL -214 AUE_NULL UNIMPL -215 AUE_NULL UNIMPL -216 AUE_NULL UNIMPL -217 AUE_NULL UNIMPL -218 AUE_NULL UNIMPL -219 AUE_NULL UNIMPL +210 AUE_NULL NODEF lkmnosys lkmnosys nosys_args int +211 AUE_NULL NODEF lkmnosys lkmnosys nosys_args int +212 AUE_NULL NODEF lkmnosys lkmnosys nosys_args int +213 AUE_NULL NODEF lkmnosys lkmnosys nosys_args int +214 AUE_NULL NODEF lkmnosys lkmnosys nosys_args int +215 AUE_NULL NODEF lkmnosys lkmnosys nosys_args int +216 AUE_NULL NODEF lkmnosys lkmnosys nosys_args int +217 AUE_NULL NODEF lkmnosys lkmnosys nosys_args int +218 AUE_NULL NODEF lkmnosys lkmnosys nosys_args int +219 AUE_NULL NODEF lkmnosys lkmnosys nosys_args int ; ; The following were introduced with NetBSD/4.4Lite-2 @@ -637,7 +637,7 @@ 367 AUE_NULL UNIMPL __cap_get_file 368 AUE_NULL UNIMPL __cap_set_fd 369 AUE_NULL UNIMPL __cap_set_file -370 AUE_NULL UNIMPL lkmressys +370 AUE_NULL UNIMPL nosys 371 AUE_EXTATTR_SET_FD NOPROTO { int extattr_set_fd(int fd, \ int attrnamespace, const char *attrname, \ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Sep 25 21:13:04 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 692E01065689; Thu, 25 Sep 2008 21:13:04 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 2B7341065692 for ; Thu, 25 Sep 2008 21:13:04 +0000 (UTC) (envelope-from zec@tel.fer.hr) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 195718FC12 for ; Thu, 25 Sep 2008 21:13:04 +0000 (UTC) (envelope-from zec@tel.fer.hr) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id m8PLD4eU016894 for ; Thu, 25 Sep 2008 21:13:04 GMT (envelope-from zec@tel.fer.hr) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m8PLD3nx016799 for perforce@freebsd.org; Thu, 25 Sep 2008 21:13:03 GMT (envelope-from zec@tel.fer.hr) Date: Thu, 25 Sep 2008 21:13:03 GMT Message-Id: <200809252113.m8PLD3nx016799@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@tel.fer.hr using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 150471 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 25 Sep 2008 21:13:04 -0000 http://perforce.freebsd.org/chv.cgi?CH=150471 Change 150471 by zec@zec_tpx32 on 2008/09/25 21:12:14 IFC @ 150469 Affected files ... .. //depot/projects/vimage-commit2/src/sys/amd64/amd64/elf_machdep.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/amd64/linux32/linux32_sysvec.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/arm/arm/elf_machdep.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/compat/freebsd32/freebsd32_ioctl.c#1 branch .. //depot/projects/vimage-commit2/src/sys/compat/freebsd32/freebsd32_ioctl.h#1 branch .. //depot/projects/vimage-commit2/src/sys/compat/freebsd32/freebsd32_misc.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/compat/freebsd32/freebsd32_proto.h#6 integrate .. //depot/projects/vimage-commit2/src/sys/compat/freebsd32/freebsd32_syscall.h#6 integrate .. //depot/projects/vimage-commit2/src/sys/compat/freebsd32/freebsd32_syscalls.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/compat/freebsd32/freebsd32_sysent.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/compat/freebsd32/freebsd32_util.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/compat/freebsd32/syscalls.master#6 integrate .. //depot/projects/vimage-commit2/src/sys/compat/ia32/ia32_sysvec.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/compat/linux/linux_misc.c#11 integrate .. //depot/projects/vimage-commit2/src/sys/compat/svr4/svr4_sysvec.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/conf/files#11 integrate .. //depot/projects/vimage-commit2/src/sys/conf/files.amd64#3 integrate .. //depot/projects/vimage-commit2/src/sys/conf/files.i386#8 integrate .. //depot/projects/vimage-commit2/src/sys/conf/files.ia64#2 integrate .. //depot/projects/vimage-commit2/src/sys/conf/files.sparc64#4 integrate .. //depot/projects/vimage-commit2/src/sys/conf/kern.pre.mk#3 integrate .. //depot/projects/vimage-commit2/src/sys/conf/options.sparc64#3 integrate .. //depot/projects/vimage-commit2/src/sys/ddb/db_command.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/ddb/db_command.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/ddb/db_main.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ath/if_ath.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ath/if_athvar.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/bge/if_bge.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/bm/if_bm.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/cxgb/common/cxgb_ael1002.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/cxgb/common/cxgb_common.h#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/cxgb/common/cxgb_mc5.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/cxgb/common/cxgb_mv88e1xxx.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/cxgb/common/cxgb_t3_hw.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/dev/cxgb/common/cxgb_tn1010.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/cxgb/common/cxgb_vsc7323.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/cxgb/common/cxgb_vsc8211.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/cxgb/common/cxgb_xgmac.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/cxgb/cxgb_adapter.h#5 integrate .. //depot/projects/vimage-commit2/src/sys/dev/cxgb/cxgb_config.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/cxgb/cxgb_include.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/cxgb/cxgb_main.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/dev/cxgb/cxgb_multiq.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/cxgb/cxgb_offload.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/cxgb/cxgb_offload.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/cxgb/cxgb_osdep.h#5 integrate .. //depot/projects/vimage-commit2/src/sys/dev/cxgb/cxgb_sge.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/dev/cxgb/cxgb_t3fw.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/cxgb/sys/cxgb_support.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/cxgb/sys/mvec.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/cxgb/sys/uipc_mvec.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_cm.c#8 integrate .. //depot/projects/vimage-commit2/src/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_cq.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_dbg.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_ev.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_hal.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_mem.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_provider.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_qp.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_resource.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/cxgb/ulp/toecore/toedev.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c#12 integrate .. //depot/projects/vimage-commit2/src/sys/dev/cxgb/ulp/tom/cxgb_cpl_socket.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/cxgb/ulp/tom/cxgb_ddp.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/cxgb/ulp/tom/cxgb_l2t.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/cxgb/ulp/tom/cxgb_l2t.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/cxgb/ulp/tom/cxgb_listen.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/cxgb/ulp/tom/cxgb_t3_ddp.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/cxgb/ulp/tom/cxgb_tcp_offload.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/cxgb/ulp/tom/cxgb_toepcb.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/cxgb/ulp/tom/cxgb_tom.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/dev/cxgb/ulp/tom/cxgb_tom.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/cxgb/ulp/tom/cxgb_tom_sysctl.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/cxgb/ulp/tom/cxgb_vm.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/hwpmc/hwpmc_amd.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/hwpmc/hwpmc_mod.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/hwpmc/hwpmc_piv.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/hwpmc/hwpmc_ppro.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/jme/if_jme.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/dev/jme/if_jmereg.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/kbdmux/kbdmux.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/le/if_le_cbus.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/le/if_le_isa.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/le/if_le_lebuffer.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/le/if_le_pci.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/le/lebuffer_sbus.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/msk/if_msk.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/msk/if_mskreg.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/ubsa.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/umass.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/xen/netfront/netfront.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/fs/devfs/devfs_devs.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/fs/devfs/devfs_vnops.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/fs/fdescfs/fdesc_vnops.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/fs/hpfs/hpfs_vnops.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/fs/msdosfs/msdosfs_vnops.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/fs/ntfs/ntfs_vnops.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/fs/portalfs/portal_vnops.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/fs/pseudofs/pseudofs_vnops.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/fs/smbfs/smbfs_node.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/fs/tmpfs/tmpfs.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/fs/tmpfs/tmpfs_subr.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/fs/tmpfs/tmpfs_vnops.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/fs/udf/udf_vnops.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/gnu/fs/xfs/FreeBSD/xfs_vnops.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/i386/bios/apm.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/i386/i386/bios.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/i386/i386/elf_machdep.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/i386/i386/pmap.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/i386/ibcs2/ibcs2_sysvec.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/i386/include/param.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/i386/include/smp.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/i386/linux/linux_sysvec.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/i386/xen/mp_machdep.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/i386/xen/pmap.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/i386/xen/xen_machdep.c#8 integrate .. //depot/projects/vimage-commit2/src/sys/ia64/ia64/efi.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/ia64/ia64/elf_machdep.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/ia64/ia64/sal.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/kern/imgact_aout.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/kern/init_main.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/kern/init_sysent.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/kern/kern_condvar.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/kern/kern_intr.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/kern/kern_pmc.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/kern/kern_synch.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/kern/makesyscalls.sh#2 integrate .. //depot/projects/vimage-commit2/src/sys/kern/subr_clist.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/kern/subr_witness.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/kern/sys_generic.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/kern/syscalls.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/kern/syscalls.master#3 integrate .. //depot/projects/vimage-commit2/src/sys/kern/systrace_args.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/kern/tty.c#10 integrate .. //depot/projects/vimage-commit2/src/sys/kern/tty_pts.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/kern/tty_ttydisc.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/kern/uipc_mqueue.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/kern/vfs_cache.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/kern/vfs_vnops.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/libkern/memcmp.c#1 branch .. //depot/projects/vimage-commit2/src/sys/mips/mips/elf_machdep.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/mips/mips/support.S#2 integrate .. //depot/projects/vimage-commit2/src/sys/modules/cxgb/Makefile#2 integrate .. //depot/projects/vimage-commit2/src/sys/modules/cxgb/cxgb/Makefile#4 integrate .. //depot/projects/vimage-commit2/src/sys/modules/cxgb/cxgb_t3fw/Makefile#2 integrate .. //depot/projects/vimage-commit2/src/sys/modules/cxgb/iw_cxgb/Makefile#2 integrate .. //depot/projects/vimage-commit2/src/sys/modules/cxgb/toecore/Makefile#2 integrate .. //depot/projects/vimage-commit2/src/sys/modules/cxgb/tom/Makefile#2 integrate .. //depot/projects/vimage-commit2/src/sys/net/if_clone.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/net/if_clone.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/net/if_stf.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/net80211/ieee80211.h#4 integrate .. //depot/projects/vimage-commit2/src/sys/net80211/ieee80211_adhoc.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/net80211/ieee80211_crypto.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/net80211/ieee80211_crypto.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/net80211/ieee80211_ddb.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/net80211/ieee80211_freebsd.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/net80211/ieee80211_freebsd.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/net80211/ieee80211_hostap.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/net80211/ieee80211_ht.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/net80211/ieee80211_ht.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/net80211/ieee80211_ioctl.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/net80211/ieee80211_ioctl.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/net80211/ieee80211_node.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/net80211/ieee80211_node.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/net80211/ieee80211_output.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/net80211/ieee80211_sta.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/net80211/ieee80211_var.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/net80211/ieee80211_wds.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/netgraph/netgraph.h#10 integrate .. //depot/projects/vimage-commit2/src/sys/netgraph/ng_base.c#11 integrate .. //depot/projects/vimage-commit2/src/sys/netgraph/ng_source.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/ip_fw.h#9 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/tcp_input.c#16 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/udp6_usrreq.c#11 integrate .. //depot/projects/vimage-commit2/src/sys/nfsclient/nfs_vnops.c#9 integrate .. //depot/projects/vimage-commit2/src/sys/powerpc/aim/machdep.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/powerpc/aim/mmu_oea.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/powerpc/booke/machdep.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/powerpc/include/dbdma.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/powerpc/include/md_var.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/powerpc/include/pmap.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/powerpc/include/pte.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/powerpc/ofw/ofw_syscons.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/powerpc/powermac/dbdma.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/powerpc/powermac/dbdmavar.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/powerpc/powerpc/cpu.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/powerpc/powerpc/elf_machdep.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/powerpc/powerpc/syncicache.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/sparc64/include/tick.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/sparc64/sparc64/elf_machdep.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/sparc64/sparc64/mp_machdep.c#8 integrate .. //depot/projects/vimage-commit2/src/sys/sparc64/sparc64/tick.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/sys/clist.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/sys/libkern.h#4 integrate .. //depot/projects/vimage-commit2/src/sys/sys/param.h#13 integrate .. //depot/projects/vimage-commit2/src/sys/sys/pmckern.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/sys/syscall.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/sys/syscall.mk#3 integrate .. //depot/projects/vimage-commit2/src/sys/sys/sysent.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/sys/sysproto.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/sys/tty.h#4 integrate .. //depot/projects/vimage-commit2/src/sys/sys/ttydevsw.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/sys/ttydisc.h#4 integrate .. //depot/projects/vimage-commit2/src/sys/sys/ttyhook.h#1 branch .. //depot/projects/vimage-commit2/src/sys/sys/ttyqueue.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/ufs/ffs/ffs_vfsops.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/ufs/ufs/ufs_dirhash.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/ufs/ufs/ufs_vnops.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/vm/vm_mmap.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/vm/vm_pageout.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/xen/evtchn/evtchn.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/xen/gnttab.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/xen/gnttab.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/xen/interface/arch-x86/xen-x86_32.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/xen/interface/arch-x86/xen-x86_64.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/xen/interface/arch-x86/xen.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/xen/interface/callback.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/xen/interface/domctl.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/xen/interface/features.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/xen/interface/grant_table.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/xen/interface/memory.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/xen/interface/physdev.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/xen/interface/vcpu.h#2 integrate Differences ... ==== //depot/projects/vimage-commit2/src/sys/amd64/amd64/elf_machdep.c#2 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/elf_machdep.c,v 1.26 2007/05/22 02:22:57 kan Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/elf_machdep.c,v 1.27 2008/09/24 10:14:37 kib Exp $"); #include #include @@ -46,59 +46,60 @@ #include struct sysentvec elf64_freebsd_sysvec = { - SYS_MAXSYSCALL, - sysent, - 0, - 0, - NULL, - 0, - NULL, - NULL, - __elfN(freebsd_fixup), - sendsig, - sigcode, - &szsigcode, - NULL, - "FreeBSD ELF64", - __elfN(coredump), - NULL, - MINSIGSTKSZ, - PAGE_SIZE, - VM_MIN_ADDRESS, - VM_MAXUSER_ADDRESS, - USRSTACK, - PS_STRINGS, - VM_PROT_ALL, - exec_copyout_strings, - exec_setregs, - NULL + .sv_size = SYS_MAXSYSCALL, + .sv_table = sysent, + .sv_mask = 0, + .sv_sigsize = 0, + .sv_sigtbl = NULL, + .sv_errsize = 0, + .sv_errtbl = NULL, + .sv_transtrap = NULL, + .sv_fixup = __elfN(freebsd_fixup), + .sv_sendsig = sendsig, + .sv_sigcode = sigcode, + .sv_szsigcode = &szsigcode, + .sv_prepsyscall = NULL, + .sv_name = "FreeBSD ELF64", + .sv_coredump = __elfN(coredump), + .sv_imgact_try = NULL, + .sv_minsigstksz = MINSIGSTKSZ, + .sv_pagesize = PAGE_SIZE, + .sv_minuser = VM_MIN_ADDRESS, + .sv_maxuser = VM_MAXUSER_ADDRESS, + .sv_usrstack = USRSTACK, + .sv_psstrings = PS_STRINGS, + .sv_stackprot = VM_PROT_ALL, + .sv_copyout_strings = exec_copyout_strings, + .sv_setregs = exec_setregs, + .sv_fixlimit = NULL, + .sv_maxssiz = NULL }; static Elf64_Brandinfo freebsd_brand_info = { - ELFOSABI_FREEBSD, - EM_X86_64, - "FreeBSD", - NULL, - "/libexec/ld-elf.so.1", - &elf64_freebsd_sysvec, - NULL, - BI_CAN_EXEC_DYN, - }; + .brand = ELFOSABI_FREEBSD, + .machine = EM_X86_64, + .compat_3_brand = "FreeBSD", + .emul_path = NULL, + .interp_path = "/libexec/ld-elf.so.1", + .sysvec = &elf64_freebsd_sysvec, + .interp_newpath = NULL, + .flags = BI_CAN_EXEC_DYN, +}; SYSINIT(elf64, SI_SUB_EXEC, SI_ORDER_ANY, (sysinit_cfunc_t) elf64_insert_brand_entry, &freebsd_brand_info); static Elf64_Brandinfo freebsd_brand_oinfo = { - ELFOSABI_FREEBSD, - EM_X86_64, - "FreeBSD", - NULL, - "/usr/libexec/ld-elf.so.1", - &elf64_freebsd_sysvec, - NULL, - BI_CAN_EXEC_DYN, - }; + .brand = ELFOSABI_FREEBSD, + .machine = EM_X86_64, + .compat_3_brand = "FreeBSD", + .emul_path = NULL, + .interp_path = "/usr/libexec/ld-elf.so.1", + .sysvec = &elf64_freebsd_sysvec, + .interp_newpath = NULL, + .flags = BI_CAN_EXEC_DYN, +}; SYSINIT(oelf64, SI_SUB_EXEC, SI_ORDER_ANY, (sysinit_cfunc_t) elf64_insert_brand_entry, ==== //depot/projects/vimage-commit2/src/sys/amd64/linux32/linux32_sysvec.c#2 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_sysvec.c,v 1.34 2008/04/08 09:45:47 kib Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_sysvec.c,v 1.35 2008/09/24 10:14:37 kib Exp $"); #include "opt_compat.h" #ifndef COMPAT_IA32 @@ -1000,62 +1000,62 @@ } struct sysentvec elf_linux_sysvec = { - LINUX_SYS_MAXSYSCALL, - linux_sysent, - 0, - LINUX_SIGTBLSZ, - bsd_to_linux_signal, - ELAST + 1, - bsd_to_linux_errno, - translate_traps, - elf_linux_fixup, - linux_sendsig, - linux_sigcode, - &linux_szsigcode, - linux_prepsyscall, - "Linux ELF32", - elf32_coredump, - exec_linux_imgact_try, - LINUX_MINSIGSTKSZ, - PAGE_SIZE, - VM_MIN_ADDRESS, - LINUX32_USRSTACK, - LINUX32_USRSTACK, - LINUX32_PS_STRINGS, - VM_PROT_ALL, - linux_copyout_strings, - exec_linux_setregs, - linux32_fixlimit, - &linux32_maxssiz, + .sv_size = LINUX_SYS_MAXSYSCALL, + .sv_table = linux_sysent, + .sv_mask = 0, + .sv_sigsize = LINUX_SIGTBLSZ, + .sv_sigtbl = bsd_to_linux_signal, + .sv_errsize = ELAST + 1, + .sv_errtbl = bsd_to_linux_errno, + .sv_transtrap = translate_traps, + .sv_fixup = elf_linux_fixup, + .sv_sendsig = linux_sendsig, + .sv_sigcode = linux_sigcode, + .sv_szsigcode = &linux_szsigcode, + .sv_prepsyscall = linux_prepsyscall, + .sv_name = "Linux ELF32", + .sv_coredump = elf32_coredump, + .sv_imgact_try = exec_linux_imgact_try, + .sv_minsigstksz = LINUX_MINSIGSTKSZ, + .sv_pagesize = PAGE_SIZE, + .sv_minuser = VM_MIN_ADDRESS, + .sv_maxuser = LINUX32_USRSTACK, + .sv_usrstack = LINUX32_USRSTACK, + .sv_psstrings = LINUX32_PS_STRINGS, + .sv_stackprot = VM_PROT_ALL, + .sv_copyout_strings = linux_copyout_strings, + .sv_setregs = exec_linux_setregs, + .sv_fixlimit = linux32_fixlimit, + .sv_maxssiz = &linux32_maxssiz, }; static Elf32_Brandinfo linux_brand = { - ELFOSABI_LINUX, - EM_386, - "Linux", - "/compat/linux", - "/lib/ld-linux.so.1", - &elf_linux_sysvec, - NULL, - BI_CAN_EXEC_DYN, - }; + .brand = ELFOSABI_LINUX, + .machine = EM_386, + .compat_3_brand = "Linux", + .emul_path = "/compat/linux", + .interp_path = "/lib/ld-linux.so.1", + .sysvec = &elf_linux_sysvec, + .interp_newpath = NULL, + .flags = BI_CAN_EXEC_DYN, +}; static Elf32_Brandinfo linux_glibc2brand = { - ELFOSABI_LINUX, - EM_386, - "Linux", - "/compat/linux", - "/lib/ld-linux.so.2", - &elf_linux_sysvec, - NULL, - BI_CAN_EXEC_DYN, - }; + .brand = ELFOSABI_LINUX, + .machine = EM_386, + .compat_3_brand = "Linux", + .emul_path = "/compat/linux", + .interp_path = "/lib/ld-linux.so.2", + .sysvec = &elf_linux_sysvec, + .interp_newpath = NULL, + .flags = BI_CAN_EXEC_DYN, +}; Elf32_Brandinfo *linux_brandlist[] = { - &linux_brand, - &linux_glibc2brand, - NULL - }; + &linux_brand, + &linux_glibc2brand, + NULL +}; static int linux_elf_modevent(module_t mod, int type, void *data) ==== //depot/projects/vimage-commit2/src/sys/arm/arm/elf_machdep.c#2 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/arm/elf_machdep.c,v 1.7 2007/05/22 02:22:57 kan Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/elf_machdep.c,v 1.8 2008/09/24 10:14:37 kib Exp $"); #include #include @@ -46,59 +46,60 @@ #include struct sysentvec elf32_freebsd_sysvec = { - SYS_MAXSYSCALL, - sysent, - 0, - 0, - NULL, - 0, - NULL, - NULL, - __elfN(freebsd_fixup), - sendsig, - sigcode, - &szsigcode, - NULL, - "FreeBSD ELF32", - __elfN(coredump), - NULL, - MINSIGSTKSZ, - PAGE_SIZE, - VM_MIN_ADDRESS, - VM_MAXUSER_ADDRESS, - USRSTACK, - PS_STRINGS, - VM_PROT_ALL, - exec_copyout_strings, - exec_setregs, - NULL + .sv_size = SYS_MAXSYSCALL, + .sv_table = sysent, + .sv_mask = 0, + .sv_sigsize = 0, + .sv_sigtbl = NULL, + .sv_errsize = 0, + .sv_errtbl = NULL, + .sv_transtrap = NULL, + .sv_fixup = __elfN(freebsd_fixup), + .sv_sendsig = sendsig, + .sv_sigcode = sigcode, + .sv_szsigcode = &szsigcode, + .sv_prepsyscall = NULL, + .sv_name = "FreeBSD ELF32", + .sv_coredump = __elfN(coredump), + .sv_imgact_try = NULL, + .sv_minsigstksz = MINSIGSTKSZ, + .sv_pagesize = PAGE_SIZE, + .sv_minuser = VM_MIN_ADDRESS, + .sv_maxuser = VM_MAXUSER_ADDRESS, + .sv_usrstack = USRSTACK, + .sv_psstrings = PS_STRINGS, + .sv_stackprot = VM_PROT_ALL, + .sv_copyout_strings = exec_copyout_strings, + .sv_setregs = exec_setregs, + .sv_fixlimit = NULL, + .sv_maxssiz = NULL }; static Elf32_Brandinfo freebsd_brand_info = { - ELFOSABI_FREEBSD, - EM_ARM, - "FreeBSD", - NULL, - "/libexec/ld-elf.so.1", - &elf32_freebsd_sysvec, - NULL, - BI_CAN_EXEC_DYN, - }; + .brand = ELFOSABI_FREEBSD, + .machine = EM_ARM, + .compat_3_brand = "FreeBSD", + .emul_path = NULL, + .interp_path = "/libexec/ld-elf.so.1", + .sysvec = &elf32_freebsd_sysvec, + .interp_newpath = NULL, + .flags = BI_CAN_EXEC_DYN, +}; SYSINIT(elf32, SI_SUB_EXEC, SI_ORDER_ANY, (sysinit_cfunc_t) elf32_insert_brand_entry, &freebsd_brand_info); static Elf32_Brandinfo freebsd_brand_oinfo = { - ELFOSABI_FREEBSD, - EM_ARM, - "FreeBSD", - NULL, - "/usr/libexec/ld-elf.so.1", - &elf32_freebsd_sysvec, - NULL, - BI_CAN_EXEC_DYN, - }; + .brand = ELFOSABI_FREEBSD, + .machine = EM_ARM, + .compat_3_brand = "FreeBSD", + .emul_path = NULL, + .interp_path = "/usr/libexec/ld-elf.so.1", + .sysvec = &elf32_freebsd_sysvec, + .interp_newpath = NULL, + .flags = BI_CAN_EXEC_DYN, +}; SYSINIT(oelf32, SI_SUB_EXEC, SI_ORDER_ANY, (sysinit_cfunc_t) elf32_insert_brand_entry, ==== //depot/projects/vimage-commit2/src/sys/compat/freebsd32/freebsd32_misc.c#5 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/freebsd32/freebsd32_misc.c,v 1.79 2008/09/19 15:17:32 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/freebsd32/freebsd32_misc.c,v 1.80 2008/09/25 20:50:21 jhb Exp $"); #include "opt_compat.h" @@ -2624,3 +2624,83 @@ return (error); } #endif + +int +syscall32_register(int *offset, struct sysent *new_sysent, + struct sysent *old_sysent) +{ + if (*offset == NO_SYSCALL) { + int i; + + for (i = 1; i < SYS_MAXSYSCALL; ++i) + if (freebsd32_sysent[i].sy_call == + (sy_call_t *)lkmnosys) + break; + if (i == SYS_MAXSYSCALL) + return (ENFILE); + *offset = i; + } else if (*offset < 0 || *offset >= SYS_MAXSYSCALL) + return (EINVAL); + else if (freebsd32_sysent[*offset].sy_call != (sy_call_t *)lkmnosys && + freebsd32_sysent[*offset].sy_call != (sy_call_t *)lkmressys) + return (EEXIST); + + *old_sysent = freebsd32_sysent[*offset]; + freebsd32_sysent[*offset] = *new_sysent; + return 0; +} + +int +syscall32_deregister(int *offset, struct sysent *old_sysent) +{ + + if (*offset) + freebsd32_sysent[*offset] = *old_sysent; + return 0; +} + +int +syscall32_module_handler(struct module *mod, int what, void *arg) +{ + struct syscall_module_data *data = (struct syscall_module_data*)arg; + modspecific_t ms; + int error; + + switch (what) { + case MOD_LOAD: + error = syscall32_register(data->offset, data->new_sysent, + &data->old_sysent); + if (error) { + /* Leave a mark so we know to safely unload below. */ + data->offset = NULL; + return error; + } + ms.intval = *data->offset; + MOD_XLOCK; + module_setspecific(mod, &ms); + MOD_XUNLOCK; + if (data->chainevh) + error = data->chainevh(mod, what, data->chainarg); + return (error); + case MOD_UNLOAD: + /* + * MOD_LOAD failed, so just return without calling the + * chained handler since we didn't pass along the MOD_LOAD + * event. + */ + if (data->offset == NULL) + return (0); + if (data->chainevh) { + error = data->chainevh(mod, what, data->chainarg); + if (error) + return (error); + } + error = syscall_deregister(data->offset, &data->old_sysent); + return (error); + default: + error = EOPNOTSUPP; + if (data->chainevh) + error = data->chainevh(mod, what, data->chainarg); + return (error); + } +} ==== //depot/projects/vimage-commit2/src/sys/compat/freebsd32/freebsd32_proto.h#6 (text+ko) ==== @@ -2,8 +2,8 @@ * System call prototypes. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/freebsd32/freebsd32_proto.h,v 1.91 2008/09/19 15:21:40 obrien Exp $ - * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 183188 2008-09-19 15:17:32Z obrien + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_proto.h,v 1.93 2008/09/25 20:08:36 jhb Exp $ + * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 183361 2008-09-25 20:07:42Z jhb */ #ifndef _FREEBSD32_SYSPROTO_H_ @@ -63,6 +63,11 @@ char ss_l_[PADL_(struct sigaltstack32 *)]; struct sigaltstack32 * ss; char ss_r_[PADR_(struct sigaltstack32 *)]; char oss_l_[PADL_(struct sigaltstack32 *)]; struct sigaltstack32 * oss; char oss_r_[PADR_(struct sigaltstack32 *)]; }; +struct freebsd32_ioctl_args { + char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)]; + char com_l_[PADL_(uint32_t)]; uint32_t com; char com_r_[PADR_(uint32_t)]; + char data_l_[PADL_(struct md_ioctl32 *)]; struct md_ioctl32 * data; char data_r_[PADR_(struct md_ioctl32 *)]; +}; struct freebsd32_execve_args { char fname_l_[PADL_(char *)]; char * fname; char fname_r_[PADR_(char *)]; char argv_l_[PADL_(u_int32_t *)]; u_int32_t * argv; char argv_r_[PADR_(u_int32_t *)]; @@ -383,6 +388,7 @@ int freebsd32_sendmsg(struct thread *, struct freebsd32_sendmsg_args *); int freebsd32_recvfrom(struct thread *, struct freebsd32_recvfrom_args *); int freebsd32_sigaltstack(struct thread *, struct freebsd32_sigaltstack_args *); +int freebsd32_ioctl(struct thread *, struct freebsd32_ioctl_args *); int freebsd32_execve(struct thread *, struct freebsd32_execve_args *); int freebsd32_setitimer(struct thread *, struct freebsd32_setitimer_args *); int freebsd32_getitimer(struct thread *, struct freebsd32_getitimer_args *); @@ -594,6 +600,7 @@ #define FREEBSD32_SYS_AUE_freebsd32_sendmsg AUE_SENDMSG #define FREEBSD32_SYS_AUE_freebsd32_recvfrom AUE_RECVFROM #define FREEBSD32_SYS_AUE_freebsd32_sigaltstack AUE_SIGALTSTACK +#define FREEBSD32_SYS_AUE_freebsd32_ioctl AUE_NULL #define FREEBSD32_SYS_AUE_freebsd32_execve AUE_EXECVE #define FREEBSD32_SYS_AUE_freebsd32_setitimer AUE_SETITIMER #define FREEBSD32_SYS_AUE_freebsd32_getitimer AUE_GETITIMER ==== //depot/projects/vimage-commit2/src/sys/compat/freebsd32/freebsd32_syscall.h#6 (text+ko) ==== @@ -2,8 +2,8 @@ * System call numbers. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscall.h,v 1.90 2008/09/19 15:21:40 obrien Exp $ - * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 183188 2008-09-19 15:17:32Z obrien + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscall.h,v 1.92 2008/09/25 20:08:36 jhb Exp $ + * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 183361 2008-09-25 20:07:42Z jhb */ #define FREEBSD32_SYS_syscall 0 @@ -58,7 +58,7 @@ #define FREEBSD32_SYS_acct 51 /* 52 is old freebsd32_sigpending */ #define FREEBSD32_SYS_freebsd32_sigaltstack 53 -#define FREEBSD32_SYS_ioctl 54 +#define FREEBSD32_SYS_freebsd32_ioctl 54 #define FREEBSD32_SYS_reboot 55 #define FREEBSD32_SYS_revoke 56 #define FREEBSD32_SYS_symlink 57 ==== //depot/projects/vimage-commit2/src/sys/compat/freebsd32/freebsd32_syscalls.c#6 (text+ko) ==== @@ -2,8 +2,8 @@ * System call names. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscalls.c,v 1.81 2008/09/19 15:21:40 obrien Exp $ - * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 183188 2008-09-19 15:17:32Z obrien + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscalls.c,v 1.83 2008/09/25 20:08:36 jhb Exp $ + * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 183361 2008-09-25 20:07:42Z jhb */ const char *freebsd32_syscallnames[] = { @@ -61,7 +61,7 @@ "acct", /* 51 = acct */ "compat.freebsd32_sigpending", /* 52 = old freebsd32_sigpending */ "freebsd32_sigaltstack", /* 53 = freebsd32_sigaltstack */ - "ioctl", /* 54 = ioctl */ + "freebsd32_ioctl", /* 54 = freebsd32_ioctl */ "reboot", /* 55 = reboot */ "revoke", /* 56 = revoke */ "symlink", /* 57 = symlink */ @@ -217,16 +217,16 @@ "getpgid", /* 207 = getpgid */ "#208", /* 208 = newreboot */ "poll", /* 209 = poll */ - "#210", /* 210 = */ - "#211", /* 211 = */ - "#212", /* 212 = */ - "#213", /* 213 = */ - "#214", /* 214 = */ - "#215", /* 215 = */ - "#216", /* 216 = */ - "#217", /* 217 = */ - "#218", /* 218 = */ - "#219", /* 219 = */ + "lkmnosys", /* 210 = lkmnosys */ + "lkmnosys", /* 211 = lkmnosys */ + "lkmnosys", /* 212 = lkmnosys */ + "lkmnosys", /* 213 = lkmnosys */ + "lkmnosys", /* 214 = lkmnosys */ + "lkmnosys", /* 215 = lkmnosys */ + "lkmnosys", /* 216 = lkmnosys */ + "lkmnosys", /* 217 = lkmnosys */ + "lkmnosys", /* 218 = lkmnosys */ + "lkmnosys", /* 219 = lkmnosys */ "freebsd32_semctl", /* 220 = freebsd32_semctl */ "semget", /* 221 = semget */ "semop", /* 222 = semop */ @@ -377,7 +377,7 @@ "#367", /* 367 = __cap_get_file */ "#368", /* 368 = __cap_set_fd */ "#369", /* 369 = __cap_set_file */ - "#370", /* 370 = lkmressys */ + "#370", /* 370 = nosys */ "extattr_set_fd", /* 371 = extattr_set_fd */ "extattr_get_fd", /* 372 = extattr_get_fd */ "extattr_delete_fd", /* 373 = extattr_delete_fd */ ==== //depot/projects/vimage-commit2/src/sys/compat/freebsd32/freebsd32_sysent.c#6 (text+ko) ==== @@ -2,8 +2,8 @@ * System call switch table. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/freebsd32/freebsd32_sysent.c,v 1.91 2008/09/19 15:21:40 obrien Exp $ - * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 183188 2008-09-19 15:17:32Z obrien + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_sysent.c,v 1.93 2008/09/25 20:08:36 jhb Exp $ + * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 183361 2008-09-25 20:07:42Z jhb */ #include "opt_compat.h" @@ -92,7 +92,7 @@ { AS(acct_args), (sy_call_t *)acct, AUE_ACCT, NULL, 0, 0 }, /* 51 = acct */ { compat(0,freebsd32_sigpending), AUE_SIGPENDING, NULL, 0, 0 }, /* 52 = old freebsd32_sigpending */ { AS(freebsd32_sigaltstack_args), (sy_call_t *)freebsd32_sigaltstack, AUE_SIGALTSTACK, NULL, 0, 0 }, /* 53 = freebsd32_sigaltstack */ - { AS(ioctl_args), (sy_call_t *)ioctl, AUE_IOCTL, NULL, 0, 0 }, /* 54 = ioctl */ + { AS(freebsd32_ioctl_args), (sy_call_t *)freebsd32_ioctl, AUE_NULL, NULL, 0, 0 }, /* 54 = freebsd32_ioctl */ { AS(reboot_args), (sy_call_t *)reboot, AUE_REBOOT, NULL, 0, 0 }, /* 55 = reboot */ { AS(revoke_args), (sy_call_t *)revoke, AUE_REVOKE, NULL, 0, 0 }, /* 56 = revoke */ { AS(symlink_args), (sy_call_t *)symlink, AUE_SYMLINK, NULL, 0, 0 }, /* 57 = symlink */ @@ -248,16 +248,16 @@ { AS(getpgid_args), (sy_call_t *)getpgid, AUE_GETPGID, NULL, 0, 0 }, /* 207 = getpgid */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 208 = newreboot */ { AS(poll_args), (sy_call_t *)poll, AUE_POLL, NULL, 0, 0 }, /* 209 = poll */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 210 = */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 211 = */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 212 = */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 213 = */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 214 = */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 215 = */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 216 = */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 217 = */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 218 = */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 219 = */ + { AS(nosys_args), (sy_call_t *)lkmnosys, AUE_NULL, NULL, 0, 0 }, /* 210 = lkmnosys */ + { AS(nosys_args), (sy_call_t *)lkmnosys, AUE_NULL, NULL, 0, 0 }, /* 211 = lkmnosys */ + { AS(nosys_args), (sy_call_t *)lkmnosys, AUE_NULL, NULL, 0, 0 }, /* 212 = lkmnosys */ + { AS(nosys_args), (sy_call_t *)lkmnosys, AUE_NULL, NULL, 0, 0 }, /* 213 = lkmnosys */ + { AS(nosys_args), (sy_call_t *)lkmnosys, AUE_NULL, NULL, 0, 0 }, /* 214 = lkmnosys */ + { AS(nosys_args), (sy_call_t *)lkmnosys, AUE_NULL, NULL, 0, 0 }, /* 215 = lkmnosys */ + { AS(nosys_args), (sy_call_t *)lkmnosys, AUE_NULL, NULL, 0, 0 }, /* 216 = lkmnosys */ + { AS(nosys_args), (sy_call_t *)lkmnosys, AUE_NULL, NULL, 0, 0 }, /* 217 = lkmnosys */ + { AS(nosys_args), (sy_call_t *)lkmnosys, AUE_NULL, NULL, 0, 0 }, /* 218 = lkmnosys */ + { AS(nosys_args), (sy_call_t *)lkmnosys, AUE_NULL, NULL, 0, 0 }, /* 219 = lkmnosys */ { AS(freebsd32_semctl_args), (sy_call_t *)freebsd32_semctl, AUE_SEMCTL, NULL, 0, 0 }, /* 220 = freebsd32_semctl */ { AS(semget_args), (sy_call_t *)semget, AUE_SEMGET, NULL, 0, 0 }, /* 221 = semget */ { AS(semop_args), (sy_call_t *)semop, AUE_SEMOP, NULL, 0, 0 }, /* 222 = semop */ @@ -408,7 +408,7 @@ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 367 = __cap_get_file */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 368 = __cap_set_fd */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 369 = __cap_set_file */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 370 = lkmressys */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 370 = nosys */ { AS(extattr_set_fd_args), (sy_call_t *)extattr_set_fd, AUE_EXTATTR_SET_FD, NULL, 0, 0 }, /* 371 = extattr_set_fd */ { AS(extattr_get_fd_args), (sy_call_t *)extattr_get_fd, AUE_EXTATTR_GET_FD, NULL, 0, 0 }, /* 372 = extattr_get_fd */ { AS(extattr_delete_fd_args), (sy_call_t *)extattr_delete_fd, AUE_EXTATTR_DELETE_FD, NULL, 0, 0 }, /* 373 = extattr_delete_fd */ ==== //depot/projects/vimage-commit2/src/sys/compat/freebsd32/freebsd32_util.h#2 (text+ko) ==== @@ -25,18 +25,20 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/compat/freebsd32/freebsd32_util.h,v 1.10 2005/06/29 15:16:20 jhb Exp $ + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_util.h,v 1.12 2008/09/25 20:50:21 jhb Exp $ */ +#ifndef _COMPAT_FREEBSD32_FREEBSD32_UTIL_H_ +#define _COMPAT_FREEBSD32_FREEBSD32_UTIL_H_ + +#include +#include +#include + #include #include #include - -#include -#include -#include - struct freebsd32_ps_strings { u_int32_t ps_argvstr; /* first of 0 or more argument strings */ int ps_nargvstr; /* the number of argument strings */ @@ -50,3 +52,35 @@ #define FREEBSD32_PS_STRINGS \ (FREEBSD32_USRSTACK - sizeof(struct freebsd32_ps_strings)) + +extern struct sysent freebsd32_sysent[]; + +#define SYSCALL32_MODULE(name, offset, new_sysent, evh, arg) \ +static struct syscall_module_data name##_syscall32_mod = { \ + evh, arg, offset, new_sysent, { 0, NULL } \ +}; \ + \ +static moduledata_t name##32_mod = { \ + #name, \ + syscall32_module_handler, \ + &name##_syscall32_mod \ +}; \ +DECLARE_MODULE(name##32, name##32_mod, SI_SUB_SYSCALLS, SI_ORDER_MIDDLE) + +#define SYSCALL32_MODULE_HELPER(syscallname) \ +static int syscallname##_syscall32 = FREEBSD32_SYS_##syscallname; \ +static struct sysent syscallname##_sysent32 = { \ + (sizeof(struct syscallname ## _args ) \ + / sizeof(register_t)), \ + (sy_call_t *)& syscallname \ +}; \ +SYSCALL32_MODULE(syscallname, \ + & syscallname##_syscall32, & syscallname##_sysent32,\ + NULL, NULL); + +int syscall32_register(int *offset, struct sysent *new_sysent, + struct sysent *old_sysent); +int syscall32_deregister(int *offset, struct sysent *old_sysent); +int syscall32_module_handler(struct module *mod, int what, void *arg); + +#endif /* !_COMPAT_FREEBSD32_FREEBSD32_UTIL_H_ */ ==== //depot/projects/vimage-commit2/src/sys/compat/freebsd32/syscalls.master#6 (text+ko) ==== @@ -1,4 +1,4 @@ - $FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.106 2008/09/19 15:17:32 obrien Exp $ + $FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.108 2008/09/25 20:07:42 jhb Exp $ ; from: @(#)syscalls.master 8.2 (Berkeley) 1/13/94 ; from: src/sys/kern/syscalls.master 1.107 ; @@ -33,7 +33,7 @@ ; so the SYSCALL_MODULE macro works ; NOARGS same as STD except do not create structure in sys/sysproto.h ; NODEF same as STD except only have the entry in the syscall table -; added. Meaning - do do not create structure or function +; added. Meaning - do not create structure or function ; prototype in sys/sysproto.h ; NOPROTO same as STD except do not create structure or ; function prototype in sys/sysproto.h. Does add a @@ -134,8 +134,8 @@ 53 AUE_SIGALTSTACK STD { int freebsd32_sigaltstack( \ struct sigaltstack32 *ss, \ struct sigaltstack32 *oss); } -54 AUE_IOCTL NOPROTO { int ioctl(int fd, u_long com, \ - caddr_t data); } +54 AUE_NULL STD { int freebsd32_ioctl(int fd, uint32_t com, \ + struct md_ioctl32 *data); } 55 AUE_REBOOT NOPROTO { int reboot(int opt); } 56 AUE_REVOKE NOPROTO { int revoke(char *path); } 57 AUE_SYMLINK NOPROTO { int symlink(char *path, char *link); } @@ -388,16 +388,16 @@ ; ; The following are reserved for loadable syscalls ; -210 AUE_NULL UNIMPL -211 AUE_NULL UNIMPL -212 AUE_NULL UNIMPL -213 AUE_NULL UNIMPL -214 AUE_NULL UNIMPL -215 AUE_NULL UNIMPL -216 AUE_NULL UNIMPL -217 AUE_NULL UNIMPL -218 AUE_NULL UNIMPL -219 AUE_NULL UNIMPL +210 AUE_NULL NODEF lkmnosys lkmnosys nosys_args int +211 AUE_NULL NODEF lkmnosys lkmnosys nosys_args int +212 AUE_NULL NODEF lkmnosys lkmnosys nosys_args int +213 AUE_NULL NODEF lkmnosys lkmnosys nosys_args int +214 AUE_NULL NODEF lkmnosys lkmnosys nosys_args int +215 AUE_NULL NODEF lkmnosys lkmnosys nosys_args int +216 AUE_NULL NODEF lkmnosys lkmnosys nosys_args int +217 AUE_NULL NODEF lkmnosys lkmnosys nosys_args int +218 AUE_NULL NODEF lkmnosys lkmnosys nosys_args int +219 AUE_NULL NODEF lkmnosys lkmnosys nosys_args int ; ; The following were introduced with NetBSD/4.4Lite-2 @@ -637,7 +637,7 @@ 367 AUE_NULL UNIMPL __cap_get_file 368 AUE_NULL UNIMPL __cap_set_fd 369 AUE_NULL UNIMPL __cap_set_file -370 AUE_NULL UNIMPL lkmressys +370 AUE_NULL UNIMPL nosys 371 AUE_EXTATTR_SET_FD NOPROTO { int extattr_set_fd(int fd, \ int attrnamespace, const char *attrname, \ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Sep 25 22:21:14 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1A9E0106568D; Thu, 25 Sep 2008 22:21:14 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D1AA11065686 for ; Thu, 25 Sep 2008 22:21:13 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id BF9CE8FC1A for ; Thu, 25 Sep 2008 22:21:13 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id m8PMLDN5061467 for ; Thu, 25 Sep 2008 22:21:13 GMT (envelope-from gonzo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m8PMLD1g061410 for perforce@freebsd.org; Thu, 25 Sep 2008 22:21:13 GMT (envelope-from gonzo@FreeBSD.org) Date: Thu, 25 Sep 2008 22:21:13 GMT Message-Id: <200809252221.m8PMLD1g061410@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 150473 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 25 Sep 2008 22:21:14 -0000 http://perforce.freebsd.org/chv.cgi?CH=150473 Change 150473 by gonzo@gonzo_jeeves on 2008/09/25 22:20:42 IFC @150472 Affected files ... .. //depot/projects/mips2/src/crypto/openssh/sshconnect2.c#4 integrate .. //depot/projects/mips2/src/etc/rc.d/jail#6 integrate .. //depot/projects/mips2/src/gnu/usr.bin/gdb/kgdb/kld.c#4 integrate .. //depot/projects/mips2/src/lib/libc/powerpc/gen/syncicache.c#3 integrate .. //depot/projects/mips2/src/release/i386/fixit_crunch.conf#3 integrate .. //depot/projects/mips2/src/release/pc98/fixit-small_crunch.conf#4 integrate .. //depot/projects/mips2/src/release/pc98/fixit_crunch.conf#4 integrate .. //depot/projects/mips2/src/sbin/bsdlabel/Makefile#3 integrate .. //depot/projects/mips2/src/sbin/fdisk/Makefile#2 integrate .. //depot/projects/mips2/src/share/man/man5/rc.conf.5#16 integrate .. //depot/projects/mips2/src/share/man/man5/src.conf.5#10 integrate .. //depot/projects/mips2/src/share/misc/committers-src.dot#11 integrate .. //depot/projects/mips2/src/sys/amd64/amd64/elf_machdep.c#3 integrate .. //depot/projects/mips2/src/sys/amd64/linux32/linux32_sysvec.c#8 integrate .. //depot/projects/mips2/src/sys/arm/arm/elf_machdep.c#3 integrate .. //depot/projects/mips2/src/sys/compat/freebsd32/freebsd32_misc.c#12 integrate .. //depot/projects/mips2/src/sys/compat/freebsd32/freebsd32_proto.h#15 integrate .. //depot/projects/mips2/src/sys/compat/freebsd32/freebsd32_syscall.h#15 integrate .. //depot/projects/mips2/src/sys/compat/freebsd32/freebsd32_syscalls.c#15 integrate .. //depot/projects/mips2/src/sys/compat/freebsd32/freebsd32_sysent.c#15 integrate .. //depot/projects/mips2/src/sys/compat/freebsd32/freebsd32_util.h#2 integrate .. //depot/projects/mips2/src/sys/compat/freebsd32/syscalls.master#16 integrate .. //depot/projects/mips2/src/sys/compat/ia32/ia32_sysvec.c#5 integrate .. //depot/projects/mips2/src/sys/compat/svr4/svr4_sysvec.c#7 integrate .. //depot/projects/mips2/src/sys/conf/files#29 integrate .. //depot/projects/mips2/src/sys/conf/files.i386#18 integrate .. //depot/projects/mips2/src/sys/conf/kern.pre.mk#9 integrate .. //depot/projects/mips2/src/sys/ddb/db_command.c#8 integrate .. //depot/projects/mips2/src/sys/ddb/db_command.h#3 integrate .. //depot/projects/mips2/src/sys/ddb/db_main.c#4 integrate .. //depot/projects/mips2/src/sys/dev/bm/if_bm.c#3 integrate .. //depot/projects/mips2/src/sys/dev/cxgb/common/cxgb_ael1002.c#6 integrate .. //depot/projects/mips2/src/sys/dev/cxgb/common/cxgb_common.h#7 integrate .. //depot/projects/mips2/src/sys/dev/cxgb/common/cxgb_mc5.c#5 integrate .. //depot/projects/mips2/src/sys/dev/cxgb/common/cxgb_mv88e1xxx.c#5 integrate .. //depot/projects/mips2/src/sys/dev/cxgb/common/cxgb_t3_hw.c#8 integrate .. //depot/projects/mips2/src/sys/dev/cxgb/common/cxgb_tn1010.c#2 integrate .. //depot/projects/mips2/src/sys/dev/cxgb/common/cxgb_vsc7323.c#3 integrate .. //depot/projects/mips2/src/sys/dev/cxgb/common/cxgb_vsc8211.c#6 integrate .. //depot/projects/mips2/src/sys/dev/cxgb/common/cxgb_xgmac.c#6 integrate .. //depot/projects/mips2/src/sys/dev/cxgb/cxgb_adapter.h#14 integrate .. //depot/projects/mips2/src/sys/dev/cxgb/cxgb_config.h#6 integrate .. //depot/projects/mips2/src/sys/dev/cxgb/cxgb_include.h#5 integrate .. //depot/projects/mips2/src/sys/dev/cxgb/cxgb_main.c#20 integrate .. //depot/projects/mips2/src/sys/dev/cxgb/cxgb_multiq.c#2 integrate .. //depot/projects/mips2/src/sys/dev/cxgb/cxgb_offload.c#7 integrate .. //depot/projects/mips2/src/sys/dev/cxgb/cxgb_offload.h#8 integrate .. //depot/projects/mips2/src/sys/dev/cxgb/cxgb_osdep.h#11 integrate .. //depot/projects/mips2/src/sys/dev/cxgb/cxgb_sge.c#17 integrate .. //depot/projects/mips2/src/sys/dev/cxgb/cxgb_t3fw.c#3 integrate .. //depot/projects/mips2/src/sys/dev/cxgb/sys/cxgb_support.c#5 integrate .. //depot/projects/mips2/src/sys/dev/cxgb/sys/mvec.h#5 integrate .. //depot/projects/mips2/src/sys/dev/cxgb/sys/uipc_mvec.c#6 integrate .. //depot/projects/mips2/src/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb.c#3 integrate .. //depot/projects/mips2/src/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_cm.c#2 integrate .. //depot/projects/mips2/src/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_cq.c#2 integrate .. //depot/projects/mips2/src/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_dbg.c#2 integrate .. //depot/projects/mips2/src/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_ev.c#2 integrate .. //depot/projects/mips2/src/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_hal.c#2 integrate .. //depot/projects/mips2/src/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_mem.c#2 integrate .. //depot/projects/mips2/src/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_provider.c#2 integrate .. //depot/projects/mips2/src/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_qp.c#2 integrate .. //depot/projects/mips2/src/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_resource.c#2 integrate .. //depot/projects/mips2/src/sys/dev/cxgb/ulp/toecore/toedev.c#3 integrate .. //depot/projects/mips2/src/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c#9 integrate .. //depot/projects/mips2/src/sys/dev/cxgb/ulp/tom/cxgb_cpl_socket.c#8 integrate .. //depot/projects/mips2/src/sys/dev/cxgb/ulp/tom/cxgb_ddp.c#6 integrate .. //depot/projects/mips2/src/sys/dev/cxgb/ulp/tom/cxgb_l2t.c#3 integrate .. //depot/projects/mips2/src/sys/dev/cxgb/ulp/tom/cxgb_l2t.h#2 integrate .. //depot/projects/mips2/src/sys/dev/cxgb/ulp/tom/cxgb_listen.c#5 integrate .. //depot/projects/mips2/src/sys/dev/cxgb/ulp/tom/cxgb_t3_ddp.h#4 integrate .. //depot/projects/mips2/src/sys/dev/cxgb/ulp/tom/cxgb_tcp_offload.c#3 integrate .. //depot/projects/mips2/src/sys/dev/cxgb/ulp/tom/cxgb_toepcb.h#4 integrate .. //depot/projects/mips2/src/sys/dev/cxgb/ulp/tom/cxgb_tom.c#7 integrate .. //depot/projects/mips2/src/sys/dev/cxgb/ulp/tom/cxgb_tom.h#3 integrate .. //depot/projects/mips2/src/sys/dev/cxgb/ulp/tom/cxgb_tom_sysctl.c#5 integrate .. //depot/projects/mips2/src/sys/dev/cxgb/ulp/tom/cxgb_vm.c#2 integrate .. //depot/projects/mips2/src/sys/dev/kbdmux/kbdmux.c#7 integrate .. //depot/projects/mips2/src/sys/dev/le/if_le_cbus.c#3 integrate .. //depot/projects/mips2/src/sys/dev/le/if_le_isa.c#3 integrate .. //depot/projects/mips2/src/sys/dev/le/if_le_lebuffer.c#2 integrate .. //depot/projects/mips2/src/sys/dev/le/if_le_pci.c#3 integrate .. //depot/projects/mips2/src/sys/dev/le/lebuffer_sbus.c#2 integrate .. //depot/projects/mips2/src/sys/dev/msk/if_msk.c#9 integrate .. //depot/projects/mips2/src/sys/dev/msk/if_mskreg.h#6 integrate .. //depot/projects/mips2/src/sys/dev/usb/ubsa.c#10 integrate .. //depot/projects/mips2/src/sys/dev/usb/umass.c#9 integrate .. //depot/projects/mips2/src/sys/dev/xen/netfront/netfront.c#2 integrate .. //depot/projects/mips2/src/sys/fs/tmpfs/tmpfs.h#7 integrate .. //depot/projects/mips2/src/sys/fs/tmpfs/tmpfs_subr.c#10 integrate .. //depot/projects/mips2/src/sys/fs/tmpfs/tmpfs_vnops.c#14 integrate .. //depot/projects/mips2/src/sys/i386/bios/apm.h#2 integrate .. //depot/projects/mips2/src/sys/i386/i386/bios.c#3 integrate .. //depot/projects/mips2/src/sys/i386/i386/elf_machdep.c#3 integrate .. //depot/projects/mips2/src/sys/i386/ibcs2/ibcs2_sysvec.c#3 integrate .. //depot/projects/mips2/src/sys/i386/include/param.h#3 integrate .. //depot/projects/mips2/src/sys/i386/include/smp.h#6 integrate .. //depot/projects/mips2/src/sys/i386/linux/linux_sysvec.c#8 integrate .. //depot/projects/mips2/src/sys/i386/xen/mp_machdep.c#2 integrate .. //depot/projects/mips2/src/sys/i386/xen/pmap.c#3 integrate .. //depot/projects/mips2/src/sys/i386/xen/xen_machdep.c#4 integrate .. //depot/projects/mips2/src/sys/ia64/ia64/efi.c#2 integrate .. //depot/projects/mips2/src/sys/ia64/ia64/elf_machdep.c#4 integrate .. //depot/projects/mips2/src/sys/ia64/ia64/sal.c#2 integrate .. //depot/projects/mips2/src/sys/kern/imgact_aout.c#4 integrate .. //depot/projects/mips2/src/sys/kern/init_main.c#14 integrate .. //depot/projects/mips2/src/sys/kern/init_sysent.c#14 integrate .. //depot/projects/mips2/src/sys/kern/kern_condvar.c#6 integrate .. //depot/projects/mips2/src/sys/kern/kern_intr.c#15 integrate .. //depot/projects/mips2/src/sys/kern/kern_synch.c#12 integrate .. //depot/projects/mips2/src/sys/kern/makesyscalls.sh#6 integrate .. //depot/projects/mips2/src/sys/kern/subr_witness.c#18 integrate .. //depot/projects/mips2/src/sys/kern/sys_generic.c#10 integrate .. //depot/projects/mips2/src/sys/kern/syscalls.c#14 integrate .. //depot/projects/mips2/src/sys/kern/syscalls.master#15 integrate .. //depot/projects/mips2/src/sys/kern/systrace_args.c#11 integrate .. //depot/projects/mips2/src/sys/kern/tty.c#14 integrate .. //depot/projects/mips2/src/sys/kern/tty_pts.c#8 integrate .. //depot/projects/mips2/src/sys/kern/vfs_cache.c#14 integrate .. //depot/projects/mips2/src/sys/libkern/memcmp.c#1 branch .. //depot/projects/mips2/src/sys/mips/mips/elf_machdep.c#7 integrate .. //depot/projects/mips2/src/sys/mips/mips/support.S#16 integrate .. //depot/projects/mips2/src/sys/modules/cxgb/Makefile#8 integrate .. //depot/projects/mips2/src/sys/modules/cxgb/cxgb/Makefile#7 integrate .. //depot/projects/mips2/src/sys/modules/cxgb/cxgb_t3fw/Makefile#3 integrate .. //depot/projects/mips2/src/sys/modules/cxgb/iw_cxgb/Makefile#2 integrate .. //depot/projects/mips2/src/sys/modules/cxgb/toecore/Makefile#2 integrate .. //depot/projects/mips2/src/sys/modules/cxgb/tom/Makefile#4 integrate .. //depot/projects/mips2/src/sys/net/if_stf.c#7 integrate .. //depot/projects/mips2/src/sys/net80211/ieee80211_ddb.c#6 integrate .. //depot/projects/mips2/src/sys/net80211/ieee80211_hostap.c#4 integrate .. //depot/projects/mips2/src/sys/netinet/tcp_input.c#16 integrate .. //depot/projects/mips2/src/sys/nfsclient/nfs_vnops.c#12 integrate .. //depot/projects/mips2/src/sys/powerpc/aim/machdep.c#8 integrate .. //depot/projects/mips2/src/sys/powerpc/aim/mmu_oea.c#6 integrate .. //depot/projects/mips2/src/sys/powerpc/booke/machdep.c#7 integrate .. //depot/projects/mips2/src/sys/powerpc/include/dbdma.h#2 integrate .. //depot/projects/mips2/src/sys/powerpc/include/md_var.h#7 integrate .. //depot/projects/mips2/src/sys/powerpc/include/pmap.h#4 integrate .. //depot/projects/mips2/src/sys/powerpc/include/pte.h#3 integrate .. //depot/projects/mips2/src/sys/powerpc/ofw/ofw_syscons.c#3 integrate .. //depot/projects/mips2/src/sys/powerpc/powermac/dbdma.c#2 integrate .. //depot/projects/mips2/src/sys/powerpc/powermac/dbdmavar.h#2 integrate .. //depot/projects/mips2/src/sys/powerpc/powerpc/elf_machdep.c#3 integrate .. //depot/projects/mips2/src/sys/powerpc/powerpc/syncicache.c#3 integrate .. //depot/projects/mips2/src/sys/sparc64/sparc64/elf_machdep.c#5 integrate .. //depot/projects/mips2/src/sys/sys/libkern.h#7 integrate .. //depot/projects/mips2/src/sys/sys/syscall.h#14 integrate .. //depot/projects/mips2/src/sys/sys/syscall.mk#14 integrate .. //depot/projects/mips2/src/sys/sys/sysent.h#5 integrate .. //depot/projects/mips2/src/sys/sys/sysproto.h#14 integrate .. //depot/projects/mips2/src/sys/sys/tty.h#7 integrate .. //depot/projects/mips2/src/sys/ufs/ffs/ffs_vfsops.c#13 integrate .. //depot/projects/mips2/src/sys/xen/evtchn/evtchn.c#2 integrate .. //depot/projects/mips2/src/sys/xen/gnttab.c#2 integrate .. //depot/projects/mips2/src/sys/xen/gnttab.h#2 integrate .. //depot/projects/mips2/src/sys/xen/interface/arch-x86/xen-x86_32.h#2 integrate .. //depot/projects/mips2/src/sys/xen/interface/arch-x86/xen-x86_64.h#2 integrate .. //depot/projects/mips2/src/sys/xen/interface/arch-x86/xen.h#2 integrate .. //depot/projects/mips2/src/sys/xen/interface/callback.h#2 integrate .. //depot/projects/mips2/src/sys/xen/interface/domctl.h#2 integrate .. //depot/projects/mips2/src/sys/xen/interface/features.h#2 integrate .. //depot/projects/mips2/src/sys/xen/interface/grant_table.h#2 integrate .. //depot/projects/mips2/src/sys/xen/interface/memory.h#2 integrate .. //depot/projects/mips2/src/sys/xen/interface/physdev.h#2 integrate .. //depot/projects/mips2/src/sys/xen/interface/vcpu.h#2 integrate .. //depot/projects/mips2/src/tools/build/options/WITHOUT_BSNMP#1 branch .. //depot/projects/mips2/src/tools/build/options/WITHOUT_FLOPPY#1 branch .. //depot/projects/mips2/src/tools/build/options/WITHOUT_NETGRAPH_SUPPORT#1 branch .. //depot/projects/mips2/src/tools/build/options/WITHOUT_WIRELESS_SUPPORT#1 branch .. //depot/projects/mips2/src/tools/tools/nanobsd/nanobsd.sh#14 integrate .. //depot/projects/mips2/src/usr.bin/Makefile#18 integrate .. //depot/projects/mips2/src/usr.sbin/syslogd/syslogd.8#3 integrate .. //depot/projects/mips2/src/usr.sbin/syslogd/syslogd.c#8 integrate .. //depot/projects/mips2/src/usr.sbin/timed/timed/globals.h#3 integrate Differences ... ==== //depot/projects/mips2/src/crypto/openssh/sshconnect2.c#4 (text+ko) ==== @@ -386,8 +386,9 @@ if (options.log_level >= SYSLOG_LEVEL_INFO) { if (len > 65536) len = 65536; - msg = xmalloc(len * 4); /* max expansion from strnvis() */ + msg = xmalloc(len * 4 + 1); /* max expansion from strnvis() */ strnvis(msg, raw, len * 4, VIS_SAFE|VIS_OCTAL); + msg[len*4] = '\0'; fprintf(stderr, "%s", msg); xfree(msg); } ==== //depot/projects/mips2/src/etc/rc.d/jail#6 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/jail,v 1.39 2008/09/16 20:18:25 thompsa Exp $ +# $FreeBSD: src/etc/rc.d/jail,v 1.40 2008/09/24 15:18:27 ru Exp $ # # PROVIDE: jail @@ -39,6 +39,7 @@ _procdir="${_rootdir}/proc" eval _hostname=\"\$jail_${_j}_hostname\" eval _ip=\"\$jail_${_j}_ip\" + eval _netmask=\"\${jail_${_j}_netmask:-255.255.255.255}\" eval _interface=\"\${jail_${_j}_interface:-${jail_interface}}\" eval _exec=\"\$jail_${_j}_exec\" eval _exec_start=\"\${jail_${_j}_exec_start:-${jail_exec_start}}\" @@ -93,6 +94,7 @@ debug "$_j mount enable: $_mount" debug "$_j hostname: $_hostname" debug "$_j ip: $_ip" + debug "$_j netmask: $_netmask" debug "$_j interface: $_interface" debug "$_j fib: $_fib" debug "$_j root: $_rootdir" @@ -297,7 +299,7 @@ continue; fi if [ -n "${_interface}" ]; then - ifconfig ${_interface} alias ${_ip} netmask 255.255.255.255 + ifconfig ${_interface} alias ${_ip} netmask ${_netmask} fi if [ -n "${_fib}" ]; then _setfib="setfib -F '${_fib}'" ==== //depot/projects/mips2/src/gnu/usr.bin/gdb/kgdb/kld.c#4 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/gnu/usr.bin/gdb/kgdb/kld.c,v 1.9 2008/04/29 20:32:45 jhb Exp $"); +__FBSDID("$FreeBSD: src/gnu/usr.bin/gdb/kgdb/kld.c,v 1.10 2008/09/25 19:32:03 jhb Exp $"); #include #include @@ -37,6 +37,7 @@ #include #include #include +#include #include #include #include @@ -196,39 +197,14 @@ return (0); } -struct add_section_info { - struct section_addr_info *section_addrs; - int sect_index; - CORE_ADDR base_addr; -}; - static void -add_section (bfd *bfd, asection *sect, void *arg) -{ - struct add_section_info *asi = arg; - CORE_ADDR address; - char *name; - - /* Ignore non-resident sections. */ - if ((bfd_get_section_flags(bfd, sect) & (SEC_ALLOC | SEC_LOAD)) == 0) - return; - - name = xstrdup(bfd_get_section_name(bfd, sect)); - make_cleanup(xfree, name); - address = asi->base_addr + bfd_get_section_vma(bfd, sect); - asi->section_addrs->other[asi->sect_index].name = name; - asi->section_addrs->other[asi->sect_index].addr = address; - asi->section_addrs->other[asi->sect_index].sectindex = sect->index; - printf_unfiltered("\t%s_addr = %s\n", name, local_hex_string(address)); - asi->sect_index++; -} - -static void load_kld (char *path, CORE_ADDR base_addr, int from_tty) { - struct add_section_info asi; + struct section_addr_info *sap; + struct section_table *sections, *sections_end, *s; struct cleanup *cleanup; bfd *bfd; + int i; /* Open the kld. */ bfd = bfd_openr(path, gnutarget); @@ -244,19 +220,30 @@ if (bfd_get_section_by_name (bfd, ".text") == NULL) error("\"%s\": can't find text section", path); + /* Build a section table from the bfd and relocate the sections. */ + if (build_section_table (bfd, §ions, §ions_end)) + error("\"%s\": can't find file sections", path); + cleanup = make_cleanup(xfree, sections); + for (s = sections; s < sections_end; s++) { + s->addr += base_addr; + s->endaddr += base_addr; + } + + /* Build a section addr info to pass to symbol_file_add(). */ + sap = build_section_addr_info_from_section_table (sections, + sections_end); + cleanup = make_cleanup((make_cleanup_ftype *)free_section_addr_info, + sap); + printf_unfiltered("add symbol table from file \"%s\" at\n", path); + for (i = 0; i < sap->num_sections; i++) + printf_unfiltered("\t%s_addr = %s\n", sap->other[i].name, + local_hex_string(sap->other[i].addr)); - /* Build a section table for symbol_file_add() from the bfd sections. */ - asi.section_addrs = alloc_section_addr_info(bfd_count_sections(bfd)); - cleanup = make_cleanup(xfree, asi.section_addrs); - asi.sect_index = 0; - asi.base_addr = base_addr; - bfd_map_over_sections(bfd, add_section, &asi); - if (from_tty && (!query("%s", ""))) error("Not confirmed."); - symbol_file_add(path, from_tty, asi.section_addrs, 0, OBJF_USERLOADED); + symbol_file_add(path, from_tty, sap, 0, OBJF_USERLOADED); do_cleanups(cleanup); } ==== //depot/projects/mips2/src/lib/libc/powerpc/gen/syncicache.c#3 (text+ko) ==== @@ -1,4 +1,4 @@ -/* +/*- * Copyright (C) 1995-1997, 1999 Wolfgang Solfrank. * Copyright (C) 1995-1997, 1999 TooLs GmbH. * All rights reserved. @@ -33,7 +33,7 @@ #ifndef lint static const char rcsid[] = - "$FreeBSD: src/lib/libc/powerpc/gen/syncicache.c,v 1.4 2007/06/10 16:32:08 marcel Exp $"; + "$FreeBSD: src/lib/libc/powerpc/gen/syncicache.c,v 1.6 2008/09/24 01:06:11 nwhitehorn Exp $"; #endif /* not lint */ #include @@ -47,28 +47,27 @@ #include #include -#if defined(_KERNEL) || defined(_STANDALONE) -#ifndef CACHELINESIZE -#error "Must know the size of a cache line" +#ifdef _STANDALONE +int cacheline_size = 32; #endif -#else + +#if !defined(_KERNEL) && !defined(_STANDALONE) #include +int cacheline_size = 0; + static void getcachelinesize(void); -static int _cachelinesize; -#define CACHELINESIZE _cachelinesize - static void getcachelinesize() { static int cachemib[] = { CTL_MACHDEP, CPU_CACHELINE }; int clen; - clen = sizeof(_cachelinesize); + clen = sizeof(cacheline_size); if (sysctl(cachemib, sizeof(cachemib) / sizeof(cachemib[0]), - &_cachelinesize, &clen, NULL, 0) < 0 || !_cachelinesize) { + &cacheline_size, &clen, NULL, 0) < 0 || !cacheline_size) { abort(); } } @@ -81,21 +80,24 @@ char *p; #if !defined(_KERNEL) && !defined(_STANDALONE) - if (!_cachelinesize) + if (!cacheline_size) getcachelinesize(); #endif - off = (u_int)from & (CACHELINESIZE - 1); + + off = (u_int)from & (cacheline_size - 1); l = len += off; p = (char *)from - off; + do { __asm __volatile ("dcbst 0,%0" :: "r"(p)); - p += CACHELINESIZE; - } while ((l -= CACHELINESIZE) > 0); + p += cacheline_size; + } while ((l -= cacheline_size) > 0); __asm __volatile ("sync"); p = (char *)from - off; do { __asm __volatile ("icbi 0,%0" :: "r"(p)); - p += CACHELINESIZE; - } while ((len -= CACHELINESIZE) > 0); + p += cacheline_size; + } while ((len -= cacheline_size) > 0); __asm __volatile ("sync; isync"); } + ==== //depot/projects/mips2/src/release/i386/fixit_crunch.conf#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/release/i386/fixit_crunch.conf,v 1.16 2007/07/02 14:01:43 kensmith Exp $ +# $FreeBSD: src/release/i386/fixit_crunch.conf,v 1.17 2008/09/25 12:25:54 nyan Exp $ buildopts -DRELEASE_CRUNCH @@ -46,4 +46,4 @@ progs chroot ln chown chgrp -libs -ledit -lgeom -lkiconv -lkvm -lncurses -lutil +libs -ledit -lgeom -lbsdxml -lsbuf -lkiconv -lkvm -lncurses -lutil ==== //depot/projects/mips2/src/release/pc98/fixit-small_crunch.conf#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/release/pc98/fixit-small_crunch.conf,v 1.10 2008/05/13 11:51:19 nyan Exp $ +# $FreeBSD: src/release/pc98/fixit-small_crunch.conf,v 1.11 2008/09/25 12:25:54 nyan Exp $ buildopts -DRELEASE_CRUNCH @@ -26,7 +26,6 @@ progs clri progs dmesg progs fdisk -progs mknod progs mount progs mount_cd9660 progs mount_msdosfs @@ -37,11 +36,8 @@ special fdisk srcdir /usr/src/sbin/fdisk_pc98 -srcdirs /usr/src/usr.bin -progs ftp - srcdirs /usr/src/usr.sbin progs chown ln chown chgrp -libs -ledit -lgeom -lkiconv -lkvm -lncurses -lutil +libs -lgeom -lbsdxml -lsbuf -lkiconv -lkvm -lncurses -lutil ==== //depot/projects/mips2/src/release/pc98/fixit_crunch.conf#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/release/pc98/fixit_crunch.conf,v 1.16 2008/05/11 14:25:24 nyan Exp $ +# $FreeBSD: src/release/pc98/fixit_crunch.conf,v 1.17 2008/09/25 12:25:54 nyan Exp $ buildopts -DRELEASE_CRUNCH @@ -26,7 +26,6 @@ progs clri progs dmesg progs fdisk -progs mknod progs mount progs mount_cd9660 progs mount_msdosfs @@ -45,4 +44,4 @@ progs chown ln chown chgrp -libs -ledit -lgeom -lkiconv -lkvm -lncurses -lutil +libs -ledit -lgeom -lbsdxml -lsbuf -lkiconv -lkvm -lncurses -lutil ==== //depot/projects/mips2/src/sbin/bsdlabel/Makefile#3 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.2 (Berkeley) 3/17/94 -# $FreeBSD: src/sbin/bsdlabel/Makefile,v 1.20 2006/08/22 07:51:09 ru Exp $ +# $FreeBSD: src/sbin/bsdlabel/Makefile,v 1.21 2008/09/23 13:12:51 ru Exp $ .PATH: ${.CURDIR}/../../sys/geom @@ -13,8 +13,8 @@ MLINKS= bsdlabel.8 disklabel.8 .endif -DPADD= ${LIBGEOM} -LDADD= -lgeom +DPADD= ${LIBGEOM} ${LIBBSDXML} ${LIBSBUF} +LDADD= -lgeom -lbsdxml -lsbuf .include ==== //depot/projects/mips2/src/sbin/fdisk/Makefile#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sbin/fdisk/Makefile,v 1.12 2005/07/15 08:02:51 phk Exp $ +# $FreeBSD: src/sbin/fdisk/Makefile,v 1.13 2008/09/23 13:12:51 ru Exp $ PROG= fdisk SRCS= fdisk.c geom_mbr_enc.c @@ -7,8 +7,8 @@ .PATH: ${.CURDIR}/../../sys/geom -DPADD += ${LIBGEOM} -LDADD += -lgeom +DPADD+= ${LIBGEOM} ${LIBBSDXML} ${LIBSBUF} +LDADD+= -lgeom -lbsdxml -lsbuf .include ==== //depot/projects/mips2/src/share/man/man5/rc.conf.5#16 (text+ko) ==== @@ -22,9 +22,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man5/rc.conf.5,v 1.347 2008/09/19 15:27:37 thompsa Exp $ +.\" $FreeBSD: src/share/man/man5/rc.conf.5,v 1.349 2008/09/24 21:07:11 des Exp $ .\" -.Dd September 16, 2008 +.Dd September 24, 2008 .Dt RC.CONF 5 .Os .Sh NAME @@ -3116,16 +3116,6 @@ If set to .Dq Li YES , load System V IPC primitives at boot time. -.It Va kernel_symlink_enable -.Pq Vt bool -Set to -.Dq Li YES -to symbolicly link -.Pa /boot/kernel -to the directory that contains the kernel you booted from, -unless -.Pa /boot/kernel -already exists and is not a symbolic link. .It Va clear_tmp_enable .Pq Vt bool Set to @@ -3450,6 +3440,12 @@ Unset by default. When set, sets the interface to use when setting IP address alias. Note that the alias is created at jail startup and removed at jail shutdown. +.It Va jail_ Ns Ao Ar jname Ac Ns Va _netmask +.Pq Vt str +Set to +.Li 255.255.255.255 +by default. +This is the IP netmask to use when setting IP address alias. .It Va jail_ Ns Ao Ar jname Ac Ns Va _fib .Pq Vt str Unset by default. ==== //depot/projects/mips2/src/share/man/man5/src.conf.5#10 (text) ==== @@ -1,7 +1,7 @@ .\" DO NOT EDIT-- this file is automatically generated. .\" from FreeBSD: head/tools/build/options/makeman 174548 2007-12-12 16:39:32Z ru -.\" $FreeBSD: src/share/man/man5/src.conf.5,v 1.30 2008/06/25 21:42:23 ru Exp $ -.Dd June 26, 2008 +.\" $FreeBSD: src/share/man/man5/src.conf.5,v 1.31 2008/09/23 16:18:15 sam Exp $ +.Dd September 23, 2008 .Dt SRC.CONF 5 .Os .Sh NAME @@ -77,17 +77,39 @@ The following list provides a name and short description for variables that can be used for source builds. .Bl -tag -width indent +.It Va WITHOUT_ACCT +.\" from FreeBSD: head/tools/build/options/WITHOUT_ACCT 183242 2008-09-21 22:02:26Z sam +Set to not build process accounting tools such as +.Xr ac 8 +and +.Xr accton 8 . .It Va WITHOUT_ACPI .\" from FreeBSD: head/tools/build/options/WITHOUT_ACPI 156932 2006-03-21 07:50:50Z ru Set to not build .Xr acpiconf 8 , .Xr acpidump 8 and related programs. +.It Va WITHOUT_AMD +.\" from FreeBSD: head/tools/build/options/WITHOUT_AMD 183242 2008-09-21 22:02:26Z sam +Set to not build +.Xr amd 8 , +and related programs. +.It Va WITHOUT_APM +.\" from FreeBSD: head/tools/build/options/WITHOUT_APM 183242 2008-09-21 22:02:26Z sam +Set to not build +.Xr apm 8 , +.Xr apmd 8 +and related programs. .It Va WITHOUT_ASSERT_DEBUG .\" from FreeBSD: head/tools/build/options/WITHOUT_ASSERT_DEBUG 162215 2006-09-11 13:55:27Z ru Set to compile programs and libraries without the .Xr assert 3 checks. +.It Va WITHOUT_AT +.\" from FreeBSD: head/tools/build/options/WITHOUT_AT 183242 2008-09-21 22:02:26Z sam +Set to not build +.Xr at 1 +and related utilities. .It Va WITHOUT_ATM .\" from FreeBSD: head/tools/build/options/WITHOUT_ATM 156932 2006-03-21 07:50:50Z ru Set to not build @@ -178,6 +200,11 @@ .\" from FreeBSD: head/tools/build/options/WITHOUT_BSD_CPIO 179813 2008-06-16 05:48:15Z dougb Set to not build the BSD licensed version of cpio based on .Xr libarchive 3 . +.It Va WITHOUT_BSNMP +.\" from FreeBSD: head/tools/build/options/WITHOUT_BSNMP 183306 2008-09-23 16:15:42Z sam +Set to not build or install +.Xr bsnmpd 1 +and related libraries and data files. .It Va WITHOUT_BZIP2 .\" from FreeBSD: head/tools/build/options/WITHOUT_BZIP2 174550 2007-12-12 16:43:17Z ru Set to not build contributed bzip2 software as a part of the base system. @@ -229,6 +256,11 @@ .It .Va WITHOUT_OPENSSL .El +.It Va WITHOUT_CTM +.\" from FreeBSD: head/tools/build/options/WITHOUT_CTM 183242 2008-09-21 22:02:26Z sam +Set to not build +.Xr ctm 1 +and related utilities. .It Va WITHOUT_CVS .\" from FreeBSD: head/tools/build/options/WITHOUT_CVS 156932 2006-03-21 07:50:50Z ru Set to not build CVS. @@ -251,6 +283,10 @@ .\" from FreeBSD: head/tools/build/options/WITHOUT_EXAMPLES 156938 2006-03-21 09:06:24Z ru Set to avoid installing examples to .Pa /usr/share/examples/ . +.It Va WITHOUT_FLOPPY +.\" from FreeBSD: head/tools/build/options/WITHOUT_FLOPPY 183306 2008-09-23 16:15:42Z sam +Set to not build or install programs +for operating floppy disk driver. .It Va WITHOUT_FORTH .\" from FreeBSD: head/tools/build/options/WITHOUT_FORTH 156932 2006-03-21 07:50:50Z ru Set to build bootloaders without Forth support. @@ -259,6 +295,10 @@ Set to build .Nm libc without floating-point support. +.It Va WITHOUT_FREEBSD_UPDATE +.\" from FreeBSD: head/tools/build/options/WITHOUT_FREEBSD_UPDATE 183242 2008-09-21 22:02:26Z sam +Set to not build +.Xr freebsd-update 8 . .It Va WITHOUT_GAMES .\" from FreeBSD: head/tools/build/options/WITHOUT_GAMES 156932 2006-03-21 07:50:50Z ru Set to not build games. @@ -348,6 +388,9 @@ .It Va WITHOUT_IPFILTER .\" from FreeBSD: head/tools/build/options/WITHOUT_IPFILTER 156932 2006-03-21 07:50:50Z ru Set to not build IP Filter package. +.It Va WITHOUT_IPFW +.\" from FreeBSD: head/tools/build/options/WITHOUT_IPFW 183242 2008-09-21 22:02:26Z sam +Set to not build IPFW tools. .It Va WITHOUT_IPX .\" from FreeBSD: head/tools/build/options/WITHOUT_IPX 156932 2006-03-21 07:50:50Z ru Set to not build programs and libraries related to IPX networking. @@ -362,6 +405,10 @@ .It Va WITHOUT_IPX_SUPPORT .\" from FreeBSD: head/tools/build/options/WITHOUT_IPX_SUPPORT 156932 2006-03-21 07:50:50Z ru Set to build some programs without IPX support. +.It Va WITHOUT_JAIL +.\" from FreeBSD: head/tools/build/options/WITHOUT_JAIL 183242 2008-09-21 22:02:26Z sam +Set to not build tools for the support of jails; e.g. +.Xr jail 8 . .It Va WITHOUT_KERBEROS .\" from FreeBSD: head/tools/build/options/WITHOUT_KERBEROS 174549 2007-12-12 16:42:03Z ru Set this if you do not want to build Kerberos 5 (KTH Heimdal). @@ -403,6 +450,12 @@ Set to build some programs without optional .Nm libkvm support. +.It Va WITHOUT_LEGACY_CONSOLE +.\" from FreeBSD: head/tools/build/options/WITHOUT_LEGACY_CONSOLE 183242 2008-09-21 22:02:26Z sam +Set to not build programs that support a legacy PC console; e.g. +.Xr kbdcontrol 8 +and +.Xr vidcontrol 8 . .It Va WITHOUT_LIB32 .\" from FreeBSD: head/tools/build/options/WITHOUT_LIB32 156932 2006-03-21 07:50:50Z ru On amd64, set to not build 32-bit library set and a @@ -465,16 +518,37 @@ .\" from FreeBSD: head/tools/build/options/WITHOUT_LOCALES 156932 2006-03-21 07:50:50Z ru Set to not build localization files; see .Xr locale 1 . +.It Va WITHOUT_LOCATE +.\" from FreeBSD: head/tools/build/options/WITHOUT_LOCATE 183242 2008-09-21 22:02:26Z sam +Set to not build +.Xr locate 1 +and related programs. .It Va WITHOUT_LPR .\" from FreeBSD: head/tools/build/options/WITHOUT_LPR 156932 2006-03-21 07:50:50Z ru Set to not build .Xr lpr 1 and related programs. +.It Va WITHOUT_MAIL +.\" from FreeBSD: head/tools/build/options/WITHOUT_MAIL 183242 2008-09-21 22:02:26Z sam +Set to not build any mail support (MUA or MTA). +When set, it also enforces the following options: +.Pp +.Bl -item -compact +.It +.Va WITHOUT_MAILWRAPPER +.It +.Va WITHOUT_SENDMAIL +.El .It Va WITHOUT_MAILWRAPPER .\" from FreeBSD: head/tools/build/options/WITHOUT_MAILWRAPPER 156932 2006-03-21 07:50:50Z ru Set to not build the .Xr mailwrapper 8 MTA selector. +.It Va WITHOUT_MAKE +.\" from FreeBSD: head/tools/build/options/WITHOUT_MAKE 183242 2008-09-21 22:02:26Z sam +Set to not install +.Xr make 1 +and related support files. .It Va WITHOUT_MAN .\" from FreeBSD: head/tools/build/options/WITHOUT_MAN 156932 2006-03-21 07:50:50Z ru Set to not build manual pages. @@ -482,11 +556,28 @@ .\" from FreeBSD: head/tools/build/options/WITHOUT_NCP 156932 2006-03-21 07:50:50Z ru Set to not build programs, libraries, and kernel modules related to NetWare Core protocol. +.It Va WITHOUT_NDIS +.\" from FreeBSD: head/tools/build/options/WITHOUT_NDIS 183242 2008-09-21 22:02:26Z sam +Set to not build programs and libraries +related to NDIS emulation support. .It Va WITHOUT_NETCAT .\" from FreeBSD: head/tools/build/options/WITHOUT_NETCAT 156932 2006-03-21 07:50:50Z ru Set to not build .Xr nc 1 utility. +.It Va WITHOUT_NETGRAPH +.\" from FreeBSD: head/tools/build/options/WITHOUT_NETGRAPH 183242 2008-09-21 22:02:26Z sam +Set to not build applications to support +.Xr netgraph 4 . +When set, it also enforces the following options: +.Pp +.Bl -item -compact +.It +.Va WITHOUT_NETGRAPH_SUPPORT +.El +.It Va WITHOUT_NETGRAPH_SUPPORT +.\" from FreeBSD: head/tools/build/options/WITHOUT_NETGRAPH_SUPPORT 183305 2008-09-23 16:11:15Z sam +Set to build libraries, programs, and kernel modules without netgraph support. .It Va WITHOUT_NIS .\" from FreeBSD: head/tools/build/options/WITHOUT_NIS 156932 2006-03-21 07:50:50Z ru Set to not build @@ -512,6 +603,11 @@ The generic caching daemon, .Xr nscd 8 , will not be built either if this option is set. +.It Va WITHOUT_NTP +.\" from FreeBSD: head/tools/build/options/WITHOUT_NTP 183242 2008-09-21 22:02:26Z sam +Set to not build +.Xr ntpd 8 +and related programs. .It Va WITHOUT_OBJC .\" from FreeBSD: head/tools/build/options/WITHOUT_OBJC 156932 2006-03-21 07:50:50Z ru Set to not build Objective C support. @@ -562,9 +658,34 @@ .It .Va WITHOUT_AUTHPF .El +.It Va WITHOUT_PKGTOOLS +.\" from FreeBSD: head/tools/build/options/WITHOUT_PKGTOOLS 183242 2008-09-21 22:02:26Z sam +Set to not build +.Xr pkg_add 8 +and related programs. +.It Va WITHOUT_PMC +.\" from FreeBSD: head/tools/build/options/WITHOUT_PMC 183242 2008-09-21 22:02:26Z sam +Set to not build +.Xr pmccontrol 8 +and related programs. +.It Va WITHOUT_PORTSNAP +.\" from FreeBSD: head/tools/build/options/WITHOUT_PORTSNAP 183242 2008-09-21 22:02:26Z sam +Set to not build or install +.Xr portsnap 8 +and related files. +.It Va WITHOUT_PPP +.\" from FreeBSD: head/tools/build/options/WITHOUT_PPP 183242 2008-09-21 22:02:26Z sam +Set to not build +.Xr ppp 8 +and related programs. .It Va WITHOUT_PROFILE .\" from FreeBSD: head/tools/build/options/WITHOUT_PROFILE 156932 2006-03-21 07:50:50Z ru Set to avoid compiling profiled libraries. +.It Va WITHOUT_QUOTAS +.\" from FreeBSD: head/tools/build/options/WITHOUT_QUOTAS 183242 2008-09-21 22:02:26Z sam +Set to not build +.Xr quota 8 +and related programs. .It Va WITHOUT_RCMDS .\" from FreeBSD: head/tools/build/options/WITHOUT_RCMDS 156932 2006-03-21 07:50:50Z ru Disable building of the @@ -583,6 +704,11 @@ .\" from FreeBSD: head/tools/build/options/WITHOUT_RESCUE 156932 2006-03-21 07:50:50Z ru Set to not build .Xr rescue 8 . +.It Va WITHOUT_ROUTED +.\" from FreeBSD: head/tools/build/options/WITHOUT_ROUTED 183242 2008-09-21 22:02:26Z sam +Set to not build +.Xr routed 8 +utility. .It Va WITHOUT_SENDMAIL .\" from FreeBSD: head/tools/build/options/WITHOUT_SENDMAIL 156932 2006-03-21 07:50:50Z ru Set to not build @@ -598,6 +724,11 @@ Set to not build the .Bx 4.4 legacy docs. +.It Va WITHOUT_SLIP +.\" from FreeBSD: head/tools/build/options/WITHOUT_SLIP 183242 2008-09-21 22:02:26Z sam +Set to not build +.Xr sliplogin 8 +and related programs. .It Va WITHOUT_SSP .\" from FreeBSD: head/tools/build/options/WITHOUT_SSP 180012 2008-06-25 21:33:28Z ru Set to not build world with propolice stack smashing protection. @@ -609,12 +740,32 @@ Set to not build .Xr syscons 4 support files such as keyboard maps, fonts, and screen output maps. +.It Va WITHOUT_SYSINSTALL +.\" from FreeBSD: head/tools/build/options/WITHOUT_SYSINSTALL 183242 2008-09-21 22:02:26Z sam +Set to not build +.Xr sysinstall 8 +and related programs. .It Va WITHOUT_TCSH .\" from FreeBSD: head/tools/build/options/WITHOUT_TCSH 156932 2006-03-21 07:50:50Z ru Set to not build and install .Pa /bin/csh (which is .Xr tcsh 1 ) . +.It Va WITHOUT_TELNET +.\" from FreeBSD: head/tools/build/options/WITHOUT_TELNET 183242 2008-09-21 22:02:26Z sam +Set to not build +.Xr telnet 8 +and related programs. +.It Va WITHOUT_TEXTPROC +.\" from FreeBSD: head/tools/build/options/WITHOUT_TEXTPROC 183242 2008-09-21 22:02:26Z sam +Set to not build +programs used for text processing. +When set, it also enforces the following options: +.Pp +.Bl -item -compact +.It +.Va WITHOUT_GROFF +.El .It Va WITHOUT_TOOLCHAIN .\" from FreeBSD: head/tools/build/options/WITHOUT_TOOLCHAIN 174550 2007-12-12 16:43:17Z ru Set to not install @@ -632,6 +783,22 @@ .It Va WITHOUT_USB .\" from FreeBSD: head/tools/build/options/WITHOUT_USB 156932 2006-03-21 07:50:50Z ru Set to not build USB-related programs and libraries. +.It Va WITHOUT_WIRELESS +.\" from FreeBSD: head/tools/build/options/WITHOUT_WIRELESS 183242 2008-09-21 22:02:26Z sam +Set to not build programs used for 802.11 wireless networks; especially +.Xr wpa_supplicant 8 +and +.Xr hostapd 8 . +When set, it also enforces the following options: +.Pp +.Bl -item -compact +.It +.Va WITHOUT_WIRELESS_SUPPORT +.El +.It Va WITHOUT_WIRELESS_SUPPORT +.\" from FreeBSD: head/tools/build/options/WITHOUT_WIRELESS_SUPPORT 183305 2008-09-23 16:11:15Z sam +Set to build libraries, programs, and kernel modules without +802.11 wireless support. .It Va WITHOUT_WPA_SUPPLICANT_EAPOL .\" from FreeBSD: head/tools/build/options/WITHOUT_WPA_SUPPLICANT_EAPOL 156932 2006-03-21 07:50:50Z ru Build ==== //depot/projects/mips2/src/share/misc/committers-src.dot#11 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/share/misc/committers-src.dot,v 1.85 2008/09/18 17:32:13 zec Exp $ +# $FreeBSD: src/share/misc/committers-src.dot,v 1.86 2008/09/22 21:53:00 rnoland Exp $ # This file is meant to list all FreeBSD src committers and describe the # mentor-mentee relationships between them. @@ -148,6 +148,7 @@ remko [label="Remko Lodder\nremko@FreeBSD.org\n2007/02/23"] rik [label="Roman Kurakin\nrik@FreeBSD.org\n2003/12/18"] rink [label="Rink Springer\nrink@FreeBSD.org\n2006/01/16"] +rnoland [label="Robert Noland\nrnoland@FreeBSD.org\n2008/09/15"] roberto [label="Ollivier Robert\nroberto@FreeBSD.org\n1995/02/22"] rpaulo [label="Rui Paulo\nrpaulo@FreeBSD.org\n2007/09/25"] rrs [label="Randall R Stewart\nrrs@FreeBSD.org\n2007/02/08"] @@ -292,6 +293,7 @@ jhb -> arr jhb -> jeff jhb -> kbyanc +jhb -> rnoland jkh -> imp jkh -> jlemon ==== //depot/projects/mips2/src/sys/amd64/amd64/elf_machdep.c#3 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/elf_machdep.c,v 1.26 2007/05/22 02:22:57 kan Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/elf_machdep.c,v 1.27 2008/09/24 10:14:37 kib Exp $"); #include #include @@ -46,59 +46,60 @@ #include struct sysentvec elf64_freebsd_sysvec = { - SYS_MAXSYSCALL, - sysent, - 0, - 0, - NULL, - 0, - NULL, - NULL, - __elfN(freebsd_fixup), - sendsig, - sigcode, - &szsigcode, - NULL, - "FreeBSD ELF64", - __elfN(coredump), - NULL, - MINSIGSTKSZ, - PAGE_SIZE, - VM_MIN_ADDRESS, - VM_MAXUSER_ADDRESS, - USRSTACK, - PS_STRINGS, - VM_PROT_ALL, - exec_copyout_strings, - exec_setregs, - NULL + .sv_size = SYS_MAXSYSCALL, + .sv_table = sysent, + .sv_mask = 0, + .sv_sigsize = 0, + .sv_sigtbl = NULL, + .sv_errsize = 0, + .sv_errtbl = NULL, + .sv_transtrap = NULL, + .sv_fixup = __elfN(freebsd_fixup), + .sv_sendsig = sendsig, + .sv_sigcode = sigcode, + .sv_szsigcode = &szsigcode, + .sv_prepsyscall = NULL, + .sv_name = "FreeBSD ELF64", + .sv_coredump = __elfN(coredump), + .sv_imgact_try = NULL, + .sv_minsigstksz = MINSIGSTKSZ, + .sv_pagesize = PAGE_SIZE, + .sv_minuser = VM_MIN_ADDRESS, + .sv_maxuser = VM_MAXUSER_ADDRESS, + .sv_usrstack = USRSTACK, + .sv_psstrings = PS_STRINGS, + .sv_stackprot = VM_PROT_ALL, + .sv_copyout_strings = exec_copyout_strings, + .sv_setregs = exec_setregs, + .sv_fixlimit = NULL, + .sv_maxssiz = NULL }; static Elf64_Brandinfo freebsd_brand_info = { - ELFOSABI_FREEBSD, >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Sep 25 23:29:23 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AA4531065690; Thu, 25 Sep 2008 23:29:23 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 6E9591065687 for ; Thu, 25 Sep 2008 23:29:23 +0000 (UTC) (envelope-from bz@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 5FAAD8FC25 for ; Thu, 25 Sep 2008 23:29:23 +0000 (UTC) (envelope-from bz@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id m8PNTNNX016597 for ; Thu, 25 Sep 2008 23:29:23 GMT (envelope-from bz@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m8PNTNSn016595 for perforce@freebsd.org; Thu, 25 Sep 2008 23:29:23 GMT (envelope-from bz@freebsd.org) Date: Thu, 25 Sep 2008 23:29:23 GMT Message-Id: <200809252329.m8PNTNSn016595@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bz@freebsd.org using -f From: "Bjoern A. Zeeb" To: Perforce Change Reviews Cc: Subject: PERFORCE change 150475 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 25 Sep 2008 23:29:23 -0000 http://perforce.freebsd.org/chv.cgi?CH=150475 Change 150475 by bz@bz_dumpster on 2008/09/25 23:28:40 Keep the order of TUNABLE and SYSCTL so the files do not differ. Affected files ... .. //depot/projects/vimage-commit2/src/sys/netinet/tcp_sack.c#9 edit Differences ... ==== //depot/projects/vimage-commit2/src/sys/netinet/tcp_sack.c#9 (text+ko) ==== @@ -126,9 +126,9 @@ SYSCTL_NODE(_net_inet_tcp, OID_AUTO, sack, CTLFLAG_RW, 0, "TCP SACK"); int tcp_do_sack = 1; -TUNABLE_INT("net.inet.tcp.sack.enable", &tcp_do_sack); SYSCTL_V_INT(V_NET, vnet_inet, _net_inet_tcp_sack, OID_AUTO, enable, CTLFLAG_RW, tcp_do_sack, 0, "Enable/Disable TCP SACK support"); +TUNABLE_INT("net.inet.tcp.sack.enable", &tcp_do_sack); static int tcp_sack_maxholes = 128; SYSCTL_V_INT(V_NET, vnet_inet, _net_inet_tcp_sack, OID_AUTO, maxholes, From owner-p4-projects@FreeBSD.ORG Fri Sep 26 10:09:28 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1733C10656A0; Fri, 26 Sep 2008 10:09:28 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C7B101065695 for ; Fri, 26 Sep 2008 10:09:27 +0000 (UTC) (envelope-from zec@tel.fer.hr) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id B75328FC21 for ; Fri, 26 Sep 2008 10:09:27 +0000 (UTC) (envelope-from zec@tel.fer.hr) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id m8QA9RXg008414 for ; Fri, 26 Sep 2008 10:09:27 GMT (envelope-from zec@tel.fer.hr) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m8QA9Rx8008412 for perforce@freebsd.org; Fri, 26 Sep 2008 10:09:27 GMT (envelope-from zec@tel.fer.hr) Date: Fri, 26 Sep 2008 10:09:27 GMT Message-Id: <200809261009.m8QA9Rx8008412@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@tel.fer.hr using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 150495 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 26 Sep 2008 10:09:28 -0000 http://perforce.freebsd.org/chv.cgi?CH=150495 Change 150495 by zec@zec_tca51 on 2008/09/26 10:08:31 vnetgraph.h doesn't exist anymore, so don't #include it. Affected files ... .. //depot/projects/vimage/src/sys/netgraph/ng_base.c#38 edit .. //depot/projects/vimage/src/sys/netgraph/ng_eiface.c#15 edit .. //depot/projects/vimage/src/sys/netgraph/ng_iface.c#12 edit .. //depot/projects/vimage/src/sys/netgraph/ng_wormhole.c#6 edit Differences ... ==== //depot/projects/vimage/src/sys/netgraph/ng_base.c#38 (text+ko) ==== @@ -67,7 +67,6 @@ #include -#include #include #include #include ==== //depot/projects/vimage/src/sys/netgraph/ng_eiface.c#15 (text+ko) ==== @@ -45,7 +45,6 @@ #include #include -#include #include #include #include ==== //depot/projects/vimage/src/sys/netgraph/ng_iface.c#12 (text+ko) ==== @@ -78,7 +78,6 @@ #include -#include #include #include #include ==== //depot/projects/vimage/src/sys/netgraph/ng_wormhole.c#6 (text+ko) ==== @@ -75,7 +75,6 @@ #include #include -#include #include #include #include From owner-p4-projects@FreeBSD.ORG Fri Sep 26 10:47:06 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7280A1065692; Fri, 26 Sep 2008 10:47:06 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 36B4B1065689 for ; Fri, 26 Sep 2008 10:47:06 +0000 (UTC) (envelope-from zec@tel.fer.hr) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 1A7908FC22 for ; Fri, 26 Sep 2008 10:47:06 +0000 (UTC) (envelope-from zec@tel.fer.hr) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id m8QAl6SR047773 for ; Fri, 26 Sep 2008 10:47:06 GMT (envelope-from zec@tel.fer.hr) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m8QAl5OE047767 for perforce@freebsd.org; Fri, 26 Sep 2008 10:47:05 GMT (envelope-from zec@tel.fer.hr) Date: Fri, 26 Sep 2008 10:47:05 GMT Message-Id: <200809261047.m8QAl5OE047767@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@tel.fer.hr using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 150497 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 26 Sep 2008 10:47:06 -0000 http://perforce.freebsd.org/chv.cgi?CH=150497 Change 150497 by zec@zec_tpx32 on 2008/09/26 10:46:13 SYSCTL_V_UINT is of type CTLTYPE_UINT, not CTLTYPE_INT!!! Affected files ... .. //depot/projects/vimage-commit2/src/sys/sys/sysctl.h#9 edit Differences ... ==== //depot/projects/vimage-commit2/src/sys/sys/sysctl.h#9 (text+ko) ==== @@ -297,11 +297,11 @@ #ifdef VIMAGE #define SYSCTL_V_UINT(subs, mod, parent, nbr, name, access, sym, val, descr) \ - SYSCTL_V_OID(subs, mod, parent, nbr, name, CTLTYPE_INT|(access), \ + SYSCTL_V_OID(subs, mod, parent, nbr, name, CTLTYPE_UINT|(access), \ sym, val, sysctl_handle_v_int, "IU", descr) #else #define SYSCTL_V_UINT(subs, mod, parent, nbr, name, access, sym, val, descr) \ - SYSCTL_OID(parent, nbr, name, CTLTYPE_INT|(access), \ + SYSCTL_OID(parent, nbr, name, CTLTYPE_UINT|(access), \ &sym, val, sysctl_handle_int, "IU", descr) #endif From owner-p4-projects@FreeBSD.ORG Fri Sep 26 10:53:12 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AF0D3106569A; Fri, 26 Sep 2008 10:53:12 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 734E01065696 for ; Fri, 26 Sep 2008 10:53:12 +0000 (UTC) (envelope-from zec@tel.fer.hr) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 630438FC25 for ; Fri, 26 Sep 2008 10:53:12 +0000 (UTC) (envelope-from zec@tel.fer.hr) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id m8QArCGR077776 for ; Fri, 26 Sep 2008 10:53:12 GMT (envelope-from zec@tel.fer.hr) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m8QArCPu077774 for perforce@freebsd.org; Fri, 26 Sep 2008 10:53:12 GMT (envelope-from zec@tel.fer.hr) Date: Fri, 26 Sep 2008 10:53:12 GMT Message-Id: <200809261053.m8QArCPu077774@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@tel.fer.hr using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 150498 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 26 Sep 2008 10:53:12 -0000 http://perforce.freebsd.org/chv.cgi?CH=150498 Change 150498 by zec@zec_tpx32 on 2008/09/26 10:53:07 Fix SYSCTL_V_UINT() macro. Spotted by: bz's stubborn efforts at proving that phase 1.5 of vimage integration (currently vimage-commit2 branch) must be effectively a null change. Affected files ... .. //depot/projects/vimage/src/sys/sys/sysctl.h#26 edit Differences ... ==== //depot/projects/vimage/src/sys/sys/sysctl.h#26 (text+ko) ==== @@ -297,11 +297,11 @@ #ifdef VIMAGE #define SYSCTL_V_UINT(subs, mod, parent, nbr, name, access, sym, val, descr) \ - SYSCTL_V_OID(subs, mod, parent, nbr, name, CTLTYPE_INT|(access), \ + SYSCTL_V_OID(subs, mod, parent, nbr, name, CTLTYPE_UINT|(access), \ sym, val, sysctl_handle_v_int, "IU", descr) #else #define SYSCTL_V_UINT(subs, mod, parent, nbr, name, access, sym, val, descr) \ - SYSCTL_OID(parent, nbr, name, CTLTYPE_INT|(access), \ + SYSCTL_OID(parent, nbr, name, CTLTYPE_UINT|(access), \ &sym, val, sysctl_handle_int, "IU", descr) #endif From owner-p4-projects@FreeBSD.ORG Fri Sep 26 14:05:27 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B3BCB106569B; Fri, 26 Sep 2008 14:05:27 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 6AB9E106568C for ; Fri, 26 Sep 2008 14:05:27 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 5763C8FC13 for ; Fri, 26 Sep 2008 14:05:27 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id m8QE5Rfw065362 for ; Fri, 26 Sep 2008 14:05:27 GMT (envelope-from pgj@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m8QE5Rd0065358 for perforce@freebsd.org; Fri, 26 Sep 2008 14:05:27 GMT (envelope-from pgj@FreeBSD.org) Date: Fri, 26 Sep 2008 14:05:27 GMT Message-Id: <200809261405.m8QE5Rd0065358@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to pgj@FreeBSD.org using -f From: Gabor Pali To: Perforce Change Reviews Cc: Subject: PERFORCE change 150501 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 26 Sep 2008 14:05:28 -0000 http://perforce.freebsd.org/chv.cgi?CH=150501 Change 150501 by pgj@kolbasz on 2008/09/26 14:04:49 IFC Affected files ... .. //depot/projects/docproj_hu/doc/share/pgpkeys/matteo.key#3 integrate .. //depot/projects/docproj_hu/doc/share/sgml/mirrors.xml#5 integrate .. //depot/projects/docproj_hu/www/en/cgi/cvsweb.cgi#2 integrate .. //depot/projects/docproj_hu/www/en/cgi/man.cgi#6 integrate .. //depot/projects/docproj_hu/www/en/cgi/mid.cgi#2 integrate .. //depot/projects/docproj_hu/www/en/cgi/ports.cgi#2 integrate .. //depot/projects/docproj_hu/www/en/cgi/query-pr.cgi#2 integrate .. //depot/projects/docproj_hu/www/en/donations/donors.sgml#7 integrate .. //depot/projects/docproj_hu/www/en/releases/6.4R/schedule.sgml#5 integrate .. //depot/projects/docproj_hu/www/en/releases/7.1R/schedule.sgml#5 integrate .. //depot/projects/docproj_hu/www/en/releng/index.sgml#6 integrate .. //depot/projects/docproj_hu/www/en/search/Makefile#2 integrate .. //depot/projects/docproj_hu/www/en/search/Makefile.inc#1 branch .. //depot/projects/docproj_hu/www/en/search/opensearch/Makefile#1 branch .. //depot/projects/docproj_hu/www/en/search/opensearch/cvsweb.xml#1 branch .. //depot/projects/docproj_hu/www/en/search/opensearch/man.xml#1 branch .. //depot/projects/docproj_hu/www/en/search/opensearch/markmail.xml#1 branch .. //depot/projects/docproj_hu/www/en/search/opensearch/message-id.xml#1 branch .. //depot/projects/docproj_hu/www/en/search/opensearch/opensearch.js#1 branch .. //depot/projects/docproj_hu/www/en/search/opensearch/opensearch.sgml#1 branch .. //depot/projects/docproj_hu/www/en/search/opensearch/ports.xml#1 branch .. //depot/projects/docproj_hu/www/en/search/opensearch/query-pr.xml#1 branch .. //depot/projects/docproj_hu/www/en/search/opensearch/rambler.xml#1 branch .. //depot/projects/docproj_hu/www/en/search/opensearch/web-all.xml#1 branch .. //depot/projects/docproj_hu/www/en/search/opensearch/web.xml#1 branch .. //depot/projects/docproj_hu/www/en/search/search.sgml#3 integrate .. //depot/projects/docproj_hu/www/share/sgml/news.xml#21 integrate Differences ... ==== //depot/projects/docproj_hu/doc/share/pgpkeys/matteo.key#3 (text+ko) ==== @@ -1,4 +1,4 @@ - + @@ -12,7 +12,7 @@ uid Matteo Riondato (Rionda) uid Matteo Riondato (Rionda) uid Matteo Riondato (Rionda) -sub 1024g/A040570C 2003-01-05 [expires: 2009-09-07] +sub 2048g/87C44A55 2008-09-23 [expires: 2009-09-23] ]]> ==== //depot/projects/docproj_hu/doc/share/sgml/mirrors.xml#5 (text+ko) ==== @@ -2,7 +2,7 @@ - $FreeBSD: doc/share/sgml/mirrors.xml,v 1.75 2008/09/11 16:36:29 danger Exp $ + $FreeBSD: doc/share/sgml/mirrors.xml,v 1.76 2008/09/22 19:27:39 manolis Exp $ @@ -781,11 +781,6 @@ http://www.gr.FreeBSD.org/ - - www.FreeBSD.gr - http://www.FreeBSD.gr/ - - ftp.gr.FreeBSD.org ftp://ftp.gr.FreeBSD.org/pub/FreeBSD/ ==== //depot/projects/docproj_hu/www/en/cgi/cvsweb.cgi#2 (text+ko) ==== @@ -45,7 +45,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: www/en/cgi/cvsweb.cgi,v 1.91 2007/03/17 22:28:31 simon Exp $ +# $FreeBSD: www/en/cgi/cvsweb.cgi,v 1.92 2008/09/23 16:31:45 wosch Exp $ # $Id: cvsweb.cgi,v 1.112 2001/07/24 13:03:16 hzeller Exp $ # $Idaemons: /home/cvs/cvsweb/cvsweb.cgi,v 1.84 2001/10/07 20:50:10 knu Exp $ # @@ -142,7 +142,7 @@ $CheckoutMagic = '~checkout~'; $cgi_style::hsty_base = 'http://www.FreeBSD.org'; - $_ = q$FreeBSD: www/en/cgi/cvsweb.cgi,v 1.91 2007/03/17 22:28:31 simon Exp $; + $_ = q$FreeBSD: www/en/cgi/cvsweb.cgi,v 1.92 2008/09/23 16:31:45 wosch Exp $; @_ = split; $cgi_style::hsty_date = "@_[3,4]"; @@ -151,6 +151,7 @@ package cgi_style; require "./cgi-style.pl"; + $cgi_style::t_style = qq{\n\n}; package main; } ==== //depot/projects/docproj_hu/www/en/cgi/man.cgi#6 (text+ko) ==== @@ -34,7 +34,7 @@ # Dual CGI/Plexus mode and new interface by sanders@bsdi.com 9/22/1995 # # $Id: man.cgi,v 1.172 2007/11/28 18:51:29 hrs Exp $ -# $FreeBSD: www/en/cgi/man.cgi,v 1.221 2008/09/21 19:07:43 wosch Exp $ +# $FreeBSD: www/en/cgi/man.cgi,v 1.222 2008/09/22 19:13:42 wosch Exp $ ############################################################################ # !!! man.cgi is stale perl4 code !!! @@ -519,6 +519,7 @@ my $html_meta = q| + + `; sub init_variables { @@ -514,10 +515,10 @@ print qq{ Powered by FreeBSD -© 1996-2007 by Wolfram Schneider. All rights reserved.
    +© 1996-2008 by Wolfram Schneider. All rights reserved.
    }; -#print q{$FreeBSD: www/en/cgi/ports.cgi,v 1.96 2007/08/02 18:30:21 wosch Exp $} . "
    \n"; +#print q{$FreeBSD: www/en/cgi/ports.cgi,v 1.97 2008/09/22 19:13:42 wosch Exp $} . "
    \n"; print qq{Please direct questions about this service to $mailto
    \n}; print qq{General questions about FreeBSD ports should be sent to } ==== //depot/projects/docproj_hu/www/en/cgi/query-pr.cgi#2 (text+ko) ==== @@ -26,7 +26,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: www/en/cgi/query-pr.cgi,v 1.64 2008/01/26 15:53:55 shaun Exp $ +# $FreeBSD: www/en/cgi/query-pr.cgi,v 1.65 2008/09/22 19:13:42 wosch Exp $ # # @@ -242,6 +242,7 @@ # From cgi-style.pl $main::t_style = ""; +$main::t_style .= qq{\n\n}; #----------------------------------------------------------------------- ==== //depot/projects/docproj_hu/www/en/donations/donors.sgml#7 (text+ko) ==== @@ -1,6 +1,6 @@ - + %developers; @@ -2500,7 +2500,7 @@ Charles Smeijer AMD Opteron 250 CPU des - Shipped + Received ==== //depot/projects/docproj_hu/www/en/releases/6.4R/schedule.sgml#5 (text+ko) ==== @@ -1,7 +1,7 @@ - + @@ -133,14 +133,14 @@ Ports tree tagged 15 September 2008 - -- + 22 September 2008 RELEASE_&local.rel.tag;_0 tag for ports/. Ports tree unfrozen 15 September 2008 - -- + 22 September 2008 After the ports/ tree is tagged, the ports/ tree will be re-opened for commits, but commits made after tagging will not go in &local.rel;-RELEASE. @@ -149,7 +149,7 @@ Final package build starts 15 September 2008 - -- + 22 September 2008 The ports cluster and pointyhat build final packages. ==== //depot/projects/docproj_hu/www/en/releases/7.1R/schedule.sgml#5 (text+ko) ==== @@ -1,7 +1,7 @@ - + @@ -132,14 +132,14 @@ Ports tree tagged 15 September 2008 - -- + 22 September 2008 RELEASE_&local.rel.tag;_0 tag for ports/. Ports tree unfrozen 15 September 2008 - -- + 22 September 2008 After the ports/ tree is tagged, the ports/ tree will be re-opened for commits, but commits made after tagging will not go in &local.rel;-RELEASE. @@ -148,7 +148,7 @@ Final package build starts 15 September 2008 - -- + 22 September 2008 The ports cluster and pointyhat build final packages. ==== //depot/projects/docproj_hu/www/en/releng/index.sgml#6 (text+ko) ==== @@ -1,6 +1,6 @@ - + @@ -281,7 +281,7 @@ ports/ - Frozen + Slush (no sweeping commits until after 6.4 and 7.1 releases) &contact.portmgr; FreeBSD Ports Collection. ==== //depot/projects/docproj_hu/www/en/search/Makefile#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: www/en/search/Makefile,v 1.9 2001/10/29 10:14:33 murray Exp $ +# $FreeBSD: www/en/search/Makefile,v 1.10 2008/09/22 18:56:21 wosch Exp $ .if exists(../Makefile.conf) .include "../Makefile.conf" @@ -12,6 +12,8 @@ DOCS+= searchhints.sgml DOCS+= search-mid.sgml +SUBDIR+= opensearch + INDEXLINK= search.html CLEANFILES+=atoz.sgml site.sgml ==== //depot/projects/docproj_hu/www/en/search/search.sgml#3 (text+ko) ==== @@ -1,6 +1,6 @@ - + ]> @@ -18,17 +18,20 @@
  • Manual Pages
  • Ports Changes
    • + + +

    + +

    List of FreeBSD OpenSearch Plugins

    Web pages (including - $FreeBSD: www/share/sgml/news.xml,v 1.198 2008/09/19 05:09:13 murray Exp $ + $FreeBSD: www/share/sgml/news.xml,v 1.199 2008/09/22 21:57:53 rnoland Exp $ @@ -69,6 +69,11 @@ href="http://www.pcbsd.org">downloaded or purchased on DVD.

    + + +

    New committer: Robert Noland + (src)

    +     From owner-p4-projects@FreeBSD.ORG Fri Sep 26 14:41:04 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 529FD10656A6; Fri, 26 Sep 2008 14:41:04 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E12FE1065693 for ; Fri, 26 Sep 2008 14:41:03 +0000 (UTC) (envelope-from thompsa@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id CE9828FC20 for ; Fri, 26 Sep 2008 14:41:03 +0000 (UTC) (envelope-from thompsa@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id m8QEf3ei078757 for ; Fri, 26 Sep 2008 14:41:03 GMT (envelope-from thompsa@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m8QEf39R078755 for perforce@freebsd.org; Fri, 26 Sep 2008 14:41:03 GMT (envelope-from thompsa@freebsd.org) Date: Fri, 26 Sep 2008 14:41:03 GMT Message-Id: <200809261441.m8QEf39R078755@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to thompsa@freebsd.org using -f From: Andrew Thompson To: Perforce Change Reviews Cc: Subject: PERFORCE change 150504 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 26 Sep 2008 14:41:04 -0000 http://perforce.freebsd.org/chv.cgi?CH=150504 Change 150504 by thompsa@thompsa_burger on 2008/09/26 14:40:15 There is no point hooking rint_done as its not an override so ttydisc_rint_done() will still be called. Pointed out by: ed Affected files ... .. //depot/projects/mpsafetty/sys/netgraph/ng_tty.c#6 edit Differences ... ==== //depot/projects/mpsafetty/sys/netgraph/ng_tty.c#6 (text+ko) ==== @@ -112,7 +112,6 @@ static th_getc_poll_t ngt_getc_poll; static th_rint_bypass_t ngt_rint_bypass; static th_rint_poll_t ngt_rint_poll; -static th_rint_done_t ngt_rint_done; static th_close_t ngt_close; static struct ttyhook ngt_hook = { @@ -120,7 +119,6 @@ .th_getc_poll = ngt_getc_poll, .th_rint_bypass = ngt_rint_bypass, .th_rint_poll = ngt_rint_poll, - .th_rint_done = ngt_rint_done, .th_close = ngt_close, }; @@ -445,12 +443,6 @@ } static void -ngt_rint_done(struct tty *tp) -{ - /* Do nothing */ -} - -static void ngt_close(struct tty *tp) { sc_p sc = ttyhook_softc(tp); From owner-p4-projects@FreeBSD.ORG Fri Sep 26 14:42:05 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6CBCC1065692; Fri, 26 Sep 2008 14:42:05 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1753B106568A for ; Fri, 26 Sep 2008 14:42:05 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 056868FC16 for ; Fri, 26 Sep 2008 14:42:05 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id m8QEg4xK087239 for ; Fri, 26 Sep 2008 14:42:04 GMT (envelope-from pgj@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m8QEg4il087233 for perforce@freebsd.org; Fri, 26 Sep 2008 14:42:04 GMT (envelope-from pgj@FreeBSD.org) Date: Fri, 26 Sep 2008 14:42:04 GMT Message-Id: <200809261442.m8QEg4il087233@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to pgj@FreeBSD.org using -f From: Gabor Pali To: Perforce Change Reviews Cc: Subject: PERFORCE change 150505 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 26 Sep 2008 14:42:05 -0000 http://perforce.freebsd.org/chv.cgi?CH=150505 Change 150505 by pgj@kolbasz on 2008/09/26 14:41:07 MFen: 1.2 -> 1.3 articles/gjournal-desktop/article.sgml Affected files ... .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/articles/gjournal-desktop/article.sgml#4 edit Differences ... ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/articles/gjournal-desktop/article.sgml#4 (text+ko) ==== @@ -11,7 +11,7 @@ Manolis Kiagias -
    sonicy@otenet.gr
    +
    manolis@FreeBSD.org
     2008 - Manolis Kiagias + Manolis Kiagias $FreeBSD$ @@ -318,9 +318,10 @@ telepített csomagok ide fognak kerülni. Az alapértelmezés szerinti felosztás - (amely a Disklabel partíciószerkesztõben az - A billentyûvel érhetõ el) nem - hagy semennyi lemezterületet szabadon. Ahány + (amely a Disklabel + partíciószerkesztõben az A + billentyûvel érhetõ el) nem hagy semennyi + lemezterületet szabadon. Ahány partíciót naplózással akarunk ellátni, annyi további partícióra lesz szükségünk a naplókhoz. Mivel a @@ -333,8 +334,9 @@ A példában most egy 80 GB méretû lemezt láthatunk. Az ábrán most a telepítés közben a - Disklabel szerint alapértelmezetten kiosztott - partíciókat láthatjuk: + Disklabel szerint + alapértelmezetten kiosztott partíciókat + láthatjuk: @@ -423,10 +425,11 @@ Lapozóterület kialakításához ismét a nyílbillentyûk használatával - navigáljunk a Disklabelhez tartozó - képernyõ felsõ részébe és - válasszuk ki a lemez nevét. Ezután nyomjuk - le az N billentyût, majd adjuk meg a + navigáljunk a Disklabel + alkalmazáshoz tartozó képernyõ + felsõ részébe és válasszuk ki a + lemez nevét. Ezután nyomjuk le az + N billentyût, majd adjuk meg a kívánt méretet (1024M) és a következõ menübõl válasszuk a From owner-p4-projects@FreeBSD.ORG Fri Sep 26 17:23:51 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8E3391065699; Fri, 26 Sep 2008 17:23:50 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 4CB6D1065697 for ; Fri, 26 Sep 2008 17:23:50 +0000 (UTC) (envelope-from ed@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 3923E8FC13 for ; Fri, 26 Sep 2008 17:23:50 +0000 (UTC) (envelope-from ed@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id m8QHNoS7095566 for ; Fri, 26 Sep 2008 17:23:50 GMT (envelope-from ed@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m8QHNnnl095524 for perforce@freebsd.org; Fri, 26 Sep 2008 17:23:49 GMT (envelope-from ed@FreeBSD.org) Date: Fri, 26 Sep 2008 17:23:49 GMT Message-Id: <200809261723.m8QHNnnl095524@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to ed@FreeBSD.org using -f From: Ed Schouten To: Perforce Change Reviews Cc: Subject: PERFORCE change 150511 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 26 Sep 2008 17:23:51 -0000 http://perforce.freebsd.org/chv.cgi?CH=150511 Change 150511 by ed@ed_dull on 2008/09/26 17:23:46 IFC. Affected files ... .. //depot/projects/mpsafetty/crypto/openssh/sshconnect2.c#3 integrate .. //depot/projects/mpsafetty/etc/rc.d/jail#3 integrate .. //depot/projects/mpsafetty/gnu/lib/csu/Makefile#2 integrate .. //depot/projects/mpsafetty/gnu/usr.bin/gdb/kgdb/kld.c#2 integrate .. //depot/projects/mpsafetty/include/Makefile#3 integrate .. //depot/projects/mpsafetty/release/i386/fixit_crunch.conf#2 integrate .. //depot/projects/mpsafetty/release/pc98/fixit-small_crunch.conf#2 integrate .. //depot/projects/mpsafetty/release/pc98/fixit_crunch.conf#2 integrate .. //depot/projects/mpsafetty/share/man/man5/rc.conf.5#6 integrate .. //depot/projects/mpsafetty/share/man/man9/make_dev.9#3 integrate .. //depot/projects/mpsafetty/sys/cam/scsi/scsi_pass.c#2 integrate .. //depot/projects/mpsafetty/sys/cam/scsi/scsi_ses.c#2 integrate .. //depot/projects/mpsafetty/sys/cam/scsi/scsi_sg.c#2 integrate .. //depot/projects/mpsafetty/sys/cam/scsi/scsi_target.c#2 integrate .. //depot/projects/mpsafetty/sys/cddl/dev/dtrace/dtrace_clone.c#2 integrate .. //depot/projects/mpsafetty/sys/compat/freebsd32/freebsd32_misc.c#5 integrate .. //depot/projects/mpsafetty/sys/compat/freebsd32/freebsd32_proto.h#8 integrate .. //depot/projects/mpsafetty/sys/compat/freebsd32/freebsd32_syscall.h#8 integrate .. //depot/projects/mpsafetty/sys/compat/freebsd32/freebsd32_syscalls.c#8 integrate .. //depot/projects/mpsafetty/sys/compat/freebsd32/freebsd32_sysent.c#8 integrate .. //depot/projects/mpsafetty/sys/compat/freebsd32/freebsd32_util.h#2 integrate .. //depot/projects/mpsafetty/sys/compat/freebsd32/syscalls.master#9 integrate .. //depot/projects/mpsafetty/sys/compat/ia32/ia32_sysvec.c#3 integrate .. //depot/projects/mpsafetty/sys/compat/linprocfs/linprocfs.c#5 integrate .. //depot/projects/mpsafetty/sys/ddb/db_command.c#3 integrate .. //depot/projects/mpsafetty/sys/ddb/db_command.h#2 integrate .. //depot/projects/mpsafetty/sys/ddb/db_main.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/ata/ata-chipset.c#7 integrate .. //depot/projects/mpsafetty/sys/dev/ata/ata-pci.h#6 integrate .. //depot/projects/mpsafetty/sys/dev/cfe/cfe_api.c#1 branch .. //depot/projects/mpsafetty/sys/dev/cfe/cfe_api.h#1 branch .. //depot/projects/mpsafetty/sys/dev/cfe/cfe_api_int.h#1 branch .. //depot/projects/mpsafetty/sys/dev/cfe/cfe_console.c#1 branch .. //depot/projects/mpsafetty/sys/dev/cfe/cfe_error.h#1 branch .. //depot/projects/mpsafetty/sys/dev/cfe/cfe_ioctl.h#1 branch .. //depot/projects/mpsafetty/sys/dev/cfe/cfe_resource.c#1 branch .. //depot/projects/mpsafetty/sys/dev/cxgb/sys/mvec.h#2 integrate .. //depot/projects/mpsafetty/sys/dev/cxgb/sys/uipc_mvec.c#3 integrate .. //depot/projects/mpsafetty/sys/dev/le/if_le_cbus.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/le/if_le_isa.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/le/if_le_lebuffer.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/le/if_le_pci.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/le/lebuffer_sbus.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/led/led.c#3 integrate .. //depot/projects/mpsafetty/sys/dev/msk/if_msk.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/msk/if_mskreg.h#2 integrate .. //depot/projects/mpsafetty/sys/dev/siba/siba.c#1 branch .. //depot/projects/mpsafetty/sys/dev/siba/siba_ids.h#1 branch .. //depot/projects/mpsafetty/sys/dev/siba/siba_pcib.c#1 branch .. //depot/projects/mpsafetty/sys/dev/siba/siba_pcibvar.h#1 branch .. //depot/projects/mpsafetty/sys/dev/siba/sibareg.h#1 branch .. //depot/projects/mpsafetty/sys/dev/siba/sibavar.h#1 branch .. //depot/projects/mpsafetty/sys/dev/sound/pci/emu10kx.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/sound/pcm/dsp.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/sound/pcm/mixer.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/usb/ubsa.c#4 integrate .. //depot/projects/mpsafetty/sys/dev/usb/umass.c#4 integrate .. //depot/projects/mpsafetty/sys/dev/vkbd/vkbd.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/xen/blkfront/blkfront.c#5 integrate .. //depot/projects/mpsafetty/sys/dev/xen/netfront/netfront.c#5 integrate .. //depot/projects/mpsafetty/sys/fs/coda/coda_fbsd.c#2 integrate .. //depot/projects/mpsafetty/sys/fs/devfs/devfs_vnops.c#6 integrate .. //depot/projects/mpsafetty/sys/geom/geom_dev.c#3 integrate .. //depot/projects/mpsafetty/sys/i386/acpica/acpi_machdep.c#2 integrate .. //depot/projects/mpsafetty/sys/i386/bios/apm.h#2 integrate .. //depot/projects/mpsafetty/sys/i386/include/param.h#2 integrate .. //depot/projects/mpsafetty/sys/i386/include/smp.h#2 integrate .. //depot/projects/mpsafetty/sys/i386/include/xen/evtchn.h#2 integrate .. //depot/projects/mpsafetty/sys/i386/xen/mp_machdep.c#3 integrate .. //depot/projects/mpsafetty/sys/i386/xen/pmap.c#6 integrate .. //depot/projects/mpsafetty/sys/i386/xen/xen_machdep.c#9 integrate .. //depot/projects/mpsafetty/sys/kern/init_sysent.c#5 integrate .. //depot/projects/mpsafetty/sys/kern/kern_condvar.c#4 integrate .. //depot/projects/mpsafetty/sys/kern/kern_conf.c#6 integrate .. //depot/projects/mpsafetty/sys/kern/kern_synch.c#6 integrate .. //depot/projects/mpsafetty/sys/kern/makesyscalls.sh#2 integrate .. //depot/projects/mpsafetty/sys/kern/subr_witness.c#8 integrate .. //depot/projects/mpsafetty/sys/kern/syscalls.c#4 integrate .. //depot/projects/mpsafetty/sys/kern/syscalls.master#6 integrate .. //depot/projects/mpsafetty/sys/kern/systrace_args.c#3 integrate .. //depot/projects/mpsafetty/sys/kern/vfs_cache.c#6 integrate .. //depot/projects/mpsafetty/sys/mips/sentry5/s5_machdep.c#3 integrate .. //depot/projects/mpsafetty/sys/net/if.c#5 integrate .. //depot/projects/mpsafetty/sys/net/if_stf.c#3 integrate .. //depot/projects/mpsafetty/sys/net/if_tap.c#3 integrate .. //depot/projects/mpsafetty/sys/net/if_tun.c#2 integrate .. //depot/projects/mpsafetty/sys/net80211/ieee80211_ddb.c#5 integrate .. //depot/projects/mpsafetty/sys/net80211/ieee80211_hostap.c#4 integrate .. //depot/projects/mpsafetty/sys/netgraph/ng_device.c#2 integrate .. //depot/projects/mpsafetty/sys/netinet/tcp_input.c#7 integrate .. //depot/projects/mpsafetty/sys/netsmb/smb_dev.c#2 integrate .. //depot/projects/mpsafetty/sys/nfsclient/nfs_vnops.c#5 integrate .. //depot/projects/mpsafetty/sys/security/audit/audit_pipe.c#3 integrate .. //depot/projects/mpsafetty/sys/sys/conf.h#5 integrate .. //depot/projects/mpsafetty/sys/sys/syscall.h#4 integrate .. //depot/projects/mpsafetty/sys/sys/syscall.mk#4 integrate .. //depot/projects/mpsafetty/sys/sys/sysent.h#3 integrate .. //depot/projects/mpsafetty/sys/sys/sysproto.h#4 integrate .. //depot/projects/mpsafetty/sys/sys/tty.h#21 integrate .. //depot/projects/mpsafetty/sys/ufs/ffs/ffs_vfsops.c#7 integrate .. //depot/projects/mpsafetty/sys/vm/device_pager.c#2 integrate .. //depot/projects/mpsafetty/sys/xen/evtchn/evtchn.c#3 integrate .. //depot/projects/mpsafetty/sys/xen/gnttab.c#3 integrate .. //depot/projects/mpsafetty/sys/xen/gnttab.h#2 integrate .. //depot/projects/mpsafetty/sys/xen/interface/arch-ia64.h#2 integrate .. //depot/projects/mpsafetty/sys/xen/interface/arch-powerpc.h#2 integrate .. //depot/projects/mpsafetty/sys/xen/interface/arch-x86/cpuid.h#1 branch .. //depot/projects/mpsafetty/sys/xen/interface/arch-x86/hvm/save.h#1 branch .. //depot/projects/mpsafetty/sys/xen/interface/arch-x86/xen-mca.h#1 branch .. //depot/projects/mpsafetty/sys/xen/interface/arch-x86/xen-x86_32.h#2 integrate .. //depot/projects/mpsafetty/sys/xen/interface/arch-x86/xen-x86_64.h#2 integrate .. //depot/projects/mpsafetty/sys/xen/interface/arch-x86/xen.h#2 integrate .. //depot/projects/mpsafetty/sys/xen/interface/callback.h#2 integrate .. //depot/projects/mpsafetty/sys/xen/interface/domctl.h#2 integrate .. //depot/projects/mpsafetty/sys/xen/interface/features.h#2 integrate .. //depot/projects/mpsafetty/sys/xen/interface/foreign/mkchecker.py#2 integrate .. //depot/projects/mpsafetty/sys/xen/interface/foreign/mkheader.py#2 integrate .. //depot/projects/mpsafetty/sys/xen/interface/foreign/structs.py#2 integrate .. //depot/projects/mpsafetty/sys/xen/interface/grant_table.h#2 integrate .. //depot/projects/mpsafetty/sys/xen/interface/hvm/hvm_op.h#2 integrate .. //depot/projects/mpsafetty/sys/xen/interface/hvm/ioreq.h#2 integrate .. //depot/projects/mpsafetty/sys/xen/interface/hvm/params.h#2 integrate .. //depot/projects/mpsafetty/sys/xen/interface/hvm/save.h#2 integrate .. //depot/projects/mpsafetty/sys/xen/interface/io/blkif.h#2 integrate .. //depot/projects/mpsafetty/sys/xen/interface/io/fbif.h#2 integrate .. //depot/projects/mpsafetty/sys/xen/interface/io/kbdif.h#2 integrate .. //depot/projects/mpsafetty/sys/xen/interface/io/netif.h#2 integrate .. //depot/projects/mpsafetty/sys/xen/interface/io/pciif.h#2 integrate .. //depot/projects/mpsafetty/sys/xen/interface/io/protocols.h#2 integrate .. //depot/projects/mpsafetty/sys/xen/interface/io/ring.h#2 integrate .. //depot/projects/mpsafetty/sys/xen/interface/io/xenbus.h#2 integrate .. //depot/projects/mpsafetty/sys/xen/interface/io/xs_wire.h#2 integrate .. //depot/projects/mpsafetty/sys/xen/interface/kexec.h#2 integrate .. //depot/projects/mpsafetty/sys/xen/interface/libelf.h#2 integrate .. //depot/projects/mpsafetty/sys/xen/interface/memory.h#2 integrate .. //depot/projects/mpsafetty/sys/xen/interface/physdev.h#2 integrate .. //depot/projects/mpsafetty/sys/xen/interface/platform.h#2 integrate .. //depot/projects/mpsafetty/sys/xen/interface/sysctl.h#2 integrate .. //depot/projects/mpsafetty/sys/xen/interface/trace.h#2 integrate .. //depot/projects/mpsafetty/sys/xen/interface/vcpu.h#2 integrate .. //depot/projects/mpsafetty/sys/xen/interface/xen-compat.h#2 integrate .. //depot/projects/mpsafetty/sys/xen/interface/xen.h#2 integrate .. //depot/projects/mpsafetty/usr.bin/Makefile#5 integrate .. //depot/projects/mpsafetty/usr.sbin/syslogd/syslogd.8#2 integrate .. //depot/projects/mpsafetty/usr.sbin/syslogd/syslogd.c#4 integrate Differences ... ==== //depot/projects/mpsafetty/crypto/openssh/sshconnect2.c#3 (text+ko) ==== @@ -386,8 +386,9 @@ if (options.log_level >= SYSLOG_LEVEL_INFO) { if (len > 65536) len = 65536; - msg = xmalloc(len * 4); /* max expansion from strnvis() */ + msg = xmalloc(len * 4 + 1); /* max expansion from strnvis() */ strnvis(msg, raw, len * 4, VIS_SAFE|VIS_OCTAL); + msg[len*4] = '\0'; fprintf(stderr, "%s", msg); xfree(msg); } ==== //depot/projects/mpsafetty/etc/rc.d/jail#3 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/jail,v 1.39 2008/09/16 20:18:25 thompsa Exp $ +# $FreeBSD: src/etc/rc.d/jail,v 1.40 2008/09/24 15:18:27 ru Exp $ # # PROVIDE: jail @@ -39,6 +39,7 @@ _procdir="${_rootdir}/proc" eval _hostname=\"\$jail_${_j}_hostname\" eval _ip=\"\$jail_${_j}_ip\" + eval _netmask=\"\${jail_${_j}_netmask:-255.255.255.255}\" eval _interface=\"\${jail_${_j}_interface:-${jail_interface}}\" eval _exec=\"\$jail_${_j}_exec\" eval _exec_start=\"\${jail_${_j}_exec_start:-${jail_exec_start}}\" @@ -93,6 +94,7 @@ debug "$_j mount enable: $_mount" debug "$_j hostname: $_hostname" debug "$_j ip: $_ip" + debug "$_j netmask: $_netmask" debug "$_j interface: $_interface" debug "$_j fib: $_fib" debug "$_j root: $_rootdir" @@ -297,7 +299,7 @@ continue; fi if [ -n "${_interface}" ]; then - ifconfig ${_interface} alias ${_ip} netmask 255.255.255.255 + ifconfig ${_interface} alias ${_ip} netmask ${_netmask} fi if [ -n "${_fib}" ]; then _setfib="setfib -F '${_fib}'" ==== //depot/projects/mpsafetty/gnu/lib/csu/Makefile#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/gnu/lib/csu/Makefile,v 1.29 2008/06/25 21:33:28 ru Exp $ +# $FreeBSD: src/gnu/lib/csu/Makefile,v 1.30 2008/09/26 15:00:18 marcel Exp $ GCCDIR= ${.CURDIR}/../../../contrib/gcc GCCLIB= ${.CURDIR}/../../../contrib/gcclibs @@ -25,7 +25,7 @@ BEGINSRC= crtbegin.asm ENDSRC= crtend.asm CFLAGS+= -x assembler-with-cpp # Ugly hack -CFLAGS+= -include osreldate.h +CFLAGS+= -D_OSRELDATE_H -include osreldate.h .undef SRCS # hack for 'make depend' .endif .if ${MACHINE_ARCH} == "powerpc" ==== //depot/projects/mpsafetty/gnu/usr.bin/gdb/kgdb/kld.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/gnu/usr.bin/gdb/kgdb/kld.c,v 1.9 2008/04/29 20:32:45 jhb Exp $"); +__FBSDID("$FreeBSD: src/gnu/usr.bin/gdb/kgdb/kld.c,v 1.10 2008/09/25 19:32:03 jhb Exp $"); #include #include @@ -37,6 +37,7 @@ #include #include #include +#include #include #include #include @@ -196,39 +197,14 @@ return (0); } -struct add_section_info { - struct section_addr_info *section_addrs; - int sect_index; - CORE_ADDR base_addr; -}; - static void -add_section (bfd *bfd, asection *sect, void *arg) -{ - struct add_section_info *asi = arg; - CORE_ADDR address; - char *name; - - /* Ignore non-resident sections. */ - if ((bfd_get_section_flags(bfd, sect) & (SEC_ALLOC | SEC_LOAD)) == 0) - return; - - name = xstrdup(bfd_get_section_name(bfd, sect)); - make_cleanup(xfree, name); - address = asi->base_addr + bfd_get_section_vma(bfd, sect); - asi->section_addrs->other[asi->sect_index].name = name; - asi->section_addrs->other[asi->sect_index].addr = address; - asi->section_addrs->other[asi->sect_index].sectindex = sect->index; - printf_unfiltered("\t%s_addr = %s\n", name, local_hex_string(address)); - asi->sect_index++; -} - -static void load_kld (char *path, CORE_ADDR base_addr, int from_tty) { - struct add_section_info asi; + struct section_addr_info *sap; + struct section_table *sections, *sections_end, *s; struct cleanup *cleanup; bfd *bfd; + int i; /* Open the kld. */ bfd = bfd_openr(path, gnutarget); @@ -244,19 +220,30 @@ if (bfd_get_section_by_name (bfd, ".text") == NULL) error("\"%s\": can't find text section", path); + /* Build a section table from the bfd and relocate the sections. */ + if (build_section_table (bfd, §ions, §ions_end)) + error("\"%s\": can't find file sections", path); + cleanup = make_cleanup(xfree, sections); + for (s = sections; s < sections_end; s++) { + s->addr += base_addr; + s->endaddr += base_addr; + } + + /* Build a section addr info to pass to symbol_file_add(). */ + sap = build_section_addr_info_from_section_table (sections, + sections_end); + cleanup = make_cleanup((make_cleanup_ftype *)free_section_addr_info, + sap); + printf_unfiltered("add symbol table from file \"%s\" at\n", path); + for (i = 0; i < sap->num_sections; i++) + printf_unfiltered("\t%s_addr = %s\n", sap->other[i].name, + local_hex_string(sap->other[i].addr)); - /* Build a section table for symbol_file_add() from the bfd sections. */ - asi.section_addrs = alloc_section_addr_info(bfd_count_sections(bfd)); - cleanup = make_cleanup(xfree, asi.section_addrs); - asi.sect_index = 0; - asi.base_addr = base_addr; - bfd_map_over_sections(bfd, add_section, &asi); - if (from_tty && (!query("%s", ""))) error("Not confirmed."); - symbol_file_add(path, from_tty, asi.section_addrs, 0, OBJF_USERLOADED); + symbol_file_add(path, from_tty, sap, 0, OBJF_USERLOADED); do_cleanups(cleanup); } ==== //depot/projects/mpsafetty/include/Makefile#3 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.2 (Berkeley) 1/4/94 -# $FreeBSD: src/include/Makefile,v 1.281 2008/07/25 12:37:46 ed Exp $ +# $FreeBSD: src/include/Makefile,v 1.282 2008/09/26 05:50:08 peter Exp $ # # Doing a "make install" builds /usr/include. @@ -103,7 +103,16 @@ echo "#else" >> osreldate.h; \ echo "#undef __FreeBSD_version" >> osreldate.h; \ echo "#define __FreeBSD_version $$RELDATE" >> osreldate.h; \ - echo "#endif" >> osreldate.h + echo "#ifdef __STDC__" >> osreldate.h; \ + echo "#ifndef _OSRELDATE_H" >> osreldate.h; \ + echo "#define _OSRELDATE_H" >> osreldate.h; \ + echo "#include " >> osreldate.h; \ + echo "__BEGIN_DECLS" >> osreldate.h; \ + echo "extern int getosreldate(void);" >> osreldate.h; \ + echo "__END_DECLS" >> osreldate.h; \ + echo "#endif /* _OSRELDATE_H */" >> osreldate.h; \ + echo "#endif /* __STDC__ */" >> osreldate.h; \ + echo "#endif /* _KERNEL */" >> osreldate.h .for i in ${LHDRS} INCSLINKS+= sys/$i ${INCLUDEDIR}/$i ==== //depot/projects/mpsafetty/release/i386/fixit_crunch.conf#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/release/i386/fixit_crunch.conf,v 1.16 2007/07/02 14:01:43 kensmith Exp $ +# $FreeBSD: src/release/i386/fixit_crunch.conf,v 1.17 2008/09/25 12:25:54 nyan Exp $ buildopts -DRELEASE_CRUNCH @@ -46,4 +46,4 @@ progs chroot ln chown chgrp -libs -ledit -lgeom -lkiconv -lkvm -lncurses -lutil +libs -ledit -lgeom -lbsdxml -lsbuf -lkiconv -lkvm -lncurses -lutil ==== //depot/projects/mpsafetty/release/pc98/fixit-small_crunch.conf#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/release/pc98/fixit-small_crunch.conf,v 1.10 2008/05/13 11:51:19 nyan Exp $ +# $FreeBSD: src/release/pc98/fixit-small_crunch.conf,v 1.11 2008/09/25 12:25:54 nyan Exp $ buildopts -DRELEASE_CRUNCH @@ -26,7 +26,6 @@ progs clri progs dmesg progs fdisk -progs mknod progs mount progs mount_cd9660 progs mount_msdosfs @@ -37,11 +36,8 @@ special fdisk srcdir /usr/src/sbin/fdisk_pc98 -srcdirs /usr/src/usr.bin -progs ftp - srcdirs /usr/src/usr.sbin progs chown ln chown chgrp -libs -ledit -lgeom -lkiconv -lkvm -lncurses -lutil +libs -lgeom -lbsdxml -lsbuf -lkiconv -lkvm -lncurses -lutil ==== //depot/projects/mpsafetty/release/pc98/fixit_crunch.conf#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/release/pc98/fixit_crunch.conf,v 1.16 2008/05/11 14:25:24 nyan Exp $ +# $FreeBSD: src/release/pc98/fixit_crunch.conf,v 1.17 2008/09/25 12:25:54 nyan Exp $ buildopts -DRELEASE_CRUNCH @@ -26,7 +26,6 @@ progs clri progs dmesg progs fdisk -progs mknod progs mount progs mount_cd9660 progs mount_msdosfs @@ -45,4 +44,4 @@ progs chown ln chown chgrp -libs -ledit -lgeom -lkiconv -lkvm -lncurses -lutil +libs -ledit -lgeom -lbsdxml -lsbuf -lkiconv -lkvm -lncurses -lutil ==== //depot/projects/mpsafetty/share/man/man5/rc.conf.5#6 (text+ko) ==== @@ -22,9 +22,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man5/rc.conf.5,v 1.347 2008/09/19 15:27:37 thompsa Exp $ +.\" $FreeBSD: src/share/man/man5/rc.conf.5,v 1.349 2008/09/24 21:07:11 des Exp $ .\" -.Dd September 16, 2008 +.Dd September 24, 2008 .Dt RC.CONF 5 .Os .Sh NAME @@ -3116,16 +3116,6 @@ If set to .Dq Li YES , load System V IPC primitives at boot time. -.It Va kernel_symlink_enable -.Pq Vt bool -Set to -.Dq Li YES -to symbolicly link -.Pa /boot/kernel -to the directory that contains the kernel you booted from, -unless -.Pa /boot/kernel -already exists and is not a symbolic link. .It Va clear_tmp_enable .Pq Vt bool Set to @@ -3450,6 +3440,12 @@ Unset by default. When set, sets the interface to use when setting IP address alias. Note that the alias is created at jail startup and removed at jail shutdown. +.It Va jail_ Ns Ao Ar jname Ac Ns Va _netmask +.Pq Vt str +Set to +.Li 255.255.255.255 +by default. +This is the IP netmask to use when setting IP address alias. .It Va jail_ Ns Ao Ar jname Ac Ns Va _fib .Pq Vt str Unset by default. ==== //depot/projects/mpsafetty/share/man/man9/make_dev.9#3 (text+ko) ==== @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man9/make_dev.9,v 1.24 2008/09/11 11:38:48 kib Exp $ +.\" $FreeBSD: src/share/man/man9/make_dev.9,v 1.25 2008/09/26 14:31:24 ed Exp $ .\" .Dd September 8, 2008 .Os @@ -44,11 +44,11 @@ .In sys/param.h .In sys/conf.h .Ft struct cdev * -.Fn make_dev "struct cdevsw *cdevsw" "int minor" "uid_t uid" "gid_t gid" "int perms" "const char *fmt" ... +.Fn make_dev "struct cdevsw *cdevsw" "int unit" "uid_t uid" "gid_t gid" "int perms" "const char *fmt" ... .Ft struct cdev * -.Fn make_dev_cred "struct cdevsw *cdevsw" "int minor" "struct ucred *cr" "uid_t uid" "gid_t gid" "int perms" "const char *fmt" ... +.Fn make_dev_cred "struct cdevsw *cdevsw" "int unit" "struct ucred *cr" "uid_t uid" "gid_t gid" "int perms" "const char *fmt" ... .Ft struct cdev * -.Fn make_dev_credf "int flags" "struct cdevsw *cdevsw" "int minor" "struct ucred *cr" "uid_t uid" "gid_t gid" "int perms" "const char *fmt" ... +.Fn make_dev_credf "int flags" "struct cdevsw *cdevsw" "int unit" "struct ucred *cr" "uid_t uid" "gid_t gid" "int perms" "const char *fmt" ... .Ft struct cdev * .Fn make_dev_alias "struct cdev *pdev" "const char *fmt" ... .Ft void @@ -148,14 +148,14 @@ .Fn make_dev_cred function is equivalent to the call .Bd -literal -offset indent -make_dev_credf(0, cdevsw, minor, cr, uid, gid, perms, fmt, ...); +make_dev_credf(0, cdevsw, unit, cr, uid, gid, perms, fmt, ...); .Ed . .Pp The .Fn make_dev function call is the same as .Bd -literal -offset indent -make_dev_credf(0, cdevsw, minor, NULL, uid, gid, perms, fmt, ...); +make_dev_credf(0, cdevsw, unit, NULL, uid, gid, perms, fmt, ...); .Ed . .Pp The @@ -184,7 +184,7 @@ Both fields are of type .Ft void * . These are designed to replace the -.Fa minor +.Fa unit argument to .Fn make_dev . .Pp ==== //depot/projects/mpsafetty/sys/cam/scsi/scsi_pass.c#2 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_pass.c,v 1.48 2007/05/16 16:54:23 scottl Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_pass.c,v 1.49 2008/09/26 14:19:52 ed Exp $"); #include #include @@ -265,7 +265,7 @@ mtx_unlock(periph->sim->mtx); no_tags = (cgd->inq_data.flags & SID_CmdQue) == 0; softc->device_stats = devstat_new_entry("pass", - unit2minor(periph->unit_number), 0, + periph->unit_number, 0, DEVSTAT_NO_BLOCKSIZE | (no_tags ? DEVSTAT_NO_ORDERED_TAGS : 0), softc->pd_type | @@ -274,7 +274,7 @@ DEVSTAT_PRIORITY_PASS); /* Register the device */ - softc->dev = make_dev(&pass_cdevsw, unit2minor(periph->unit_number), + softc->dev = make_dev(&pass_cdevsw, periph->unit_number, UID_ROOT, GID_OPERATOR, 0600, "%s%d", periph->periph_name, periph->unit_number); mtx_lock(periph->sim->mtx); ==== //depot/projects/mpsafetty/sys/cam/scsi/scsi_ses.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_ses.c,v 1.37 2008/03/17 17:18:16 scottl Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_ses.c,v 1.38 2008/09/26 14:19:52 ed Exp $"); #include #include @@ -343,7 +343,7 @@ } cam_periph_unlock(periph); - softc->ses_dev = make_dev(&ses_cdevsw, unit2minor(periph->unit_number), + softc->ses_dev = make_dev(&ses_cdevsw, periph->unit_number, UID_ROOT, GID_OPERATOR, 0600, "%s%d", periph->periph_name, periph->unit_number); cam_periph_lock(periph); ==== //depot/projects/mpsafetty/sys/cam/scsi/scsi_sg.c#2 (text+ko) ==== @@ -30,7 +30,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_sg.c,v 1.9 2007/05/16 16:54:23 scottl Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_sg.c,v 1.10 2008/09/26 14:19:52 ed Exp $"); #include #include @@ -287,7 +287,7 @@ cam_periph_unlock(periph); no_tags = (cgd->inq_data.flags & SID_CmdQue) == 0; softc->device_stats = devstat_new_entry("sg", - unit2minor(periph->unit_number), 0, + periph->unit_number, 0, DEVSTAT_NO_BLOCKSIZE | (no_tags ? DEVSTAT_NO_ORDERED_TAGS : 0), softc->pd_type | @@ -296,7 +296,7 @@ DEVSTAT_PRIORITY_PASS); /* Register the device */ - softc->dev = make_dev(&sg_cdevsw, unit2minor(periph->unit_number), + softc->dev = make_dev(&sg_cdevsw, periph->unit_number, UID_ROOT, GID_OPERATOR, 0600, "%s%d", periph->periph_name, periph->unit_number); (void)make_dev_alias(softc->dev, "sg%c", 'a' + periph->unit_number); ==== //depot/projects/mpsafetty/sys/cam/scsi/scsi_target.c#2 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_target.c,v 1.73 2007/04/15 08:49:11 scottl Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_target.c,v 1.74 2008/09/26 14:19:52 ed Exp $"); #include @@ -1031,7 +1031,7 @@ return; if (dev_stdclone(name, NULL, "targ", &u) != 1) return; - *dev = make_dev(&targ_cdevsw, unit2minor(u), UID_ROOT, GID_WHEEL, + *dev = make_dev(&targ_cdevsw, u, UID_ROOT, GID_WHEEL, 0600, "targ%d", u); dev_ref(*dev); (*dev)->si_flags |= SI_CHEAPCLONE; ==== //depot/projects/mpsafetty/sys/cddl/dev/dtrace/dtrace_clone.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH * DAMAGE. * - * $FreeBSD: src/sys/cddl/dev/dtrace/dtrace_clone.c,v 1.1 2008/05/23 05:59:41 jb Exp $ + * $FreeBSD: src/sys/cddl/dev/dtrace/dtrace_clone.c,v 1.2 2008/09/26 14:19:52 ed Exp $ * */ @@ -52,7 +52,7 @@ /* Clone the device to the new minor number. */ if (clone_create(&dtrace_clones, &dtrace_cdevsw, &u, dev, 0) != 0) /* Create the /dev/dtrace/dtraceNN entry. */ - *dev = make_dev_cred(&dtrace_cdevsw, unit2minor(u), cred, + *dev = make_dev_cred(&dtrace_cdevsw, u, cred, UID_ROOT, GID_WHEEL, 0600, "dtrace/dtrace%d", u); if (*dev != NULL) { dev_ref(*dev); ==== //depot/projects/mpsafetty/sys/compat/freebsd32/freebsd32_misc.c#5 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/freebsd32/freebsd32_misc.c,v 1.79 2008/09/19 15:17:32 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/freebsd32/freebsd32_misc.c,v 1.80 2008/09/25 20:50:21 jhb Exp $"); #include "opt_compat.h" @@ -2624,3 +2624,83 @@ return (error); } #endif + +int +syscall32_register(int *offset, struct sysent *new_sysent, + struct sysent *old_sysent) +{ + if (*offset == NO_SYSCALL) { + int i; + + for (i = 1; i < SYS_MAXSYSCALL; ++i) + if (freebsd32_sysent[i].sy_call == + (sy_call_t *)lkmnosys) + break; + if (i == SYS_MAXSYSCALL) + return (ENFILE); + *offset = i; + } else if (*offset < 0 || *offset >= SYS_MAXSYSCALL) + return (EINVAL); + else if (freebsd32_sysent[*offset].sy_call != (sy_call_t *)lkmnosys && + freebsd32_sysent[*offset].sy_call != (sy_call_t *)lkmressys) + return (EEXIST); + + *old_sysent = freebsd32_sysent[*offset]; + freebsd32_sysent[*offset] = *new_sysent; + return 0; +} + +int +syscall32_deregister(int *offset, struct sysent *old_sysent) +{ + + if (*offset) + freebsd32_sysent[*offset] = *old_sysent; + return 0; +} + +int +syscall32_module_handler(struct module *mod, int what, void *arg) +{ + struct syscall_module_data *data = (struct syscall_module_data*)arg; + modspecific_t ms; + int error; + + switch (what) { + case MOD_LOAD: + error = syscall32_register(data->offset, data->new_sysent, + &data->old_sysent); + if (error) { + /* Leave a mark so we know to safely unload below. */ + data->offset = NULL; + return error; + } + ms.intval = *data->offset; + MOD_XLOCK; + module_setspecific(mod, &ms); + MOD_XUNLOCK; + if (data->chainevh) + error = data->chainevh(mod, what, data->chainarg); + return (error); + case MOD_UNLOAD: + /* + * MOD_LOAD failed, so just return without calling the + * chained handler since we didn't pass along the MOD_LOAD + * event. + */ + if (data->offset == NULL) + return (0); + if (data->chainevh) { + error = data->chainevh(mod, what, data->chainarg); + if (error) + return (error); + } + error = syscall_deregister(data->offset, &data->old_sysent); + return (error); + default: + error = EOPNOTSUPP; + if (data->chainevh) + error = data->chainevh(mod, what, data->chainarg); + return (error); + } +} ==== //depot/projects/mpsafetty/sys/compat/freebsd32/freebsd32_proto.h#8 (text+ko) ==== @@ -2,8 +2,8 @@ * System call prototypes. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/freebsd32/freebsd32_proto.h,v 1.92 2008/09/22 16:09:43 obrien Exp $ - * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 183270 2008-09-22 16:09:16Z obrien + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_proto.h,v 1.93 2008/09/25 20:08:36 jhb Exp $ + * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 183361 2008-09-25 20:07:42Z jhb */ #ifndef _FREEBSD32_SYSPROTO_H_ ==== //depot/projects/mpsafetty/sys/compat/freebsd32/freebsd32_syscall.h#8 (text+ko) ==== @@ -2,8 +2,8 @@ * System call numbers. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscall.h,v 1.91 2008/09/22 16:09:43 obrien Exp $ - * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 183270 2008-09-22 16:09:16Z obrien + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscall.h,v 1.92 2008/09/25 20:08:36 jhb Exp $ + * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 183361 2008-09-25 20:07:42Z jhb */ #define FREEBSD32_SYS_syscall 0 ==== //depot/projects/mpsafetty/sys/compat/freebsd32/freebsd32_syscalls.c#8 (text+ko) ==== @@ -2,8 +2,8 @@ * System call names. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscalls.c,v 1.82 2008/09/22 16:09:43 obrien Exp $ - * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 183270 2008-09-22 16:09:16Z obrien + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscalls.c,v 1.83 2008/09/25 20:08:36 jhb Exp $ + * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 183361 2008-09-25 20:07:42Z jhb */ const char *freebsd32_syscallnames[] = { @@ -217,16 +217,16 @@ "getpgid", /* 207 = getpgid */ "#208", /* 208 = newreboot */ "poll", /* 209 = poll */ - "#210", /* 210 = */ - "#211", /* 211 = */ - "#212", /* 212 = */ - "#213", /* 213 = */ - "#214", /* 214 = */ - "#215", /* 215 = */ - "#216", /* 216 = */ - "#217", /* 217 = */ - "#218", /* 218 = */ - "#219", /* 219 = */ + "lkmnosys", /* 210 = lkmnosys */ + "lkmnosys", /* 211 = lkmnosys */ + "lkmnosys", /* 212 = lkmnosys */ + "lkmnosys", /* 213 = lkmnosys */ + "lkmnosys", /* 214 = lkmnosys */ + "lkmnosys", /* 215 = lkmnosys */ + "lkmnosys", /* 216 = lkmnosys */ + "lkmnosys", /* 217 = lkmnosys */ + "lkmnosys", /* 218 = lkmnosys */ + "lkmnosys", /* 219 = lkmnosys */ "freebsd32_semctl", /* 220 = freebsd32_semctl */ "semget", /* 221 = semget */ "semop", /* 222 = semop */ @@ -377,7 +377,7 @@ "#367", /* 367 = __cap_get_file */ "#368", /* 368 = __cap_set_fd */ "#369", /* 369 = __cap_set_file */ - "#370", /* 370 = lkmressys */ + "#370", /* 370 = nosys */ "extattr_set_fd", /* 371 = extattr_set_fd */ "extattr_get_fd", /* 372 = extattr_get_fd */ "extattr_delete_fd", /* 373 = extattr_delete_fd */ ==== //depot/projects/mpsafetty/sys/compat/freebsd32/freebsd32_sysent.c#8 (text+ko) ==== @@ -2,8 +2,8 @@ * System call switch table. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/freebsd32/freebsd32_sysent.c,v 1.92 2008/09/22 16:09:43 obrien Exp $ - * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 183270 2008-09-22 16:09:16Z obrien + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_sysent.c,v 1.93 2008/09/25 20:08:36 jhb Exp $ + * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 183361 2008-09-25 20:07:42Z jhb */ #include "opt_compat.h" @@ -248,16 +248,16 @@ { AS(getpgid_args), (sy_call_t *)getpgid, AUE_GETPGID, NULL, 0, 0 }, /* 207 = getpgid */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 208 = newreboot */ { AS(poll_args), (sy_call_t *)poll, AUE_POLL, NULL, 0, 0 }, /* 209 = poll */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 210 = */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 211 = */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 212 = */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 213 = */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 214 = */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 215 = */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 216 = */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 217 = */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 218 = */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 219 = */ + { AS(nosys_args), (sy_call_t *)lkmnosys, AUE_NULL, NULL, 0, 0 }, /* 210 = lkmnosys */ + { AS(nosys_args), (sy_call_t *)lkmnosys, AUE_NULL, NULL, 0, 0 }, /* 211 = lkmnosys */ + { AS(nosys_args), (sy_call_t *)lkmnosys, AUE_NULL, NULL, 0, 0 }, /* 212 = lkmnosys */ + { AS(nosys_args), (sy_call_t *)lkmnosys, AUE_NULL, NULL, 0, 0 }, /* 213 = lkmnosys */ + { AS(nosys_args), (sy_call_t *)lkmnosys, AUE_NULL, NULL, 0, 0 }, /* 214 = lkmnosys */ + { AS(nosys_args), (sy_call_t *)lkmnosys, AUE_NULL, NULL, 0, 0 }, /* 215 = lkmnosys */ + { AS(nosys_args), (sy_call_t *)lkmnosys, AUE_NULL, NULL, 0, 0 }, /* 216 = lkmnosys */ + { AS(nosys_args), (sy_call_t *)lkmnosys, AUE_NULL, NULL, 0, 0 }, /* 217 = lkmnosys */ + { AS(nosys_args), (sy_call_t *)lkmnosys, AUE_NULL, NULL, 0, 0 }, /* 218 = lkmnosys */ + { AS(nosys_args), (sy_call_t *)lkmnosys, AUE_NULL, NULL, 0, 0 }, /* 219 = lkmnosys */ { AS(freebsd32_semctl_args), (sy_call_t *)freebsd32_semctl, AUE_SEMCTL, NULL, 0, 0 }, /* 220 = freebsd32_semctl */ { AS(semget_args), (sy_call_t *)semget, AUE_SEMGET, NULL, 0, 0 }, /* 221 = semget */ { AS(semop_args), (sy_call_t *)semop, AUE_SEMOP, NULL, 0, 0 }, /* 222 = semop */ @@ -408,7 +408,7 @@ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 367 = __cap_get_file */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 368 = __cap_set_fd */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 369 = __cap_set_file */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 370 = lkmressys */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 370 = nosys */ { AS(extattr_set_fd_args), (sy_call_t *)extattr_set_fd, AUE_EXTATTR_SET_FD, NULL, 0, 0 }, /* 371 = extattr_set_fd */ { AS(extattr_get_fd_args), (sy_call_t *)extattr_get_fd, AUE_EXTATTR_GET_FD, NULL, 0, 0 }, /* 372 = extattr_get_fd */ { AS(extattr_delete_fd_args), (sy_call_t *)extattr_delete_fd, AUE_EXTATTR_DELETE_FD, NULL, 0, 0 }, /* 373 = extattr_delete_fd */ ==== //depot/projects/mpsafetty/sys/compat/freebsd32/freebsd32_util.h#2 (text+ko) ==== @@ -25,18 +25,20 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/compat/freebsd32/freebsd32_util.h,v 1.10 2005/06/29 15:16:20 jhb Exp $ + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_util.h,v 1.12 2008/09/25 20:50:21 jhb Exp $ */ +#ifndef _COMPAT_FREEBSD32_FREEBSD32_UTIL_H_ +#define _COMPAT_FREEBSD32_FREEBSD32_UTIL_H_ + +#include +#include +#include + #include #include #include - -#include -#include -#include - struct freebsd32_ps_strings { u_int32_t ps_argvstr; /* first of 0 or more argument strings */ int ps_nargvstr; /* the number of argument strings */ @@ -50,3 +52,35 @@ #define FREEBSD32_PS_STRINGS \ (FREEBSD32_USRSTACK - sizeof(struct freebsd32_ps_strings)) + +extern struct sysent freebsd32_sysent[]; + +#define SYSCALL32_MODULE(name, offset, new_sysent, evh, arg) \ +static struct syscall_module_data name##_syscall32_mod = { \ + evh, arg, offset, new_sysent, { 0, NULL } \ +}; \ + \ +static moduledata_t name##32_mod = { \ + #name, \ + syscall32_module_handler, \ + &name##_syscall32_mod \ +}; \ +DECLARE_MODULE(name##32, name##32_mod, SI_SUB_SYSCALLS, SI_ORDER_MIDDLE) + +#define SYSCALL32_MODULE_HELPER(syscallname) \ +static int syscallname##_syscall32 = FREEBSD32_SYS_##syscallname; \ +static struct sysent syscallname##_sysent32 = { \ + (sizeof(struct syscallname ## _args ) \ + / sizeof(register_t)), \ + (sy_call_t *)& syscallname \ +}; \ +SYSCALL32_MODULE(syscallname, \ + & syscallname##_syscall32, & syscallname##_sysent32,\ + NULL, NULL); + +int syscall32_register(int *offset, struct sysent *new_sysent, + struct sysent *old_sysent); +int syscall32_deregister(int *offset, struct sysent *old_sysent); +int syscall32_module_handler(struct module *mod, int what, void *arg); + +#endif /* !_COMPAT_FREEBSD32_FREEBSD32_UTIL_H_ */ ==== //depot/projects/mpsafetty/sys/compat/freebsd32/syscalls.master#9 (text+ko) ==== @@ -1,4 +1,4 @@ - $FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.107 2008/09/22 16:09:16 obrien Exp $ + $FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.108 2008/09/25 20:07:42 jhb Exp $ ; from: @(#)syscalls.master 8.2 (Berkeley) 1/13/94 ; from: src/sys/kern/syscalls.master 1.107 ; @@ -33,7 +33,7 @@ ; so the SYSCALL_MODULE macro works ; NOARGS same as STD except do not create structure in sys/sysproto.h ; NODEF same as STD except only have the entry in the syscall table -; added. Meaning - do do not create structure or function +; added. Meaning - do not create structure or function ; prototype in sys/sysproto.h ; NOPROTO same as STD except do not create structure or ; function prototype in sys/sysproto.h. Does add a @@ -388,16 +388,16 @@ ; ; The following are reserved for loadable syscalls ; -210 AUE_NULL UNIMPL -211 AUE_NULL UNIMPL -212 AUE_NULL UNIMPL -213 AUE_NULL UNIMPL -214 AUE_NULL UNIMPL -215 AUE_NULL UNIMPL -216 AUE_NULL UNIMPL -217 AUE_NULL UNIMPL -218 AUE_NULL UNIMPL -219 AUE_NULL UNIMPL +210 AUE_NULL NODEF lkmnosys lkmnosys nosys_args int +211 AUE_NULL NODEF lkmnosys lkmnosys nosys_args int +212 AUE_NULL NODEF lkmnosys lkmnosys nosys_args int +213 AUE_NULL NODEF lkmnosys lkmnosys nosys_args int +214 AUE_NULL NODEF lkmnosys lkmnosys nosys_args int +215 AUE_NULL NODEF lkmnosys lkmnosys nosys_args int +216 AUE_NULL NODEF lkmnosys lkmnosys nosys_args int +217 AUE_NULL NODEF lkmnosys lkmnosys nosys_args int +218 AUE_NULL NODEF lkmnosys lkmnosys nosys_args int +219 AUE_NULL NODEF lkmnosys lkmnosys nosys_args int ; ; The following were introduced with NetBSD/4.4Lite-2 @@ -637,7 +637,7 @@ 367 AUE_NULL UNIMPL __cap_get_file 368 AUE_NULL UNIMPL __cap_set_fd 369 AUE_NULL UNIMPL __cap_set_file -370 AUE_NULL UNIMPL lkmressys +370 AUE_NULL UNIMPL nosys 371 AUE_EXTATTR_SET_FD NOPROTO { int extattr_set_fd(int fd, \ int attrnamespace, const char *attrname, \ void *data, size_t nbytes); } ==== //depot/projects/mpsafetty/sys/compat/ia32/ia32_sysvec.c#3 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/ia32/ia32_sysvec.c,v 1.28 2008/09/24 10:14:37 kib Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/ia32/ia32_sysvec.c,v 1.29 2008/09/25 20:50:21 jhb Exp $"); #include "opt_compat.h" @@ -96,8 +96,6 @@ static register_t *ia32_copyout_strings(struct image_params *imgp); static void ia32_fixlimit(struct rlimit *rl, int which); >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Sep 26 17:29:57 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DC8B3106568E; Fri, 26 Sep 2008 17:29:56 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A0D1F106568B for ; Fri, 26 Sep 2008 17:29:56 +0000 (UTC) (envelope-from thompsa@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 84F068FC1D for ; Fri, 26 Sep 2008 17:29:56 +0000 (UTC) (envelope-from thompsa@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id m8QHTuQn025961 for ; Fri, 26 Sep 2008 17:29:56 GMT (envelope-from thompsa@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m8QHTuvq025959 for perforce@freebsd.org; Fri, 26 Sep 2008 17:29:56 GMT (envelope-from thompsa@freebsd.org) Date: Fri, 26 Sep 2008 17:29:56 GMT Message-Id: <200809261729.m8QHTuvq025959@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to thompsa@freebsd.org using -f From: Andrew Thompson To: Perforce Change Reviews Cc: Subject: PERFORCE change 150512 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 26 Sep 2008 17:29:57 -0000 http://perforce.freebsd.org/chv.cgi?CH=150512 Change 150512 by thompsa@thompsa_burger on 2008/09/26 17:29:13 Add in a custom rint routine, we should buffer the input intil the hotchar is seen. In most cases this will be the PPP framing char of 0x7e. Affected files ... .. //depot/projects/mpsafetty/sys/netgraph/ng_tty.c#7 edit Differences ... ==== //depot/projects/mpsafetty/sys/netgraph/ng_tty.c#7 (text+ko) ==== @@ -87,6 +87,7 @@ hook_p hook; /* Netgraph hook */ struct ifqueue outq; /* Queue of outgoing data */ size_t outqlen; /* Number of bytes in outq */ + struct mbuf *m; /* Incoming non-bypass data buffer */ short hotchar; /* Hotchar, or -1 if none */ u_int flags; /* Flags */ }; @@ -110,6 +111,7 @@ static th_getc_inject_t ngt_getc_inject; static th_getc_poll_t ngt_getc_poll; +static th_rint_t ngt_rint; static th_rint_bypass_t ngt_rint_bypass; static th_rint_poll_t ngt_rint_poll; static th_close_t ngt_close; @@ -117,7 +119,8 @@ static struct ttyhook ngt_hook = { .th_getc_inject = ngt_getc_inject, .th_getc_poll = ngt_getc_poll, - .th_rint_bypass = ngt_rint_bypass, + .th_rint = ngt_rint, + .th_rint_bypass = ngt_rint_bypass, .th_rint_poll = ngt_rint_poll, .th_close = ngt_close, }; @@ -401,6 +404,12 @@ return (sc->outqlen); } +/* + * Optimised TTY input. + * + * We get a buffer pointer to hopefully a complete data frame. Do not check for + * the hotchar, just pass it on. + */ static size_t ngt_rint_bypass(struct tty *tp, const void *buf, size_t len) { @@ -410,6 +419,8 @@ size_t total = 0; int error = 0, length; + tty_lock_assert(tp, MA_OWNED); + if (sc->hook == NULL) return (0); @@ -430,11 +441,75 @@ total += length; m->m_pkthdr.len += length; } + if (sc->m != NULL) { + /* + * Odd, we have changed from non-bypass to bypass. It is + * unlikely but not impossible, flush the data first. + */ + sc->m->m_data = sc->m->m_pktdat; + NG_SEND_DATA_ONLY(error, sc->hook, sc->m); + sc->m = NULL; + } NG_SEND_DATA_ONLY(error, sc->hook, m); return (total); } +/* + * Receive data coming from the device one char at a time, when it is not in + * bypass mode. + */ +static int +ngt_rint(struct tty *tp, char c, int flags) +{ + sc_p sc = ttyhook_softc(tp); + node_p node = sc->node; + struct mbuf *m; + int error = 0; + + tty_lock_assert(tp, MA_OWNED); + + if (sc->hook == NULL) + return (0); + + if (flags != 0) { + /* framing error or overrun on this char */ + if (sc->flags & FLG_DEBUG) + log(LOG_DEBUG, "%s: line error %x\n", + NG_NODE_NAME(node), flags); + return (0); + } + + /* Get a new header mbuf if we need one */ + if (!(m = sc->m)) { + MGETHDR(m, M_DONTWAIT, MT_DATA); + if (!m) { + if (sc->flags & FLG_DEBUG) + log(LOG_ERR, + "%s: can't get mbuf\n", NG_NODE_NAME(node)); + return (ENOBUFS); + } + m->m_len = m->m_pkthdr.len = 0; + m->m_pkthdr.rcvif = NULL; + sc->m = m; + } + + /* Add char to mbuf */ + *mtod(m, u_char *) = c; + m->m_data++; + m->m_len++; + m->m_pkthdr.len++; + + /* Ship off mbuf if it's time */ + if (sc->hotchar == -1 || c == sc->hotchar || m->m_len >= MHLEN) { + m->m_data = m->m_pktdat; + sc->m = NULL; + NG_SEND_DATA_ONLY(error, sc->hook, m); /* Will queue */ + } + + return (error); +} + static size_t ngt_rint_poll(struct tty *tp) { From owner-p4-projects@FreeBSD.ORG Fri Sep 26 17:53:20 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A8EE91065691; Fri, 26 Sep 2008 17:53:20 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 6B13C1065690 for ; Fri, 26 Sep 2008 17:53:20 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 58AD88FC16 for ; Fri, 26 Sep 2008 17:53:20 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id m8QHrKfW075490 for ; Fri, 26 Sep 2008 17:53:20 GMT (envelope-from pgj@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m8QHrKfS075484 for perforce@freebsd.org; Fri, 26 Sep 2008 17:53:20 GMT (envelope-from pgj@FreeBSD.org) Date: Fri, 26 Sep 2008 17:53:20 GMT Message-Id: <200809261753.m8QHrKfS075484@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to pgj@FreeBSD.org using -f From: Gabor Pali To: Perforce Change Reviews Cc: Subject: PERFORCE change 150513 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 26 Sep 2008 17:53:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=150513 Change 150513 by pgj@kolbasz on 2008/09/26 17:52:57 Add Hungarian translation of Preface from books/fdp-primer Affected files ... .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/fdp-primer/book.sgml#2 edit Differences ... ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/fdp-primer/book.sgml#2 (text+ko) ==== @@ -27,10 +27,11 @@ ANY WAY OUT OF THE USE OF THIS DOCUMENTATION, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - $FreeBSD: doc/en_US.ISO8859-1/books/fdp-primer/book.sgml,v 1.29 2006/05/28 17:08:45 blackend Exp $ + $FreeBSD$ --> @@ -45,9 +46,10 @@ - FreeBSD Documentation Project Primer for New Contributors + A &os; Dokumentációs Projekt irányelvei + kezdõknek - The FreeBSD Documentation Project + A &os; Dokumentációs Projekt 1998 @@ -62,55 +64,72 @@ DocEng - $FreeBSD: doc/en_US.ISO8859-1/books/fdp-primer/book.sgml,v 1.29 2006/05/28 17:08:45 blackend Exp $ + $FreeBSD$ - $FreeBSD: doc/en_US.ISO8859-1/books/fdp-primer/book.sgml,v 1.29 2006/05/28 17:08:45 blackend Exp $ + $FreeBSD$ &bookinfo.legalnotice; - Thank you for becoming a part of the FreeBSD Documentation - Project. Your contribution is extremely valuable. + Köszönjük a részvételt a &os; + Dokumentációs Projektben! Minden + segítség nagyon fontos számunkra. + + Ebben az ismertetõben megtalálható a &os; + Dokumentációs Projekt munkáját + segítõ (kötelezõ és + ajánlott) szoftverek és + segédeszközök + leírásától kezdõdõen a + Dokumentációs Projekt mögött + álló elképzelések + bemutatásáig minden olyan hasznos + információ, amelyre szükségünk + lehet a munkánk megkezdéséhez. - This primer covers everything you will need to know in order - to start contributing to the FreeBSD Documentation Project, from - the tools and software you will be using (both mandatory and - recommended) to the philosophy behind the Documentation - Project. + A leíráson folyamatosan dolgozunk, nem + tekinthetõ még véglegesnek. A befejezetlen + szakaszokat a címükben csillaggal jelöltük + meg. - This document is a work in progress, and is not complete. Sections - that are known to be incomplete are indicated with a - * in their name. + Fordítja és a + fordítást vezeti: &a.hu.pgj;. Várjuk + további fordítók + jelentkezését! - Preface + Bevezetés - Shell Prompts - - The following table shows the default system prompt and superuser - prompt. The examples will use this prompt to indicate which user you - should be running the example as. + Parancssori promptok + + A következõ táblázatban + láthatjuk a rendszer alapértelmezett + promptját és a rendszeradminisztrátor + promptját. A példákban ilyen elemek + segítségével fogjuk jelezni, hogy milyen + felhasználóként kell azokat + lefuttatni. - User + Felhasználó Prompt - + - Normal user + Egyszerû felhasználó &prompt.user; - root + Rendszeradminisztrátor &prompt.root; @@ -119,76 +138,88 @@ - Typographic Conventions + Szedési szabályok - The following table describes the typographic conventions used in - this book. + Az alábbi táblázatban röviden + összefoglaljuk a könyvben alkalmazott szedési + irányelveket. - Meaning - Examples + Leírás + Példa - The names of commands. - Use ls -l to list all files. + Parancsok + A ls -l + használatával listázzuk ki az + összes állományt. - The names of files. - Edit your .login file. + Állománynevek + Nyissuk meg a .login + állományt. - On screen computer output. + Képernyõn megjelenõ + üzenetek You have mail. - What you type, when contrasted with on-screen computer - output. + Felhasználói parancsok &prompt.user; su Password: - Manual page references. + Hivatkozások man oldalakra - Use - su - 1 - to change user names. + A &man.su.1; használatával + váltsunk felhasználót. - User and group names + Felhasználói- és + csoportnevek - Only root can do this. + Ezt kizárólag csak a + root felhasználó + végezheti el. - Emphasis + Kiemelések - You must do this. + Ezt meg kell + csinálni. - Command line variables; replace with the real name or - variable. + Parancssori változók: + helyettesítsük egy valódi névvel + vagy változóval - To delete a file, type rm filename + Az állomány + törléséhez adjuk ki az rm + állománynév + parancsot. - Environment variables + Környezeti változók - $HOME is your home directory. + A $HOME a saját + felhasználói könyvtárunkat + tartalmazza. @@ -196,49 +227,65 @@ - Notes, tips, important information, warnings, and examples + Megjegyzések, tanácsok, fontosabb + információk, figyelmeztetések és + példák - Within the text appear notes, warnings, and examples. + A szövegben elõfordulhatnak megjegyzések, + figyelmeztetések és példák. - Notes are represented like this, and contain information that - you should take note of, as it may affect what you do. + Így jelennek meg a megjegyzések és + általában ránk hatással levõ + információkat tartalmaznak, amelyeket + érdemes figyelembe vennünk. - Tips are represented like this, and contain information that you - might find useful, or lead to an easier way to do something. + Így jelennek meg a gyakorta hasznos + tanácsok, amelyek esetenként egy másik, + gyakran egyszerûbb megoldást mutatnak be. - Important information is represented like this. Typically they - flag extra steps you may need to carry out. + Így jelennek meg a fontosabb + információk. Általában még + további elvégzendõ lépéseket + adnak meg. - Warnings are represented like this, and contain information - warning you about possible damage if you do not follow the - instructions. This damage may be physical, to your hardware or to - you, or it may be non-physical, such as the inadvertent deletion of - important files. + Így jelennek meg a figyelmeztetések. + Határozottan érdemes rájuk figyelni, mert + ha nem követjük pontosan a bennük megadott + utasításokat, akkor azzal kárt okozhatunk + a rendszerünkben. Ez lehet fizikai, tehát a + hardvereszközeink sérülését + okozó probléma, vagy nem fizikai, tehát + például egy fontos állomány + akartlan törlése. - A sample example + Mintapélda - Examples are represented like this, and typically contain - examples you should walk through, or show you what the results of a - particular action should be. + Így jelennek meg a példák, amelyek + jellemzõen valaminek a részletes + bemutatását vagy egy konkrét mûvelet + eredményét tartalmazzák. - Acknowledgments + Köszönetnyilvánítás - My thanks to Sue Blake, Patrick Durusau, Jon Hamilton, Peter - Flynn, and Christopher Maden, who took the time to read early drafts - of this document and offer many valuable comments and - criticisms. + Szeretnénk megköszönni Sue Blake, Patrick + Durusau, Jon Hamilton, Peter Flynn és Christopher Maden + munkáját, akik kellõ fordítottak + idõt arra, hogy átolvassák a könyv + kezdeti változatait, majd azt számos + értékes megjegyzéssel és javaslattal + gazdagítsák. From owner-p4-projects@FreeBSD.ORG Fri Sep 26 19:28:00 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3D9E510656AD; Fri, 26 Sep 2008 19:28:00 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0075C10656B7 for ; Fri, 26 Sep 2008 19:28:00 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id E2DFE8FC22 for ; Fri, 26 Sep 2008 19:27:59 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id m8QJRx7i066537 for ; Fri, 26 Sep 2008 19:27:59 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m8QJRxmj066531 for perforce@freebsd.org; Fri, 26 Sep 2008 19:27:59 GMT (envelope-from hselasky@FreeBSD.org) Date: Fri, 26 Sep 2008 19:27:59 GMT Message-Id: <200809261927.m8QJRxmj066531@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 150524 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 26 Sep 2008 19:28:00 -0000 http://perforce.freebsd.org/chv.cgi?CH=150524 Change 150524 by hselasky@hselasky_laptop001 on 2008/09/26 19:27:31 Reduce the need for memory. This also fixes an issue where the BUS-DMA refuses to allocate the memory due to the aligment and size combination. I was not able to find the real reason for the failure, but this patch fixes the problem for now. Affected files ... .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_busdma.c#8 edit .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_transfer.c#29 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_busdma.c#8 (text+ko) ==== @@ -495,7 +495,7 @@ * memory, hence we sometimes to a large number of * small allocations! */ - if (size < USB_PAGE_SIZE) { + if (size <= (USB_PAGE_SIZE / 2)) { size *= 2; } #endif ==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_transfer.c#29 (text+ko) ==== @@ -942,10 +942,12 @@ parm.size[1] = parm.size[0]; /* - * UHCI need DMA tags for fixup buffers. There - * is a maximum of one tag for each endpoint. + * The number of DMA tags required depends on + * the number of endpoints. The current estimate + * for maximum number of DMA tags per endpoint + * is two. */ - parm.dma_tag_max += MIN(n_setup, USB_EP_MAX); + parm.dma_tag_max += 2 * MIN(n_setup, USB_EP_MAX); /* * DMA tags for QH, TD, Data and more. From owner-p4-projects@FreeBSD.ORG Fri Sep 26 19:32:04 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 700E1106568A; Fri, 26 Sep 2008 19:32:04 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 33BCE1065697 for ; Fri, 26 Sep 2008 19:32:04 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 220F18FC12 for ; Fri, 26 Sep 2008 19:32:04 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id m8QJW4AD084594 for ; Fri, 26 Sep 2008 19:32:04 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m8QJW49D084590 for perforce@freebsd.org; Fri, 26 Sep 2008 19:32:04 GMT (envelope-from hselasky@FreeBSD.org) Date: Fri, 26 Sep 2008 19:32:04 GMT Message-Id: <200809261932.m8QJW49D084590@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 150525 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 26 Sep 2008 19:32:04 -0000 http://perforce.freebsd.org/chv.cgi?CH=150525 Change 150525 by hselasky@hselasky_laptop001 on 2008/09/26 19:31:36 Add more text-filtering. Affected files ... .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_request.c#18 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_request.c#18 (text+ko) ==== @@ -735,8 +735,11 @@ *s = '.'; } - /* filter by default ! */ - if (!isprint(*s)) { + /* + * Filter by default - we don't allow greater and less than + * signs because they might confuse the dmesg printouts! + */ + if ((*s == '<') || (*s == '>') || (!isprint(*s))) { *s = '.'; } s++; From owner-p4-projects@FreeBSD.ORG Fri Sep 26 19:35:07 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AC547106568E; Fri, 26 Sep 2008 19:35:07 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 706CE106568B for ; Fri, 26 Sep 2008 19:35:07 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 5EEFA8FC1B for ; Fri, 26 Sep 2008 19:35:07 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id m8QJZ7Xa009758 for ; Fri, 26 Sep 2008 19:35:07 GMT (envelope-from trasz@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m8QJZ7VY009753 for perforce@freebsd.org; Fri, 26 Sep 2008 19:35:07 GMT (envelope-from trasz@freebsd.org) Date: Fri, 26 Sep 2008 19:35:07 GMT Message-Id: <200809261935.m8QJZ7VY009753@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to trasz@freebsd.org using -f From: Edward Tomasz Napierala To: Perforce Change Reviews Cc: Subject: PERFORCE change 150526 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 26 Sep 2008 19:35:07 -0000 http://perforce.freebsd.org/chv.cgi?CH=150526 Change 150526 by trasz@trasz_traszkan on 2008/09/26 19:34:46 Minor agl_get_brand_np(3) manual page fix. Affected files ... .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/acl_get_brand_np.3#3 edit Differences ... ==== //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/acl_get_brand_np.3#3 (text+ko) ==== @@ -51,9 +51,10 @@ .Pp Branding is an internal mechanism intended to prevent mixing POSIX.1e and NFS4 entries by mistake. +It's also used by the libc to determine how to print out the ACL. The first call to function that is specific for one particular brand - POSIX -or NFS4 - "brands" the ACL. Calling another function specific to another -brand will result in error. +or NFS4 - "brands" the ACL. +After that, calling function specific to another brand will result in error. .Sh RETURN VALUES .Rv -std acl_get_brand_np .Sh ERRORS From owner-p4-projects@FreeBSD.ORG Fri Sep 26 19:37:10 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 27135106568E; Fri, 26 Sep 2008 19:37:10 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C5F84106568B for ; Fri, 26 Sep 2008 19:37:09 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id B2D1A8FC25 for ; Fri, 26 Sep 2008 19:37:09 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id m8QJb9KG025542 for ; Fri, 26 Sep 2008 19:37:09 GMT (envelope-from trasz@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m8QJb9la025534 for perforce@freebsd.org; Fri, 26 Sep 2008 19:37:09 GMT (envelope-from trasz@freebsd.org) Date: Fri, 26 Sep 2008 19:37:09 GMT Message-Id: <200809261937.m8QJb9la025534@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to trasz@freebsd.org using -f From: Edward Tomasz Napierala To: Perforce Change Reviews Cc: Subject: PERFORCE change 150528 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 26 Sep 2008 19:37:10 -0000 http://perforce.freebsd.org/chv.cgi?CH=150528 Change 150528 by trasz@trasz_traszkan on 2008/09/26 19:36:51 More vaccess_t - it seems pretty complete now - and removing Vflags abuse. Affected files ... .. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/compat/opensolaris/kern/opensolaris_policy.c#4 edit .. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/compat/opensolaris/sys/policy.h#2 edit .. //depot/projects/soc2008/trasz_nfs4acl/sys/compat/linux/linux_getcwd.c#3 edit .. //depot/projects/soc2008/trasz_nfs4acl/sys/compat/linux/linux_misc.c#6 edit .. //depot/projects/soc2008/trasz_nfs4acl/sys/fs/cd9660/cd9660_node.c#2 edit .. //depot/projects/soc2008/trasz_nfs4acl/sys/fs/cd9660/cd9660_vfsops.c#2 edit .. //depot/projects/soc2008/trasz_nfs4acl/sys/fs/fdescfs/fdesc_vnops.c#4 edit .. //depot/projects/soc2008/trasz_nfs4acl/sys/fs/msdosfs/msdosfs_vfsops.c#2 edit .. //depot/projects/soc2008/trasz_nfs4acl/sys/fs/unionfs/union_vfsops.c#3 edit .. //depot/projects/soc2008/trasz_nfs4acl/sys/fs/unionfs/union_vnops.c#4 edit .. //depot/projects/soc2008/trasz_nfs4acl/sys/gnu/fs/ext2fs/ext2_vfsops.c#3 edit .. //depot/projects/soc2008/trasz_nfs4acl/sys/gnu/fs/reiserfs/reiserfs_vfsops.c#2 edit .. //depot/projects/soc2008/trasz_nfs4acl/sys/gnu/fs/xfs/FreeBSD/xfs_super.c#2 edit .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/uipc_mqueue.c#5 edit .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/uipc_shm.c#3 edit .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/vfs_subr.c#14 edit .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/vfs_syscalls.c#6 edit .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/vfs_vnops.c#6 edit .. //depot/projects/soc2008/trasz_nfs4acl/sys/nfsserver/nfs_serv.c#4 edit .. //depot/projects/soc2008/trasz_nfs4acl/sys/security/mac/mac_framework.h#5 edit .. //depot/projects/soc2008/trasz_nfs4acl/sys/security/mac/mac_policy.h#5 edit .. //depot/projects/soc2008/trasz_nfs4acl/sys/security/mac/mac_vfs.c#3 edit .. //depot/projects/soc2008/trasz_nfs4acl/sys/security/mac_biba/mac_biba.c#7 edit .. //depot/projects/soc2008/trasz_nfs4acl/sys/security/mac_bsdextended/mac_bsdextended.c#6 edit .. //depot/projects/soc2008/trasz_nfs4acl/sys/security/mac_ifoff/mac_ifoff.c#3 edit .. //depot/projects/soc2008/trasz_nfs4acl/sys/security/mac_lomac/mac_lomac.c#7 edit .. //depot/projects/soc2008/trasz_nfs4acl/sys/security/mac_mls/mac_mls.c#7 edit .. //depot/projects/soc2008/trasz_nfs4acl/sys/security/mac_stub/mac_stub.c#5 edit .. //depot/projects/soc2008/trasz_nfs4acl/sys/security/mac_test/mac_test.c#5 edit .. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/extattr.h#2 edit .. //depot/projects/soc2008/trasz_nfs4acl/sys/ufs/ffs/ffs_vfsops.c#11 edit .. //depot/projects/soc2008/trasz_nfs4acl/sys/ufs/ffs/ffs_vnops.c#4 edit Differences ... ==== //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/compat/opensolaris/kern/opensolaris_policy.c#4 (text+ko) ==== @@ -91,7 +91,7 @@ int secpolicy_vnode_access(struct ucred *cred, struct vnode *vp, uint64_t owner, - int mode) + vaccess_t mode) { if ((mode & VREAD) && priv_check_cred(cred, PRIV_VFS_READ, 0) != 0) { ==== //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/compat/opensolaris/sys/policy.h#2 (text+ko) ==== @@ -46,7 +46,7 @@ int secpolicy_vnode_stky_modify(struct ucred *cred); int secpolicy_vnode_remove(struct ucred *cred); int secpolicy_vnode_access(struct ucred *cred, struct vnode *vp, - uint64_t owner, int mode); + uint64_t owner, vaccess_t mode); int secpolicy_vnode_setdac(struct ucred *cred, uid_t owner); int secpolicy_vnode_setattr(struct ucred *cred, struct vnode *vp, struct vattr *vap, const struct vattr *ovap, int flags, ==== //depot/projects/soc2008/trasz_nfs4acl/sys/compat/linux/linux_getcwd.c#3 (text+ko) ==== @@ -307,7 +307,7 @@ struct vnode *uvp = NULL; char *bp = NULL; int error; - int perms = VEXEC; + vaccess_t perms = VEXEC; if (rvp == NULL) { rvp = fdp->fd_rdir; ==== //depot/projects/soc2008/trasz_nfs4acl/sys/compat/linux/linux_misc.c#6 (text+ko) ==== @@ -306,7 +306,7 @@ * than vn_open(). */ #ifdef MAC - error = mac_vnode_check_open(td->td_ucred, vp, FREAD); + error = mac_vnode_check_open(td->td_ucred, vp, VREAD); if (error) goto cleanup; #endif ==== //depot/projects/soc2008/trasz_nfs4acl/sys/fs/cd9660/cd9660_node.c#2 (text+ko) ==== @@ -156,24 +156,24 @@ if (isonum_711(ap->version) == 1) { if (!(ap->perm[0]&0x40)) - inop->inode.iso_mode |= VEXEC >> 6; + inop->inode.iso_mode |= S_IXOTH; if (!(ap->perm[0]&0x10)) - inop->inode.iso_mode |= VREAD >> 6; + inop->inode.iso_mode |= S_IROTH; if (!(ap->perm[0]&4)) - inop->inode.iso_mode |= VEXEC >> 3; + inop->inode.iso_mode |= S_IXGRP; if (!(ap->perm[0]&1)) - inop->inode.iso_mode |= VREAD >> 3; + inop->inode.iso_mode |= S_IRGRP; if (!(ap->perm[1]&0x40)) - inop->inode.iso_mode |= VEXEC; + inop->inode.iso_mode |= S_IXUSR; if (!(ap->perm[1]&0x10)) - inop->inode.iso_mode |= VREAD; + inop->inode.iso_mode |= S_IRUSR; inop->inode.iso_uid = isonum_723(ap->owner); /* what about 0? */ inop->inode.iso_gid = isonum_723(ap->group); /* what about 0? */ } else ap = NULL; } if (!ap) { - inop->inode.iso_mode |= VREAD|VEXEC|(VREAD|VEXEC)>>3|(VREAD|VEXEC)>>6; + inop->inode.iso_mode |= S_IRUSR|S_IXUSR|S_IRGRP|S_IXGRP|S_IROTH|S_IXOTH; inop->inode.iso_uid = (uid_t)0; inop->inode.iso_gid = (gid_t)0; } ==== //depot/projects/soc2008/trasz_nfs4acl/sys/fs/cd9660/cd9660_vfsops.c#2 (text+ko) ==== @@ -129,7 +129,7 @@ struct vnode *devvp; char *fspec; int error; - mode_t accessmode; + vaccess_t accessmode; struct nameidata ndp; struct iso_mnt *imp = 0; ==== //depot/projects/soc2008/trasz_nfs4acl/sys/fs/fdescfs/fdesc_vnops.c#4 (text+ko) ==== @@ -424,10 +424,8 @@ VATTR_NULL(vap); vap->va_type = IFTOVT(stb.st_mode); vap->va_mode = stb.st_mode; -#define FDRX (VREAD|VEXEC) if (vap->va_type == VDIR) - vap->va_mode &= ~((FDRX)|(FDRX>>3)|(FDRX>>6)); -#undef FDRX + vap->va_mode &= ~(S_IRUSR|S_IXUSR|S_IRGRP|S_IXGRP|S_IROTH|S_IXOTH); vap->va_nlink = 1; vap->va_flags = 0; vap->va_bytes = stb.st_blocks * stb.st_blksize; ==== //depot/projects/soc2008/trasz_nfs4acl/sys/fs/msdosfs/msdosfs_vfsops.c#2 (text+ko) ==== @@ -241,7 +241,7 @@ struct msdosfsmount *pmp = NULL; struct nameidata ndp; int error, flags; - mode_t accessmode; + vaccess_t accessmode; char *from; if (vfs_filteropt(mp->mnt_optnew, msdosfs_opts)) ==== //depot/projects/soc2008/trasz_nfs4acl/sys/fs/unionfs/union_vfsops.c#3 (text+ko) ==== @@ -67,43 +67,6 @@ static struct vfsops unionfs_vfsops; /* - * Exchange from userland file mode to vmode. - */ -static u_short -mode2vmode(mode_t mode) -{ - u_short ret; - - ret = 0; - - /* other */ - if (mode & S_IXOTH) - ret |= VEXEC >> 6; - if (mode & S_IWOTH) - ret |= VWRITE >> 6; - if (mode & S_IROTH) - ret |= VREAD >> 6; - - /* group */ - if (mode & S_IXGRP) - ret |= VEXEC >> 3; - if (mode & S_IWGRP) - ret |= VWRITE >> 3; - if (mode & S_IRGRP) - ret |= VREAD >> 3; - - /* owner */ - if (mode & S_IXUSR) - ret |= VEXEC; - if (mode & S_IWUSR) - ret |= VWRITE; - if (mode & S_IRUSR) - ret |= VREAD; - - return (ret); -} - -/* * Mount unionfs layer. */ static int @@ -121,8 +84,8 @@ int below; uid_t uid; gid_t gid; - u_short udir; - u_short ufile; + vaccess_t udir; + vaccess_t ufile; unionfs_copymode copymode; unionfs_whitemode whitemode; struct componentname fakecn; @@ -174,7 +137,7 @@ vfs_mount_error(mp, "Invalid udir"); return (EINVAL); } - udir = mode2vmode(udir); + udir &= S_IRWXU | S_IRWXG | S_IRWXO; } if (vfs_getopt(mp->mnt_optnew, "ufile", (void **)&tmp, NULL) == 0) { if (tmp != NULL) @@ -183,7 +146,7 @@ vfs_mount_error(mp, "Invalid ufile"); return (EINVAL); } - ufile = mode2vmode(ufile); + ufile &= S_IRWXU | S_IRWXG | S_IRWXO; } /* check umask, uid and gid */ if (udir == 0 && ufile != 0) ==== //depot/projects/soc2008/trasz_nfs4acl/sys/fs/unionfs/union_vnops.c#4 (text+ko) ==== @@ -583,7 +583,7 @@ * Check the access mode toward shadow file/dir. */ static int -unionfs_check_corrected_access(u_short mode, +unionfs_check_corrected_access(vaccess_t mode, struct vattr *va, struct ucred *cred) { ==== //depot/projects/soc2008/trasz_nfs4acl/sys/gnu/fs/ext2fs/ext2_vfsops.c#3 (text+ko) ==== @@ -137,7 +137,7 @@ struct ext2_sb_info *fs; char *path, *fspec; int error, flags, len; - mode_t accessmode; + vaccess_t accessmode; struct nameidata nd, *ndp = &nd; opts = mp->mnt_optnew; ==== //depot/projects/soc2008/trasz_nfs4acl/sys/gnu/fs/reiserfs/reiserfs_vfsops.c#2 (text+ko) ==== @@ -74,7 +74,7 @@ { size_t size; int error, len; - mode_t accessmode; + vaccess_t accessmode; char *path, *fspec; struct vnode *devvp; struct vfsoptlist *opts; ==== //depot/projects/soc2008/trasz_nfs4acl/sys/gnu/fs/xfs/FreeBSD/xfs_super.c#2 (text+ko) ==== @@ -133,7 +133,7 @@ struct vnode *devvp; struct g_consumer *cp; struct g_provider *pp; - mode_t accessmode; + vaccess_t accessmode; td = curthread; ==== //depot/projects/soc2008/trasz_nfs4acl/sys/kern/uipc_mqueue.c#5 (text+ko) ==== @@ -2005,7 +2005,7 @@ if ((flags & (O_CREAT | O_EXCL)) == (O_CREAT | O_EXCL)) { error = EEXIST; } else { - int acc_mode = 0; + vaccess_t acc_mode = 0; if (flags & FREAD) acc_mode |= VREAD; ==== //depot/projects/soc2008/trasz_nfs4acl/sys/kern/uipc_shm.c#3 (text+ko) ==== @@ -367,7 +367,7 @@ static int shm_access(struct shmfd *shmfd, struct ucred *ucred, int flags) { - int acc_mode; + vaccess_t acc_mode; acc_mode = 0; if (flags & FREAD) ==== //depot/projects/soc2008/trasz_nfs4acl/sys/kern/vfs_subr.c#14 (text+ko) ==== @@ -53,6 +53,7 @@ #include #include #include +#include #include #include #include @@ -71,7 +72,6 @@ #include #include #include -#include #include @@ -3564,7 +3564,7 @@ */ int extattr_check_cred(struct vnode *vp, int attrnamespace, struct ucred *cred, - struct thread *td, int access) + struct thread *td, vaccess_t access) { /* ==== //depot/projects/soc2008/trasz_nfs4acl/sys/kern/vfs_syscalls.c#6 (text+ko) ==== @@ -2032,7 +2032,8 @@ struct ucred *cred; struct thread *td; { - int error, flags; + int error; + vaccess_t flags; /* Flags == 0 means only check for existence. */ error = 0; @@ -4335,7 +4336,8 @@ struct flock lf; struct file *fp; register struct filedesc *fdp = p->p_fd; - int fmode, mode, error, type; + int fmode, error, type; + vaccess_t mode; struct file *nfp; int vfslocked; int indx; ==== //depot/projects/soc2008/trasz_nfs4acl/sys/kern/vfs_vnops.c#6 (text+ko) ==== @@ -115,7 +115,8 @@ struct thread *td = ndp->ni_cnd.cn_thread; struct vattr vat; struct vattr *vap = &vat; - int mode, fmode, error; + int fmode, error; + vaccess_t mode; int vfslocked, mpsafe; mpsafe = ndp->ni_cnd.cn_flags & MPSAFE; ==== //depot/projects/soc2008/trasz_nfs4acl/sys/nfsserver/nfs_serv.c#4 (text+ko) ==== @@ -138,7 +138,7 @@ SYSCTL_STRUCT(_vfs_nfsrv, NFS_NFSRVSTATS, nfsrvstats, CTLFLAG_RW, &nfsrvstats, nfsrvstats, "S,nfsrvstats"); -static int nfsrv_access(struct vnode *, int, struct ucred *, int, +static int nfsrv_access(struct vnode *, vaccess_t, struct ucred *, int, struct thread *, int); static void nfsrvw_coalesce(struct nfsrv_descript *, struct nfsrv_descript *); @@ -4235,7 +4235,7 @@ * will return EPERM instead of EACCESS. EPERM is always an error. */ static int -nfsrv_access(struct vnode *vp, int flags, struct ucred *cred, +nfsrv_access(struct vnode *vp, vaccess_t flags, struct ucred *cred, int rdonly, struct thread *td, int override) { struct vattr vattr; ==== //depot/projects/soc2008/trasz_nfs4acl/sys/security/mac/mac_framework.h#5 (text+ko) ==== @@ -87,6 +87,7 @@ struct vop_setlabel_args; #include /* XXX acl_type_t */ +#include /* vaccess_t */ /* * Entry points to the TrustedBSD MAC Framework from the remainder of the @@ -355,7 +356,7 @@ int mac_vnode_associate_extattr(struct mount *mp, struct vnode *vp); void mac_vnode_associate_singlelabel(struct mount *mp, struct vnode *vp); int mac_vnode_check_access(struct ucred *cred, struct vnode *vp, - int acc_mode); + vaccess_t acc_mode); int mac_vnode_check_chdir(struct ucred *cred, struct vnode *dvp); int mac_vnode_check_chroot(struct ucred *cred, struct vnode *dvp); int mac_vnode_check_create(struct ucred *cred, struct vnode *dvp, @@ -381,7 +382,7 @@ int mac_vnode_check_mprotect(struct ucred *cred, struct vnode *vp, int prot); int mac_vnode_check_open(struct ucred *cred, struct vnode *vp, - int acc_mode); + vaccess_t acc_mode); int mac_vnode_check_poll(struct ucred *active_cred, struct ucred *file_cred, struct vnode *vp); int mac_vnode_check_read(struct ucred *active_cred, ==== //depot/projects/soc2008/trasz_nfs4acl/sys/security/mac/mac_policy.h#5 (text+ko) ==== @@ -61,6 +61,7 @@ * alphabetically. */ #include /* XXX acl_type_t */ +#include /* XXX vaccess_t */ struct acl; struct auditinfo; @@ -516,7 +517,8 @@ struct label *mplabel, struct vnode *vp, struct label *vplabel); typedef int (*mpo_vnode_check_access_t)(struct ucred *cred, - struct vnode *vp, struct label *vplabel, int acc_mode); + struct vnode *vp, struct label *vplabel, + vaccess_t acc_mode); typedef int (*mpo_vnode_check_chdir_t)(struct ucred *cred, struct vnode *dvp, struct label *dvplabel); typedef int (*mpo_vnode_check_chroot_t)(struct ucred *cred, @@ -557,7 +559,8 @@ typedef int (*mpo_vnode_check_mprotect_t)(struct ucred *cred, struct vnode *vp, struct label *vplabel, int prot); typedef int (*mpo_vnode_check_open_t)(struct ucred *cred, - struct vnode *vp, struct label *vplabel, int acc_mode); + struct vnode *vp, struct label *vplabel, + vaccess_t acc_mode); typedef int (*mpo_vnode_check_poll_t)(struct ucred *active_cred, struct ucred *file_cred, struct vnode *vp, struct label *vplabel); ==== //depot/projects/soc2008/trasz_nfs4acl/sys/security/mac/mac_vfs.c#3 (text+ko) ==== @@ -362,7 +362,7 @@ } int -mac_vnode_check_access(struct ucred *cred, struct vnode *vp, int acc_mode) +mac_vnode_check_access(struct ucred *cred, struct vnode *vp, vaccess_t acc_mode) { int error; @@ -546,7 +546,7 @@ } int -mac_vnode_check_open(struct ucred *cred, struct vnode *vp, int acc_mode) +mac_vnode_check_open(struct ucred *cred, struct vnode *vp, vaccess_t acc_mode) { int error; ==== //depot/projects/soc2008/trasz_nfs4acl/sys/security/mac_biba/mac_biba.c#7 (text+ko) ==== @@ -46,6 +46,7 @@ #include #include +#include #include #include #include @@ -59,7 +60,6 @@ #include #include #include -#include #include #include #include @@ -2819,7 +2819,7 @@ static int biba_vnode_check_open(struct ucred *cred, struct vnode *vp, - struct label *vplabel, int acc_mode) + struct label *vplabel, vaccess_t acc_mode) { struct mac_biba *subj, *obj; ==== //depot/projects/soc2008/trasz_nfs4acl/sys/security/mac_bsdextended/mac_bsdextended.c#6 (text+ko) ==== @@ -219,7 +219,8 @@ static int ugidfw_rulecheck(struct mac_bsdextended_rule *rule, - struct ucred *cred, struct vnode *vp, struct vattr *vap, int acc_mode) + struct ucred *cred, struct vnode *vp, struct vattr *vap, + vaccess_t acc_mode) { int match; int i; @@ -395,7 +396,7 @@ static int ugidfw_check(struct ucred *cred, struct vnode *vp, struct vattr *vap, - int acc_mode) + vaccess_t acc_mode) { int error, i; @@ -479,7 +480,7 @@ static int ugidfw_vnode_check_access(struct ucred *cred, struct vnode *vp, - struct label *vplabel, int acc_mode) + struct label *vplabel, vaccess_t acc_mode) { return (ugidfw_check_vp(cred, vp, acc_mode)); @@ -585,7 +586,7 @@ static int ugidfw_vnode_check_open(struct ucred *cred, struct vnode *vp, - struct label *vplabel, int acc_mode) + struct label *vplabel, vaccess_t acc_mode) { return (ugidfw_check_vp(cred, vp, acc_mode)); ==== //depot/projects/soc2008/trasz_nfs4acl/sys/security/mac_ifoff/mac_ifoff.c#3 (text+ko) ==== ==== //depot/projects/soc2008/trasz_nfs4acl/sys/security/mac_lomac/mac_lomac.c#7 (text+ko) ==== @@ -48,6 +48,7 @@ #include #include #include +#include #include #include #include @@ -60,7 +61,6 @@ #include #include #include -#include #include #include #include @@ -2366,7 +2366,7 @@ static int lomac_vnode_check_open(struct ucred *cred, struct vnode *vp, - struct label *vplabel, int acc_mode) + struct label *vplabel, vaccess_t acc_mode) { struct mac_lomac *subj, *obj; ==== //depot/projects/soc2008/trasz_nfs4acl/sys/security/mac_mls/mac_mls.c#7 (text+ko) ==== @@ -48,6 +48,7 @@ #include #include #include +#include #include #include #include @@ -60,7 +61,6 @@ #include #include #include -#include #include #include #include @@ -2442,7 +2442,7 @@ static int mls_vnode_check_open(struct ucred *cred, struct vnode *vp, - struct label *vplabel, int acc_mode) + struct label *vplabel, vaccess_t acc_mode) { struct mac_mls *subj, *obj; ==== //depot/projects/soc2008/trasz_nfs4acl/sys/security/mac_stub/mac_stub.c#5 (text+ko) ==== @@ -50,6 +50,7 @@ #include #include #include +#include #include #include #include @@ -58,7 +59,6 @@ #include #include #include -#include #include #include #include @@ -985,7 +985,7 @@ static int stub_vnode_check_access(struct ucred *cred, struct vnode *vp, - struct label *vplabel, int acc_mode) + struct label *vplabel, vaccess_t acc_mode) { return (0); @@ -1300,7 +1300,7 @@ static int stub_vnode_check_open(struct ucred *cred, struct vnode *vp, - struct label *vplabel, int acc_mode) + struct label *vplabel, vaccess_t acc_mode) { return (0); ==== //depot/projects/soc2008/trasz_nfs4acl/sys/security/mac_test/mac_test.c#5 (text+ko) ==== @@ -2242,7 +2242,7 @@ COUNTER_DECL(vnode_check_access); static int test_vnode_check_access(struct ucred *cred, struct vnode *vp, - struct label *vplabel, int acc_mode) + struct label *vplabel, vaccess_t acc_mode) { LABEL_CHECK(cred->cr_label, MAGIC_CRED); @@ -2416,7 +2416,7 @@ COUNTER_DECL(vnode_check_open); static int test_vnode_check_open(struct ucred *cred, struct vnode *vp, - struct label *vplabel, int acc_mode) + struct label *vplabel, vaccess_t acc_mode) { LABEL_CHECK(cred->cr_label, MAGIC_CRED); ==== //depot/projects/soc2008/trasz_nfs4acl/sys/sys/extattr.h#2 (text+ko) ==== @@ -64,7 +64,7 @@ struct ucred; struct vnode; int extattr_check_cred(struct vnode *vp, int attrnamespace, - struct ucred *cred, struct thread *td, int access); + struct ucred *cred, struct thread *td, vaccess_t access); #else #include ==== //depot/projects/soc2008/trasz_nfs4acl/sys/ufs/ffs/ffs_vfsops.c#11 (text+ko) ==== @@ -135,7 +135,7 @@ struct fs *fs; int error, flags; u_int mntorflags, mntandnotflags; - mode_t accessmode; + vaccess_t accessmode; struct nameidata ndp; char *fspec; ==== //depot/projects/soc2008/trasz_nfs4acl/sys/ufs/ffs/ffs_vnops.c#4 (text+ko) ==== @@ -69,6 +69,7 @@ #include #include #include +#include #include #include #include @@ -80,7 +81,6 @@ #include #include #include -#include #include #include From owner-p4-projects@FreeBSD.ORG Fri Sep 26 19:56:35 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1E744106568C; Fri, 26 Sep 2008 19:56:35 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D411A1065690 for ; Fri, 26 Sep 2008 19:56:34 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id BFFDD8FC13 for ; Fri, 26 Sep 2008 19:56:34 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id m8QJuYZ3042414 for ; Fri, 26 Sep 2008 19:56:34 GMT (envelope-from trasz@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m8QJuXHr042412 for perforce@freebsd.org; Fri, 26 Sep 2008 19:56:33 GMT (envelope-from trasz@freebsd.org) Date: Fri, 26 Sep 2008 19:56:33 GMT Message-Id: <200809261956.m8QJuXHr042412@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to trasz@freebsd.org using -f From: Edward Tomasz Napierala To: Perforce Change Reviews Cc: Subject: PERFORCE change 150531 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 26 Sep 2008 19:56:35 -0000 http://perforce.freebsd.org/chv.cgi?CH=150531 Change 150531 by trasz@trasz_traszkan on 2008/09/26 19:56:33 IFC. Affected files ... .. //depot/projects/soc2008/trasz_nfs4acl/Makefile.inc1#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/ObsoleteFiles.inc#11 integrate .. //depot/projects/soc2008/trasz_nfs4acl/UPDATING#8 integrate .. //depot/projects/soc2008/trasz_nfs4acl/cddl/contrib/opensolaris/lib/libdtrace/common/dt_printf.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/libpcap/pcap-bpf.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/libpcap/pcap-int.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/libpcap/pcap.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/telnet/arpa/telnet.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssh/sshconnect2.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssl/FREEBSD-Xlist#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssl/FREEBSD-upgrade#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/etc/Makefile#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/etc/defaults/rc.conf#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/etc/periodic/daily/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/etc/periodic/monthly/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/etc/periodic/security/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/etc/periodic/weekly/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/etc/rc.d/jail#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/gnu/lib/csu/Makefile#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/gnu/lib/libgcc/Makefile#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/gnu/lib/libgomp/Makefile#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/gnu/usr.bin/Makefile#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/gnu/usr.bin/gdb/kgdb/kld.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/gnu/usr.bin/gdb/libgdb/fbsd-threads.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/include/Makefile#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/include/arpa/telnet.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/include/uuid.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/Makefile#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/archive.h#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/archive_entry.h#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/archive_platform.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/archive_read_support_compression_program.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/archive_read_support_format_mtree.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/archive_write_disk.c#8 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/config_freebsd.h#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/filter_fork.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/test/test_read_format_mtree.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/gen/getosreldate.3#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/powerpc/gen/syncicache.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/rpc/clnt_dg.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/uuid/Symbol.map#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libpmc/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libpmc/libpmc.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libpmc/pmc.3#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libpmc/pmc.k7.3#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/lib/libpmc/pmc.k8.3#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/lib/libpmc/pmc.p4.3#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/lib/libpmc/pmc.p5.3#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/lib/libpmc/pmc.p6.3#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/lib/libpmc/pmc.tsc.3#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/lib/libpmc/pmc_allocate.3#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libpmc/pmc_capabilities.3#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libpmc/pmc_disable.3#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libpmc/pmc_start.3#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libthr/thread/thr_event.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libthread_db/libpthread_db.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libthread_db/libthr_db.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libthread_db/thread_db.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libthread_db/thread_db.h#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libthread_db/thread_db_int.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/libexec/Makefile#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/libexec/rtld-elf/rtld_lock.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/release/doc/zh_CN.GB2312/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/release/doc/zh_CN.GB2312/errata/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/release/doc/zh_CN.GB2312/errata/article.sgml#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/release/doc/zh_CN.GB2312/hardware/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/release/doc/zh_CN.GB2312/hardware/article.sgml#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/release/doc/zh_CN.GB2312/readme/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/release/doc/zh_CN.GB2312/readme/article.sgml#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/release/doc/zh_CN.GB2312/relnotes/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/release/doc/zh_CN.GB2312/relnotes/article.sgml#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/release/doc/zh_CN.GB2312/share/sgml/catalog#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/release/doc/zh_CN.GB2312/share/sgml/release.dsl#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/release/i386/fixit_crunch.conf#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/release/pc98/fixit-small_crunch.conf#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/release/pc98/fixit_crunch.conf#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/rescue/rescue/Makefile#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sbin/Makefile#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sbin/bsdlabel/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sbin/bsdlabel/bsdlabel.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sbin/fdisk/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sbin/fsck_ffs/fsck_ffs.8#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sbin/ifconfig/ifconfig.8#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sbin/ifconfig/ifieee80211.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sbin/ifconfig/regdomain.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sbin/ipfw/ipfw2.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sbin/mount_nfs/mount_nfs.8#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sbin/mount_nfs/mount_nfs.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/Makefile#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/examples/drivers/make_pseudo_driver.sh#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/age.4#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/ddb.4#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/hwpmc.4#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/snd_hda.4#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man5/rc.conf.5#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man5/src.conf.5#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man9/DB_COMMAND.9#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man9/Makefile#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man9/bus_dma.9#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man9/dev_clone.9#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man9/devfs_set_cdevpriv.9#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man9/insmntque.9#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man9/make_dev.9#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man9/priv.9#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man9/suser.9#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man9/ucred.9#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man9/vfs_suser.9#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/misc/committers-src.dot#8 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/mk/bsd.own.mk#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/zoneinfo/africa#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/zoneinfo/asia#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/zoneinfo/europe#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/zoneinfo/southamerica#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/amd64/amd64/elf_machdep.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/amd64/amd64/identcpu.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/amd64/amd64/vm_machdep.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/amd64/include/pmc_mdep.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/amd64/linux32/linux32_sysvec.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/amd64/pci/pci_cfgreg.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/arm/elf_machdep.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/arm/intr.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/arm/nexus.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/include/intr.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/include/pcpu.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/xscale/ixp425/ixp425.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/xscale/ixp425/ixp425_qmgr.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/boot/Makefile#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/boot/ofw/libofw/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/boot/ofw/libofw/ofw_console.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/cam/cam.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/cam/scsi/scsi_pass.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/cam/scsi/scsi_ses.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/cam/scsi/scsi_sg.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/cam/scsi/scsi_target.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/compat/opensolaris/kern/opensolaris_atomic.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/compat/opensolaris/sys/atomic.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/dev/dtrace/dtrace_clone.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/compat/freebsd32/freebsd32_ioctl.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/compat/freebsd32/freebsd32_ioctl.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/compat/freebsd32/freebsd32_misc.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/compat/freebsd32/freebsd32_proto.h#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/compat/freebsd32/freebsd32_syscall.h#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/compat/freebsd32/freebsd32_syscalls.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/compat/freebsd32/freebsd32_sysent.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/compat/freebsd32/freebsd32_util.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/compat/freebsd32/syscalls.master#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/compat/ia32/ia32_sysvec.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/compat/linprocfs/linprocfs.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/compat/linux/linux_misc.c#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/compat/ndis/ntoskrnl_var.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/compat/svr4/svr4_stream.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/compat/svr4/svr4_sysvec.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/conf/NOTES#12 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/conf/files#13 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/conf/files.amd64#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/conf/files.i386#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/conf/files.ia64#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/conf/files.mips#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/conf/files.sparc64#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/conf/kern.pre.mk#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/conf/ldscript.mips#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/conf/options.mips#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/conf/options.sparc64#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/ddb/db_command.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/ddb/db_command.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/ddb/db_main.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/ddb/ddb.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/aac/aac_pci.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/acpica/acpi_quirk.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/aic7xxx/aic79xx_osm.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ata/ata-chipset.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ata/ata-pci.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ata/ata-pci.h#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ath/if_ath.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ath/if_athvar.h#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/bge/if_bge.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/bm/if_bm.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/cfe/cfe_api.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/cfe/cfe_api.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/cfe/cfe_api_int.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/cfe/cfe_console.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/cfe/cfe_error.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/cfe/cfe_ioctl.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/cfe/cfe_resource.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/cxgb/common/cxgb_ael1002.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/cxgb/common/cxgb_common.h#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/cxgb/common/cxgb_mc5.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/cxgb/common/cxgb_mv88e1xxx.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/cxgb/common/cxgb_t3_hw.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/cxgb/common/cxgb_tn1010.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/cxgb/common/cxgb_vsc7323.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/cxgb/common/cxgb_vsc8211.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/cxgb/common/cxgb_xgmac.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/cxgb/cxgb_adapter.h#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/cxgb/cxgb_config.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/cxgb/cxgb_include.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/cxgb/cxgb_main.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/cxgb/cxgb_multiq.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/cxgb/cxgb_offload.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/cxgb/cxgb_offload.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/cxgb/cxgb_osdep.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/cxgb/cxgb_sge.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/cxgb/cxgb_t3fw.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/cxgb/sys/cxgb_support.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/cxgb/sys/mbufq.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/cxgb/sys/mvec.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/cxgb/sys/uipc_mvec.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_cm.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_cq.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_dbg.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_ev.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_hal.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_mem.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_provider.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_qp.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_resource.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/cxgb/ulp/toecore/cxgb_toedev.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/cxgb/ulp/toecore/toedev.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/cxgb/ulp/tom/cxgb_cpl_socket.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/cxgb/ulp/tom/cxgb_ddp.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/cxgb/ulp/tom/cxgb_defs.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/cxgb/ulp/tom/cxgb_l2t.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/cxgb/ulp/tom/cxgb_l2t.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/cxgb/ulp/tom/cxgb_listen.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/cxgb/ulp/tom/cxgb_t3_ddp.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/cxgb/ulp/tom/cxgb_tcp_offload.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/cxgb/ulp/tom/cxgb_toepcb.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/cxgb/ulp/tom/cxgb_tom.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/cxgb/ulp/tom/cxgb_tom.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/cxgb/ulp/tom/cxgb_tom_sysctl.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/cxgb/ulp/tom/cxgb_vm.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/hwpmc/hwpmc_amd.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/hwpmc/hwpmc_mod.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/hwpmc/hwpmc_piv.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/hwpmc/hwpmc_ppro.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/hwpmc/hwpmc_x86.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/jme/if_jme.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/jme/if_jmereg.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/kbdmux/kbdmux.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/le/if_le_cbus.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/le/if_le_isa.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/le/if_le_lebuffer.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/le/if_le_pci.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/le/lebuffer_sbus.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/led/led.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/mlx/mlx.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/msk/if_msk.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/msk/if_mskreg.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/pci/vga_pci.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ppbus/if_plip.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ppbus/lpt.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ppbus/ppbconf.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ppbus/ppbconf.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ppbus/ppi.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ppbus/pps.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ppc/ppc.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ppc/ppc_acpi.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ppc/ppc_isa.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ppc/ppc_pci.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ppc/ppc_puc.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ppc/ppcreg.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ppc/ppcvar.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/siba/siba.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/siba/siba_ids.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/siba/siba_pcib.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/siba/siba_pcibvar.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/siba/sibareg.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/siba/sibavar.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/snp/snp.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/sound/pci/emu10kx.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/sound/pci/hda/hda_reg.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/sound/pci/hda/hdac.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/sound/pci/hda/hdac_private.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/sound/pcm/dsp.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/sound/pcm/mixer.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/tx/if_tx.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/if_zyd.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/ubsa.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/ufoma.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/umass.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/usbdevs#8 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/vkbd/vkbd.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/xen/blkfront/blkfront.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/xen/netfront/netfront.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/fs/coda/coda_fbsd.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/fs/devfs/devfs_devs.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/fs/devfs/devfs_vnops.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/fs/fdescfs/fdesc_vnops.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/fs/hpfs/hpfs_vnops.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/fs/msdosfs/msdosfs_vnops.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/fs/ntfs/ntfs_vnops.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/fs/nullfs/null_vnops.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/fs/portalfs/portal_vnops.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/fs/pseudofs/pseudofs_vnops.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/fs/smbfs/smbfs_node.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/fs/tmpfs/tmpfs.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/fs/tmpfs/tmpfs_subr.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/fs/tmpfs/tmpfs_vnops.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/fs/udf/udf_vnops.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/geom/geom_dev.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/geom/geom_io.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/gnu/fs/ext2fs/ext2_inode.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/gnu/fs/xfs/FreeBSD/support/kdb.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/gnu/fs/xfs/FreeBSD/xfs_vnops.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/acpica/acpi_machdep.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/bios/apm.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/conf/GENERIC#9 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/i386/bios.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/i386/elf_machdep.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/i386/identcpu.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/i386/intr_machdep.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/i386/pmap.c#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/i386/sys_machdep.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/i386/vm_machdep.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/ibcs2/ibcs2_sysvec.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/include/param.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/include/pmc_mdep.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/include/proc.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/include/smp.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/include/specialreg.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/include/xen/evtchn.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/linux/linux_sysvec.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/pci/pci_cfgreg.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/xen/mp_machdep.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/xen/pmap.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/xen/xen_machdep.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/ia64/ia64/efi.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/ia64/ia64/elf_machdep.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/ia64/ia64/sal.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/imgact_aout.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/init_main.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/init_sysent.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/kern_condvar.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/kern_conf.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/kern_intr.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/kern_pmc.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/kern_priv.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/kern_proc.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/kern_synch.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/kern_syscalls.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/makesyscalls.sh#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/subr_clist.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/subr_pcpu.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/subr_rman.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/subr_sleepqueue.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/subr_turnstile.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/subr_witness.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/sys_generic.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/syscalls.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/syscalls.master#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/systrace_args.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/tty.c#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/tty_pts.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/tty_ttydisc.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/uipc_mqueue.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/vfs_bio.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/vfs_cache.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/vfs_mount.c#9 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/vfs_vnops.c#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/libkern/memcmp.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/mips/adm5120/obio.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/mips/conf/IDT#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/mips/idt/obio.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/mips/malta/gt_pci.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/mips/mips/elf_machdep.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/mips/mips/intr_machdep.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/mips/mips/support.S#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/mips/sentry5/s5_machdep.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/Makefile#9 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/cxgb/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/cxgb/cxgb/Makefile#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/cxgb/cxgb_t3fw/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/cxgb/iw_cxgb/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/cxgb/toecore/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/cxgb/tom/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/svr4/Makefile#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/wlan/Makefile#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net/if.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net/if_atmsubr.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net/if_clone.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net/if_clone.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net/if_fwsubr.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net/if_iso88025subr.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net/if_lagg.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net/if_stf.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net/if_tap.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net/if_tun.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net/route.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net/route.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net80211/ieee80211.h#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net80211/ieee80211_adhoc.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net80211/ieee80211_crypto.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net80211/ieee80211_crypto.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net80211/ieee80211_ddb.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net80211/ieee80211_freebsd.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net80211/ieee80211_freebsd.h#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net80211/ieee80211_hostap.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net80211/ieee80211_ht.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net80211/ieee80211_ht.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net80211/ieee80211_ioctl.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net80211/ieee80211_ioctl.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net80211/ieee80211_node.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net80211/ieee80211_node.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net80211/ieee80211_output.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net80211/ieee80211_sta.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net80211/ieee80211_var.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net80211/ieee80211_wds.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netgraph/netgraph.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netgraph/ng_base.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netgraph/ng_device.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netgraph/ng_source.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/if_ether.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/in_rmx.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/in_var.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/ip.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/ip_fw.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/ip_fw2.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/ip_input.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/tcp_input.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/tcp_output.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/tcp_subr.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/tcp_syncache.c#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet6/udp6_usrreq.c#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netipx/ipx.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netsmb/smb_dev.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/nfsclient/nfs_vfsops.c#8 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/nfsclient/nfs_vnops.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/nfsserver/nfs.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/nfsserver/nfs_serv.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/nfsserver/nfs_srvsock.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/nfsserver/nfs_srvsubs.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/nfsserver/nfs_syscalls.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/powerpc/aim/clock.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/powerpc/aim/machdep.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/powerpc/aim/mmu_oea.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/powerpc/aim/mp_cpudep.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/powerpc/aim/swtch.S#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/powerpc/aim/trap_subr.S#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/powerpc/booke/machdep.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/powerpc/include/cpufunc.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/powerpc/include/dbdma.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/powerpc/include/md_var.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/powerpc/include/pmap.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/powerpc/include/pte.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/powerpc/include/smp.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/powerpc/include/spr.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/powerpc/ofw/ofw_syscons.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/powerpc/powermac/dbdma.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/powerpc/powermac/dbdmavar.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/powerpc/powerpc/autoconf.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/powerpc/powerpc/cpu.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/powerpc/powerpc/elf_machdep.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/powerpc/powerpc/mp_machdep.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/powerpc/powerpc/openpic.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/powerpc/powerpc/syncicache.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/security/audit/audit_pipe.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/security/mac_bsdextended/mac_bsdextended.c#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sparc64/include/smp.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sparc64/include/tick.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sparc64/pci/psycho.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sparc64/pci/psychoreg.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sparc64/sparc64/elf_machdep.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sparc64/sparc64/genassym.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sparc64/sparc64/intr_machdep.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sparc64/sparc64/mp_machdep.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sparc64/sparc64/tick.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/clist.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/conf.h#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/interrupt.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/libkern.h#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/mount.h#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/param.h#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/pmckern.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/priv.h#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/proc.h#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/procfs.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/syscall.h#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/syscall.mk#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/sysent.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/sysproto.h#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/tty.h#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/ttydevsw.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/ttydisc.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/ttyhook.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/ttyqueue.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/vnode.h#11 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/ufs/ffs/ffs_extern.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/ufs/ffs/ffs_inode.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/ufs/ffs/ffs_snapshot.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/ufs/ffs/ffs_softdep.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/ufs/ffs/ffs_vfsops.c#12 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/ufs/ufs/dirhash.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/ufs/ufs/inode.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/ufs/ufs/ufs_dirhash.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/ufs/ufs/ufs_inode.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/ufs/ufs/ufs_lookup.c#12 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/ufs/ufs/ufs_vnops.c#20 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/ufs/ufs/ufsmount.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/vm/device_pager.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/vm/vm_mmap.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/vm/vm_page.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/vm/vm_page.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/vm/vm_pageout.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/xen/evtchn/evtchn.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/xen/gnttab.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/xen/gnttab.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/xen/interface/arch-ia64.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/xen/interface/arch-powerpc.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/xen/interface/arch-x86/cpuid.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/xen/interface/arch-x86/hvm/save.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/xen/interface/arch-x86/xen-mca.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/xen/interface/arch-x86/xen-x86_32.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/xen/interface/arch-x86/xen-x86_64.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/xen/interface/arch-x86/xen.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/xen/interface/callback.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/xen/interface/domctl.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/xen/interface/features.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/xen/interface/foreign/mkchecker.py#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/xen/interface/foreign/mkheader.py#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/xen/interface/foreign/structs.py#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/xen/interface/grant_table.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/xen/interface/hvm/hvm_op.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/xen/interface/hvm/ioreq.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/xen/interface/hvm/params.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/xen/interface/hvm/save.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/xen/interface/io/blkif.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/xen/interface/io/fbif.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/xen/interface/io/kbdif.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/xen/interface/io/netif.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/xen/interface/io/pciif.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/xen/interface/io/protocols.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/xen/interface/io/ring.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/xen/interface/io/xenbus.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/xen/interface/io/xs_wire.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/xen/interface/kexec.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/xen/interface/libelf.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/xen/interface/memory.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/xen/interface/physdev.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/xen/interface/platform.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/xen/interface/sysctl.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/xen/interface/trace.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/xen/interface/vcpu.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/xen/interface/xen-compat.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/xen/interface/xen.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/tools/build/mk/OptionalObsoleteFiles.inc#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/tools/build/options/WITHOUT_ACCT#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/tools/build/options/WITHOUT_AMD#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/tools/build/options/WITHOUT_APM#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/tools/build/options/WITHOUT_AT#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/tools/build/options/WITHOUT_BSNMP#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/tools/build/options/WITHOUT_CTM#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/tools/build/options/WITHOUT_FLOPPY#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/tools/build/options/WITHOUT_FREEBSD_UPDATE#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/tools/build/options/WITHOUT_IPFW#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/tools/build/options/WITHOUT_JAIL#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/tools/build/options/WITHOUT_LEGACY_CONSOLE#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/tools/build/options/WITHOUT_LOCATE#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/tools/build/options/WITHOUT_MAIL#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/tools/build/options/WITHOUT_MAKE#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/tools/build/options/WITHOUT_NDIS#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/tools/build/options/WITHOUT_NETGRAPH#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/tools/build/options/WITHOUT_NETGRAPH_SUPPORT#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/tools/build/options/WITHOUT_NTP#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/tools/build/options/WITHOUT_PKGTOOLS#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/tools/build/options/WITHOUT_PMC#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/tools/build/options/WITHOUT_PORTSNAP#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/tools/build/options/WITHOUT_PPP#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/tools/build/options/WITHOUT_QUOTAS#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/tools/build/options/WITHOUT_ROUTED#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/tools/build/options/WITHOUT_SLIP#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/tools/build/options/WITHOUT_SYSINSTALL#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/tools/build/options/WITHOUT_TELNET#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/tools/build/options/WITHOUT_TEXTPROC#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/tools/build/options/WITHOUT_WIRELESS#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/tools/build/options/WITHOUT_WIRELESS_SUPPORT#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/tools/tools/nanobsd/nanobsd.sh#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/tools/tools/net80211/scripts/config#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/Makefile#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/ar/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/ar/acplex.l#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/ar/acpyacc.y#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/ar/ar.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/ar/ar.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/ar/write.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/netstat/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/netstat/main.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/netstat/netstat.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/tar/config_freebsd.h#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/tar/test/Makefile#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/tar/test/test_symlink_dir.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/tar/write.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/top/machine.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/Makefile#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/fwcontrol/fwcontrol.8#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/iostat/iostat.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/mlxcontrol/command.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/mlxcontrol/interface.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/ntp/config.h#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/pmcstat/pmcstat.8#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/pmcstat/pmcstat.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/portsnap/portsnap/portsnap.8#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/pstat/pstat.8#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/pstat/pstat.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/quot/quot.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/syslogd/syslogd.8#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/syslogd/syslogd.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/timed/timed/globals.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/ypbind/yp_ping.c#2 integrate Differences ... ==== //depot/projects/soc2008/trasz_nfs4acl/Makefile.inc1#6 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.610 2008/08/19 14:23:26 jhb Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.611 2008/09/19 16:14:42 obrien Exp $ # # Make command line options: # -DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir @@ -27,6 +27,10 @@ .include +.if ${MACHINE_ARCH} == "mips" +MK_RESCUE=no # not yet +.endif + # We must do share/info early so that installation of info `dir' # entries works correctly. Do it first since it is less likely to # grow dependencies on include and lib than vice versa. ==== //depot/projects/soc2008/trasz_nfs4acl/ObsoleteFiles.inc#11 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/ObsoleteFiles.inc,v 1.158 2008/09/10 18:36:58 jhb Exp $ +# $FreeBSD: src/ObsoleteFiles.inc,v 1.162 2008/09/21 16:11:11 antoine Exp $ # # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and # directories (OLD_DIRS) which should get removed at an update. Recently @@ -14,6 +14,11 @@ # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last. # +# 20080917: removal of manpage for axed kernel primitive suser(9) +OLD_FILES+=usr/share/man/man9/suser.9.gz +OLD_FILES+=usr/share/man/man9/suser_cred.9.gz +# 20080913: pax removed from rescue +OLD_FILES+=rescue/pax # 20080823: removal of unneeded pt_chown, to implement grantpt(3) OLD_FILES+=usr/libexec/pt_chown # 20080822: ntp 4.2.4p5 import @@ -3794,7 +3799,6 @@ OLD_FILES+=usr/games/worms OLD_FILES+=usr/games/wump OLD_FILES+=sbin/mount_reiserfs -OLD_FILES+=usr/bin/hesinfo OLD_FILES+=usr/include/c++/3.4/ext/demangle.h OLD_FILES+=usr/include/cam/cam_extend.h OLD_FILES+=usr/include/dev/wi/wi_hostap.h @@ -4204,10 +4208,8 @@ OLD_FILES+=usr/share/doc/ntp/tickadj.htm OLD_FILES+=usr/share/doc/papers/nqnfs.ascii.gz OLD_FILES+=usr/share/doc/papers/px.ascii.gz -OLD_FILES+=usr/share/man/man1/hesinfo.1.gz OLD_FILES+=usr/share/man/man3/mbrune.3.gz OLD_FILES+=usr/share/man/man3/rune.3.gz -OLD_FILES+=usr/share/man/man3/hesiod.3.gz OLD_FILES+=usr/share/man/man3/mac_is_present_np.3.gz OLD_FILES+=usr/share/man/man3/fpsetsticky.3.gz OLD_FILES+=usr/share/man/man3/gss_krb5_copy_ccache.3.gz @@ -4222,7 +4224,6 @@ OLD_FILES+=usr/share/man/man3/setinvalidrune.3.gz OLD_FILES+=usr/share/man/man3/mbrune.3.gz OLD_FILES+=usr/share/man/man3/rune.3.gz -OLD_FILES+=usr/share/man/man3/hesiod.3.gz OLD_FILES+=usr/share/man/man3/mac_is_present_np.3.gz OLD_FILES+=usr/share/man/man3/fpsetsticky.3.gz OLD_FILES+=usr/share/man/man3/gss_krb5_copy_ccache.3.gz @@ -4238,7 +4239,6 @@ OLD_FILES+=usr/share/man/man3/fungetrune.3.gz OLD_FILES+=usr/share/man/man3/fputrune.3.gz OLD_FILES+=usr/share/man/man3/fgetrune.3.gz -OLD_FILES+=usr/share/man/man5/hesiod.conf.5.gz OLD_FILES+=usr/share/man/man5/usbd.conf.5.gz .if ${TARGET_ARCH} != "i386" && ${TARGET_ARCH} != "amd64" OLD_FILES+=usr/share/man/man8/boot_i386.8.gz ==== //depot/projects/soc2008/trasz_nfs4acl/UPDATING#8 (text+ko) ==== @@ -30,10 +30,10 @@ drivers have not yet been ported to the new TTY layer: PCI/ISA: - cy, digi, rc, rp, si, sio + cy, digi, rc, rp, sio USB: - ubser, ucycom, ufoma + ubser, ucycom Line disciplines: ng_h4, ng_tty, ppp, sl, snp @@ -1126,4 +1126,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.541 2008/09/03 08:30:17 roberto Exp $ +$FreeBSD: src/UPDATING,v 1.542 2008/09/14 19:25:57 ed Exp $ ==== //depot/projects/soc2008/trasz_nfs4acl/cddl/contrib/opensolaris/lib/libdtrace/common/dt_printf.c#2 (text+ko) ==== @@ -306,7 +306,7 @@ case sizeof (double): return (dt_printf(dtp, fp, format, *((double *)addr) / n)); -#if !defined(__arm__) && !defined(__powerpc__) +#if !defined(__arm__) && !defined(__powerpc__) && !defined(__mips__) case sizeof (long double): return (dt_printf(dtp, fp, format, *((long double *)addr) / ldn)); ==== //depot/projects/soc2008/trasz_nfs4acl/contrib/libpcap/pcap-bpf.c#2 (text+ko) ==== @@ -18,7 +18,7 @@ * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. * - * $FreeBSD: src/contrib/libpcap/pcap-bpf.c,v 1.4 2007/10/16 02:07:55 mlaier Exp $ + * $FreeBSD: src/contrib/libpcap/pcap-bpf.c,v 1.5 2008/09/16 20:32:29 csjp Exp $ */ #ifndef lint static const char rcsid[] _U_ = @@ -30,6 +30,7 @@ #endif #include /* optionally get BSD define */ +#include #include #include #include @@ -86,6 +87,10 @@ #endif /* _AIX */ +#ifdef BIOCSETBUFMODE +#include +#endif + #include #include #include @@ -139,6 +144,159 @@ return (0); } +#ifdef BIOCGETBUFMODE +/* + * Zero-copy BPF buffer routines to check for and acknowledge BPF data in + * shared memory buffers. + * + * pcap_next_zbuf_shm(): Check for a newly available shared memory buffer, + * and set up p->buffer and cc to reflect one if available. Notice that if + * there was no prior buffer, we select zbuf1 as this will be the first + * buffer filled for a fresh BPF session. + */ +static int +pcap_next_zbuf_shm(pcap_t *p, int *cc) +{ + struct bpf_zbuf_header *bzh; + + if (p->zbuffer == p->zbuf2 || p->zbuffer == NULL) { + bzh = (struct bpf_zbuf_header *)p->zbuf1; + if (bzh->bzh_user_gen != + atomic_load_acq_int(&bzh->bzh_kernel_gen)) { + p->bzh = bzh; + p->zbuffer = (u_char *)p->zbuf1; + p->buffer = p->zbuffer + sizeof(*bzh); + *cc = bzh->bzh_kernel_len; + return (1); + } + } else if (p->zbuffer == p->zbuf1) { + bzh = (struct bpf_zbuf_header *)p->zbuf2; + if (bzh->bzh_user_gen != + atomic_load_acq_int(&bzh->bzh_kernel_gen)) { + p->bzh = bzh; + p->zbuffer = (u_char *)p->zbuf2; + p->buffer = p->zbuffer + sizeof(*bzh); + *cc = bzh->bzh_kernel_len; + return (1); + } + } + *cc = 0; + return (0); +} + +/* + * pcap_next_zbuf() -- Similar to pcap_next_zbuf_shm(), except wait using + * select() for data or a timeout, and possibly force rotation of the buffer + * in the event we time out or are in immediate mode. Invoke the shared + * memory check before doing system calls in order to avoid doing avoidable + * work. + */ +static int +pcap_next_zbuf(pcap_t *p, int *cc) +{ + struct bpf_zbuf bz; + struct timeval tv; + struct timespec cur; + fd_set r_set; + int data, r; + int tmout, expire; + +#define TSTOMILLI(ts) (((ts)->tv_sec * 1000) + ((ts)->tv_nsec / 1000000)) + /* + * Start out by seeing whether anything is waiting by checking the + * next shared memory buffer for data. + */ + data = pcap_next_zbuf_shm(p, cc); + if (data) + return (data); + /* + * If a previous sleep was interrupted due to signal delivery, make + * sure that the timeout gets adjusted accordingly. This requires + * that we analyze when the timeout should be been expired, and + * subtract the current time from that. If after this operation, + * our timeout is less then or equal to zero, handle it like a + * regular timeout. + */ + tmout = p->to_ms; + if (tmout) + (void) clock_gettime(CLOCK_MONOTONIC, &cur); + if (p->interrupted && p->to_ms) { + expire = TSTOMILLI(&p->firstsel) + p->to_ms; + tmout = expire - TSTOMILLI(&cur); +#undef TSTOMILLI + if (tmout <= 0) { + p->interrupted = 0; + data = pcap_next_zbuf_shm(p, cc); + if (data) + return (data); + if (ioctl(p->fd, BIOCROTZBUF, &bz) < 0) { + (void) snprintf(p->errbuf, PCAP_ERRBUF_SIZE, + "BIOCROTZBUF: %s", strerror(errno)); + return (-1); + } + return (pcap_next_zbuf_shm(p, cc)); + } + } + /* + * No data in the buffer, so must use select() to wait for data or + * the next timeout. + */ + FD_ZERO(&r_set); + FD_SET(p->fd, &r_set); + if (tmout != 0) { + tv.tv_sec = tmout / 1000; + tv.tv_usec = (tmout * 1000) % 1000000; + } + r = select(p->fd + 1, &r_set, NULL, NULL, p->to_ms != 0 ? &tv : + NULL); + if (r < 0 && errno == EINTR) { + if (!p->interrupted && p->to_ms) { + p->interrupted = 1; + p->firstsel = cur; + } + return (0); + } else if (r < 0) { + (void) snprintf(p->errbuf, PCAP_ERRBUF_SIZE, + "select: %s", strerror(errno)); + return (-1); + } + p->interrupted = 0; + /* + * Check again for data, which may exist now that we've either been + * woken up as a result of data or timed out. Try the "there's data" + * case first since it doesn't require a system call. + */ + data = pcap_next_zbuf_shm(p, cc); + if (data) + return (data); + + /* + * Try forcing a buffer rotation to dislodge timed out or immediate + * data. + */ + if (ioctl(p->fd, BIOCROTZBUF, &bz) < 0) { + (void) snprintf(p->errbuf, PCAP_ERRBUF_SIZE, + "BIOCROTZBUF: %s", strerror(errno)); + return (-1); + } + return (pcap_next_zbuf_shm(p, cc)); +} + +/* + * Notify kernel that we are done with the buffer. We don't reset zbuffer so + * that we know which buffer to use next time around. + */ +static int +pcap_ack_zbuf(pcap_t *p) +{ + + atomic_store_rel_int(&p->bzh->bzh_user_gen, p->bzh->bzh_kernel_gen); + p->bzh = NULL; + p->buffer = NULL; + return (0); +} +#endif + static int pcap_read_bpf(pcap_t *p, int cnt, pcap_handler callback, u_char *user) { @@ -147,6 +305,9 @@ register u_char *bp, *ep; u_char *datap; struct bpf_insn *fcode; +#ifdef BIOCSETBUFMODE + int i; +#endif #ifdef PCAP_FDDIPAD register int pad; #endif @@ -167,7 +328,27 @@ } cc = p->cc; if (p->cc == 0) { - cc = read(p->fd, (char *)p->buffer, p->bufsize); + /* + * When reading without zero-copy from a file descriptor, we + * use a single buffer and return a length of data in the + * buffer. With zero-copy, we update the p->buffer pointer + * to point at whatever underlying buffer contains the next + * data and update cc to reflect the data found in the + * buffer. + */ +#ifdef BIOCSETBUFMODE + if (p->zerocopy) { + if (p->buffer != NULL) + pcap_ack_zbuf(p); + i = pcap_next_zbuf(p, &cc); + if (i == 0) + goto again; + if (i < 0) + return (-1); + } else +#endif + cc = read(p->fd, (char *)p->buffer, p->bufsize); + if (cc < 0) { /* Don't choke when we get ptraced */ switch (errno) { @@ -609,6 +790,10 @@ struct bpf_insn total_insn; struct bpf_program total_prog; struct utsname osinfo; +#ifdef BIOCSETBUFMODE + struct bpf_zbuf bz; + u_int bufmode, zbufmax; +#endif #ifdef HAVE_DAG_API if (strstr(device, "dag")) { @@ -646,41 +831,105 @@ goto bad; } +#ifdef BIOCSETBUFMODE /* - * Try finding a good size for the buffer; 32768 may be too - * big, so keep cutting it in half until we find a size - * that works, or run out of sizes to try. If the default - * is larger, don't make it smaller. - * - * XXX - there should be a user-accessible hook to set the - * initial buffer size. + * If the BPF extension to set buffer mode is present, try setting + * the mode to zero-copy. If that fails, use regular buffering. If + * it succeeds but other setup fails, return an error to the user. */ - if ((ioctl(fd, BIOCGBLEN, (caddr_t)&v) < 0) || v < 32768) - v = 32768; - for ( ; v != 0; v >>= 1) { - /* Ignore the return value - this is because the call fails - * on BPF systems that don't have kernel malloc. And if - * the call fails, it's no big deal, we just continue to - * use the standard buffer size. + bufmode = BPF_BUFMODE_ZBUF; + if (ioctl(fd, BIOCSETBUFMODE, (caddr_t)&bufmode) == 0) { + p->zerocopy = 1; + >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat Sep 27 09:01:00 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4FDD11065689; Sat, 27 Sep 2008 09:01:00 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1339410656A9 for ; Sat, 27 Sep 2008 09:01:00 +0000 (UTC) (envelope-from ed@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id F3F5E8FC1B for ; Sat, 27 Sep 2008 09:00:59 +0000 (UTC) (envelope-from ed@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id m8R90xQN085032 for ; Sat, 27 Sep 2008 09:00:59 GMT (envelope-from ed@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m8R90xNf085000 for perforce@freebsd.org; Sat, 27 Sep 2008 09:00:59 GMT (envelope-from ed@FreeBSD.org) Date: Sat, 27 Sep 2008 09:00:59 GMT Message-Id: <200809270900.m8R90xNf085000@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to ed@FreeBSD.org using -f From: Ed Schouten To: Perforce Change Reviews Cc: Subject: PERFORCE change 150550 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 27 Sep 2008 09:01:00 -0000 http://perforce.freebsd.org/chv.cgi?CH=150550 Change 150550 by ed@ed_dull on 2008/09/27 09:00:29 IFC. Affected files ... .. //depot/projects/mpsafetty/include/Makefile#4 integrate .. //depot/projects/mpsafetty/include/unistd.h#3 integrate .. //depot/projects/mpsafetty/sbin/init/init.c#2 integrate .. //depot/projects/mpsafetty/sys/amd64/amd64/mem.c#2 integrate .. //depot/projects/mpsafetty/sys/arm/arm/mem.c#2 integrate .. //depot/projects/mpsafetty/sys/cam/scsi/scsi_sa.c#2 integrate .. //depot/projects/mpsafetty/sys/cam/scsi/scsi_ses.c#3 integrate .. //depot/projects/mpsafetty/sys/cam/scsi/scsi_target.c#3 integrate .. //depot/projects/mpsafetty/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c#3 integrate .. //depot/projects/mpsafetty/sys/contrib/ipfilter/netinet/ip_compat.h#3 integrate .. //depot/projects/mpsafetty/sys/contrib/pf/net/pf_ioctl.c#4 integrate .. //depot/projects/mpsafetty/sys/dev/agp/agp.c#3 integrate .. //depot/projects/mpsafetty/sys/dev/amr/amr.c#3 integrate .. //depot/projects/mpsafetty/sys/dev/arcmsr/arcmsr.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/asr/asr.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/ata/atapi-tape.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/atkbdc/psm.c#3 integrate .. //depot/projects/mpsafetty/sys/dev/bktr/bktr_os.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/ce/if_ce.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/cp/if_cp.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/cpuctl/cpuctl.c#3 integrate .. //depot/projects/mpsafetty/sys/dev/ctau/if_ct.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/drm/drm_drv.c#4 integrate .. //depot/projects/mpsafetty/sys/dev/drm/drm_fops.c#3 integrate .. //depot/projects/mpsafetty/sys/dev/fb/fb.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/fb/vgareg.h#2 integrate .. //depot/projects/mpsafetty/sys/dev/firewire/firewire.h#2 integrate .. //depot/projects/mpsafetty/sys/dev/firewire/fwdev.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/hptiop/hptiop.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/iir/iir_ctrl.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/iscsi/initiator/isc_cam.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/iscsi/initiator/iscsi.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/isp/isp_freebsd.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/joy/joy.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/kbd/kbd.c#3 integrate .. //depot/projects/mpsafetty/sys/dev/mlx/mlx.c#3 integrate .. //depot/projects/mpsafetty/sys/dev/mly/mly.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/mse/mse.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/pbio/pbio.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/powermac_nvram/powermac_nvram.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/ppbus/lpt.c#3 integrate .. //depot/projects/mpsafetty/sys/dev/ppbus/pcfclock.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/ppbus/ppi.c#3 integrate .. //depot/projects/mpsafetty/sys/dev/rp/rpvar.h#2 integrate .. //depot/projects/mpsafetty/sys/dev/sound/midi/sequencer.c#3 integrate .. //depot/projects/mpsafetty/sys/dev/speaker/spkr.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/streams/streams.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/tdfx/tdfx_pci.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/twa/tw_osl_freebsd.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/twe/twe_freebsd.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/usb/ucomvar.h#4 integrate .. //depot/projects/mpsafetty/sys/dev/usb/ufm.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/usb/ugen.c#3 integrate .. //depot/projects/mpsafetty/sys/dev/usb/uhid.c#3 integrate .. //depot/projects/mpsafetty/sys/dev/usb/ulpt.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/usb/ums.c#3 integrate .. //depot/projects/mpsafetty/sys/dev/usb/urio.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/usb/usb.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/usb/uscanner.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/xen/console/console.c#8 integrate .. //depot/projects/mpsafetty/sys/i386/bios/apm.c#2 integrate .. //depot/projects/mpsafetty/sys/i386/bios/smapi.c#2 integrate .. //depot/projects/mpsafetty/sys/i386/i386/mem.c#2 integrate .. //depot/projects/mpsafetty/sys/ia64/ia64/mem.c#2 integrate .. //depot/projects/mpsafetty/sys/kern/kern_conf.c#7 integrate .. //depot/projects/mpsafetty/sys/kern/tty.c#50 integrate .. //depot/projects/mpsafetty/sys/mips/mips/mem.c#2 integrate .. //depot/projects/mpsafetty/sys/net/if.c#6 integrate .. //depot/projects/mpsafetty/sys/net/if_tap.c#4 integrate .. //depot/projects/mpsafetty/sys/net/if_tun.c#3 integrate .. //depot/projects/mpsafetty/sys/netgraph/bluetooth/drivers/ubtbcmfw/ubtbcmfw.c#2 integrate .. //depot/projects/mpsafetty/sys/netinet/ip.h#2 integrate .. //depot/projects/mpsafetty/sys/netinet/ip_input.c#5 integrate .. //depot/projects/mpsafetty/sys/netsmb/smb_dev.c#3 integrate .. //depot/projects/mpsafetty/sys/pc98/cbus/gdc.c#2 integrate .. //depot/projects/mpsafetty/sys/pc98/cbus/olpt.c#2 integrate .. //depot/projects/mpsafetty/sys/powerpc/powerpc/mem.c#2 integrate .. //depot/projects/mpsafetty/sys/sparc64/sparc64/mem.c#3 integrate .. //depot/projects/mpsafetty/sys/vm/vm_page.c#3 integrate .. //depot/projects/mpsafetty/sys/vm/vm_page.h#2 integrate .. //depot/projects/mpsafetty/usr.sbin/Makefile#8 integrate Differences ... ==== //depot/projects/mpsafetty/include/Makefile#4 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.2 (Berkeley) 1/4/94 -# $FreeBSD: src/include/Makefile,v 1.282 2008/09/26 05:50:08 peter Exp $ +# $FreeBSD: src/include/Makefile,v 1.283 2008/09/26 19:23:22 peter Exp $ # # Doing a "make install" builds /usr/include. @@ -103,16 +103,7 @@ echo "#else" >> osreldate.h; \ echo "#undef __FreeBSD_version" >> osreldate.h; \ echo "#define __FreeBSD_version $$RELDATE" >> osreldate.h; \ - echo "#ifdef __STDC__" >> osreldate.h; \ - echo "#ifndef _OSRELDATE_H" >> osreldate.h; \ - echo "#define _OSRELDATE_H" >> osreldate.h; \ - echo "#include " >> osreldate.h; \ - echo "__BEGIN_DECLS" >> osreldate.h; \ - echo "extern int getosreldate(void);" >> osreldate.h; \ - echo "__END_DECLS" >> osreldate.h; \ - echo "#endif /* _OSRELDATE_H */" >> osreldate.h; \ - echo "#endif /* __STDC__ */" >> osreldate.h; \ - echo "#endif /* _KERNEL */" >> osreldate.h + echo "#endif" >> osreldate.h .for i in ${LHDRS} INCSLINKS+= sys/$i ${INCLUDEDIR}/$i ==== //depot/projects/mpsafetty/include/unistd.h#3 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)unistd.h 8.12 (Berkeley) 4/27/95 - * $FreeBSD: src/include/unistd.h,v 1.90 2008/07/08 03:08:32 davidxu Exp $ + * $FreeBSD: src/include/unistd.h,v 1.91 2008/09/26 19:23:22 peter Exp $ */ #ifndef _UNISTD_H_ @@ -485,6 +485,7 @@ int getdomainname(char *, int); int getgrouplist(const char *, gid_t, gid_t *, int *); mode_t getmode(const void *, mode_t); +int getosreldate(void); int getpeereid(int, uid_t *, gid_t *); int getresgid(gid_t *, gid_t *, gid_t *); int getresuid(uid_t *, uid_t *, uid_t *); ==== //depot/projects/mpsafetty/sbin/init/init.c#2 (text+ko) ==== @@ -41,7 +41,7 @@ static char sccsid[] = "@(#)init.c 8.1 (Berkeley) 7/15/93"; #endif static const char rcsid[] = - "$FreeBSD: src/sbin/init/init.c,v 1.65 2007/11/20 21:25:58 obrien Exp $"; + "$FreeBSD: src/sbin/init/init.c,v 1.66 2008/09/27 00:09:10 delphij Exp $"; #endif /* not lint */ #include @@ -95,15 +95,15 @@ #define RESOURCE_WINDOW "default" #define RESOURCE_GETTY "default" -void handle(sig_t, ...); -void delset(sigset_t *, ...); +static void handle(sig_t, ...); +static void delset(sigset_t *, ...); -void stall(const char *, ...) __printflike(1, 2); -void warning(const char *, ...) __printflike(1, 2); -void emergency(const char *, ...) __printflike(1, 2); -void disaster(int); -void badsys(int); -int runshutdown(void); +static void stall(const char *, ...) __printflike(1, 2); +static void warning(const char *, ...) __printflike(1, 2); +static void emergency(const char *, ...) __printflike(1, 2); +static void disaster(int); +static void badsys(int); +static int runshutdown(void); static char *strk(char *); /* @@ -114,15 +114,15 @@ typedef long (*state_func_t)(void); typedef state_func_t (*state_t)(void); -state_func_t single_user(void); -state_func_t runcom(void); -state_func_t read_ttys(void); -state_func_t multi_user(void); -state_func_t clean_ttys(void); -state_func_t catatonia(void); -state_func_t death(void); +static state_func_t single_user(void); +static state_func_t runcom(void); +static state_func_t read_ttys(void); +static state_func_t multi_user(void); +static state_func_t clean_ttys(void); +static state_func_t catatonia(void); +static state_func_t death(void); -state_func_t run_script(const char *); +static state_func_t run_script(const char *); enum { AUTOBOOT, FASTBOOT } runcom_mode = AUTOBOOT; #define FALSE 0 @@ -133,12 +133,12 @@ int devfs; -void transition(state_t); -state_t requested_transition; +static void transition(state_t); +static state_t requested_transition; -void setctty(const char *); -const char *get_shell(void); -void write_stderr(const char *message); +static void setctty(const char *); +static const char *get_shell(void); +static void write_stderr(const char *message); typedef struct init_session { int se_index; /* index of entry in ttys file */ @@ -160,31 +160,31 @@ struct init_session *se_next; } session_t; -void free_session(session_t *); -session_t *new_session(session_t *, int, struct ttyent *); -session_t *sessions; +static void free_session(session_t *); +static session_t *new_session(session_t *, int, struct ttyent *); +static session_t *sessions; -char **construct_argv(char *); -void start_window_system(session_t *); -void collect_child(pid_t); -pid_t start_getty(session_t *); -void transition_handler(int); -void alrm_handler(int); -void setsecuritylevel(int); -int getsecuritylevel(void); -int setupargv(session_t *, struct ttyent *); +static char **construct_argv(char *); +static void start_window_system(session_t *); +static void collect_child(pid_t); +static pid_t start_getty(session_t *); +static void transition_handler(int); +static void alrm_handler(int); +static void setsecuritylevel(int); +static int getsecuritylevel(void); +static int setupargv(session_t *, struct ttyent *); #ifdef LOGIN_CAP -void setprocresources(const char *); +static void setprocresources(const char *); #endif -int clang; +static int clang; -void clear_session_logs(session_t *); +static void clear_session_logs(session_t *); -int start_session_db(void); -void add_session(session_t *); -void del_session(session_t *); -session_t *find_session(pid_t); -DB *session_db; +static int start_session_db(void); +static void add_session(session_t *); +static void del_session(session_t *); +static session_t *find_session(pid_t); +static DB *session_db; /* * The mother of all processes. @@ -388,7 +388,7 @@ /* * Associate a function with a signal handler. */ -void +static void handle(sig_t handler, ...) { int sig; @@ -412,7 +412,7 @@ /* * Delete a set of signals from a mask. */ -void +static void delset(sigset_t *maskp, ...) { int sig; @@ -429,7 +429,7 @@ * to read it and to save log or hardcopy output if the problem is chronic). * NB: should send a message to the session logger to avoid blocking. */ -void +static void stall(const char *message, ...) { va_list ap; @@ -445,7 +445,7 @@ * If cpp had variadic macros, the two functions could be #defines for another. * NB: should send a message to the session logger to avoid blocking. */ -void +static void warning(const char *message, ...) { va_list ap; @@ -459,7 +459,7 @@ * Log an emergency message. * NB: should send a message to the session logger to avoid blocking. */ -void +static void emergency(const char *message, ...) { va_list ap; @@ -475,7 +475,7 @@ * These may arise if a system does not support sysctl. * We tolerate up to 25 of these, then throw in the towel. */ -void +static void badsys(int sig) { static int badcount = 0; @@ -488,7 +488,7 @@ /* * Catch an unexpected signal. */ -void +static void disaster(int sig) { @@ -502,7 +502,7 @@ /* * Get the security level of the kernel. */ -int +static int getsecuritylevel(void) { #ifdef KERN_SECURELVL @@ -526,7 +526,7 @@ /* * Set the security level of the kernel. */ -void +static void setsecuritylevel(int newlevel) { #ifdef KERN_SECURELVL @@ -554,7 +554,7 @@ * Change states in the finite state machine. * The initial state is passed as an argument. */ -void +static void transition(state_t s) { @@ -566,7 +566,7 @@ * Close out the accounting files for a login session. * NB: should send a message to the session logger to avoid blocking. */ -void +static void clear_session_logs(session_t *sp) { char *line = sp->se_device + sizeof(_PATH_DEV) - 1; @@ -579,7 +579,7 @@ * Start a session and allocate a controlling terminal. * Only called by children of init after forking. */ -void +static void setctty(const char *name) { int fd; @@ -595,7 +595,7 @@ } } -const char * +static const char * get_shell(void) { static char kenv_value[PATH_MAX]; @@ -606,7 +606,7 @@ return _PATH_BSHELL; } -void +static void write_stderr(const char *message) { @@ -616,7 +616,7 @@ /* * Bring the system up single user. */ -state_func_t +static state_func_t single_user(void) { pid_t pid, wpid; @@ -772,7 +772,7 @@ /* * Run the system startup script. */ -state_func_t +static state_func_t runcom(void) { state_func_t next_transition; @@ -793,7 +793,7 @@ * terminated with a signal or exit code != 0. * - death if a SIGTERM was delivered to init(8). */ -state_func_t +static state_func_t run_script(const char *script) { pid_t pid, wpid; @@ -890,7 +890,7 @@ * * NB: We could pass in the size here; is it necessary? */ -int +static int start_session_db(void) { if (session_db && (*session_db->close)(session_db)) @@ -906,7 +906,7 @@ /* * Add a new login session. */ -void +static void add_session(session_t *sp) { DBT key; @@ -924,7 +924,7 @@ /* * Delete an old login session. */ -void +static void del_session(session_t *sp) { DBT key; @@ -939,7 +939,7 @@ /* * Look up a login session by pid. */ -session_t * +static session_t * find_session(pid_t pid) { DBT key; @@ -957,7 +957,7 @@ /* * Construct an argument vector from a command line. */ -char ** +static char ** construct_argv(char *command) { int argc = 0; @@ -976,7 +976,7 @@ /* * Deallocate a session descriptor. */ -void +static void free_session(session_t *sp) { free(sp->se_device); @@ -999,7 +999,7 @@ * Allocate a new session descriptor. * Mark it SE_PRESENT. */ -session_t * +static session_t * new_session(session_t *sprev, int session_index, struct ttyent *typ) { session_t *sp; @@ -1050,7 +1050,7 @@ /* * Calculate getty and if useful window argv vectors. */ -int +static int setupargv(session_t *sp, struct ttyent *typ) { @@ -1099,7 +1099,7 @@ /* * Walk the list of ttys and create sessions for each active line. */ -state_func_t +static state_func_t read_ttys(void) { int session_index = 0; @@ -1136,7 +1136,7 @@ /* * Start a window system running. */ -void +static void start_window_system(session_t *sp) { pid_t pid; @@ -1191,7 +1191,7 @@ /* * Start a login session running. */ -pid_t +static pid_t start_getty(session_t *sp) { pid_t pid; @@ -1255,7 +1255,7 @@ * Collect exit status for a child. * If an exiting login, start a new login running. */ -void +static void collect_child(pid_t pid) { session_t *sp, *sprev, *snext; @@ -1295,7 +1295,7 @@ /* * Catch a signal and request a state transition. */ -void +static void transition_handler(int sig) { @@ -1324,7 +1324,7 @@ /* * Take the system multiuser. */ -state_func_t +static state_func_t multi_user(void) { pid_t pid; @@ -1364,7 +1364,7 @@ /* * This is an (n*2)+(n^2) algorithm. We hope it isn't run often... */ -state_func_t +static state_func_t clean_ttys(void) { session_t *sp, *sprev; @@ -1459,7 +1459,7 @@ /* * Block further logins. */ -state_func_t +static state_func_t catatonia(void) { session_t *sp; @@ -1473,7 +1473,7 @@ /* * Note SIGALRM. */ -void +static void alrm_handler(int sig) { @@ -1484,7 +1484,7 @@ /* * Bring the system down to single user. */ -state_func_t +static state_func_t death(void) { session_t *sp; @@ -1532,7 +1532,7 @@ * 0 good. * >0 some error (exit code) */ -int +static int runshutdown(void) { pid_t pid, wpid; @@ -1711,7 +1711,7 @@ } #ifdef LOGIN_CAP -void +static void setprocresources(const char *cname) { login_cap_t *lc; ==== //depot/projects/mpsafetty/sys/amd64/amd64/mem.c#2 (text+ko) ==== @@ -37,7 +37,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/mem.c,v 1.123 2008/06/20 05:22:09 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/mem.c,v 1.124 2008/09/27 08:51:18 ed Exp $"); /* * Memory special file @@ -93,7 +93,7 @@ panic("memrw"); continue; } - if (minor(dev) == CDEV_MINOR_MEM) { + if (dev2unit(dev) == CDEV_MINOR_MEM) { v = uio->uio_offset; kmemphys: o = v & PAGE_MASK; @@ -101,7 +101,7 @@ error = uiomove((void *)PHYS_TO_DMAP(v), (int)c, uio); continue; } - else if (minor(dev) == CDEV_MINOR_KMEM) { + else if (dev2unit(dev) == CDEV_MINOR_KMEM) { v = uio->uio_offset; if (v >= DMAP_MIN_ADDRESS && v < DMAP_MAX_ADDRESS) { @@ -147,9 +147,9 @@ memmmap(struct cdev *dev, vm_offset_t offset, vm_paddr_t *paddr, int prot __unused) { - if (minor(dev) == CDEV_MINOR_MEM) + if (dev2unit(dev) == CDEV_MINOR_MEM) *paddr = offset; - else if (minor(dev) == CDEV_MINOR_KMEM) + else if (dev2unit(dev) == CDEV_MINOR_KMEM) *paddr = vtophys(offset); /* else panic! */ return (0); ==== //depot/projects/mpsafetty/sys/arm/arm/mem.c#2 (text+ko) ==== @@ -37,7 +37,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/arm/mem.c,v 1.5 2007/02/13 15:35:57 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/mem.c,v 1.6 2008/09/27 08:51:18 ed Exp $"); /* * Memory special file @@ -91,7 +91,7 @@ panic("memrw"); continue; } - if (minor(dev) == CDEV_MINOR_MEM) { + if (dev2unit(dev) == CDEV_MINOR_MEM) { int i; int address_valid = 0; @@ -116,7 +116,7 @@ pmap_qremove((vm_offset_t)_tmppt, 1); continue; } - else if (minor(dev) == CDEV_MINOR_KMEM) { + else if (dev2unit(dev) == CDEV_MINOR_KMEM) { c = iov->iov_len; /* @@ -156,9 +156,9 @@ memmmap(struct cdev *dev, vm_offset_t offset, vm_paddr_t *paddr, int prot __unused) { - if (minor(dev) == CDEV_MINOR_MEM) + if (dev2unit(dev) == CDEV_MINOR_MEM) *paddr = offset; - else if (minor(dev) == CDEV_MINOR_KMEM) + else if (dev2unit(dev) == CDEV_MINOR_KMEM) *paddr = vtophys(offset); /* else panic! */ return (0); ==== //depot/projects/mpsafetty/sys/cam/scsi/scsi_sa.c#2 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_sa.c,v 1.113 2007/06/16 18:20:29 scottl Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_sa.c,v 1.114 2008/09/27 08:51:18 ed Exp $"); #include #include @@ -175,11 +175,11 @@ /* units are bits 4-7, 16-21 (1024 units) */ #define SAUNIT(DEV) \ - (((minor(DEV) & 0xF0) >> 4) | ((minor(DEV) & 0x3f0000) >> 16)) + (((dev2unit(DEV) & 0xF0) >> 4) | ((dev2unit(DEV) & 0x3f0000) >> 16)) -#define SAMODE(z) ((minor(z) & 0x3)) -#define SADENSITY(z) (((minor(z) >> 2) & 0x3)) -#define SA_IS_CTRL(z) (minor(z) & (1 << 29)) +#define SAMODE(z) ((dev2unit(z) & 0x3)) +#define SADENSITY(z) (((dev2unit(z) >> 2) & 0x3)) +#define SA_IS_CTRL(z) (dev2unit(z) & (1 << 29)) #define SA_NOT_CTLDEV 0 #define SA_CTLDEV 1 ==== //depot/projects/mpsafetty/sys/cam/scsi/scsi_ses.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_ses.c,v 1.38 2008/09/26 14:19:52 ed Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_ses.c,v 1.39 2008/09/27 08:51:18 ed Exp $"); #include #include @@ -155,7 +155,7 @@ #define SES_FLAG_OPEN 0x02 #define SES_FLAG_INITIALIZED 0x04 -#define SESUNIT(x) (minor((x))) +#define SESUNIT(x) (dev2unit((x))) static d_open_t sesopen; static d_close_t sesclose; ==== //depot/projects/mpsafetty/sys/cam/scsi/scsi_target.c#3 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_target.c,v 1.74 2008/09/26 14:19:52 ed Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_target.c,v 1.75 2008/09/27 08:51:18 ed Exp $"); #include @@ -180,7 +180,7 @@ /* Create the targ device, allocate its softc, initialize it */ if ((dev->si_flags & SI_NAMED) == 0) { - make_dev(&targ_cdevsw, minor(dev), UID_ROOT, GID_WHEEL, 0600, + make_dev(&targ_cdevsw, dev2unit(dev), UID_ROOT, GID_WHEEL, 0600, "targ%d", dev2unit(dev)); } MALLOC(softc, struct targ_softc *, sizeof(*softc), M_TARG, ==== //depot/projects/mpsafetty/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c#3 (text+ko) ==== @@ -18,7 +18,7 @@ * * CDDL HEADER END * - * $FreeBSD: src/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c,v 1.6 2008/08/19 21:28:58 jb Exp $ + * $FreeBSD: src/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c,v 1.7 2008/09/27 08:51:18 ed Exp $ */ /* @@ -12816,7 +12816,7 @@ #else if (dev != NULL) { cr = dev->si_cred; - m = minor(dev); + m = dev2unit(dev); } /* Allocate memory for the state. */ @@ -15266,7 +15266,7 @@ * The first minor device is the one that is cloned so there is * nothing more to do here. */ - if (minor(dev) == 0) + if (dev2unit(dev) == 0) return 0; /* @@ -15367,7 +15367,7 @@ dtrace_state_t *state = dev->si_drv1; /* Check if this is not a cloned device. */ - if (minor(dev) == 0) + if (dev2unit(dev) == 0) return (0); #endif ==== //depot/projects/mpsafetty/sys/contrib/ipfilter/netinet/ip_compat.h#3 (text+ko) ==== @@ -4,7 +4,7 @@ * See the IPFILTER.LICENCE file for details on licencing. * * @(#)ip_compat.h 1.8 1/14/96 - * $FreeBSD: src/sys/contrib/ipfilter/netinet/ip_compat.h,v 1.36 2008/07/24 12:35:05 darrenr Exp $ + * $FreeBSD: src/sys/contrib/ipfilter/netinet/ip_compat.h,v 1.37 2008/09/27 08:51:18 ed Exp $ * Id: ip_compat.h,v 2.142.2.57 2007/10/10 09:51:42 darrenr Exp $ */ @@ -1709,7 +1709,7 @@ # endif # ifndef GET_MINOR -# define GET_MINOR(x) minor(x) +# define GET_MINOR(x) dev2unit(x) # endif # define PANIC(x,y) if (x) panic y #endif /* _KERNEL */ ==== //depot/projects/mpsafetty/sys/contrib/pf/net/pf_ioctl.c#4 (text+ko) ==== @@ -40,7 +40,7 @@ #include "opt_inet6.h" #include -__FBSDID("$FreeBSD: src/sys/contrib/pf/net/pf_ioctl.c,v 1.35 2008/08/17 23:27:27 bz Exp $"); +__FBSDID("$FreeBSD: src/sys/contrib/pf/net/pf_ioctl.c,v 1.36 2008/09/27 08:51:18 ed Exp $"); #endif #ifdef __FreeBSD__ @@ -478,7 +478,7 @@ int pfopen(struct cdev *dev, int flags, int fmt, struct proc *p) { - if (minor(dev) >= 1) + if (dev2unit(dev) >= 1) return (ENXIO); return (0); } @@ -486,7 +486,7 @@ int pfclose(struct cdev *dev, int flags, int fmt, struct proc *p) { - if (minor(dev) >= 1) + if (dev2unit(dev) >= 1) return (ENXIO); return (0); } ==== //depot/projects/mpsafetty/sys/dev/agp/agp.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/agp/agp.c,v 1.59 2008/08/23 15:57:43 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/agp/agp.c,v 1.60 2008/09/27 08:51:18 ed Exp $"); #include "opt_bus.h" @@ -80,7 +80,7 @@ }; static devclass_t agp_devclass; -#define KDEV2DEV(kdev) devclass_get_device(agp_devclass, minor(kdev)) +#define KDEV2DEV(kdev) devclass_get_device(agp_devclass, dev2unit(kdev)) /* Helper functions for implementing chipset mini drivers. */ ==== //depot/projects/mpsafetty/sys/dev/amr/amr.c#3 (text+ko) ==== @@ -56,7 +56,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/amr/amr.c,v 1.86 2008/07/20 16:50:14 scottl Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/amr/amr.c,v 1.87 2008/09/27 08:51:18 ed Exp $"); /* * Driver for the AMI MegaRaid family of controllers. @@ -438,7 +438,7 @@ static int amr_open(struct cdev *dev, int flags, int fmt, d_thread_t *td) { - int unit = minor(dev); + int unit = dev2unit(dev); struct amr_softc *sc = devclass_get_softc(devclass_find("amr"), unit); debug_called(1); @@ -494,7 +494,7 @@ static int amr_close(struct cdev *dev, int flags, int fmt, d_thread_t *td) { - int unit = minor(dev); + int unit = dev2unit(dev); struct amr_softc *sc = devclass_get_softc(devclass_find("amr"), unit); debug_called(1); ==== //depot/projects/mpsafetty/sys/dev/arcmsr/arcmsr.c#2 (text+ko) ==== @@ -56,7 +56,7 @@ ** and cause g_vfs_done() read write error ** 1.20.00.15 10/10/2007 Erich Chen support new RAID adapter type ARC120x ****************************************************************************************** -* $FreeBSD: src/sys/dev/arcmsr/arcmsr.c,v 1.27 2007/12/09 19:24:27 scottl Exp $ +* $FreeBSD: src/sys/dev/arcmsr/arcmsr.c,v 1.28 2008/09/27 08:51:18 ed Exp $ */ #include #include @@ -256,7 +256,7 @@ #if __FreeBSD_version < 503000 struct AdapterControlBlock *acb=dev->si_drv1; #else - int unit = minor(dev); + int unit = dev2unit(dev); struct AdapterControlBlock *acb = devclass_get_softc(arcmsr_devclass, unit); #endif if(acb==NULL) { @@ -281,7 +281,7 @@ #if __FreeBSD_version < 503000 struct AdapterControlBlock *acb=dev->si_drv1; #else - int unit = minor(dev); + int unit = dev2unit(dev); struct AdapterControlBlock *acb = devclass_get_softc(arcmsr_devclass, unit); #endif if(acb==NULL) { @@ -306,7 +306,7 @@ #if __FreeBSD_version < 503000 struct AdapterControlBlock *acb=dev->si_drv1; #else - int unit = minor(dev); + int unit = dev2unit(dev); struct AdapterControlBlock *acb = devclass_get_softc(arcmsr_devclass, unit); #endif ==== //depot/projects/mpsafetty/sys/dev/asr/asr.c#2 (text+ko) ==== @@ -163,7 +163,7 @@ #include -__FBSDID("$FreeBSD: src/sys/dev/asr/asr.c,v 1.85 2007/06/17 05:55:48 scottl Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/asr/asr.c,v 1.86 2008/09/27 08:51:18 ed Exp $"); #define ASR_VERSION 1 #define ASR_REVISION '1' @@ -3113,7 +3113,7 @@ #undef SCSI_RESET /* Conflicts with "scsi/scsiconf.h" defintion */ #include "dev/asr/osd_unix.h" -#define asr_unit(dev) minor(dev) +#define asr_unit(dev) dev2unit(dev) static u_int8_t ASR_ctlr_held; ==== //depot/projects/mpsafetty/sys/dev/ata/atapi-tape.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/atapi-tape.c,v 1.108 2008/05/08 17:55:44 grehan Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/atapi-tape.c,v 1.109 2008/09/27 08:51:18 ed Exp $"); #include "opt_ata.h" #include @@ -238,7 +238,7 @@ ast_write_filemark(dev, ATAPI_WF_WRITE); /* if minor is even rewind on close */ - if (!(minor(cdev) & 0x01)) + if (!(dev2unit(cdev) & 0x01)) ast_rewind(dev); if (stp->cap.lock && count_dev(cdev) == 1) ==== //depot/projects/mpsafetty/sys/dev/atkbdc/psm.c#3 (text+ko) ==== @@ -59,7 +59,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/atkbdc/psm.c,v 1.98 2008/07/26 00:01:19 trhodes Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/atkbdc/psm.c,v 1.99 2008/09/27 08:51:18 ed Exp $"); #include "opt_isa.h" #include "opt_psm.h" @@ -141,8 +141,8 @@ (((b[0] & 0x30) >> 2) | ((b[1] & 0x30) >> 4)) /* some macros */ -#define PSM_UNIT(dev) (minor(dev) >> 1) -#define PSM_NBLOCKIO(dev) (minor(dev) & 1) +#define PSM_UNIT(dev) (dev2unit(dev) >> 1) +#define PSM_NBLOCKIO(dev) (dev2unit(dev) & 1) #define PSM_MKMINOR(unit,block) (((unit) << 1) | ((block) ? 0:1)) /* ring buffer */ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat Sep 27 10:23:30 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9FCF3106568E; Sat, 27 Sep 2008 10:23:30 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 62D4F1065689 for ; Sat, 27 Sep 2008 10:23:29 +0000 (UTC) (envelope-from ed@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 51B178FC16 for ; Sat, 27 Sep 2008 10:23:29 +0000 (UTC) (envelope-from ed@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id m8RANTuk097168 for ; Sat, 27 Sep 2008 10:23:29 GMT (envelope-from ed@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m8RANT2Q097166 for perforce@freebsd.org; Sat, 27 Sep 2008 10:23:29 GMT (envelope-from ed@FreeBSD.org) Date: Sat, 27 Sep 2008 10:23:29 GMT Message-Id: <200809271023.m8RANT2Q097166@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to ed@FreeBSD.org using -f From: Ed Schouten To: Perforce Change Reviews Cc: Subject: PERFORCE change 150555 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 27 Sep 2008 10:23:30 -0000 http://perforce.freebsd.org/chv.cgi?CH=150555 Change 150555 by ed@ed_dull on 2008/09/27 10:22:38 Add a little more sanity checking to tty_(timed)wait(). In our current TTY layer design it isn't possible to sleep on a TTY that has been abandoned by the driver. Add an assertion to tty_(timed)wait() to disallow sleeping when the TTY is gone. Affected files ... .. //depot/projects/mpsafetty/sys/kern/tty.c#51 edit Differences ... ==== //depot/projects/mpsafetty/sys/kern/tty.c#51 (text+ko) ==== @@ -1189,6 +1189,7 @@ tty_lock_assert(tp, MA_OWNED|MA_NOTRECURSED); #endif tty_lock_assert(tp, MA_OWNED); + MPASS(!tty_gone(tp)); error = cv_wait_sig(cv, tp->t_mtx); @@ -1214,6 +1215,7 @@ tty_lock_assert(tp, MA_OWNED|MA_NOTRECURSED); #endif tty_lock_assert(tp, MA_OWNED); + MPASS(!tty_gone(tp)); error = cv_timedwait_sig(cv, tp->t_mtx, hz); From owner-p4-projects@FreeBSD.ORG Sat Sep 27 10:28:35 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 094D1106568E; Sat, 27 Sep 2008 10:28:35 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C1E60106568A for ; Sat, 27 Sep 2008 10:28:34 +0000 (UTC) (envelope-from ed@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 979268FC17 for ; Sat, 27 Sep 2008 10:28:34 +0000 (UTC) (envelope-from ed@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id m8RASYH2031406 for ; Sat, 27 Sep 2008 10:28:34 GMT (envelope-from ed@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m8RASYF9031404 for perforce@freebsd.org; Sat, 27 Sep 2008 10:28:34 GMT (envelope-from ed@FreeBSD.org) Date: Sat, 27 Sep 2008 10:28:34 GMT Message-Id: <200809271028.m8RASYF9031404@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to ed@FreeBSD.org using -f From: Ed Schouten To: Perforce Change Reviews Cc: Subject: PERFORCE change 150556 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 27 Sep 2008 10:28:35 -0000 http://perforce.freebsd.org/chv.cgi?CH=150556 Change 150556 by ed@ed_dull on 2008/09/27 10:27:47 Don't rely on ttydisc_modem() to wake up inwait and outwait when abandoning the TTY. Affected files ... .. //depot/projects/mpsafetty/sys/kern/tty.c#52 edit Differences ... ==== //depot/projects/mpsafetty/sys/kern/tty.c#52 (text+ko) ==== @@ -973,7 +973,8 @@ /* Simulate carrier removal. */ ttydisc_modem(tp, 0); - /* Wake up misc. blocked threads. */ + /* Wake up all blocked threads. */ + tty_wakeup(tp, FREAD|FWRITE); cv_broadcast(&tp->t_bgwait); cv_broadcast(&tp->t_dcdwait); From owner-p4-projects@FreeBSD.ORG Sat Sep 27 14:57:46 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 772061065693; Sat, 27 Sep 2008 14:57:46 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 36B54106568E for ; Sat, 27 Sep 2008 14:57:46 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 22CBA8FC1D for ; Sat, 27 Sep 2008 14:57:46 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id m8REvjPI012152 for ; Sat, 27 Sep 2008 14:57:45 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m8REv7sk009100 for perforce@freebsd.org; Sat, 27 Sep 2008 14:57:07 GMT (envelope-from jb@freebsd.org) Date: Sat, 27 Sep 2008 14:57:07 GMT Message-Id: <200809271457.m8REv7sk009100@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 150560 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 27 Sep 2008 14:57:46 -0000 http://perforce.freebsd.org/chv.cgi?CH=150560 Change 150560 by jb@freebsd3 on 2008/09/27 14:57:02 IFC Affected files ... .. //depot/projects/dtrace/src/Makefile.inc1#51 integrate .. //depot/projects/dtrace/src/ObsoleteFiles.inc#52 integrate .. //depot/projects/dtrace/src/UPDATING#39 integrate .. //depot/projects/dtrace/src/bin/Makefile#5 integrate .. //depot/projects/dtrace/src/bin/cp/utils.c#9 integrate .. //depot/projects/dtrace/src/bin/pkill/Makefile#1 branch .. //depot/projects/dtrace/src/bin/pkill/pkill.1#1 branch .. //depot/projects/dtrace/src/bin/pkill/pkill.c#1 branch .. //depot/projects/dtrace/src/bin/setfacl/setfacl.c#5 integrate .. //depot/projects/dtrace/src/bin/sh/options.c#6 integrate .. //depot/projects/dtrace/src/bin/sh/sh.1#10 integrate .. //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_printf.c#6 integrate .. //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h#5 integrate .. //depot/projects/dtrace/src/contrib/bind9/CHANGES#10 integrate .. //depot/projects/dtrace/src/contrib/bind9/COPYRIGHT#7 integrate .. //depot/projects/dtrace/src/contrib/bind9/bin/dig/dighost.c#7 integrate .. //depot/projects/dtrace/src/contrib/bind9/bin/named/client.c#8 integrate .. //depot/projects/dtrace/src/contrib/bind9/bin/named/config.c#7 integrate .. //depot/projects/dtrace/src/contrib/bind9/bin/named/controlconf.c#6 integrate .. //depot/projects/dtrace/src/contrib/bind9/bin/named/interfacemgr.c#6 integrate .. //depot/projects/dtrace/src/contrib/bind9/bin/named/lwresd.c#6 integrate .. //depot/projects/dtrace/src/contrib/bind9/bin/named/named.conf.docbook#7 integrate .. //depot/projects/dtrace/src/contrib/bind9/bin/named/server.c#8 integrate .. //depot/projects/dtrace/src/contrib/bind9/bin/rndc/rndc.c#6 integrate .. //depot/projects/dtrace/src/contrib/bind9/configure.in#8 integrate .. //depot/projects/dtrace/src/contrib/bind9/doc/arm/Bv9ARM-book.xml#8 integrate .. //depot/projects/dtrace/src/contrib/bind9/lib/bind/configure.in#7 integrate .. //depot/projects/dtrace/src/contrib/bind9/lib/bind9/check.c#8 integrate .. //depot/projects/dtrace/src/contrib/bind9/lib/dns/api#8 integrate .. //depot/projects/dtrace/src/contrib/bind9/lib/dns/dispatch.c#8 integrate .. //depot/projects/dtrace/src/contrib/bind9/lib/dns/include/dns/dispatch.h#7 integrate .. //depot/projects/dtrace/src/contrib/bind9/lib/dns/request.c#6 integrate .. //depot/projects/dtrace/src/contrib/bind9/lib/dns/resolver.c#10 integrate .. //depot/projects/dtrace/src/contrib/bind9/lib/dns/xfrin.c#7 integrate .. //depot/projects/dtrace/src/contrib/bind9/lib/isc/api#7 integrate .. //depot/projects/dtrace/src/contrib/bind9/lib/isc/include/isc/resource.h#5 integrate .. //depot/projects/dtrace/src/contrib/bind9/lib/isc/include/isc/socket.h#5 integrate .. //depot/projects/dtrace/src/contrib/bind9/lib/isc/include/isc/timer.h#5 integrate .. //depot/projects/dtrace/src/contrib/bind9/lib/isc/timer.c#7 integrate .. //depot/projects/dtrace/src/contrib/bind9/lib/isc/unix/app.c#5 integrate .. //depot/projects/dtrace/src/contrib/bind9/lib/isc/unix/resource.c#5 integrate .. //depot/projects/dtrace/src/contrib/bind9/lib/isc/unix/socket.c#7 integrate .. //depot/projects/dtrace/src/contrib/bind9/lib/isc/unix/socket_p.h#5 integrate .. //depot/projects/dtrace/src/contrib/bind9/lib/isccfg/api#6 integrate .. //depot/projects/dtrace/src/contrib/bind9/lib/isccfg/namedconf.c#6 integrate .. //depot/projects/dtrace/src/contrib/bind9/version#10 integrate .. //depot/projects/dtrace/src/contrib/gcc/config/arm/arm.h#5 integrate .. //depot/projects/dtrace/src/contrib/gcc/config/freebsd-spec.h#7 integrate .. //depot/projects/dtrace/src/contrib/gcc/config/freebsd.h#5 integrate .. //depot/projects/dtrace/src/contrib/gcc/config/i386/freebsd64.h#5 integrate .. //depot/projects/dtrace/src/contrib/gcc/config/mips/freebsd.h#1 branch .. //depot/projects/dtrace/src/contrib/gdtoa/README#5 integrate .. //depot/projects/dtrace/src/contrib/gdtoa/dtoa.c#5 integrate .. //depot/projects/dtrace/src/contrib/gdtoa/gdtoa.h#5 integrate .. //depot/projects/dtrace/src/contrib/gdtoa/gdtoaimp.h#6 integrate .. //depot/projects/dtrace/src/contrib/gdtoa/gethex.c#6 integrate .. //depot/projects/dtrace/src/contrib/gdtoa/strtoIg.c#5 integrate .. //depot/projects/dtrace/src/contrib/gdtoa/strtod.c#6 integrate .. //depot/projects/dtrace/src/contrib/gdtoa/strtodg.c#5 integrate .. //depot/projects/dtrace/src/contrib/gdtoa/strtof.c#6 integrate .. //depot/projects/dtrace/src/contrib/gdtoa/test/README#4 integrate .. //depot/projects/dtrace/src/contrib/gdtoa/test/f.out#4 integrate .. //depot/projects/dtrace/src/contrib/gdtoa/test/getround.c#5 integrate .. //depot/projects/dtrace/src/contrib/gdtoa/test/xsum0.out#5 integrate .. //depot/projects/dtrace/src/contrib/gdtoa/xsum0.out#5 integrate .. //depot/projects/dtrace/src/contrib/libpcap/pcap-bpf.c#7 integrate .. //depot/projects/dtrace/src/contrib/libpcap/pcap-int.h#6 integrate .. //depot/projects/dtrace/src/contrib/libpcap/pcap.c#6 integrate .. //depot/projects/dtrace/src/contrib/ntp/libparse/clk_rawdcf.c#5 integrate .. //depot/projects/dtrace/src/contrib/sendmail/FREEBSD-upgrade#8 integrate .. //depot/projects/dtrace/src/contrib/sendmail/KNOWNBUGS#5 integrate .. //depot/projects/dtrace/src/contrib/sendmail/PGPKEYS#5 integrate .. //depot/projects/dtrace/src/contrib/sendmail/README#4 integrate .. //depot/projects/dtrace/src/contrib/sendmail/RELEASE_NOTES#7 integrate .. //depot/projects/dtrace/src/contrib/sendmail/cf/README#5 integrate .. //depot/projects/dtrace/src/contrib/sendmail/cf/cf/submit.cf#7 integrate .. //depot/projects/dtrace/src/contrib/sendmail/cf/m4/proto.m4#6 integrate .. //depot/projects/dtrace/src/contrib/sendmail/cf/m4/version.m4#7 integrate .. //depot/projects/dtrace/src/contrib/sendmail/include/libmilter/mfapi.h#5 integrate .. //depot/projects/dtrace/src/contrib/sendmail/libmilter/Makefile.m4#5 integrate .. //depot/projects/dtrace/src/contrib/sendmail/libmilter/docs/smfi_opensocket.html#5 integrate .. //depot/projects/dtrace/src/contrib/sendmail/libmilter/docs/smfi_version.html#2 integrate .. //depot/projects/dtrace/src/contrib/sendmail/libmilter/engine.c#6 integrate .. //depot/projects/dtrace/src/contrib/sendmail/libmilter/main.c#6 integrate .. //depot/projects/dtrace/src/contrib/sendmail/libmilter/worker.c#2 integrate .. //depot/projects/dtrace/src/contrib/sendmail/mail.local/mail.local.c#5 integrate .. //depot/projects/dtrace/src/contrib/sendmail/makemap/makemap.8#4 integrate .. //depot/projects/dtrace/src/contrib/sendmail/makemap/makemap.c#5 integrate .. //depot/projects/dtrace/src/contrib/sendmail/smrsh/README#4 integrate .. //depot/projects/dtrace/src/contrib/sendmail/smrsh/smrsh.c#4 integrate .. //depot/projects/dtrace/src/contrib/sendmail/src/Makefile.m4#6 integrate .. //depot/projects/dtrace/src/contrib/sendmail/src/README#5 integrate .. //depot/projects/dtrace/src/contrib/sendmail/src/collect.c#5 integrate .. //depot/projects/dtrace/src/contrib/sendmail/src/conf.c#6 integrate .. //depot/projects/dtrace/src/contrib/sendmail/src/conf.h#5 integrate .. //depot/projects/dtrace/src/contrib/sendmail/src/daemon.c#5 integrate .. //depot/projects/dtrace/src/contrib/sendmail/src/envelope.c#6 integrate .. //depot/projects/dtrace/src/contrib/sendmail/src/err.c#5 integrate .. //depot/projects/dtrace/src/contrib/sendmail/src/headers.c#6 integrate .. //depot/projects/dtrace/src/contrib/sendmail/src/mailq.1#5 integrate .. //depot/projects/dtrace/src/contrib/sendmail/src/main.c#7 integrate .. //depot/projects/dtrace/src/contrib/sendmail/src/mci.c#5 integrate .. //depot/projects/dtrace/src/contrib/sendmail/src/parseaddr.c#6 integrate .. //depot/projects/dtrace/src/contrib/sendmail/src/queue.c#7 integrate .. //depot/projects/dtrace/src/contrib/sendmail/src/ratectrl.c#5 integrate .. //depot/projects/dtrace/src/contrib/sendmail/src/readcf.c#6 integrate .. //depot/projects/dtrace/src/contrib/sendmail/src/savemail.c#5 integrate .. //depot/projects/dtrace/src/contrib/sendmail/src/sendmail.h#6 integrate .. //depot/projects/dtrace/src/contrib/sendmail/src/sfsasl.c#4 integrate .. //depot/projects/dtrace/src/contrib/sendmail/src/sm_resolve.c#6 integrate .. //depot/projects/dtrace/src/contrib/sendmail/src/srvrsmtp.c#7 integrate .. //depot/projects/dtrace/src/contrib/sendmail/src/usersmtp.c#6 integrate .. //depot/projects/dtrace/src/contrib/sendmail/src/util.c#6 integrate .. //depot/projects/dtrace/src/contrib/sendmail/src/version.c#7 integrate .. //depot/projects/dtrace/src/contrib/telnet/arpa/telnet.h#4 integrate .. //depot/projects/dtrace/src/contrib/telnet/telnetd/telnetd.8#4 integrate .. //depot/projects/dtrace/src/crypto/openssh/config.h#8 integrate .. //depot/projects/dtrace/src/crypto/openssh/openbsd-compat/fake-queue.h#4 delete .. //depot/projects/dtrace/src/crypto/openssh/openbsd-compat/tree.h#4 delete .. //depot/projects/dtrace/src/crypto/openssh/sshconnect2.c#6 integrate .. //depot/projects/dtrace/src/crypto/openssl/FREEBSD-Xlist#5 delete .. //depot/projects/dtrace/src/crypto/openssl/FREEBSD-upgrade#4 delete .. //depot/projects/dtrace/src/etc/Makefile#15 integrate .. //depot/projects/dtrace/src/etc/defaults/rc.conf#41 integrate .. //depot/projects/dtrace/src/etc/periodic/daily/Makefile#5 integrate .. //depot/projects/dtrace/src/etc/periodic/monthly/Makefile#4 integrate .. //depot/projects/dtrace/src/etc/periodic/security/Makefile#6 integrate .. //depot/projects/dtrace/src/etc/periodic/weekly/Makefile#5 integrate .. //depot/projects/dtrace/src/etc/rc.d/jail#8 integrate .. //depot/projects/dtrace/src/etc/rc.d/savecore#7 integrate .. //depot/projects/dtrace/src/etc/rc.initdiskless#8 integrate .. //depot/projects/dtrace/src/etc/sendmail/freebsd.mc#9 integrate .. //depot/projects/dtrace/src/etc/sendmail/freebsd.submit.mc#8 integrate .. //depot/projects/dtrace/src/gnu/lib/csu/Makefile#8 integrate .. //depot/projects/dtrace/src/gnu/lib/libgcc/Makefile#7 integrate .. //depot/projects/dtrace/src/gnu/lib/libgomp/Makefile#2 integrate .. //depot/projects/dtrace/src/gnu/lib/libgomp/config.h#2 integrate .. //depot/projects/dtrace/src/gnu/usr.bin/Makefile#10 integrate .. //depot/projects/dtrace/src/gnu/usr.bin/binutils/libbfd/Makefile.amd64#4 integrate .. //depot/projects/dtrace/src/gnu/usr.bin/cc/Makefile.tgt#6 integrate .. //depot/projects/dtrace/src/gnu/usr.bin/cc/cc_tools/Makefile#9 integrate .. //depot/projects/dtrace/src/gnu/usr.bin/cc/cc_tools/elfos-undef.h#1 branch .. //depot/projects/dtrace/src/gnu/usr.bin/cc/cc_tools/freebsd64-fix.h#4 delete .. //depot/projects/dtrace/src/gnu/usr.bin/gdb/kgdb/kld.c#5 integrate .. //depot/projects/dtrace/src/gnu/usr.bin/gdb/libgdb/fbsd-threads.c#6 integrate .. //depot/projects/dtrace/src/include/Makefile#19 integrate .. //depot/projects/dtrace/src/include/arpa/telnet.h#4 integrate .. //depot/projects/dtrace/src/include/rpc/svc_auth.h#4 integrate .. //depot/projects/dtrace/src/include/unistd.h#17 integrate .. //depot/projects/dtrace/src/include/uuid.h#4 integrate .. //depot/projects/dtrace/src/lib/Makefile#24 integrate .. //depot/projects/dtrace/src/lib/bind/config.h#7 integrate .. //depot/projects/dtrace/src/lib/libarchive/Makefile#17 integrate .. //depot/projects/dtrace/src/lib/libarchive/archive.h#3 integrate .. //depot/projects/dtrace/src/lib/libarchive/archive_entry.c#11 integrate .. //depot/projects/dtrace/src/lib/libarchive/archive_entry.h#9 integrate .. //depot/projects/dtrace/src/lib/libarchive/archive_entry_link_resolver.c#4 integrate .. //depot/projects/dtrace/src/lib/libarchive/archive_entry_private.h#5 integrate .. //depot/projects/dtrace/src/lib/libarchive/archive_platform.h#11 integrate .. //depot/projects/dtrace/src/lib/libarchive/archive_read_support_compression_program.c#4 integrate .. //depot/projects/dtrace/src/lib/libarchive/archive_read_support_format_mtree.c#8 integrate .. //depot/projects/dtrace/src/lib/libarchive/archive_write_disk.3#4 integrate .. //depot/projects/dtrace/src/lib/libarchive/archive_write_disk.c#11 integrate .. //depot/projects/dtrace/src/lib/libarchive/archive_write_set_format.c#7 integrate .. //depot/projects/dtrace/src/lib/libarchive/archive_write_set_format_by_name.c#7 integrate .. //depot/projects/dtrace/src/lib/libarchive/archive_write_set_format_mtree.c#1 branch .. //depot/projects/dtrace/src/lib/libarchive/archive_write_set_format_shar.c#8 integrate .. //depot/projects/dtrace/src/lib/libarchive/config_freebsd.h#9 integrate .. //depot/projects/dtrace/src/lib/libarchive/filter_fork.c#5 integrate .. //depot/projects/dtrace/src/lib/libarchive/test/Makefile#11 integrate .. //depot/projects/dtrace/src/lib/libarchive/test/main.c#7 integrate .. //depot/projects/dtrace/src/lib/libarchive/test/read_open_memory.c#3 integrate .. //depot/projects/dtrace/src/lib/libarchive/test/test_acl_basic.c#2 integrate .. //depot/projects/dtrace/src/lib/libarchive/test/test_acl_pax.c#3 integrate .. //depot/projects/dtrace/src/lib/libarchive/test/test_bad_fd.c#2 integrate .. //depot/projects/dtrace/src/lib/libarchive/test/test_compat_gtar.c#3 integrate .. //depot/projects/dtrace/src/lib/libarchive/test/test_compat_zip.c#3 integrate .. //depot/projects/dtrace/src/lib/libarchive/test/test_empty_write.c#3 integrate .. //depot/projects/dtrace/src/lib/libarchive/test/test_entry.c#4 integrate .. //depot/projects/dtrace/src/lib/libarchive/test/test_read_compress_program.c#2 integrate .. //depot/projects/dtrace/src/lib/libarchive/test/test_read_data_large.c#2 integrate .. //depot/projects/dtrace/src/lib/libarchive/test/test_read_extract.c#3 integrate .. //depot/projects/dtrace/src/lib/libarchive/test/test_read_format_ar.c#3 integrate .. //depot/projects/dtrace/src/lib/libarchive/test/test_read_format_cpio_bin.c#2 integrate .. //depot/projects/dtrace/src/lib/libarchive/test/test_read_format_cpio_bin_Z.c#2 integrate .. //depot/projects/dtrace/src/lib/libarchive/test/test_read_format_cpio_bin_bz2.c#2 integrate .. //depot/projects/dtrace/src/lib/libarchive/test/test_read_format_cpio_bin_gz.c#2 integrate .. //depot/projects/dtrace/src/lib/libarchive/test/test_read_format_cpio_odc.c#3 integrate .. //depot/projects/dtrace/src/lib/libarchive/test/test_read_format_cpio_svr4_gzip.c#2 integrate .. //depot/projects/dtrace/src/lib/libarchive/test/test_read_format_cpio_svr4c_Z.c#2 integrate .. //depot/projects/dtrace/src/lib/libarchive/test/test_read_format_empty.c#2 integrate .. //depot/projects/dtrace/src/lib/libarchive/test/test_read_format_gtar_gz.c#2 integrate .. //depot/projects/dtrace/src/lib/libarchive/test/test_read_format_gtar_sparse.c#4 integrate .. //depot/projects/dtrace/src/lib/libarchive/test/test_read_format_iso_gz.c#2 integrate .. //depot/projects/dtrace/src/lib/libarchive/test/test_read_format_isorr_bz2.c#4 integrate .. //depot/projects/dtrace/src/lib/libarchive/test/test_read_format_mtree.c#3 integrate .. //depot/projects/dtrace/src/lib/libarchive/test/test_read_format_pax_bz2.c#2 integrate .. //depot/projects/dtrace/src/lib/libarchive/test/test_read_format_tar.c#3 integrate .. //depot/projects/dtrace/src/lib/libarchive/test/test_read_format_tar_empty_filename.c#2 integrate .. //depot/projects/dtrace/src/lib/libarchive/test/test_read_format_tbz.c#2 integrate .. //depot/projects/dtrace/src/lib/libarchive/test/test_read_format_tgz.c#2 integrate .. //depot/projects/dtrace/src/lib/libarchive/test/test_read_format_tz.c#2 integrate .. //depot/projects/dtrace/src/lib/libarchive/test/test_read_format_zip.c#5 integrate .. //depot/projects/dtrace/src/lib/libarchive/test/test_read_large.c#2 integrate .. //depot/projects/dtrace/src/lib/libarchive/test/test_read_pax_truncated.c#3 integrate .. //depot/projects/dtrace/src/lib/libarchive/test/test_read_position.c#2 integrate .. //depot/projects/dtrace/src/lib/libarchive/test/test_read_truncated.c#2 integrate .. //depot/projects/dtrace/src/lib/libarchive/test/test_tar_filenames.c#4 integrate .. //depot/projects/dtrace/src/lib/libarchive/test/test_tar_large.c#4 integrate .. //depot/projects/dtrace/src/lib/libarchive/test/test_write_compress.c#2 integrate .. //depot/projects/dtrace/src/lib/libarchive/test/test_write_compress_program.c#2 integrate .. //depot/projects/dtrace/src/lib/libarchive/test/test_write_disk.c#5 integrate .. //depot/projects/dtrace/src/lib/libarchive/test/test_write_disk_hardlink.c#4 integrate .. //depot/projects/dtrace/src/lib/libarchive/test/test_write_disk_perms.c#4 integrate .. //depot/projects/dtrace/src/lib/libarchive/test/test_write_disk_secure.c#3 integrate .. //depot/projects/dtrace/src/lib/libarchive/test/test_write_format_ar.c#4 integrate .. //depot/projects/dtrace/src/lib/libarchive/test/test_write_format_cpio.c#4 integrate .. //depot/projects/dtrace/src/lib/libarchive/test/test_write_format_cpio_empty.c#2 integrate .. //depot/projects/dtrace/src/lib/libarchive/test/test_write_format_cpio_newc.c#3 integrate .. //depot/projects/dtrace/src/lib/libarchive/test/test_write_format_cpio_odc.c#2 integrate .. //depot/projects/dtrace/src/lib/libarchive/test/test_write_format_shar_empty.c#2 integrate .. //depot/projects/dtrace/src/lib/libarchive/test/test_write_format_tar.c#2 integrate .. //depot/projects/dtrace/src/lib/libarchive/test/test_write_format_tar_empty.c#2 integrate .. //depot/projects/dtrace/src/lib/libarchive/test/test_write_open_memory.c#2 integrate .. //depot/projects/dtrace/src/lib/libc/gen/arc4random.c#8 integrate .. //depot/projects/dtrace/src/lib/libc/gen/getosreldate.3#4 integrate .. //depot/projects/dtrace/src/lib/libc/include/libc_private.h#9 integrate .. //depot/projects/dtrace/src/lib/libc/powerpc/gen/syncicache.c#5 integrate .. //depot/projects/dtrace/src/lib/libc/regex/re_format.7#4 integrate .. //depot/projects/dtrace/src/lib/libc/rpc/clnt_dg.c#6 integrate .. //depot/projects/dtrace/src/lib/libc/rpc/svc.c#5 integrate .. //depot/projects/dtrace/src/lib/libc/rpc/svc_auth.c#5 integrate .. //depot/projects/dtrace/src/lib/libc/stdlib/Symbol.map#6 integrate .. //depot/projects/dtrace/src/lib/libc/stdlib/malloc.3#12 integrate .. //depot/projects/dtrace/src/lib/libc/stdlib/malloc.c#28 integrate .. //depot/projects/dtrace/src/lib/libc/uuid/Symbol.map#4 integrate .. //depot/projects/dtrace/src/lib/libgeom/geom_util.c#3 integrate .. //depot/projects/dtrace/src/lib/libgeom/libgeom.3#7 integrate .. //depot/projects/dtrace/src/lib/libgeom/libgeom.h#5 integrate .. //depot/projects/dtrace/src/lib/libpcap/Makefile#7 integrate .. //depot/projects/dtrace/src/lib/libpmc/Makefile#6 integrate .. //depot/projects/dtrace/src/lib/libpmc/libpmc.c#7 integrate .. //depot/projects/dtrace/src/lib/libpmc/pmc.3#9 integrate .. //depot/projects/dtrace/src/lib/libpmc/pmc.k7.3#1 branch .. //depot/projects/dtrace/src/lib/libpmc/pmc.k8.3#1 branch .. //depot/projects/dtrace/src/lib/libpmc/pmc.p4.3#1 branch .. //depot/projects/dtrace/src/lib/libpmc/pmc.p5.3#1 branch .. //depot/projects/dtrace/src/lib/libpmc/pmc.p6.3#1 branch .. //depot/projects/dtrace/src/lib/libpmc/pmc.tsc.3#1 branch .. //depot/projects/dtrace/src/lib/libpmc/pmc_allocate.3#2 integrate .. //depot/projects/dtrace/src/lib/libpmc/pmc_capabilities.3#3 integrate .. //depot/projects/dtrace/src/lib/libpmc/pmc_disable.3#2 integrate .. //depot/projects/dtrace/src/lib/libpmc/pmc_start.3#2 integrate .. //depot/projects/dtrace/src/lib/librpcsec_gss/svc_rpcsec_gss.c#2 integrate .. //depot/projects/dtrace/src/lib/libstand/mips/_setjmp.S#1 branch .. //depot/projects/dtrace/src/lib/libstand/stand.h#5 integrate .. //depot/projects/dtrace/src/lib/libstand/ufs.c#8 integrate .. //depot/projects/dtrace/src/lib/libstand/zalloc_malloc.c#4 integrate .. //depot/projects/dtrace/src/lib/libthr/thread/thr_event.c#5 integrate .. //depot/projects/dtrace/src/lib/libthr/thread/thr_exit.c#12 integrate .. //depot/projects/dtrace/src/lib/libthread_db/arch/mips/libpthread_md.c#1 branch .. //depot/projects/dtrace/src/lib/libthread_db/libpthread_db.c#8 integrate .. //depot/projects/dtrace/src/lib/libthread_db/libthr_db.c#8 integrate .. //depot/projects/dtrace/src/lib/libthread_db/thread_db.c#7 integrate .. //depot/projects/dtrace/src/lib/libthread_db/thread_db.h#6 integrate .. //depot/projects/dtrace/src/lib/libthread_db/thread_db_int.h#5 integrate .. //depot/projects/dtrace/src/libexec/Makefile#7 integrate .. //depot/projects/dtrace/src/libexec/rtld-elf/rtld.c#10 integrate .. //depot/projects/dtrace/src/libexec/rtld-elf/rtld_lock.c#6 integrate .. //depot/projects/dtrace/src/release/Makefile.inc.docports#5 integrate .. //depot/projects/dtrace/src/release/doc/en_US.ISO8859-1/relnotes/article.sgml#27 integrate .. //depot/projects/dtrace/src/release/doc/zh_CN.GB2312/Makefile#5 integrate .. //depot/projects/dtrace/src/release/doc/zh_CN.GB2312/errata/Makefile#5 integrate .. //depot/projects/dtrace/src/release/doc/zh_CN.GB2312/errata/article.sgml#4 integrate .. //depot/projects/dtrace/src/release/doc/zh_CN.GB2312/hardware/Makefile#5 integrate .. //depot/projects/dtrace/src/release/doc/zh_CN.GB2312/hardware/article.sgml#2 integrate .. //depot/projects/dtrace/src/release/doc/zh_CN.GB2312/readme/Makefile#4 integrate .. //depot/projects/dtrace/src/release/doc/zh_CN.GB2312/readme/article.sgml#5 integrate .. //depot/projects/dtrace/src/release/doc/zh_CN.GB2312/relnotes/Makefile#6 integrate .. //depot/projects/dtrace/src/release/doc/zh_CN.GB2312/relnotes/article.sgml#2 integrate .. //depot/projects/dtrace/src/release/doc/zh_CN.GB2312/share/sgml/catalog#4 integrate .. //depot/projects/dtrace/src/release/doc/zh_CN.GB2312/share/sgml/release.dsl#4 integrate .. //depot/projects/dtrace/src/release/i386/fixit_crunch.conf#5 integrate .. //depot/projects/dtrace/src/release/pc98/fixit-small_crunch.conf#6 integrate .. //depot/projects/dtrace/src/release/pc98/fixit_crunch.conf#6 integrate .. //depot/projects/dtrace/src/rescue/rescue/Makefile#14 integrate .. //depot/projects/dtrace/src/sbin/Makefile#14 integrate .. //depot/projects/dtrace/src/sbin/bsdlabel/Makefile#5 integrate .. //depot/projects/dtrace/src/sbin/bsdlabel/bsdlabel.c#7 integrate .. //depot/projects/dtrace/src/sbin/fdisk/Makefile#4 integrate .. //depot/projects/dtrace/src/sbin/fdisk/fdisk.c#6 integrate .. //depot/projects/dtrace/src/sbin/fsck_ffs/fsck_ffs.8#5 integrate .. //depot/projects/dtrace/src/sbin/geom/class/eli/geli.8#8 integrate .. //depot/projects/dtrace/src/sbin/geom/class/eli/geom_eli.c#10 integrate .. //depot/projects/dtrace/src/sbin/gpt/Makefile#5 delete .. //depot/projects/dtrace/src/sbin/gpt/add.c#6 delete .. //depot/projects/dtrace/src/sbin/gpt/boot.c#3 delete .. //depot/projects/dtrace/src/sbin/gpt/create.c#4 delete .. //depot/projects/dtrace/src/sbin/gpt/destroy.c#4 delete .. //depot/projects/dtrace/src/sbin/gpt/gpt.8#6 delete .. //depot/projects/dtrace/src/sbin/gpt/gpt.c#9 delete .. //depot/projects/dtrace/src/sbin/gpt/gpt.h#5 delete .. //depot/projects/dtrace/src/sbin/gpt/label.c#5 delete .. //depot/projects/dtrace/src/sbin/gpt/map.c#4 delete .. //depot/projects/dtrace/src/sbin/gpt/map.h#4 delete .. //depot/projects/dtrace/src/sbin/gpt/migrate.c#5 delete .. //depot/projects/dtrace/src/sbin/gpt/recover.c#4 delete .. //depot/projects/dtrace/src/sbin/gpt/remove.c#5 delete .. //depot/projects/dtrace/src/sbin/gpt/show.c#6 delete .. //depot/projects/dtrace/src/sbin/ifconfig/ifconfig.8#22 integrate .. //depot/projects/dtrace/src/sbin/ifconfig/ifconfig.c#13 integrate .. //depot/projects/dtrace/src/sbin/ifconfig/ifieee80211.c#15 integrate .. //depot/projects/dtrace/src/sbin/ifconfig/ifvlan.c#6 integrate .. //depot/projects/dtrace/src/sbin/ifconfig/regdomain.c#4 integrate .. //depot/projects/dtrace/src/sbin/init/init.c#6 integrate .. //depot/projects/dtrace/src/sbin/ipfw/ipfw.8#23 integrate .. //depot/projects/dtrace/src/sbin/ipfw/ipfw2.c#20 integrate .. //depot/projects/dtrace/src/sbin/md5/md5.1#4 integrate .. //depot/projects/dtrace/src/sbin/md5/md5.c#5 integrate .. //depot/projects/dtrace/src/sbin/mount/mount.c#12 integrate .. //depot/projects/dtrace/src/sbin/mount_nfs/mount_nfs.8#7 integrate .. //depot/projects/dtrace/src/sbin/mount_nfs/mount_nfs.c#9 integrate .. //depot/projects/dtrace/src/sbin/natd/natd.c#7 integrate .. //depot/projects/dtrace/src/sbin/ping6/ping6.8#7 integrate .. //depot/projects/dtrace/src/sbin/ping6/ping6.c#9 integrate .. //depot/projects/dtrace/src/share/Makefile#6 integrate .. //depot/projects/dtrace/src/share/examples/drivers/make_pseudo_driver.sh#6 integrate .. //depot/projects/dtrace/src/share/man/man4/Makefile#42 integrate .. //depot/projects/dtrace/src/share/man/man4/age.4#3 integrate .. //depot/projects/dtrace/src/share/man/man4/ddb.4#22 integrate .. //depot/projects/dtrace/src/share/man/man4/hwpmc.4#11 integrate .. //depot/projects/dtrace/src/share/man/man4/if_bridge.4#15 integrate .. //depot/projects/dtrace/src/share/man/man4/man4.i386/Makefile#9 integrate .. //depot/projects/dtrace/src/share/man/man4/man4.i386/sbni.4#5 branch .. //depot/projects/dtrace/src/share/man/man4/pts.4#2 integrate .. //depot/projects/dtrace/src/share/man/man4/snd_hda.4#9 integrate .. //depot/projects/dtrace/src/share/man/man4/tap.4#5 integrate .. //depot/projects/dtrace/src/share/man/man4/wi.4#10 integrate .. //depot/projects/dtrace/src/share/man/man4/witness.4#4 integrate .. //depot/projects/dtrace/src/share/man/man5/rc.conf.5#34 integrate .. //depot/projects/dtrace/src/share/man/man5/src.conf.5#18 integrate .. //depot/projects/dtrace/src/share/man/man9/CTASSERT.9#4 integrate .. //depot/projects/dtrace/src/share/man/man9/DB_COMMAND.9#1 branch .. //depot/projects/dtrace/src/share/man/man9/Makefile#33 integrate .. //depot/projects/dtrace/src/share/man/man9/VOP_ATTRIB.9#4 integrate .. //depot/projects/dtrace/src/share/man/man9/bus_dma.9#9 integrate .. //depot/projects/dtrace/src/share/man/man9/dev_clone.9#1 branch .. //depot/projects/dtrace/src/share/man/man9/devfs_set_cdevpriv.9#1 branch .. //depot/projects/dtrace/src/share/man/man9/insmntque.9#2 integrate .. //depot/projects/dtrace/src/share/man/man9/make_dev.9#7 integrate .. //depot/projects/dtrace/src/share/man/man9/priv.9#4 integrate .. //depot/projects/dtrace/src/share/man/man9/suser.9#8 delete .. //depot/projects/dtrace/src/share/man/man9/ucred.9#4 integrate .. //depot/projects/dtrace/src/share/man/man9/vfs_busy.9#4 integrate .. //depot/projects/dtrace/src/share/man/man9/vfs_suser.9#4 integrate .. //depot/projects/dtrace/src/share/man/man9/vfs_unbusy.9#4 integrate .. //depot/projects/dtrace/src/share/misc/committers-ports.dot#10 integrate .. //depot/projects/dtrace/src/share/misc/committers-src.dot#16 integrate .. //depot/projects/dtrace/src/share/mk/bsd.own.mk#24 integrate .. //depot/projects/dtrace/src/share/zoneinfo/africa#9 integrate .. //depot/projects/dtrace/src/share/zoneinfo/asia#12 integrate .. //depot/projects/dtrace/src/share/zoneinfo/europe#9 integrate .. //depot/projects/dtrace/src/share/zoneinfo/southamerica#13 integrate .. //depot/projects/dtrace/src/sys/amd64/amd64/cpu_switch.S#8 integrate .. //depot/projects/dtrace/src/sys/amd64/amd64/elf_machdep.c#5 integrate .. //depot/projects/dtrace/src/sys/amd64/amd64/genassym.c#12 integrate .. //depot/projects/dtrace/src/sys/amd64/amd64/identcpu.c#13 integrate .. //depot/projects/dtrace/src/sys/amd64/amd64/machdep.c#30 integrate .. //depot/projects/dtrace/src/sys/amd64/amd64/mem.c#6 integrate .. //depot/projects/dtrace/src/sys/amd64/amd64/mp_machdep.c#14 integrate .. //depot/projects/dtrace/src/sys/amd64/amd64/trap.c#27 integrate .. //depot/projects/dtrace/src/sys/amd64/amd64/vm_machdep.c#10 integrate .. //depot/projects/dtrace/src/sys/amd64/ia32/ia32_signal.c#8 integrate .. //depot/projects/dtrace/src/sys/amd64/include/pcb.h#7 integrate .. //depot/projects/dtrace/src/sys/amd64/include/pcpu.h#7 integrate .. //depot/projects/dtrace/src/sys/amd64/include/pmc_mdep.h#6 integrate .. //depot/projects/dtrace/src/sys/amd64/include/segments.h#5 integrate .. //depot/projects/dtrace/src/sys/amd64/linux32/linux32_genassym.c#4 integrate .. //depot/projects/dtrace/src/sys/amd64/linux32/linux32_locore.s#5 integrate .. //depot/projects/dtrace/src/sys/amd64/linux32/linux32_machdep.c#13 integrate .. //depot/projects/dtrace/src/sys/amd64/linux32/linux32_sysvec.c#13 integrate .. //depot/projects/dtrace/src/sys/amd64/pci/pci_cfgreg.c#6 integrate .. //depot/projects/dtrace/src/sys/arm/arm/elf_machdep.c#5 integrate .. //depot/projects/dtrace/src/sys/arm/arm/intr.c#12 integrate .. //depot/projects/dtrace/src/sys/arm/arm/mem.c#7 integrate .. //depot/projects/dtrace/src/sys/arm/arm/nexus.c#9 integrate .. //depot/projects/dtrace/src/sys/arm/at91/at91.c#14 integrate .. //depot/projects/dtrace/src/sys/arm/at91/at91_mci.c#4 integrate .. //depot/projects/dtrace/src/sys/arm/at91/at91_ssc.c#6 integrate .. //depot/projects/dtrace/src/sys/arm/at91/if_ate.c#15 integrate .. //depot/projects/dtrace/src/sys/arm/at91/kb920x_machdep.c#23 integrate .. //depot/projects/dtrace/src/sys/arm/conf/KB920X#14 integrate .. //depot/projects/dtrace/src/sys/arm/conf/NSLU#2 integrate .. //depot/projects/dtrace/src/sys/arm/include/intr.h#7 integrate .. //depot/projects/dtrace/src/sys/arm/include/pcpu.h#6 integrate .. //depot/projects/dtrace/src/sys/arm/xscale/ixp425/ixp425.c#5 integrate .. //depot/projects/dtrace/src/sys/arm/xscale/ixp425/ixp425_qmgr.c#4 integrate .. //depot/projects/dtrace/src/sys/boot/Makefile#10 integrate .. //depot/projects/dtrace/src/sys/boot/common/dev_net.c#5 integrate .. //depot/projects/dtrace/src/sys/boot/common/devopen.c#5 integrate .. //depot/projects/dtrace/src/sys/boot/forth/loader.conf#21 integrate .. //depot/projects/dtrace/src/sys/boot/ofw/libofw/Makefile#6 integrate .. //depot/projects/dtrace/src/sys/boot/ofw/libofw/ofw_console.c#6 integrate .. //depot/projects/dtrace/src/sys/boot/powerpc/uboot/Makefile#3 integrate .. //depot/projects/dtrace/src/sys/boot/powerpc/uboot/metadata.c#4 delete .. //depot/projects/dtrace/src/sys/boot/powerpc/uboot/start.S#3 integrate .. //depot/projects/dtrace/src/sys/boot/sparc64/loader/main.c#10 integrate .. //depot/projects/dtrace/src/sys/boot/uboot/common/Makefile.inc#2 integrate .. //depot/projects/dtrace/src/sys/boot/uboot/common/main.c#4 integrate .. //depot/projects/dtrace/src/sys/boot/uboot/common/metadata.c#1 branch .. //depot/projects/dtrace/src/sys/boot/uboot/lib/Makefile#4 integrate .. //depot/projects/dtrace/src/sys/boot/uboot/lib/console.c#3 integrate .. //depot/projects/dtrace/src/sys/boot/uboot/lib/elf_freebsd.c#3 integrate .. //depot/projects/dtrace/src/sys/boot/uboot/lib/glue.c#4 integrate .. //depot/projects/dtrace/src/sys/boot/uboot/lib/glue.h#3 integrate .. //depot/projects/dtrace/src/sys/boot/uboot/lib/net.c#3 integrate .. //depot/projects/dtrace/src/sys/boot/uboot/lib/reboot.c#3 integrate .. //depot/projects/dtrace/src/sys/boot/uboot/lib/time.c#3 integrate .. //depot/projects/dtrace/src/sys/cam/cam.h#4 integrate .. //depot/projects/dtrace/src/sys/cam/scsi/scsi_da.c#16 integrate .. //depot/projects/dtrace/src/sys/cam/scsi/scsi_pass.c#7 integrate .. //depot/projects/dtrace/src/sys/cam/scsi/scsi_sa.c#6 integrate .. //depot/projects/dtrace/src/sys/cam/scsi/scsi_ses.c#8 integrate .. //depot/projects/dtrace/src/sys/cam/scsi/scsi_sg.c#2 integrate .. //depot/projects/dtrace/src/sys/cam/scsi/scsi_target.c#6 integrate .. //depot/projects/dtrace/src/sys/cddl/compat/opensolaris/kern/opensolaris_atomic.c#3 integrate .. //depot/projects/dtrace/src/sys/cddl/compat/opensolaris/kern/opensolaris_kobj.c#3 integrate .. //depot/projects/dtrace/src/sys/cddl/compat/opensolaris/kern/opensolaris_vfs.c#4 integrate .. //depot/projects/dtrace/src/sys/cddl/compat/opensolaris/sys/atomic.h#4 integrate .. //depot/projects/dtrace/src/sys/cddl/compat/opensolaris/sys/cpuvar.h#5 integrate .. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c#13 integrate .. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/fs/gfs.c#2 integrate .. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_file.c#2 integrate .. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c#2 integrate .. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_replay.c#2 integrate .. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#3 integrate .. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#6 integrate .. //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace_clone.c#12 integrate .. //depot/projects/dtrace/src/sys/compat/freebsd32/freebsd32_ioctl.c#1 branch .. //depot/projects/dtrace/src/sys/compat/freebsd32/freebsd32_ioctl.h#1 branch .. //depot/projects/dtrace/src/sys/compat/freebsd32/freebsd32_misc.c#16 integrate .. //depot/projects/dtrace/src/sys/compat/freebsd32/freebsd32_proto.h#27 integrate .. //depot/projects/dtrace/src/sys/compat/freebsd32/freebsd32_syscall.h#27 integrate .. //depot/projects/dtrace/src/sys/compat/freebsd32/freebsd32_syscalls.c#27 integrate .. //depot/projects/dtrace/src/sys/compat/freebsd32/freebsd32_sysent.c#27 integrate .. //depot/projects/dtrace/src/sys/compat/freebsd32/freebsd32_util.h#4 integrate .. //depot/projects/dtrace/src/sys/compat/freebsd32/syscalls.master#27 integrate .. //depot/projects/dtrace/src/sys/compat/ia32/ia32_sysvec.c#6 integrate .. //depot/projects/dtrace/src/sys/compat/linprocfs/linprocfs.c#19 integrate .. //depot/projects/dtrace/src/sys/compat/linux/linux_file.c#18 integrate .. //depot/projects/dtrace/src/sys/compat/linux/linux_getcwd.c#8 integrate .. //depot/projects/dtrace/src/sys/compat/linux/linux_misc.c#28 integrate .. //depot/projects/dtrace/src/sys/compat/linux/linux_socket.c#10 integrate .. //depot/projects/dtrace/src/sys/compat/ndis/ntoskrnl_var.h#6 integrate .. //depot/projects/dtrace/src/sys/compat/ndis/subr_ndis.c#10 integrate .. //depot/projects/dtrace/src/sys/compat/svr4/svr4_fcntl.c#12 integrate .. //depot/projects/dtrace/src/sys/compat/svr4/svr4_stream.c#10 integrate .. //depot/projects/dtrace/src/sys/compat/svr4/svr4_sysvec.c#8 integrate .. //depot/projects/dtrace/src/sys/conf/NOTES#67 integrate .. //depot/projects/dtrace/src/sys/conf/files#106 integrate .. //depot/projects/dtrace/src/sys/conf/files.amd64#31 integrate .. //depot/projects/dtrace/src/sys/conf/files.i386#41 integrate .. //depot/projects/dtrace/src/sys/conf/files.ia64#10 integrate .. //depot/projects/dtrace/src/sys/conf/files.mips#2 integrate .. //depot/projects/dtrace/src/sys/conf/files.pc98#24 integrate .. //depot/projects/dtrace/src/sys/conf/files.sparc64#12 integrate .. //depot/projects/dtrace/src/sys/conf/files.sun4v#16 integrate .. //depot/projects/dtrace/src/sys/conf/kern.pre.mk#17 integrate .. //depot/projects/dtrace/src/sys/conf/ldscript.mips#3 integrate .. //depot/projects/dtrace/src/sys/conf/options#59 integrate .. //depot/projects/dtrace/src/sys/conf/options.mips#2 integrate .. //depot/projects/dtrace/src/sys/conf/options.sparc64#6 integrate .. //depot/projects/dtrace/src/sys/contrib/dev/ath/COPYRIGHT#4 integrate .. //depot/projects/dtrace/src/sys/contrib/dev/ath/README#4 integrate .. //depot/projects/dtrace/src/sys/contrib/dev/ath/ah.h#5 integrate .. //depot/projects/dtrace/src/sys/contrib/dev/ath/ah_desc.h#5 integrate .. //depot/projects/dtrace/src/sys/contrib/dev/ath/ah_devid.h#5 integrate .. //depot/projects/dtrace/src/sys/contrib/dev/ath/ah_soc.h#3 integrate .. //depot/projects/dtrace/src/sys/contrib/dev/ath/public/alpha-elf.hal.o.uu#5 integrate .. //depot/projects/dtrace/src/sys/contrib/dev/ath/public/alpha-elf.inc#5 integrate .. //depot/projects/dtrace/src/sys/contrib/dev/ath/public/alpha-elf.opt_ah.h#4 integrate .. //depot/projects/dtrace/src/sys/contrib/dev/ath/public/ap30.hal.o.uu#4 integrate .. //depot/projects/dtrace/src/sys/contrib/dev/ath/public/ap30.inc#3 integrate .. //depot/projects/dtrace/src/sys/contrib/dev/ath/public/ap43.hal.o.uu#4 integrate .. //depot/projects/dtrace/src/sys/contrib/dev/ath/public/ap43.inc#3 integrate .. //depot/projects/dtrace/src/sys/contrib/dev/ath/public/ap51.hal.o.uu#4 integrate .. //depot/projects/dtrace/src/sys/contrib/dev/ath/public/ap51.inc#3 integrate .. //depot/projects/dtrace/src/sys/contrib/dev/ath/public/ap61.hal.o.uu#4 integrate .. //depot/projects/dtrace/src/sys/contrib/dev/ath/public/ap61.inc#3 integrate .. //depot/projects/dtrace/src/sys/contrib/dev/ath/public/arm9-le-thumb-elf.hal.o.uu#5 integrate .. //depot/projects/dtrace/src/sys/contrib/dev/ath/public/arm9-le-thumb-elf.inc#5 integrate .. //depot/projects/dtrace/src/sys/contrib/dev/ath/public/arm9-le-thumb-elf.opt_ah.h#4 integrate .. //depot/projects/dtrace/src/sys/contrib/dev/ath/public/armv4-be-elf.hal.o.uu#5 integrate .. //depot/projects/dtrace/src/sys/contrib/dev/ath/public/armv4-be-elf.inc#5 integrate .. //depot/projects/dtrace/src/sys/contrib/dev/ath/public/armv4-be-elf.opt_ah.h#4 integrate .. //depot/projects/dtrace/src/sys/contrib/dev/ath/public/armv4-le-elf.hal.o.uu#5 integrate .. //depot/projects/dtrace/src/sys/contrib/dev/ath/public/armv4-le-elf.inc#5 integrate .. //depot/projects/dtrace/src/sys/contrib/dev/ath/public/armv4-le-elf.opt_ah.h#4 integrate .. //depot/projects/dtrace/src/sys/contrib/dev/ath/public/i386-elf.hal.o.uu#5 integrate .. //depot/projects/dtrace/src/sys/contrib/dev/ath/public/i386-elf.inc#4 integrate .. //depot/projects/dtrace/src/sys/contrib/dev/ath/public/i386-elf.opt_ah.h#4 integrate .. //depot/projects/dtrace/src/sys/contrib/dev/ath/public/mips-be-elf.hal.o.uu#5 integrate .. //depot/projects/dtrace/src/sys/contrib/dev/ath/public/mips-be-elf.inc#4 integrate .. //depot/projects/dtrace/src/sys/contrib/dev/ath/public/mips-be-elf.opt_ah.h#4 integrate .. //depot/projects/dtrace/src/sys/contrib/dev/ath/public/mips-le-elf.hal.o.uu#5 integrate .. //depot/projects/dtrace/src/sys/contrib/dev/ath/public/mips-le-elf.inc#4 integrate .. //depot/projects/dtrace/src/sys/contrib/dev/ath/public/mips-le-elf.opt_ah.h#4 integrate .. //depot/projects/dtrace/src/sys/contrib/dev/ath/public/mips1-be-elf.hal.o.uu#5 integrate .. //depot/projects/dtrace/src/sys/contrib/dev/ath/public/mips1-be-elf.inc#4 integrate .. //depot/projects/dtrace/src/sys/contrib/dev/ath/public/mips1-be-elf.opt_ah.h#4 integrate .. //depot/projects/dtrace/src/sys/contrib/dev/ath/public/mips1-le-elf.hal.o.uu#5 integrate .. //depot/projects/dtrace/src/sys/contrib/dev/ath/public/mips1-le-elf.inc#4 integrate .. //depot/projects/dtrace/src/sys/contrib/dev/ath/public/mips1-le-elf.opt_ah.h#4 integrate .. //depot/projects/dtrace/src/sys/contrib/dev/ath/public/mipsisa32-be-elf.hal.o.uu#5 integrate .. //depot/projects/dtrace/src/sys/contrib/dev/ath/public/mipsisa32-be-elf.inc#4 integrate .. //depot/projects/dtrace/src/sys/contrib/dev/ath/public/mipsisa32-be-elf.opt_ah.h#4 integrate .. //depot/projects/dtrace/src/sys/contrib/dev/ath/public/mipsisa32-le-elf.hal.o.uu#5 integrate .. //depot/projects/dtrace/src/sys/contrib/dev/ath/public/mipsisa32-le-elf.inc#4 integrate .. //depot/projects/dtrace/src/sys/contrib/dev/ath/public/mipsisa32-le-elf.opt_ah.h#4 integrate .. //depot/projects/dtrace/src/sys/contrib/dev/ath/public/powerpc-be-eabi.hal.o.uu#5 integrate .. //depot/projects/dtrace/src/sys/contrib/dev/ath/public/powerpc-be-eabi.inc#4 integrate .. //depot/projects/dtrace/src/sys/contrib/dev/ath/public/powerpc-be-eabi.opt_ah.h#4 integrate .. //depot/projects/dtrace/src/sys/contrib/dev/ath/public/powerpc-be-elf.hal.o.uu#5 integrate .. //depot/projects/dtrace/src/sys/contrib/dev/ath/public/powerpc-be-elf.inc#4 integrate .. //depot/projects/dtrace/src/sys/contrib/dev/ath/public/powerpc-be-elf.opt_ah.h#4 integrate .. //depot/projects/dtrace/src/sys/contrib/dev/ath/public/powerpc-le-eabi.hal.o.uu#5 integrate .. //depot/projects/dtrace/src/sys/contrib/dev/ath/public/powerpc-le-eabi.inc#4 integrate .. //depot/projects/dtrace/src/sys/contrib/dev/ath/public/powerpc-le-eabi.opt_ah.h#4 integrate .. //depot/projects/dtrace/src/sys/contrib/dev/ath/public/sh4-le-elf.hal.o.uu#5 integrate .. //depot/projects/dtrace/src/sys/contrib/dev/ath/public/sh4-le-elf.inc#4 integrate .. //depot/projects/dtrace/src/sys/contrib/dev/ath/public/sh4-le-elf.opt_ah.h#4 integrate .. //depot/projects/dtrace/src/sys/contrib/dev/ath/public/sparc-be-elf.hal.o.uu#4 integrate .. //depot/projects/dtrace/src/sys/contrib/dev/ath/public/sparc-be-elf.inc#3 integrate .. //depot/projects/dtrace/src/sys/contrib/dev/ath/public/sparc-be-elf.opt_ah.h#3 integrate .. //depot/projects/dtrace/src/sys/contrib/dev/ath/public/sparc64-be-elf.hal.o.uu#5 integrate .. //depot/projects/dtrace/src/sys/contrib/dev/ath/public/sparc64-be-elf.inc#4 integrate .. //depot/projects/dtrace/src/sys/contrib/dev/ath/public/sparc64-be-elf.opt_ah.h#4 integrate .. //depot/projects/dtrace/src/sys/contrib/dev/ath/public/wackelf.c#2 integrate .. //depot/projects/dtrace/src/sys/contrib/dev/ath/public/wisoc.hal.o.uu#1 branch .. //depot/projects/dtrace/src/sys/contrib/dev/ath/public/wisoc.inc#1 branch .. //depot/projects/dtrace/src/sys/contrib/dev/ath/public/wisoc.opt_ah.h#1 branch .. //depot/projects/dtrace/src/sys/contrib/dev/ath/public/x86_64-elf.hal.o.uu#5 integrate .. //depot/projects/dtrace/src/sys/contrib/dev/ath/public/x86_64-elf.inc#4 integrate .. //depot/projects/dtrace/src/sys/contrib/dev/ath/public/x86_64-elf.opt_ah.h#4 integrate .. //depot/projects/dtrace/src/sys/contrib/dev/ath/public/xscale-be-elf.hal.o.uu#5 integrate .. //depot/projects/dtrace/src/sys/contrib/dev/ath/public/xscale-be-elf.inc#5 integrate .. //depot/projects/dtrace/src/sys/contrib/dev/ath/public/xscale-be-elf.opt_ah.h#4 integrate .. //depot/projects/dtrace/src/sys/contrib/dev/ath/public/xscale-le-elf.hal.o.uu#5 integrate .. //depot/projects/dtrace/src/sys/contrib/dev/ath/public/xscale-le-elf.inc#5 integrate .. //depot/projects/dtrace/src/sys/contrib/dev/ath/public/xscale-le-elf.opt_ah.h#4 integrate .. //depot/projects/dtrace/src/sys/contrib/dev/ath/version.h#5 integrate .. //depot/projects/dtrace/src/sys/contrib/ipfilter/netinet/ip_compat.h#9 integrate .. //depot/projects/dtrace/src/sys/contrib/pf/net/pf_ioctl.c#16 integrate .. //depot/projects/dtrace/src/sys/ddb/db_command.c#15 integrate .. //depot/projects/dtrace/src/sys/ddb/db_command.h#5 integrate .. //depot/projects/dtrace/src/sys/ddb/db_main.c#7 integrate .. //depot/projects/dtrace/src/sys/ddb/ddb.h#9 integrate .. //depot/projects/dtrace/src/sys/dev/aac/aac_pci.c#11 integrate .. //depot/projects/dtrace/src/sys/dev/acpi_support/acpi_fujitsu.c#5 integrate .. //depot/projects/dtrace/src/sys/dev/acpica/acpi_quirk.c#5 integrate .. //depot/projects/dtrace/src/sys/dev/agp/agp.c#3 integrate .. //depot/projects/dtrace/src/sys/dev/aic7xxx/aic79xx_osm.c#7 integrate .. //depot/projects/dtrace/src/sys/dev/amr/amr.c#12 integrate .. //depot/projects/dtrace/src/sys/dev/arcmsr/arcmsr.c#11 integrate .. //depot/projects/dtrace/src/sys/dev/asmc/asmc.c#6 integrate .. //depot/projects/dtrace/src/sys/dev/asmc/asmcvar.h#4 integrate .. //depot/projects/dtrace/src/sys/dev/asr/asr.c#10 integrate .. //depot/projects/dtrace/src/sys/dev/ata/ata-chipset.c#32 integrate .. //depot/projects/dtrace/src/sys/dev/ata/ata-pci.c#12 integrate .. //depot/projects/dtrace/src/sys/dev/ata/ata-pci.h#18 integrate .. //depot/projects/dtrace/src/sys/dev/ata/atapi-tape.c#9 integrate .. //depot/projects/dtrace/src/sys/dev/ath/if_ath.c#25 integrate .. //depot/projects/dtrace/src/sys/dev/ath/if_athvar.h#15 integrate .. //depot/projects/dtrace/src/sys/dev/atkbdc/psm.c#12 integrate .. //depot/projects/dtrace/src/sys/dev/bce/if_bce.c#24 integrate .. //depot/projects/dtrace/src/sys/dev/bce/if_bcereg.h#15 integrate .. //depot/projects/dtrace/src/sys/dev/bge/if_bge.c#32 integrate .. //depot/projects/dtrace/src/sys/dev/bktr/bktr_os.c#5 integrate .. //depot/projects/dtrace/src/sys/dev/bm/if_bm.c#3 integrate .. //depot/projects/dtrace/src/sys/dev/ce/if_ce.c#8 integrate .. //depot/projects/dtrace/src/sys/dev/cfe/cfe_api.c#1 branch .. //depot/projects/dtrace/src/sys/dev/cfe/cfe_api.h#1 branch .. //depot/projects/dtrace/src/sys/dev/cfe/cfe_api_int.h#1 branch .. //depot/projects/dtrace/src/sys/dev/cfe/cfe_console.c#1 branch .. //depot/projects/dtrace/src/sys/dev/cfe/cfe_error.h#1 branch .. //depot/projects/dtrace/src/sys/dev/cfe/cfe_ioctl.h#1 branch .. //depot/projects/dtrace/src/sys/dev/cfe/cfe_resource.c#1 branch .. //depot/projects/dtrace/src/sys/dev/ciss/ciss.c#19 integrate .. //depot/projects/dtrace/src/sys/dev/ciss/cissreg.h#6 integrate .. //depot/projects/dtrace/src/sys/dev/cp/if_cp.c#8 integrate .. //depot/projects/dtrace/src/sys/dev/cpuctl/cpuctl.c#2 integrate .. //depot/projects/dtrace/src/sys/dev/ctau/if_ct.c#10 integrate .. //depot/projects/dtrace/src/sys/dev/cxgb/common/cxgb_ael1002.c#6 integrate .. //depot/projects/dtrace/src/sys/dev/cxgb/common/cxgb_common.h#6 integrate .. //depot/projects/dtrace/src/sys/dev/cxgb/common/cxgb_mc5.c#4 integrate .. //depot/projects/dtrace/src/sys/dev/cxgb/common/cxgb_mv88e1xxx.c#4 integrate .. //depot/projects/dtrace/src/sys/dev/cxgb/common/cxgb_t3_hw.c#5 integrate .. //depot/projects/dtrace/src/sys/dev/cxgb/common/cxgb_tn1010.c#2 integrate .. //depot/projects/dtrace/src/sys/dev/cxgb/common/cxgb_vsc7323.c#2 integrate .. //depot/projects/dtrace/src/sys/dev/cxgb/common/cxgb_vsc8211.c#4 integrate .. //depot/projects/dtrace/src/sys/dev/cxgb/common/cxgb_xgmac.c#5 integrate .. //depot/projects/dtrace/src/sys/dev/cxgb/cxgb_adapter.h#12 integrate .. //depot/projects/dtrace/src/sys/dev/cxgb/cxgb_config.h#4 integrate .. //depot/projects/dtrace/src/sys/dev/cxgb/cxgb_include.h#4 integrate .. //depot/projects/dtrace/src/sys/dev/cxgb/cxgb_ioctl.h#4 integrate .. //depot/projects/dtrace/src/sys/dev/cxgb/cxgb_main.c#14 integrate .. //depot/projects/dtrace/src/sys/dev/cxgb/cxgb_multiq.c#5 integrate .. //depot/projects/dtrace/src/sys/dev/cxgb/cxgb_offload.c#7 integrate .. //depot/projects/dtrace/src/sys/dev/cxgb/cxgb_offload.h#6 integrate .. //depot/projects/dtrace/src/sys/dev/cxgb/cxgb_osdep.h#9 integrate .. //depot/projects/dtrace/src/sys/dev/cxgb/cxgb_sge.c#14 integrate .. //depot/projects/dtrace/src/sys/dev/cxgb/cxgb_t3fw.c#2 integrate .. //depot/projects/dtrace/src/sys/dev/cxgb/sys/cxgb_support.c#7 integrate .. //depot/projects/dtrace/src/sys/dev/cxgb/sys/mbufq.h#4 integrate .. //depot/projects/dtrace/src/sys/dev/cxgb/sys/mvec.h#7 integrate .. //depot/projects/dtrace/src/sys/dev/cxgb/sys/uipc_mvec.c#9 integrate .. //depot/projects/dtrace/src/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb.c#2 integrate .. //depot/projects/dtrace/src/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_cm.c#2 integrate .. //depot/projects/dtrace/src/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_cq.c#2 integrate .. //depot/projects/dtrace/src/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_dbg.c#2 integrate .. //depot/projects/dtrace/src/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_ev.c#2 integrate .. //depot/projects/dtrace/src/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_hal.c#2 integrate .. //depot/projects/dtrace/src/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_mem.c#2 integrate .. //depot/projects/dtrace/src/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_provider.c#2 integrate .. //depot/projects/dtrace/src/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_qp.c#2 integrate .. //depot/projects/dtrace/src/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_resource.c#2 integrate .. //depot/projects/dtrace/src/sys/dev/cxgb/ulp/toecore/cxgb_toedev.h#3 integrate .. //depot/projects/dtrace/src/sys/dev/cxgb/ulp/toecore/toedev.c#2 integrate .. //depot/projects/dtrace/src/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c#10 integrate .. //depot/projects/dtrace/src/sys/dev/cxgb/ulp/tom/cxgb_cpl_socket.c#9 integrate .. //depot/projects/dtrace/src/sys/dev/cxgb/ulp/tom/cxgb_ddp.c#6 integrate .. //depot/projects/dtrace/src/sys/dev/cxgb/ulp/tom/cxgb_defs.h#5 integrate .. //depot/projects/dtrace/src/sys/dev/cxgb/ulp/tom/cxgb_l2t.c#3 integrate .. //depot/projects/dtrace/src/sys/dev/cxgb/ulp/tom/cxgb_l2t.h#2 integrate .. //depot/projects/dtrace/src/sys/dev/cxgb/ulp/tom/cxgb_listen.c#5 integrate .. //depot/projects/dtrace/src/sys/dev/cxgb/ulp/tom/cxgb_t3_ddp.h#4 integrate .. //depot/projects/dtrace/src/sys/dev/cxgb/ulp/tom/cxgb_tcp_offload.c#4 integrate .. //depot/projects/dtrace/src/sys/dev/cxgb/ulp/tom/cxgb_toepcb.h#4 integrate .. //depot/projects/dtrace/src/sys/dev/cxgb/ulp/tom/cxgb_tom.c#5 integrate .. //depot/projects/dtrace/src/sys/dev/cxgb/ulp/tom/cxgb_tom.h#3 integrate .. //depot/projects/dtrace/src/sys/dev/cxgb/ulp/tom/cxgb_tom_sysctl.c#5 integrate .. //depot/projects/dtrace/src/sys/dev/cxgb/ulp/tom/cxgb_vm.c#2 integrate .. //depot/projects/dtrace/src/sys/dev/dc/if_dc.c#17 integrate .. //depot/projects/dtrace/src/sys/dev/dc/if_dcreg.h#9 integrate .. //depot/projects/dtrace/src/sys/dev/drm/ati_pcigart.c#5 integrate .. //depot/projects/dtrace/src/sys/dev/drm/drm_bufs.c#5 integrate .. //depot/projects/dtrace/src/sys/dev/drm/drm_drv.c#7 integrate .. //depot/projects/dtrace/src/sys/dev/drm/drm_fops.c#5 integrate .. //depot/projects/dtrace/src/sys/dev/drm/drm_lock.c#5 integrate .. //depot/projects/dtrace/src/sys/dev/drm/drm_pci.c#5 integrate .. //depot/projects/dtrace/src/sys/dev/drm/i915_dma.c#9 integrate .. //depot/projects/dtrace/src/sys/dev/drm/mach64_dma.c#5 integrate .. //depot/projects/dtrace/src/sys/dev/e1000/if_igb.c#2 integrate .. //depot/projects/dtrace/src/sys/dev/e1000/if_igb.h#2 integrate .. //depot/projects/dtrace/src/sys/dev/esp/esp_sbus.c#8 integrate .. //depot/projects/dtrace/src/sys/dev/esp/ncr53c9x.c#8 integrate .. //depot/projects/dtrace/src/sys/dev/esp/ncr53c9xreg.h#4 integrate .. //depot/projects/dtrace/src/sys/dev/esp/ncr53c9xvar.h#5 integrate .. //depot/projects/dtrace/src/sys/dev/ex/if_ex_pccard.c#6 integrate .. //depot/projects/dtrace/src/sys/dev/fb/fb.c#5 integrate .. //depot/projects/dtrace/src/sys/dev/fb/vgareg.h#4 integrate .. //depot/projects/dtrace/src/sys/dev/firewire/firewire.h#5 integrate .. //depot/projects/dtrace/src/sys/dev/firewire/fwdev.c#6 integrate .. //depot/projects/dtrace/src/sys/dev/hptiop/hptiop.c#3 integrate .. //depot/projects/dtrace/src/sys/dev/hwpmc/hwpmc_amd.c#6 integrate .. //depot/projects/dtrace/src/sys/dev/hwpmc/hwpmc_mod.c#13 integrate .. //depot/projects/dtrace/src/sys/dev/hwpmc/hwpmc_piv.c#6 integrate .. //depot/projects/dtrace/src/sys/dev/hwpmc/hwpmc_ppro.c#5 integrate .. //depot/projects/dtrace/src/sys/dev/hwpmc/hwpmc_x86.c#6 integrate .. //depot/projects/dtrace/src/sys/dev/ic/i8251.h#4 integrate .. //depot/projects/dtrace/src/sys/dev/ic/i8255.h#1 branch .. //depot/projects/dtrace/src/sys/dev/ic/ns16550.h#4 integrate .. //depot/projects/dtrace/src/sys/dev/iicbus/ds133x.c#2 integrate .. //depot/projects/dtrace/src/sys/dev/iicbus/ds1672.c#2 integrate .. //depot/projects/dtrace/src/sys/dev/iir/iir_ctrl.c#4 integrate .. //depot/projects/dtrace/src/sys/dev/ipmi/ipmi.c#10 integrate .. //depot/projects/dtrace/src/sys/dev/ipmi/ipmi_kcs.c#4 integrate .. //depot/projects/dtrace/src/sys/dev/ipmi/ipmivars.h#5 integrate .. //depot/projects/dtrace/src/sys/dev/iscsi/initiator/isc_cam.c#2 integrate .. //depot/projects/dtrace/src/sys/dev/iscsi/initiator/iscsi.c#3 integrate .. //depot/projects/dtrace/src/sys/dev/isp/isp_freebsd.c#19 integrate .. //depot/projects/dtrace/src/sys/dev/jme/if_jme.c#3 integrate .. //depot/projects/dtrace/src/sys/dev/jme/if_jmereg.h#2 integrate .. //depot/projects/dtrace/src/sys/dev/joy/joy.c#4 integrate .. //depot/projects/dtrace/src/sys/dev/k8temp/k8temp.c#6 integrate .. //depot/projects/dtrace/src/sys/dev/kbd/kbd.c#7 integrate .. //depot/projects/dtrace/src/sys/dev/kbdmux/kbdmux.c#9 integrate .. //depot/projects/dtrace/src/sys/dev/le/if_le_cbus.c#6 integrate .. //depot/projects/dtrace/src/sys/dev/le/if_le_isa.c#5 integrate .. //depot/projects/dtrace/src/sys/dev/le/if_le_lebuffer.c#3 integrate .. //depot/projects/dtrace/src/sys/dev/le/if_le_ledma.c#7 integrate .. //depot/projects/dtrace/src/sys/dev/le/if_le_pci.c#7 integrate .. //depot/projects/dtrace/src/sys/dev/le/lebuffer_sbus.c#2 integrate .. //depot/projects/dtrace/src/sys/dev/led/led.c#7 integrate .. //depot/projects/dtrace/src/sys/dev/md/md.c#13 integrate .. //depot/projects/dtrace/src/sys/dev/mii/e1000phy.c#8 integrate .. //depot/projects/dtrace/src/sys/dev/mii/miidevs#21 integrate .. //depot/projects/dtrace/src/sys/dev/mlx/mlx.c#5 integrate .. //depot/projects/dtrace/src/sys/dev/mly/mly.c#8 integrate .. //depot/projects/dtrace/src/sys/dev/mse/mse.c#6 integrate .. //depot/projects/dtrace/src/sys/dev/msk/if_msk.c#10 integrate .. //depot/projects/dtrace/src/sys/dev/msk/if_mskreg.h#7 integrate .. //depot/projects/dtrace/src/sys/dev/pbio/pbio.c#5 integrate .. //depot/projects/dtrace/src/sys/dev/pccard/pccard_cis.c#7 integrate .. //depot/projects/dtrace/src/sys/dev/pccard/pccarddevs#11 integrate .. //depot/projects/dtrace/src/sys/dev/pci/pci_pci.c#14 integrate .. //depot/projects/dtrace/src/sys/dev/pci/vga_pci.c#4 integrate .. //depot/projects/dtrace/src/sys/dev/powermac_nvram/powermac_nvram.c#4 integrate .. //depot/projects/dtrace/src/sys/dev/ppbus/if_plip.c#7 integrate .. //depot/projects/dtrace/src/sys/dev/ppbus/lpt.c#6 integrate .. //depot/projects/dtrace/src/sys/dev/ppbus/pcfclock.c#4 integrate .. //depot/projects/dtrace/src/sys/dev/ppbus/ppbconf.c#8 integrate .. //depot/projects/dtrace/src/sys/dev/ppbus/ppbconf.h#5 integrate .. //depot/projects/dtrace/src/sys/dev/ppbus/ppi.c#5 integrate .. //depot/projects/dtrace/src/sys/dev/ppbus/pps.c#5 integrate .. //depot/projects/dtrace/src/sys/dev/ppc/ppc.c#8 integrate .. //depot/projects/dtrace/src/sys/dev/ppc/ppc_acpi.c#4 integrate .. //depot/projects/dtrace/src/sys/dev/ppc/ppc_isa.c#4 integrate .. //depot/projects/dtrace/src/sys/dev/ppc/ppc_pci.c#3 integrate .. //depot/projects/dtrace/src/sys/dev/ppc/ppc_puc.c#6 integrate .. //depot/projects/dtrace/src/sys/dev/ppc/ppcreg.h#6 integrate .. //depot/projects/dtrace/src/sys/dev/ppc/ppcvar.h#6 integrate .. //depot/projects/dtrace/src/sys/dev/re/if_re.c#24 integrate .. //depot/projects/dtrace/src/sys/dev/rp/rpvar.h#5 integrate .. //depot/projects/dtrace/src/sys/dev/sbni/if_sbni.c#7 branch .. //depot/projects/dtrace/src/sys/dev/sbni/if_sbni_isa.c#6 branch .. //depot/projects/dtrace/src/sys/dev/sbni/if_sbni_pci.c#6 branch .. //depot/projects/dtrace/src/sys/dev/sbni/if_sbnireg.h#5 branch .. //depot/projects/dtrace/src/sys/dev/sbni/if_sbnivar.h#5 branch .. //depot/projects/dtrace/src/sys/dev/si/si.c#8 integrate .. //depot/projects/dtrace/src/sys/dev/siba/siba.c#1 branch .. //depot/projects/dtrace/src/sys/dev/siba/siba_ids.h#1 branch .. //depot/projects/dtrace/src/sys/dev/siba/siba_pcib.c#1 branch .. //depot/projects/dtrace/src/sys/dev/siba/siba_pcibvar.h#1 branch .. //depot/projects/dtrace/src/sys/dev/siba/sibareg.h#1 branch .. //depot/projects/dtrace/src/sys/dev/siba/sibavar.h#1 branch .. //depot/projects/dtrace/src/sys/dev/snp/snp.c#9 integrate .. //depot/projects/dtrace/src/sys/dev/sound/midi/sequencer.c#11 integrate .. //depot/projects/dtrace/src/sys/dev/sound/pci/emu10kx.c#7 integrate .. //depot/projects/dtrace/src/sys/dev/sound/pci/hda/hda_reg.h#4 integrate .. //depot/projects/dtrace/src/sys/dev/sound/pci/hda/hdac.c#21 integrate .. //depot/projects/dtrace/src/sys/dev/sound/pci/hda/hdac_private.h#7 integrate .. //depot/projects/dtrace/src/sys/dev/sound/pcm/dsp.c#12 integrate .. //depot/projects/dtrace/src/sys/dev/sound/pcm/mixer.c#7 integrate .. //depot/projects/dtrace/src/sys/dev/speaker/spkr.c#7 integrate .. //depot/projects/dtrace/src/sys/dev/streams/streams.c#8 integrate .. //depot/projects/dtrace/src/sys/dev/syscons/syscons.c#18 integrate .. //depot/projects/dtrace/src/sys/dev/tdfx/tdfx_pci.c#5 integrate .. //depot/projects/dtrace/src/sys/dev/twa/tw_osl_freebsd.c#7 integrate .. //depot/projects/dtrace/src/sys/dev/twe/twe_freebsd.c#5 integrate .. //depot/projects/dtrace/src/sys/dev/tx/if_tx.c#7 integrate .. //depot/projects/dtrace/src/sys/dev/uart/uart_cpu_pc98.c#6 integrate .. //depot/projects/dtrace/src/sys/dev/usb/ehci_pci.c#12 integrate .. //depot/projects/dtrace/src/sys/dev/usb/if_zyd.c#14 integrate .. //depot/projects/dtrace/src/sys/dev/usb/if_zydreg.h#5 integrate .. //depot/projects/dtrace/src/sys/dev/usb/ohci_pci.c#7 integrate .. //depot/projects/dtrace/src/sys/dev/usb/ubsa.c#12 integrate .. //depot/projects/dtrace/src/sys/dev/usb/ucom.c#9 integrate .. //depot/projects/dtrace/src/sys/dev/usb/ucomvar.h#8 integrate .. //depot/projects/dtrace/src/sys/dev/usb/ufm.c#6 integrate .. //depot/projects/dtrace/src/sys/dev/usb/ufoma.c#7 integrate .. //depot/projects/dtrace/src/sys/dev/usb/ugen.c#7 integrate .. //depot/projects/dtrace/src/sys/dev/usb/uhci_pci.c#8 integrate .. //depot/projects/dtrace/src/sys/dev/usb/uhid.c#7 integrate .. //depot/projects/dtrace/src/sys/dev/usb/uipaq.c#8 integrate .. //depot/projects/dtrace/src/sys/dev/usb/ulpt.c#6 integrate .. //depot/projects/dtrace/src/sys/dev/usb/umass.c#14 integrate .. //depot/projects/dtrace/src/sys/dev/usb/umodem.c#7 integrate .. //depot/projects/dtrace/src/sys/dev/usb/ums.c#11 integrate .. //depot/projects/dtrace/src/sys/dev/usb/uplcom.c#10 integrate .. //depot/projects/dtrace/src/sys/dev/usb/urio.c#6 integrate .. //depot/projects/dtrace/src/sys/dev/usb/usb.c#9 integrate .. //depot/projects/dtrace/src/sys/dev/usb/usb_quirks.c#12 integrate .. //depot/projects/dtrace/src/sys/dev/usb/usbdevs#44 integrate .. //depot/projects/dtrace/src/sys/dev/usb/uscanner.c#14 integrate .. //depot/projects/dtrace/src/sys/dev/usb/uvscom.c#6 integrate .. //depot/projects/dtrace/src/sys/dev/vkbd/vkbd.c#7 integrate .. //depot/projects/dtrace/src/sys/dev/wi/if_wi_pccard.c#6 integrate .. //depot/projects/dtrace/src/sys/dev/xen/blkback/blkback.c#2 integrate .. //depot/projects/dtrace/src/sys/dev/xen/blkfront/blkfront.c#4 integrate .. //depot/projects/dtrace/src/sys/dev/xen/console/console.c#4 integrate .. //depot/projects/dtrace/src/sys/dev/xen/netfront/netfront.c#3 integrate .. //depot/projects/dtrace/src/sys/fs/cd9660/cd9660_vnops.c#3 integrate .. //depot/projects/dtrace/src/sys/fs/coda/coda_fbsd.c#3 integrate .. //depot/projects/dtrace/src/sys/fs/coda/coda_venus.c#4 integrate .. //depot/projects/dtrace/src/sys/fs/coda/coda_venus.h#3 integrate .. //depot/projects/dtrace/src/sys/fs/coda/coda_vnops.c#10 integrate .. //depot/projects/dtrace/src/sys/fs/devfs/devfs_devs.c#12 integrate .. //depot/projects/dtrace/src/sys/fs/devfs/devfs_vnops.c#26 integrate .. //depot/projects/dtrace/src/sys/fs/fdescfs/fdesc_vnops.c#10 integrate .. //depot/projects/dtrace/src/sys/fs/hpfs/hpfs_vnops.c#8 integrate .. //depot/projects/dtrace/src/sys/fs/msdosfs/msdosfs_fat.c#7 integrate .. //depot/projects/dtrace/src/sys/fs/msdosfs/msdosfs_vnops.c#15 integrate .. //depot/projects/dtrace/src/sys/fs/ntfs/ntfs_vnops.c#9 integrate .. //depot/projects/dtrace/src/sys/fs/nullfs/null_vnops.c#10 integrate .. //depot/projects/dtrace/src/sys/fs/nwfs/nwfs_io.c#6 integrate .. //depot/projects/dtrace/src/sys/fs/nwfs/nwfs_vnops.c#6 integrate .. //depot/projects/dtrace/src/sys/fs/portalfs/portal_vnops.c#8 integrate .. //depot/projects/dtrace/src/sys/fs/pseudofs/pseudofs_vnops.c#8 integrate .. //depot/projects/dtrace/src/sys/fs/smbfs/smbfs_io.c#8 integrate .. //depot/projects/dtrace/src/sys/fs/smbfs/smbfs_node.c#10 integrate .. //depot/projects/dtrace/src/sys/fs/smbfs/smbfs_vnops.c#11 integrate .. //depot/projects/dtrace/src/sys/fs/tmpfs/tmpfs.h#4 integrate .. //depot/projects/dtrace/src/sys/fs/tmpfs/tmpfs_fifoops.c#2 integrate .. //depot/projects/dtrace/src/sys/fs/tmpfs/tmpfs_fifoops.h#2 integrate .. //depot/projects/dtrace/src/sys/fs/tmpfs/tmpfs_subr.c#7 integrate .. //depot/projects/dtrace/src/sys/fs/tmpfs/tmpfs_vfsops.c#9 integrate .. //depot/projects/dtrace/src/sys/fs/tmpfs/tmpfs_vnops.c#9 integrate .. //depot/projects/dtrace/src/sys/fs/tmpfs/tmpfs_vnops.h#2 integrate .. //depot/projects/dtrace/src/sys/fs/udf/udf_vnops.c#9 integrate .. //depot/projects/dtrace/src/sys/fs/unionfs/union_subr.c#18 integrate .. //depot/projects/dtrace/src/sys/fs/unionfs/union_vfsops.c#13 integrate .. //depot/projects/dtrace/src/sys/fs/unionfs/union_vnops.c#17 integrate .. //depot/projects/dtrace/src/sys/geom/geom_dev.c#7 integrate .. //depot/projects/dtrace/src/sys/geom/geom_io.c#8 integrate .. //depot/projects/dtrace/src/sys/geom/journal/g_journal.c#8 integrate .. //depot/projects/dtrace/src/sys/geom/part/g_part.c#11 integrate .. //depot/projects/dtrace/src/sys/geom/part/g_part.h#9 integrate .. //depot/projects/dtrace/src/sys/geom/part/g_part_gpt.c#8 integrate .. //depot/projects/dtrace/src/sys/gnu/fs/ext2fs/ext2_inode.c#5 integrate .. //depot/projects/dtrace/src/sys/gnu/fs/ext2fs/ext2_vfsops.c#14 integrate .. //depot/projects/dtrace/src/sys/gnu/fs/ext2fs/ext2_vnops.c#9 integrate .. //depot/projects/dtrace/src/sys/gnu/fs/xfs/FreeBSD/support/kdb.c#4 integrate .. //depot/projects/dtrace/src/sys/gnu/fs/xfs/FreeBSD/xfs_vnode.h#4 integrate .. //depot/projects/dtrace/src/sys/gnu/fs/xfs/FreeBSD/xfs_vnops.c#8 integrate .. //depot/projects/dtrace/src/sys/i386/acpica/acpi_machdep.c#9 integrate .. //depot/projects/dtrace/src/sys/i386/bios/apm.c#9 integrate .. //depot/projects/dtrace/src/sys/i386/bios/apm.h#4 integrate .. //depot/projects/dtrace/src/sys/i386/bios/smapi.c#5 integrate .. //depot/projects/dtrace/src/sys/i386/conf/GENERIC#47 integrate .. //depot/projects/dtrace/src/sys/i386/conf/NOTES#27 integrate .. //depot/projects/dtrace/src/sys/i386/conf/XEN#3 integrate .. //depot/projects/dtrace/src/sys/i386/cpufreq/est.c#13 integrate .. //depot/projects/dtrace/src/sys/i386/cpufreq/powernow.c#7 integrate .. //depot/projects/dtrace/src/sys/i386/cpufreq/smist.c#6 integrate .. //depot/projects/dtrace/src/sys/i386/i386/bios.c#5 integrate .. //depot/projects/dtrace/src/sys/i386/i386/elf_machdep.c#8 integrate .. //depot/projects/dtrace/src/sys/i386/i386/identcpu.c#14 integrate .. //depot/projects/dtrace/src/sys/i386/i386/intr_machdep.c#14 integrate .. //depot/projects/dtrace/src/sys/i386/i386/local_apic.c#19 integrate .. //depot/projects/dtrace/src/sys/i386/i386/machdep.c#31 integrate .. //depot/projects/dtrace/src/sys/i386/i386/mem.c#4 integrate .. //depot/projects/dtrace/src/sys/i386/i386/pmap.c#45 integrate .. //depot/projects/dtrace/src/sys/i386/i386/sys_machdep.c#10 integrate .. //depot/projects/dtrace/src/sys/i386/i386/vm_machdep.c#11 integrate .. //depot/projects/dtrace/src/sys/i386/ibcs2/ibcs2_sysvec.c#5 integrate .. //depot/projects/dtrace/src/sys/i386/ibcs2/imgact_coff.c#10 integrate .. //depot/projects/dtrace/src/sys/i386/include/param.h#7 integrate .. //depot/projects/dtrace/src/sys/i386/include/pmc_mdep.h#5 integrate .. //depot/projects/dtrace/src/sys/i386/include/proc.h#6 integrate .. //depot/projects/dtrace/src/sys/i386/include/smp.h#7 integrate .. //depot/projects/dtrace/src/sys/i386/include/specialreg.h#11 integrate .. //depot/projects/dtrace/src/sys/i386/include/xen/evtchn.h#2 integrate .. //depot/projects/dtrace/src/sys/i386/include/xen/xenpmap.h#3 integrate .. //depot/projects/dtrace/src/sys/i386/include/xen/xenvar.h#3 integrate .. //depot/projects/dtrace/src/sys/i386/isa/isa.c#5 integrate .. //depot/projects/dtrace/src/sys/i386/linux/linux_genassym.c#4 integrate .. //depot/projects/dtrace/src/sys/i386/linux/linux_locore.s#4 integrate .. //depot/projects/dtrace/src/sys/i386/linux/linux_sysvec.c#12 integrate .. //depot/projects/dtrace/src/sys/i386/pci/pci_cfgreg.c#8 integrate .. //depot/projects/dtrace/src/sys/i386/xen/locore.s#3 integrate .. //depot/projects/dtrace/src/sys/i386/xen/mp_machdep.c#1 branch .. //depot/projects/dtrace/src/sys/i386/xen/mptable.c#1 branch .. //depot/projects/dtrace/src/sys/i386/xen/pmap.c#4 integrate .. //depot/projects/dtrace/src/sys/i386/xen/xen_machdep.c#4 integrate .. //depot/projects/dtrace/src/sys/ia64/ia64/efi.c#4 integrate .. //depot/projects/dtrace/src/sys/ia64/ia64/elf_machdep.c#6 integrate .. //depot/projects/dtrace/src/sys/ia64/ia64/mem.c#4 integrate .. //depot/projects/dtrace/src/sys/ia64/ia64/sal.c#4 integrate .. //depot/projects/dtrace/src/sys/kern/imgact_aout.c#7 integrate .. //depot/projects/dtrace/src/sys/kern/imgact_shell.c#5 integrate .. //depot/projects/dtrace/src/sys/kern/init_main.c#29 integrate .. //depot/projects/dtrace/src/sys/kern/init_sysent.c#35 integrate .. //depot/projects/dtrace/src/sys/kern/kern_condvar.c#9 integrate .. //depot/projects/dtrace/src/sys/kern/kern_conf.c#19 integrate .. //depot/projects/dtrace/src/sys/kern/kern_exec.c#33 integrate .. //depot/projects/dtrace/src/sys/kern/kern_exit.c#25 integrate .. //depot/projects/dtrace/src/sys/kern/kern_intr.c#24 integrate .. //depot/projects/dtrace/src/sys/kern/kern_linker.c#36 integrate .. //depot/projects/dtrace/src/sys/kern/kern_lock.c#30 integrate .. //depot/projects/dtrace/src/sys/kern/kern_mib.c#12 integrate .. //depot/projects/dtrace/src/sys/kern/kern_mutex.c#20 integrate .. //depot/projects/dtrace/src/sys/kern/kern_pmc.c#5 integrate .. //depot/projects/dtrace/src/sys/kern/kern_priv.c#4 integrate .. //depot/projects/dtrace/src/sys/kern/kern_proc.c#26 integrate .. //depot/projects/dtrace/src/sys/kern/kern_resource.c#19 integrate .. //depot/projects/dtrace/src/sys/kern/kern_rmlock.c#4 integrate .. //depot/projects/dtrace/src/sys/kern/kern_rwlock.c#18 integrate .. //depot/projects/dtrace/src/sys/kern/kern_sig.c#28 integrate .. //depot/projects/dtrace/src/sys/kern/kern_subr.c#10 integrate .. //depot/projects/dtrace/src/sys/kern/kern_sx.c#16 integrate .. //depot/projects/dtrace/src/sys/kern/kern_synch.c#23 integrate .. //depot/projects/dtrace/src/sys/kern/kern_syscalls.c#5 integrate .. //depot/projects/dtrace/src/sys/kern/makesyscalls.sh#15 integrate .. //depot/projects/dtrace/src/sys/kern/subr_clist.c#4 integrate .. //depot/projects/dtrace/src/sys/kern/subr_pcpu.c#10 integrate .. //depot/projects/dtrace/src/sys/kern/subr_rman.c#12 integrate .. //depot/projects/dtrace/src/sys/kern/subr_sleepqueue.c#20 integrate .. //depot/projects/dtrace/src/sys/kern/subr_smp.c#15 integrate .. //depot/projects/dtrace/src/sys/kern/subr_turnstile.c#14 integrate .. //depot/projects/dtrace/src/sys/kern/subr_witness.c#23 integrate .. //depot/projects/dtrace/src/sys/kern/sys_generic.c#13 integrate .. //depot/projects/dtrace/src/sys/kern/syscalls.c#34 integrate .. //depot/projects/dtrace/src/sys/kern/syscalls.master#26 integrate .. //depot/projects/dtrace/src/sys/kern/systrace_args.c#31 integrate .. //depot/projects/dtrace/src/sys/kern/tty.c#17 integrate .. //depot/projects/dtrace/src/sys/kern/tty_compat.c#5 integrate .. //depot/projects/dtrace/src/sys/kern/tty_inq.c#2 integrate .. //depot/projects/dtrace/src/sys/kern/tty_outq.c#2 integrate .. //depot/projects/dtrace/src/sys/kern/tty_pts.c#13 integrate .. //depot/projects/dtrace/src/sys/kern/tty_ttydisc.c#2 integrate .. //depot/projects/dtrace/src/sys/kern/uipc_mbuf.c#14 integrate .. //depot/projects/dtrace/src/sys/kern/uipc_mqueue.c#14 integrate .. //depot/projects/dtrace/src/sys/kern/uipc_sockbuf.c#11 integrate .. //depot/projects/dtrace/src/sys/kern/uipc_socket.c#28 integrate .. //depot/projects/dtrace/src/sys/kern/vfs_bio.c#27 integrate .. //depot/projects/dtrace/src/sys/kern/vfs_cache.c#16 integrate .. //depot/projects/dtrace/src/sys/kern/vfs_default.c#13 integrate .. //depot/projects/dtrace/src/sys/kern/vfs_lookup.c#17 integrate .. //depot/projects/dtrace/src/sys/kern/vfs_mount.c#39 integrate .. //depot/projects/dtrace/src/sys/kern/vfs_subr.c#45 integrate .. //depot/projects/dtrace/src/sys/kern/vfs_syscalls.c#27 integrate .. //depot/projects/dtrace/src/sys/kern/vfs_vnops.c#19 integrate .. //depot/projects/dtrace/src/sys/kern/vnode_if.src#10 integrate .. //depot/projects/dtrace/src/sys/libkern/memcmp.c#1 branch .. //depot/projects/dtrace/src/sys/mips/adm5120/admpci.c#2 integrate .. //depot/projects/dtrace/src/sys/mips/adm5120/if_admsw.c#2 integrate .. //depot/projects/dtrace/src/sys/mips/adm5120/if_admswvar.h#2 integrate .. //depot/projects/dtrace/src/sys/mips/adm5120/obio.c#2 integrate .. //depot/projects/dtrace/src/sys/mips/adm5120/std.adm5120#2 integrate .. //depot/projects/dtrace/src/sys/mips/adm5120/uart_bus_adm5120.c#2 integrate .. //depot/projects/dtrace/src/sys/mips/adm5120/uart_cpu_adm5120.c#2 integrate .. //depot/projects/dtrace/src/sys/mips/adm5120/uart_dev_adm5120.c#2 integrate .. //depot/projects/dtrace/src/sys/mips/conf/ADM5120#3 integrate .. //depot/projects/dtrace/src/sys/mips/conf/IDT#4 integrate .. //depot/projects/dtrace/src/sys/mips/conf/MALTA#3 integrate .. //depot/projects/dtrace/src/sys/mips/conf/SENTRY5#4 integrate .. //depot/projects/dtrace/src/sys/mips/idt/idtpci.c#2 integrate .. //depot/projects/dtrace/src/sys/mips/idt/if_kr.c#2 integrate .. //depot/projects/dtrace/src/sys/mips/idt/obio.c#2 integrate .. //depot/projects/dtrace/src/sys/mips/idt/std.idt#2 integrate .. //depot/projects/dtrace/src/sys/mips/idt/uart_bus_rc32434.c#2 integrate .. //depot/projects/dtrace/src/sys/mips/malta/files.malta#2 integrate .. //depot/projects/dtrace/src/sys/mips/malta/gt.c#2 integrate .. //depot/projects/dtrace/src/sys/mips/malta/gt_pci.c#2 integrate .. //depot/projects/dtrace/src/sys/mips/malta/malta_machdep.c#2 integrate .. //depot/projects/dtrace/src/sys/mips/malta/obio.c#2 integrate .. //depot/projects/dtrace/src/sys/mips/malta/std.malta#2 integrate .. //depot/projects/dtrace/src/sys/mips/malta/uart_bus_maltausart.c#2 integrate .. //depot/projects/dtrace/src/sys/mips/malta/uart_cpu_maltausart.c#2 integrate .. //depot/projects/dtrace/src/sys/mips/malta/yamon.c#2 integrate .. //depot/projects/dtrace/src/sys/mips/mips/elf_machdep.c#2 integrate .. //depot/projects/dtrace/src/sys/mips/mips/in_cksum.c#2 integrate .. //depot/projects/dtrace/src/sys/mips/mips/intr_machdep.c#2 integrate .. //depot/projects/dtrace/src/sys/mips/mips/mem.c#2 integrate .. //depot/projects/dtrace/src/sys/mips/mips/support.S#2 integrate .. //depot/projects/dtrace/src/sys/mips/sentry5/obio.c#2 integrate .. //depot/projects/dtrace/src/sys/mips/sentry5/s5_machdep.c#2 integrate .. //depot/projects/dtrace/src/sys/mips/sentry5/uart_bus_sbusart.c#2 integrate .. //depot/projects/dtrace/src/sys/mips/sentry5/uart_cpu_sbusart.c#2 integrate .. //depot/projects/dtrace/src/sys/modules/Makefile#55 integrate .. //depot/projects/dtrace/src/sys/modules/aha/Makefile#4 integrate .. //depot/projects/dtrace/src/sys/modules/ahb/Makefile#4 integrate .. //depot/projects/dtrace/src/sys/modules/an/Makefile#4 integrate .. //depot/projects/dtrace/src/sys/modules/ar/Makefile#4 integrate .. //depot/projects/dtrace/src/sys/modules/ath_rate_amrr/Makefile#9 integrate .. //depot/projects/dtrace/src/sys/modules/ath_rate_onoe/Makefile#8 integrate .. //depot/projects/dtrace/src/sys/modules/ath_rate_sample/Makefile#8 integrate .. //depot/projects/dtrace/src/sys/modules/ce/Makefile#4 integrate .. //depot/projects/dtrace/src/sys/modules/cp/Makefile#4 integrate .. //depot/projects/dtrace/src/sys/modules/ctau/Makefile#4 integrate .. //depot/projects/dtrace/src/sys/modules/cx/Makefile#4 integrate .. //depot/projects/dtrace/src/sys/modules/cxgb/Makefile#6 integrate .. //depot/projects/dtrace/src/sys/modules/cxgb/cxgb/Makefile#9 integrate .. //depot/projects/dtrace/src/sys/modules/cxgb/cxgb_t3fw/Makefile#2 integrate .. //depot/projects/dtrace/src/sys/modules/cxgb/iw_cxgb/Makefile#2 integrate .. //depot/projects/dtrace/src/sys/modules/cxgb/toecore/Makefile#2 integrate .. //depot/projects/dtrace/src/sys/modules/cxgb/tom/Makefile#4 integrate .. //depot/projects/dtrace/src/sys/modules/digi/digi/Makefile#5 integrate .. //depot/projects/dtrace/src/sys/modules/fatm/Makefile#4 integrate .. //depot/projects/dtrace/src/sys/modules/hatm/Makefile#4 integrate .. //depot/projects/dtrace/src/sys/modules/hifn/Makefile#5 integrate .. //depot/projects/dtrace/src/sys/modules/if_tap/Makefile#5 integrate .. //depot/projects/dtrace/src/sys/modules/linux/Makefile#9 integrate .. //depot/projects/dtrace/src/sys/modules/netgraph/sync_ar/Makefile#4 integrate .. //depot/projects/dtrace/src/sys/modules/netgraph/sync_sr/Makefile#4 integrate .. //depot/projects/dtrace/src/sys/modules/patm/Makefile#4 integrate .. //depot/projects/dtrace/src/sys/modules/pf/Makefile#6 integrate .. //depot/projects/dtrace/src/sys/modules/pflog/Makefile#4 integrate .. //depot/projects/dtrace/src/sys/modules/rp/Makefile#4 integrate .. //depot/projects/dtrace/src/sys/modules/safe/Makefile#5 integrate .. //depot/projects/dtrace/src/sys/modules/sbni/Makefile#5 branch .. //depot/projects/dtrace/src/sys/modules/sppp/Makefile#4 integrate .. //depot/projects/dtrace/src/sys/modules/sr/Makefile#4 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat Sep 27 16:52:45 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4FDCB106568A; Sat, 27 Sep 2008 16:52:45 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1475310656CF for ; Sat, 27 Sep 2008 16:52:45 +0000 (UTC) (envelope-from snb@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id DDF4C8FC0C for ; Sat, 27 Sep 2008 16:52:44 +0000 (UTC) (envelope-from snb@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id m8RGqigY017838 for ; Sat, 27 Sep 2008 16:52:44 GMT (envelope-from snb@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m8RGqiDp017836 for perforce@freebsd.org; Sat, 27 Sep 2008 16:52:44 GMT (envelope-from snb@FreeBSD.org) Date: Sat, 27 Sep 2008 16:52:44 GMT Message-Id: <200809271652.m8RGqiDp017836@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to snb@FreeBSD.org using -f From: Nick Barkas To: Perforce Change Reviews Cc: Subject: PERFORCE change 150568 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 27 Sep 2008 16:52:45 -0000 http://perforce.freebsd.org/chv.cgi?CH=150568 Change 150568 by snb@snb_toro on 2008/09/27 16:52:04 Another, hopefully better than the others already in this directory, script for benchmarking dirhash. Affected files ... .. //depot/projects/soc2008/snb-dirhash/benchmark/dh_bench.py#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Sat Sep 27 18:38:33 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 508961065695; Sat, 27 Sep 2008 18:38:33 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1358E1065692 for ; Sat, 27 Sep 2008 18:38:33 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 019B28FC20 for ; Sat, 27 Sep 2008 18:38:33 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id m8RIcW88070305 for ; Sat, 27 Sep 2008 18:38:32 GMT (envelope-from trasz@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m8RIcWa2070303 for perforce@freebsd.org; Sat, 27 Sep 2008 18:38:32 GMT (envelope-from trasz@freebsd.org) Date: Sat, 27 Sep 2008 18:38:32 GMT Message-Id: <200809271838.m8RIcWa2070303@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to trasz@freebsd.org using -f From: Edward Tomasz Napierala To: Perforce Change Reviews Cc: Subject: PERFORCE change 150572 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 27 Sep 2008 18:38:33 -0000 http://perforce.freebsd.org/chv.cgi?CH=150572 Change 150572 by trasz@trasz_traszkan on 2008/09/27 18:38:02 Update TODO. Affected files ... .. //depot/projects/soc2008/trasz_nfs4acl/TODO#49 edit Differences ... ==== //depot/projects/soc2008/trasz_nfs4acl/TODO#49 (text+ko) ==== @@ -1,3 +1,20 @@ +Things that need to be done before this goes into -CURRENT: + +- Fix Vflags abuse (mostly done). + +- MFP4 of the above. + +- Use vaccess_t (mostly done). + +- MFP4 of the above. + +- Decide how VAPPEND is supposed to work - always OR-ed with VWRITE, + or used alone. Fix stuff accordingly. + +- MFP4 of the above. + +- Review. + Things to do, in no particular order: - Add support for NFS4 ACLs to tar(1). From owner-p4-projects@FreeBSD.ORG Sat Sep 27 20:52:51 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 428CC106568A; Sat, 27 Sep 2008 20:52:51 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 04B611065686 for ; Sat, 27 Sep 2008 20:52:51 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id E4D9B8FC13 for ; Sat, 27 Sep 2008 20:52:50 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id m8RKqoun098178 for ; Sat, 27 Sep 2008 20:52:50 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m8RKqntU097936 for perforce@freebsd.org; Sat, 27 Sep 2008 20:52:49 GMT (envelope-from sam@freebsd.org) Date: Sat, 27 Sep 2008 20:52:49 GMT Message-Id: <200809272052.m8RKqntU097936@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 150577 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 27 Sep 2008 20:52:51 -0000 http://perforce.freebsd.org/chv.cgi?CH=150577 Change 150577 by sam@sam_ebb on 2008/09/27 20:51:57 IFC @ 150575 Affected files ... .. //depot/projects/vap/Makefile.inc1#16 integrate .. //depot/projects/vap/ObsoleteFiles.inc#19 integrate .. //depot/projects/vap/cddl/contrib/opensolaris/lib/libdtrace/common/dt_printf.c#3 integrate .. //depot/projects/vap/contrib/libpcap/pcap-bpf.c#3 integrate .. //depot/projects/vap/contrib/libpcap/pcap-int.h#3 integrate .. //depot/projects/vap/contrib/libpcap/pcap.c#3 integrate .. //depot/projects/vap/crypto/openssh/sshconnect2.c#4 integrate .. //depot/projects/vap/crypto/openssl/FREEBSD-Xlist#3 delete .. //depot/projects/vap/crypto/openssl/FREEBSD-upgrade#3 delete .. //depot/projects/vap/etc/Makefile#7 integrate .. //depot/projects/vap/etc/defaults/rc.conf#21 integrate .. //depot/projects/vap/etc/periodic/daily/Makefile#3 integrate .. //depot/projects/vap/etc/periodic/monthly/Makefile#3 integrate .. //depot/projects/vap/etc/periodic/security/Makefile#3 integrate .. //depot/projects/vap/etc/periodic/weekly/Makefile#3 integrate .. //depot/projects/vap/etc/rc.d/jail#4 integrate .. //depot/projects/vap/gnu/lib/csu/Makefile#5 integrate .. //depot/projects/vap/gnu/lib/libgcc/Makefile#5 integrate .. //depot/projects/vap/gnu/lib/libgomp/Makefile#4 integrate .. //depot/projects/vap/gnu/usr.bin/Makefile#7 integrate .. //depot/projects/vap/gnu/usr.bin/gdb/kgdb/kld.c#5 integrate .. //depot/projects/vap/gnu/usr.bin/gdb/kgdb/trgt_i386.c#7 integrate .. //depot/projects/vap/include/Makefile#7 integrate .. //depot/projects/vap/include/unistd.h#12 integrate .. //depot/projects/vap/include/uuid.h#3 integrate .. //depot/projects/vap/lib/Makefile#7 integrate .. //depot/projects/vap/lib/libarchive/archive.h#4 integrate .. //depot/projects/vap/lib/libarchive/archive_entry.h#7 integrate .. //depot/projects/vap/lib/libarchive/archive_read_support_format_mtree.c#7 integrate .. //depot/projects/vap/lib/libarchive/test/test_read_format_mtree.c#4 integrate .. //depot/projects/vap/lib/libc/gen/getosreldate.3#3 integrate .. //depot/projects/vap/lib/libc/powerpc/gen/syncicache.c#3 integrate .. //depot/projects/vap/lib/libc/uuid/Symbol.map#3 integrate .. //depot/projects/vap/lib/libpmc/Makefile#3 integrate .. //depot/projects/vap/lib/libpmc/libpmc.c#5 integrate .. //depot/projects/vap/lib/libpmc/pmc.3#6 integrate .. //depot/projects/vap/lib/libpmc/pmc.k7.3#1 branch .. //depot/projects/vap/lib/libpmc/pmc.k8.3#1 branch .. //depot/projects/vap/lib/libpmc/pmc.p4.3#1 branch .. //depot/projects/vap/lib/libpmc/pmc.p5.3#1 branch .. //depot/projects/vap/lib/libpmc/pmc.p6.3#1 branch .. //depot/projects/vap/lib/libpmc/pmc.tsc.3#1 branch .. //depot/projects/vap/lib/libpmc/pmc_allocate.3#3 integrate .. //depot/projects/vap/lib/libpmc/pmc_capabilities.3#4 integrate .. //depot/projects/vap/lib/libpmc/pmc_disable.3#3 integrate .. //depot/projects/vap/lib/libpmc/pmc_start.3#3 integrate .. //depot/projects/vap/libexec/Makefile#4 integrate .. //depot/projects/vap/libexec/rtld-elf/rtld_lock.c#4 integrate .. //depot/projects/vap/release/doc/zh_CN.GB2312/Makefile#4 integrate .. //depot/projects/vap/release/doc/zh_CN.GB2312/errata/Makefile#4 integrate .. //depot/projects/vap/release/doc/zh_CN.GB2312/errata/article.sgml#3 integrate .. //depot/projects/vap/release/doc/zh_CN.GB2312/hardware/Makefile#4 integrate .. //depot/projects/vap/release/doc/zh_CN.GB2312/hardware/article.sgml#2 integrate .. //depot/projects/vap/release/doc/zh_CN.GB2312/readme/Makefile#3 integrate .. //depot/projects/vap/release/doc/zh_CN.GB2312/readme/article.sgml#4 integrate .. //depot/projects/vap/release/doc/zh_CN.GB2312/relnotes/Makefile#4 integrate .. //depot/projects/vap/release/doc/zh_CN.GB2312/relnotes/article.sgml#2 integrate .. //depot/projects/vap/release/doc/zh_CN.GB2312/share/sgml/catalog#3 integrate .. //depot/projects/vap/release/doc/zh_CN.GB2312/share/sgml/release.dsl#3 integrate .. //depot/projects/vap/release/i386/fixit_crunch.conf#3 integrate .. //depot/projects/vap/release/pc98/fixit-small_crunch.conf#4 integrate .. //depot/projects/vap/release/pc98/fixit_crunch.conf#4 integrate .. //depot/projects/vap/sbin/Makefile#6 integrate .. //depot/projects/vap/sbin/bsdlabel/Makefile#3 integrate .. //depot/projects/vap/sbin/bsdlabel/bsdlabel.c#5 integrate .. //depot/projects/vap/sbin/fdisk/Makefile#3 integrate .. //depot/projects/vap/sbin/fsck_ffs/fsck_ffs.8#4 integrate .. //depot/projects/vap/sbin/ifconfig/ifconfig.8#18 integrate .. //depot/projects/vap/sbin/ifconfig/ifieee80211.c#29 integrate .. //depot/projects/vap/sbin/ifconfig/regdomain.c#7 integrate .. //depot/projects/vap/sbin/init/init.c#3 integrate .. //depot/projects/vap/sbin/ipfw/ipfw.8#9 integrate .. //depot/projects/vap/sbin/ipfw/ipfw2.c#9 integrate .. //depot/projects/vap/sbin/mount_nfs/mount_nfs.c#6 integrate .. //depot/projects/vap/share/Makefile#4 integrate .. //depot/projects/vap/share/examples/drivers/make_pseudo_driver.sh#3 integrate .. //depot/projects/vap/share/man/man4/age.4#2 integrate .. //depot/projects/vap/share/man/man4/hwpmc.4#4 integrate .. //depot/projects/vap/share/man/man4/snd_hda.4#6 integrate .. //depot/projects/vap/share/man/man5/rc.conf.5#15 integrate .. //depot/projects/vap/share/man/man5/src.conf.5#9 integrate .. //depot/projects/vap/share/man/man9/DB_COMMAND.9#1 branch .. //depot/projects/vap/share/man/man9/Makefile#14 integrate .. //depot/projects/vap/share/man/man9/make_dev.9#4 integrate .. //depot/projects/vap/share/man/man9/priv.9#3 integrate .. //depot/projects/vap/share/man/man9/suser.9#3 delete .. //depot/projects/vap/share/man/man9/ucred.9#3 integrate .. //depot/projects/vap/share/man/man9/vfs_suser.9#3 integrate .. //depot/projects/vap/share/misc/committers-src.dot#11 integrate .. //depot/projects/vap/share/mk/bsd.own.mk#10 integrate .. //depot/projects/vap/share/zoneinfo/africa#4 integrate .. //depot/projects/vap/share/zoneinfo/asia#6 integrate .. //depot/projects/vap/share/zoneinfo/europe#5 integrate .. //depot/projects/vap/share/zoneinfo/southamerica#7 integrate .. //depot/projects/vap/sys/amd64/amd64/elf_machdep.c#5 integrate .. //depot/projects/vap/sys/amd64/amd64/identcpu.c#10 integrate .. //depot/projects/vap/sys/amd64/amd64/mem.c#5 integrate .. //depot/projects/vap/sys/amd64/linux32/linux32_sysvec.c#9 integrate .. //depot/projects/vap/sys/arm/arm/elf_machdep.c#5 integrate .. //depot/projects/vap/sys/arm/arm/mem.c#5 integrate .. //depot/projects/vap/sys/boot/Makefile#7 integrate .. //depot/projects/vap/sys/boot/ofw/libofw/Makefile#5 integrate .. //depot/projects/vap/sys/boot/ofw/libofw/ofw_console.c#6 integrate .. //depot/projects/vap/sys/cam/cam.h#3 integrate .. //depot/projects/vap/sys/cam/scsi/scsi_pass.c#6 integrate .. //depot/projects/vap/sys/cam/scsi/scsi_sa.c#6 integrate .. //depot/projects/vap/sys/cam/scsi/scsi_ses.c#8 integrate .. //depot/projects/vap/sys/cam/scsi/scsi_sg.c#3 integrate .. //depot/projects/vap/sys/cam/scsi/scsi_target.c#6 integrate .. //depot/projects/vap/sys/cddl/compat/opensolaris/kern/opensolaris_atomic.c#2 integrate .. //depot/projects/vap/sys/cddl/compat/opensolaris/sys/atomic.h#3 integrate .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c#4 integrate .. //depot/projects/vap/sys/cddl/dev/dtrace/dtrace_clone.c#2 integrate .. //depot/projects/vap/sys/compat/freebsd32/freebsd32_ioctl.c#1 branch .. //depot/projects/vap/sys/compat/freebsd32/freebsd32_ioctl.h#1 branch .. //depot/projects/vap/sys/compat/freebsd32/freebsd32_misc.c#9 integrate .. //depot/projects/vap/sys/compat/freebsd32/freebsd32_proto.h#14 integrate .. //depot/projects/vap/sys/compat/freebsd32/freebsd32_syscall.h#14 integrate .. //depot/projects/vap/sys/compat/freebsd32/freebsd32_syscalls.c#14 integrate .. //depot/projects/vap/sys/compat/freebsd32/freebsd32_sysent.c#14 integrate .. //depot/projects/vap/sys/compat/freebsd32/freebsd32_util.h#5 integrate .. //depot/projects/vap/sys/compat/freebsd32/syscalls.master#14 integrate .. //depot/projects/vap/sys/compat/ia32/ia32_sysvec.c#6 integrate .. //depot/projects/vap/sys/compat/linprocfs/linprocfs.c#10 integrate .. //depot/projects/vap/sys/compat/linux/linux_misc.c#17 integrate .. //depot/projects/vap/sys/compat/svr4/svr4_sysvec.c#10 integrate .. //depot/projects/vap/sys/conf/files.ia64#7 integrate .. //depot/projects/vap/sys/conf/files.mips#3 integrate .. //depot/projects/vap/sys/conf/files.powerpc#15 integrate .. //depot/projects/vap/sys/conf/files.sparc64#11 integrate .. //depot/projects/vap/sys/conf/ldscript.mips#3 integrate .. //depot/projects/vap/sys/conf/options.mips#2 integrate .. //depot/projects/vap/sys/conf/options.sparc64#6 integrate .. //depot/projects/vap/sys/contrib/ipfilter/netinet/ip_compat.h#7 integrate .. //depot/projects/vap/sys/contrib/pf/net/pf_ioctl.c#11 integrate .. //depot/projects/vap/sys/ddb/db_command.c#10 integrate .. //depot/projects/vap/sys/ddb/db_command.h#4 integrate .. //depot/projects/vap/sys/ddb/db_main.c#6 integrate .. //depot/projects/vap/sys/ddb/ddb.h#9 integrate .. //depot/projects/vap/sys/dev/acpica/acpi_quirk.c#5 integrate .. //depot/projects/vap/sys/dev/agp/agp.c#4 integrate .. //depot/projects/vap/sys/dev/aic7xxx/aic79xx_osm.c#7 integrate .. //depot/projects/vap/sys/dev/amr/amr.c#9 integrate .. //depot/projects/vap/sys/dev/arcmsr/arcmsr.c#6 integrate .. //depot/projects/vap/sys/dev/asr/asr.c#6 integrate .. //depot/projects/vap/sys/dev/ata/ata-chipset.c#16 integrate .. //depot/projects/vap/sys/dev/ata/ata-pci.c#10 integrate .. //depot/projects/vap/sys/dev/ata/ata-pci.h#11 integrate .. //depot/projects/vap/sys/dev/ata/atapi-tape.c#9 integrate .. //depot/projects/vap/sys/dev/ath/if_ath.c#94 integrate .. //depot/projects/vap/sys/dev/ath/if_athvar.h#30 integrate .. //depot/projects/vap/sys/dev/atkbdc/psm.c#7 integrate .. //depot/projects/vap/sys/dev/bge/if_bge.c#17 integrate .. //depot/projects/vap/sys/dev/bktr/bktr_os.c#6 integrate .. //depot/projects/vap/sys/dev/bm/if_bm.c#4 integrate .. //depot/projects/vap/sys/dev/ce/if_ce.c#4 integrate .. //depot/projects/vap/sys/dev/cfe/cfe_api.c#1 branch .. //depot/projects/vap/sys/dev/cfe/cfe_api.h#1 branch .. //depot/projects/vap/sys/dev/cfe/cfe_api_int.h#1 branch .. //depot/projects/vap/sys/dev/cfe/cfe_console.c#1 branch .. //depot/projects/vap/sys/dev/cfe/cfe_error.h#1 branch .. //depot/projects/vap/sys/dev/cfe/cfe_ioctl.h#1 branch .. //depot/projects/vap/sys/dev/cfe/cfe_resource.c#1 branch .. //depot/projects/vap/sys/dev/cp/if_cp.c#7 integrate .. //depot/projects/vap/sys/dev/cpuctl/cpuctl.c#3 integrate .. //depot/projects/vap/sys/dev/ctau/if_ct.c#7 integrate .. //depot/projects/vap/sys/dev/cxgb/common/cxgb_ael1002.c#7 integrate .. //depot/projects/vap/sys/dev/cxgb/common/cxgb_common.h#7 integrate .. //depot/projects/vap/sys/dev/cxgb/common/cxgb_mc5.c#5 integrate .. //depot/projects/vap/sys/dev/cxgb/common/cxgb_mv88e1xxx.c#5 integrate .. //depot/projects/vap/sys/dev/cxgb/common/cxgb_t3_hw.c#6 integrate .. //depot/projects/vap/sys/dev/cxgb/common/cxgb_tn1010.c#2 integrate .. //depot/projects/vap/sys/dev/cxgb/common/cxgb_vsc7323.c#3 integrate .. //depot/projects/vap/sys/dev/cxgb/common/cxgb_vsc8211.c#5 integrate .. //depot/projects/vap/sys/dev/cxgb/common/cxgb_xgmac.c#6 integrate .. //depot/projects/vap/sys/dev/cxgb/cxgb_adapter.h#10 integrate .. //depot/projects/vap/sys/dev/cxgb/cxgb_config.h#5 integrate .. //depot/projects/vap/sys/dev/cxgb/cxgb_include.h#4 integrate .. //depot/projects/vap/sys/dev/cxgb/cxgb_main.c#14 integrate .. //depot/projects/vap/sys/dev/cxgb/cxgb_multiq.c#3 integrate .. //depot/projects/vap/sys/dev/cxgb/cxgb_offload.c#7 integrate .. //depot/projects/vap/sys/dev/cxgb/cxgb_offload.h#6 integrate .. //depot/projects/vap/sys/dev/cxgb/cxgb_osdep.h#7 integrate .. //depot/projects/vap/sys/dev/cxgb/cxgb_sge.c#12 integrate .. //depot/projects/vap/sys/dev/cxgb/cxgb_t3fw.c#2 integrate .. //depot/projects/vap/sys/dev/cxgb/sys/cxgb_support.c#5 integrate .. //depot/projects/vap/sys/dev/cxgb/sys/mbufq.h#5 integrate .. //depot/projects/vap/sys/dev/cxgb/sys/mvec.h#6 integrate .. //depot/projects/vap/sys/dev/cxgb/sys/uipc_mvec.c#6 integrate .. //depot/projects/vap/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb.c#3 integrate .. //depot/projects/vap/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_cm.c#2 integrate .. //depot/projects/vap/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_cq.c#2 integrate .. //depot/projects/vap/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_dbg.c#2 integrate .. //depot/projects/vap/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_ev.c#2 integrate .. //depot/projects/vap/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_hal.c#2 integrate .. //depot/projects/vap/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_mem.c#2 integrate .. //depot/projects/vap/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_provider.c#2 integrate .. //depot/projects/vap/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_qp.c#2 integrate .. //depot/projects/vap/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_resource.c#2 integrate .. //depot/projects/vap/sys/dev/cxgb/ulp/toecore/cxgb_toedev.h#3 integrate .. //depot/projects/vap/sys/dev/cxgb/ulp/toecore/toedev.c#3 integrate .. //depot/projects/vap/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c#11 integrate .. //depot/projects/vap/sys/dev/cxgb/ulp/tom/cxgb_cpl_socket.c#10 integrate .. //depot/projects/vap/sys/dev/cxgb/ulp/tom/cxgb_ddp.c#6 integrate .. //depot/projects/vap/sys/dev/cxgb/ulp/tom/cxgb_defs.h#5 integrate .. //depot/projects/vap/sys/dev/cxgb/ulp/tom/cxgb_l2t.c#3 integrate .. //depot/projects/vap/sys/dev/cxgb/ulp/tom/cxgb_l2t.h#2 integrate .. //depot/projects/vap/sys/dev/cxgb/ulp/tom/cxgb_listen.c#5 integrate .. //depot/projects/vap/sys/dev/cxgb/ulp/tom/cxgb_t3_ddp.h#4 integrate .. //depot/projects/vap/sys/dev/cxgb/ulp/tom/cxgb_tcp_offload.c#4 integrate .. //depot/projects/vap/sys/dev/cxgb/ulp/tom/cxgb_toepcb.h#4 integrate .. //depot/projects/vap/sys/dev/cxgb/ulp/tom/cxgb_tom.c#5 integrate .. //depot/projects/vap/sys/dev/cxgb/ulp/tom/cxgb_tom.h#3 integrate .. //depot/projects/vap/sys/dev/cxgb/ulp/tom/cxgb_tom_sysctl.c#5 integrate .. //depot/projects/vap/sys/dev/cxgb/ulp/tom/cxgb_vm.c#2 integrate .. //depot/projects/vap/sys/dev/drm/drm_drv.c#8 integrate .. //depot/projects/vap/sys/dev/drm/drm_fops.c#6 integrate .. //depot/projects/vap/sys/dev/fb/fb.c#6 integrate .. //depot/projects/vap/sys/dev/fb/vgareg.h#4 integrate .. //depot/projects/vap/sys/dev/firewire/firewire.h#5 integrate .. //depot/projects/vap/sys/dev/firewire/fwdev.c#6 integrate .. //depot/projects/vap/sys/dev/hptiop/hptiop.c#4 integrate .. //depot/projects/vap/sys/dev/hwpmc/hwpmc_amd.c#7 integrate .. //depot/projects/vap/sys/dev/hwpmc/hwpmc_mod.c#7 integrate .. //depot/projects/vap/sys/dev/hwpmc/hwpmc_piv.c#6 integrate .. //depot/projects/vap/sys/dev/hwpmc/hwpmc_ppro.c#6 integrate .. //depot/projects/vap/sys/dev/iir/iir_ctrl.c#5 integrate .. //depot/projects/vap/sys/dev/iscsi/initiator/isc_cam.c#3 integrate .. //depot/projects/vap/sys/dev/iscsi/initiator/iscsi.c#4 integrate .. //depot/projects/vap/sys/dev/isp/isp_freebsd.c#6 integrate .. //depot/projects/vap/sys/dev/jme/if_jme.c#4 integrate .. //depot/projects/vap/sys/dev/jme/if_jmereg.h#3 integrate .. //depot/projects/vap/sys/dev/joy/joy.c#5 integrate .. //depot/projects/vap/sys/dev/kbd/kbd.c#7 integrate .. //depot/projects/vap/sys/dev/kbdmux/kbdmux.c#5 integrate .. //depot/projects/vap/sys/dev/le/if_le_cbus.c#3 integrate .. //depot/projects/vap/sys/dev/le/if_le_isa.c#3 integrate .. //depot/projects/vap/sys/dev/le/if_le_lebuffer.c#3 integrate .. //depot/projects/vap/sys/dev/le/if_le_pci.c#3 integrate .. //depot/projects/vap/sys/dev/le/lebuffer_sbus.c#3 integrate .. //depot/projects/vap/sys/dev/led/led.c#8 integrate .. //depot/projects/vap/sys/dev/mlx/mlx.c#7 integrate .. //depot/projects/vap/sys/dev/mly/mly.c#6 integrate .. //depot/projects/vap/sys/dev/mse/mse.c#6 integrate .. //depot/projects/vap/sys/dev/msk/if_msk.c#9 integrate .. //depot/projects/vap/sys/dev/msk/if_mskreg.h#5 integrate .. //depot/projects/vap/sys/dev/pbio/pbio.c#6 integrate .. //depot/projects/vap/sys/dev/pci/vga_pci.c#3 integrate .. //depot/projects/vap/sys/dev/powermac_nvram/powermac_nvram.c#4 integrate .. //depot/projects/vap/sys/dev/ppbus/if_plip.c#6 integrate .. //depot/projects/vap/sys/dev/ppbus/lpt.c#6 integrate .. //depot/projects/vap/sys/dev/ppbus/pcfclock.c#3 integrate .. //depot/projects/vap/sys/dev/ppbus/ppbconf.c#7 integrate .. //depot/projects/vap/sys/dev/ppbus/ppbconf.h#4 integrate .. //depot/projects/vap/sys/dev/ppbus/ppi.c#5 integrate .. //depot/projects/vap/sys/dev/ppbus/pps.c#6 integrate .. //depot/projects/vap/sys/dev/ppc/ppc.c#7 integrate .. //depot/projects/vap/sys/dev/ppc/ppc_acpi.c#4 integrate .. //depot/projects/vap/sys/dev/ppc/ppc_isa.c#5 integrate .. //depot/projects/vap/sys/dev/ppc/ppc_pci.c#3 integrate .. //depot/projects/vap/sys/dev/ppc/ppc_puc.c#5 integrate .. //depot/projects/vap/sys/dev/ppc/ppcreg.h#6 integrate .. //depot/projects/vap/sys/dev/ppc/ppcvar.h#5 integrate .. //depot/projects/vap/sys/dev/rp/rpvar.h#5 integrate .. //depot/projects/vap/sys/dev/siba/siba.c#1 branch .. //depot/projects/vap/sys/dev/siba/siba_ids.h#1 branch .. //depot/projects/vap/sys/dev/siba/siba_pcib.c#1 branch .. //depot/projects/vap/sys/dev/siba/siba_pcibvar.h#1 branch .. //depot/projects/vap/sys/dev/siba/sibareg.h#1 branch .. //depot/projects/vap/sys/dev/siba/sibavar.h#1 branch .. //depot/projects/vap/sys/dev/snp/snp.c#9 integrate .. //depot/projects/vap/sys/dev/sound/midi/sequencer.c#5 integrate .. //depot/projects/vap/sys/dev/sound/pci/emu10kx.c#3 integrate .. //depot/projects/vap/sys/dev/sound/pci/hda/hdac.c#10 integrate .. //depot/projects/vap/sys/dev/sound/pcm/dsp.c#8 integrate .. //depot/projects/vap/sys/dev/sound/pcm/mixer.c#6 integrate .. //depot/projects/vap/sys/dev/speaker/spkr.c#5 integrate .. //depot/projects/vap/sys/dev/streams/streams.c#7 integrate .. //depot/projects/vap/sys/dev/tdfx/tdfx_pci.c#7 integrate .. //depot/projects/vap/sys/dev/twa/tw_osl_freebsd.c#5 integrate .. //depot/projects/vap/sys/dev/twe/twe_freebsd.c#6 integrate .. //depot/projects/vap/sys/dev/usb/if_zyd.c#28 integrate .. //depot/projects/vap/sys/dev/usb/ubsa.c#11 integrate .. //depot/projects/vap/sys/dev/usb/ucomvar.h#8 integrate .. //depot/projects/vap/sys/dev/usb/ufm.c#5 integrate .. //depot/projects/vap/sys/dev/usb/ugen.c#6 integrate .. //depot/projects/vap/sys/dev/usb/uhid.c#6 integrate .. //depot/projects/vap/sys/dev/usb/ulpt.c#5 integrate .. //depot/projects/vap/sys/dev/usb/umass.c#11 integrate .. //depot/projects/vap/sys/dev/usb/ums.c#9 integrate .. //depot/projects/vap/sys/dev/usb/urio.c#5 integrate .. //depot/projects/vap/sys/dev/usb/usb.c#7 integrate .. //depot/projects/vap/sys/dev/usb/usbdevs#30 integrate .. //depot/projects/vap/sys/dev/usb/uscanner.c#9 integrate .. //depot/projects/vap/sys/dev/vkbd/vkbd.c#8 integrate .. //depot/projects/vap/sys/dev/xen/blkfront/blkfront.c#3 integrate .. //depot/projects/vap/sys/dev/xen/console/console.c#4 integrate .. //depot/projects/vap/sys/dev/xen/netfront/netfront.c#3 integrate .. //depot/projects/vap/sys/fs/coda/coda_fbsd.c#4 integrate .. //depot/projects/vap/sys/fs/devfs/devfs_devs.c#8 integrate .. //depot/projects/vap/sys/fs/devfs/devfs_vnops.c#14 integrate .. //depot/projects/vap/sys/fs/fdescfs/fdesc_vnops.c#11 integrate .. //depot/projects/vap/sys/fs/hpfs/hpfs_vnops.c#8 integrate .. //depot/projects/vap/sys/fs/msdosfs/msdosfs_vnops.c#11 integrate .. //depot/projects/vap/sys/fs/ntfs/ntfs_vnops.c#7 integrate .. //depot/projects/vap/sys/fs/portalfs/portal_vnops.c#8 integrate .. //depot/projects/vap/sys/fs/pseudofs/pseudofs_vnops.c#8 integrate .. //depot/projects/vap/sys/fs/smbfs/smbfs_node.c#12 integrate .. //depot/projects/vap/sys/fs/tmpfs/tmpfs.h#5 integrate .. //depot/projects/vap/sys/fs/tmpfs/tmpfs_subr.c#7 integrate .. //depot/projects/vap/sys/fs/tmpfs/tmpfs_vnops.c#9 integrate .. //depot/projects/vap/sys/fs/udf/udf_vnops.c#8 integrate .. //depot/projects/vap/sys/geom/geom_dev.c#9 integrate .. //depot/projects/vap/sys/geom/geom_io.c#6 integrate .. //depot/projects/vap/sys/geom/part/g_part.c#10 integrate .. //depot/projects/vap/sys/geom/part/g_part_bsd.c#5 integrate .. //depot/projects/vap/sys/geom/part/g_part_pc98.c#5 integrate .. //depot/projects/vap/sys/gnu/fs/ext2fs/ext2_inode.c#3 integrate .. //depot/projects/vap/sys/gnu/fs/xfs/FreeBSD/support/kdb.c#3 integrate .. //depot/projects/vap/sys/gnu/fs/xfs/FreeBSD/xfs_vnops.c#6 integrate .. //depot/projects/vap/sys/i386/acpica/acpi_machdep.c#7 integrate .. //depot/projects/vap/sys/i386/bios/apm.c#8 integrate .. //depot/projects/vap/sys/i386/bios/apm.h#5 integrate .. //depot/projects/vap/sys/i386/bios/smapi.c#5 integrate .. //depot/projects/vap/sys/i386/conf/GENERIC#23 integrate .. //depot/projects/vap/sys/i386/i386/bios.c#6 integrate .. //depot/projects/vap/sys/i386/i386/db_trace.c#6 integrate .. //depot/projects/vap/sys/i386/i386/elf_machdep.c#5 integrate .. //depot/projects/vap/sys/i386/i386/identcpu.c#10 integrate .. //depot/projects/vap/sys/i386/i386/intr_machdep.c#9 integrate .. //depot/projects/vap/sys/i386/i386/mem.c#5 integrate .. //depot/projects/vap/sys/i386/i386/pmap.c#19 integrate .. //depot/projects/vap/sys/i386/ibcs2/ibcs2_sysvec.c#6 integrate .. //depot/projects/vap/sys/i386/include/param.h#6 integrate .. //depot/projects/vap/sys/i386/include/smp.h#7 integrate .. //depot/projects/vap/sys/i386/include/specialreg.h#8 integrate .. //depot/projects/vap/sys/i386/include/xen/evtchn.h#2 integrate .. //depot/projects/vap/sys/i386/linux/linux_sysvec.c#10 integrate .. //depot/projects/vap/sys/i386/xen/mp_machdep.c#2 integrate .. //depot/projects/vap/sys/i386/xen/pmap.c#5 integrate .. //depot/projects/vap/sys/i386/xen/xen_machdep.c#6 integrate .. //depot/projects/vap/sys/ia64/ia64/efi.c#3 integrate .. //depot/projects/vap/sys/ia64/ia64/elf_machdep.c#6 integrate .. //depot/projects/vap/sys/ia64/ia64/mem.c#3 integrate .. //depot/projects/vap/sys/ia64/ia64/sal.c#5 integrate .. //depot/projects/vap/sys/kern/imgact_aout.c#7 integrate .. //depot/projects/vap/sys/kern/init_main.c#11 integrate .. //depot/projects/vap/sys/kern/init_sysent.c#15 integrate .. //depot/projects/vap/sys/kern/kern_condvar.c#8 integrate .. //depot/projects/vap/sys/kern/kern_conf.c#14 integrate .. //depot/projects/vap/sys/kern/kern_intr.c#15 integrate .. //depot/projects/vap/sys/kern/kern_pmc.c#6 integrate .. //depot/projects/vap/sys/kern/kern_priv.c#4 integrate .. //depot/projects/vap/sys/kern/kern_proc.c#13 integrate .. //depot/projects/vap/sys/kern/kern_shutdown.c#11 integrate .. //depot/projects/vap/sys/kern/kern_synch.c#13 integrate .. //depot/projects/vap/sys/kern/kern_syscalls.c#5 integrate .. //depot/projects/vap/sys/kern/makesyscalls.sh#7 integrate .. //depot/projects/vap/sys/kern/subr_clist.c#3 integrate .. //depot/projects/vap/sys/kern/subr_pcpu.c#5 integrate .. //depot/projects/vap/sys/kern/subr_rman.c#7 integrate .. //depot/projects/vap/sys/kern/subr_sleepqueue.c#16 integrate .. //depot/projects/vap/sys/kern/subr_turnstile.c#9 integrate .. //depot/projects/vap/sys/kern/subr_witness.c#19 integrate .. //depot/projects/vap/sys/kern/sys_generic.c#8 integrate .. //depot/projects/vap/sys/kern/syscalls.c#15 integrate .. //depot/projects/vap/sys/kern/syscalls.master#15 integrate .. //depot/projects/vap/sys/kern/systrace_args.c#12 integrate .. //depot/projects/vap/sys/kern/tty.c#14 integrate .. //depot/projects/vap/sys/kern/tty_pts.c#7 integrate .. //depot/projects/vap/sys/kern/tty_ttydisc.c#4 integrate .. //depot/projects/vap/sys/kern/uipc_mqueue.c#7 integrate .. //depot/projects/vap/sys/kern/vfs_bio.c#15 integrate .. //depot/projects/vap/sys/kern/vfs_cache.c#13 integrate .. //depot/projects/vap/sys/kern/vfs_mount.c#22 integrate .. //depot/projects/vap/sys/kern/vfs_vnops.c#11 integrate .. //depot/projects/vap/sys/libkern/memcmp.c#1 branch .. //depot/projects/vap/sys/mips/adm5120/obio.c#3 integrate .. //depot/projects/vap/sys/mips/conf/IDT#5 integrate .. //depot/projects/vap/sys/mips/idt/obio.c#3 integrate .. //depot/projects/vap/sys/mips/malta/gt_pci.c#3 integrate .. //depot/projects/vap/sys/mips/mips/elf_machdep.c#2 integrate .. //depot/projects/vap/sys/mips/mips/intr_machdep.c#3 integrate .. //depot/projects/vap/sys/mips/mips/mem.c#2 integrate .. //depot/projects/vap/sys/mips/mips/support.S#2 integrate .. //depot/projects/vap/sys/mips/sentry5/s5_machdep.c#3 integrate .. //depot/projects/vap/sys/modules/cxgb/Makefile#6 integrate .. //depot/projects/vap/sys/modules/cxgb/cxgb/Makefile#7 integrate .. //depot/projects/vap/sys/modules/cxgb/cxgb_t3fw/Makefile#3 integrate .. //depot/projects/vap/sys/modules/cxgb/iw_cxgb/Makefile#2 integrate .. //depot/projects/vap/sys/modules/cxgb/toecore/Makefile#2 integrate .. //depot/projects/vap/sys/modules/cxgb/tom/Makefile#4 integrate .. //depot/projects/vap/sys/modules/wlan/Makefile#12 integrate .. //depot/projects/vap/sys/net/if.c#16 integrate .. //depot/projects/vap/sys/net/if_clone.c#9 integrate .. //depot/projects/vap/sys/net/if_clone.h#8 integrate .. //depot/projects/vap/sys/net/if_lagg.c#8 integrate .. //depot/projects/vap/sys/net/if_stf.c#11 integrate .. //depot/projects/vap/sys/net/if_tap.c#10 integrate .. //depot/projects/vap/sys/net/if_tun.c#8 integrate .. //depot/projects/vap/sys/net/route.c#13 integrate .. //depot/projects/vap/sys/net/route.h#10 integrate .. //depot/projects/vap/sys/net80211/ieee80211.h#18 integrate .. //depot/projects/vap/sys/net80211/ieee80211_adhoc.c#15 integrate .. //depot/projects/vap/sys/net80211/ieee80211_crypto.c#20 integrate .. //depot/projects/vap/sys/net80211/ieee80211_crypto.h#20 integrate .. //depot/projects/vap/sys/net80211/ieee80211_ddb.c#28 integrate .. //depot/projects/vap/sys/net80211/ieee80211_freebsd.c#35 integrate .. //depot/projects/vap/sys/net80211/ieee80211_freebsd.h#37 integrate .. //depot/projects/vap/sys/net80211/ieee80211_hostap.c#26 integrate .. //depot/projects/vap/sys/net80211/ieee80211_ht.c#54 integrate .. //depot/projects/vap/sys/net80211/ieee80211_ht.h#23 integrate .. //depot/projects/vap/sys/net80211/ieee80211_ioctl.c#66 integrate .. //depot/projects/vap/sys/net80211/ieee80211_ioctl.h#25 integrate .. //depot/projects/vap/sys/net80211/ieee80211_node.c#47 integrate .. //depot/projects/vap/sys/net80211/ieee80211_node.h#29 integrate .. //depot/projects/vap/sys/net80211/ieee80211_output.c#60 integrate .. //depot/projects/vap/sys/net80211/ieee80211_sta.c#19 integrate .. //depot/projects/vap/sys/net80211/ieee80211_var.h#53 integrate .. //depot/projects/vap/sys/net80211/ieee80211_wds.c#11 integrate .. //depot/projects/vap/sys/netgraph/bluetooth/drivers/ubtbcmfw/ubtbcmfw.c#5 integrate .. //depot/projects/vap/sys/netgraph/netgraph.h#10 integrate .. //depot/projects/vap/sys/netgraph/ng_base.c#22 integrate .. //depot/projects/vap/sys/netgraph/ng_device.c#6 integrate .. //depot/projects/vap/sys/netgraph/ng_source.c#7 integrate .. //depot/projects/vap/sys/netinet/ip.h#5 integrate .. //depot/projects/vap/sys/netinet/ip_fw.h#12 integrate .. //depot/projects/vap/sys/netinet/ip_fw2.c#18 integrate .. //depot/projects/vap/sys/netinet/ip_input.c#11 integrate .. //depot/projects/vap/sys/netinet/tcp_input.c#13 integrate .. //depot/projects/vap/sys/netinet6/udp6_usrreq.c#14 integrate .. //depot/projects/vap/sys/netipx/ipx.c#5 integrate .. //depot/projects/vap/sys/netsmb/smb_dev.c#6 integrate .. //depot/projects/vap/sys/nfsclient/nfs_vnops.c#16 integrate .. //depot/projects/vap/sys/nfsserver/nfs.h#6 integrate .. //depot/projects/vap/sys/nfsserver/nfs_serv.c#12 integrate .. //depot/projects/vap/sys/nfsserver/nfs_srvsock.c#8 integrate .. //depot/projects/vap/sys/nfsserver/nfs_srvsubs.c#10 integrate .. //depot/projects/vap/sys/nfsserver/nfs_syscalls.c#8 integrate .. //depot/projects/vap/sys/pc98/cbus/gdc.c#4 integrate .. //depot/projects/vap/sys/pc98/cbus/olpt.c#3 integrate .. //depot/projects/vap/sys/powerpc/aim/clock.c#6 integrate .. //depot/projects/vap/sys/powerpc/aim/machdep.c#11 integrate .. //depot/projects/vap/sys/powerpc/aim/mmu_oea.c#6 integrate .. //depot/projects/vap/sys/powerpc/aim/mp_cpudep.c#3 integrate .. //depot/projects/vap/sys/powerpc/aim/swtch.S#4 integrate .. //depot/projects/vap/sys/powerpc/aim/trap_subr.S#4 integrate .. //depot/projects/vap/sys/powerpc/booke/machdep.c#7 integrate .. //depot/projects/vap/sys/powerpc/include/cpufunc.h#6 integrate .. //depot/projects/vap/sys/powerpc/include/dbdma.h#2 integrate .. //depot/projects/vap/sys/powerpc/include/md_var.h#6 integrate .. //depot/projects/vap/sys/powerpc/include/pmap.h#6 integrate .. //depot/projects/vap/sys/powerpc/include/pte.h#6 integrate .. //depot/projects/vap/sys/powerpc/include/smp.h#4 integrate .. //depot/projects/vap/sys/powerpc/ofw/ofw_syscons.c#6 integrate .. //depot/projects/vap/sys/powerpc/powermac/ata_dbdma.c#1 branch .. //depot/projects/vap/sys/powerpc/powermac/ata_dbdma.h#1 branch .. //depot/projects/vap/sys/powerpc/powermac/ata_kauai.c#7 integrate .. //depot/projects/vap/sys/powerpc/powermac/ata_macio.c#4 integrate .. //depot/projects/vap/sys/powerpc/powermac/dbdma.c#2 integrate .. //depot/projects/vap/sys/powerpc/powermac/dbdmavar.h#2 integrate .. //depot/projects/vap/sys/powerpc/powerpc/cpu.c#9 integrate .. //depot/projects/vap/sys/powerpc/powerpc/elf_machdep.c#5 integrate .. //depot/projects/vap/sys/powerpc/powerpc/mem.c#5 integrate .. //depot/projects/vap/sys/powerpc/powerpc/mp_machdep.c#8 integrate .. //depot/projects/vap/sys/powerpc/powerpc/syncicache.c#5 integrate .. //depot/projects/vap/sys/security/audit/audit_pipe.c#7 integrate .. //depot/projects/vap/sys/security/mac_bsdextended/mac_bsdextended.c#10 integrate .. //depot/projects/vap/sys/sparc64/include/smp.h#8 integrate .. //depot/projects/vap/sys/sparc64/include/tick.h#5 integrate .. //depot/projects/vap/sys/sparc64/pci/psycho.c#11 integrate .. //depot/projects/vap/sys/sparc64/pci/psychoreg.h#5 integrate .. //depot/projects/vap/sys/sparc64/sparc64/elf_machdep.c#5 integrate .. //depot/projects/vap/sys/sparc64/sparc64/genassym.c#10 integrate .. //depot/projects/vap/sys/sparc64/sparc64/intr_machdep.c#11 integrate .. //depot/projects/vap/sys/sparc64/sparc64/mem.c#6 integrate .. //depot/projects/vap/sys/sparc64/sparc64/mp_machdep.c#13 integrate .. //depot/projects/vap/sys/sparc64/sparc64/tick.c#8 integrate .. //depot/projects/vap/sys/sys/clist.h#4 integrate .. //depot/projects/vap/sys/sys/conf.h#12 integrate .. //depot/projects/vap/sys/sys/interrupt.h#9 integrate .. //depot/projects/vap/sys/sys/libkern.h#8 integrate .. //depot/projects/vap/sys/sys/mount.h#10 integrate .. //depot/projects/vap/sys/sys/param.h#30 integrate .. //depot/projects/vap/sys/sys/pmckern.h#6 integrate .. //depot/projects/vap/sys/sys/priv.h#8 integrate .. //depot/projects/vap/sys/sys/proc.h#22 integrate .. //depot/projects/vap/sys/sys/syscall.h#15 integrate .. //depot/projects/vap/sys/sys/syscall.mk#15 integrate .. //depot/projects/vap/sys/sys/sysent.h#5 integrate .. //depot/projects/vap/sys/sys/sysproto.h#15 integrate .. //depot/projects/vap/sys/sys/systm.h#12 integrate .. //depot/projects/vap/sys/sys/tty.h#9 integrate .. //depot/projects/vap/sys/sys/ttydevsw.h#3 integrate .. //depot/projects/vap/sys/sys/ttydisc.h#3 integrate .. //depot/projects/vap/sys/sys/ttyhook.h#1 branch .. //depot/projects/vap/sys/sys/ttyqueue.h#3 integrate .. //depot/projects/vap/sys/sys/types.h#8 integrate .. //depot/projects/vap/sys/sys/vnode.h#16 integrate .. //depot/projects/vap/sys/ufs/ffs/ffs_extern.h#7 integrate .. //depot/projects/vap/sys/ufs/ffs/ffs_inode.c#7 integrate .. //depot/projects/vap/sys/ufs/ffs/ffs_snapshot.c#11 integrate .. //depot/projects/vap/sys/ufs/ffs/ffs_softdep.c#13 integrate .. //depot/projects/vap/sys/ufs/ffs/ffs_vfsops.c#17 integrate .. //depot/projects/vap/sys/ufs/ufs/dirhash.h#4 integrate .. //depot/projects/vap/sys/ufs/ufs/inode.h#8 integrate .. //depot/projects/vap/sys/ufs/ufs/ufs_dirhash.c#7 integrate .. //depot/projects/vap/sys/ufs/ufs/ufs_inode.c#6 integrate .. //depot/projects/vap/sys/ufs/ufs/ufs_lookup.c#11 integrate .. //depot/projects/vap/sys/ufs/ufs/ufs_vnops.c#11 integrate .. //depot/projects/vap/sys/ufs/ufs/ufsmount.h#7 integrate .. //depot/projects/vap/sys/vm/device_pager.c#6 integrate .. //depot/projects/vap/sys/vm/vm_mmap.c#14 integrate .. //depot/projects/vap/sys/vm/vm_page.c#13 integrate .. //depot/projects/vap/sys/vm/vm_page.h#7 integrate .. //depot/projects/vap/sys/vm/vm_pageout.c#8 integrate .. //depot/projects/vap/sys/xen/evtchn/evtchn.c#3 integrate .. //depot/projects/vap/sys/xen/gnttab.c#3 integrate .. //depot/projects/vap/sys/xen/gnttab.h#2 integrate .. //depot/projects/vap/sys/xen/interface/arch-ia64.h#2 integrate .. //depot/projects/vap/sys/xen/interface/arch-powerpc.h#2 integrate .. //depot/projects/vap/sys/xen/interface/arch-x86/cpuid.h#1 branch .. //depot/projects/vap/sys/xen/interface/arch-x86/hvm/save.h#1 branch .. //depot/projects/vap/sys/xen/interface/arch-x86/xen-mca.h#1 branch .. //depot/projects/vap/sys/xen/interface/arch-x86/xen-x86_32.h#2 integrate .. //depot/projects/vap/sys/xen/interface/arch-x86/xen-x86_64.h#2 integrate .. //depot/projects/vap/sys/xen/interface/arch-x86/xen.h#2 integrate .. //depot/projects/vap/sys/xen/interface/callback.h#2 integrate .. //depot/projects/vap/sys/xen/interface/domctl.h#2 integrate .. //depot/projects/vap/sys/xen/interface/features.h#2 integrate .. //depot/projects/vap/sys/xen/interface/foreign/mkchecker.py#2 integrate .. //depot/projects/vap/sys/xen/interface/foreign/mkheader.py#2 integrate .. //depot/projects/vap/sys/xen/interface/foreign/structs.py#2 integrate .. //depot/projects/vap/sys/xen/interface/grant_table.h#2 integrate .. //depot/projects/vap/sys/xen/interface/hvm/hvm_op.h#2 integrate .. //depot/projects/vap/sys/xen/interface/hvm/ioreq.h#2 integrate .. //depot/projects/vap/sys/xen/interface/hvm/params.h#2 integrate .. //depot/projects/vap/sys/xen/interface/hvm/save.h#2 integrate .. //depot/projects/vap/sys/xen/interface/io/blkif.h#2 integrate .. //depot/projects/vap/sys/xen/interface/io/fbif.h#2 integrate .. //depot/projects/vap/sys/xen/interface/io/kbdif.h#2 integrate .. //depot/projects/vap/sys/xen/interface/io/netif.h#2 integrate .. //depot/projects/vap/sys/xen/interface/io/pciif.h#2 integrate .. //depot/projects/vap/sys/xen/interface/io/protocols.h#2 integrate .. //depot/projects/vap/sys/xen/interface/io/ring.h#2 integrate .. //depot/projects/vap/sys/xen/interface/io/xenbus.h#2 integrate .. //depot/projects/vap/sys/xen/interface/io/xs_wire.h#2 integrate .. //depot/projects/vap/sys/xen/interface/kexec.h#2 integrate .. //depot/projects/vap/sys/xen/interface/libelf.h#2 integrate .. //depot/projects/vap/sys/xen/interface/memory.h#2 integrate .. //depot/projects/vap/sys/xen/interface/physdev.h#2 integrate .. //depot/projects/vap/sys/xen/interface/platform.h#2 integrate .. //depot/projects/vap/sys/xen/interface/sysctl.h#2 integrate .. //depot/projects/vap/sys/xen/interface/trace.h#2 integrate .. //depot/projects/vap/sys/xen/interface/vcpu.h#2 integrate .. //depot/projects/vap/sys/xen/interface/xen-compat.h#2 integrate .. //depot/projects/vap/sys/xen/interface/xen.h#2 integrate .. //depot/projects/vap/tools/build/options/WITHOUT_ACCT#1 branch .. //depot/projects/vap/tools/build/options/WITHOUT_AMD#1 branch .. //depot/projects/vap/tools/build/options/WITHOUT_APM#1 branch .. //depot/projects/vap/tools/build/options/WITHOUT_AT#1 branch .. //depot/projects/vap/tools/build/options/WITHOUT_BSNMP#1 branch .. //depot/projects/vap/tools/build/options/WITHOUT_CTM#1 branch .. //depot/projects/vap/tools/build/options/WITHOUT_FLOPPY#1 branch .. //depot/projects/vap/tools/build/options/WITHOUT_FREEBSD_UPDATE#1 branch .. //depot/projects/vap/tools/build/options/WITHOUT_IPFW#1 branch .. //depot/projects/vap/tools/build/options/WITHOUT_JAIL#1 branch .. //depot/projects/vap/tools/build/options/WITHOUT_LEGACY_CONSOLE#1 branch .. //depot/projects/vap/tools/build/options/WITHOUT_LOCATE#1 branch .. //depot/projects/vap/tools/build/options/WITHOUT_MAIL#1 branch .. //depot/projects/vap/tools/build/options/WITHOUT_MAKE#1 branch .. //depot/projects/vap/tools/build/options/WITHOUT_NDIS#1 branch .. //depot/projects/vap/tools/build/options/WITHOUT_NETGRAPH#1 branch .. //depot/projects/vap/tools/build/options/WITHOUT_NETGRAPH_SUPPORT#1 branch .. //depot/projects/vap/tools/build/options/WITHOUT_NTP#1 branch .. //depot/projects/vap/tools/build/options/WITHOUT_PKGTOOLS#1 branch .. //depot/projects/vap/tools/build/options/WITHOUT_PMC#1 branch .. //depot/projects/vap/tools/build/options/WITHOUT_PORTSNAP#1 branch .. //depot/projects/vap/tools/build/options/WITHOUT_PPP#1 branch .. //depot/projects/vap/tools/build/options/WITHOUT_QUOTAS#1 branch .. //depot/projects/vap/tools/build/options/WITHOUT_ROUTED#1 branch .. //depot/projects/vap/tools/build/options/WITHOUT_SLIP#1 branch .. //depot/projects/vap/tools/build/options/WITHOUT_SYSINSTALL#1 branch .. //depot/projects/vap/tools/build/options/WITHOUT_TELNET#1 branch .. //depot/projects/vap/tools/build/options/WITHOUT_TEXTPROC#1 branch .. //depot/projects/vap/tools/build/options/WITHOUT_WIRELESS#1 branch .. //depot/projects/vap/tools/build/options/WITHOUT_WIRELESS_SUPPORT#1 branch .. //depot/projects/vap/tools/tools/nanobsd/nanobsd.sh#9 integrate .. //depot/projects/vap/tools/tools/net80211/scripts/config#8 integrate .. //depot/projects/vap/usr.bin/Makefile#11 integrate .. //depot/projects/vap/usr.bin/ar/Makefile#2 integrate .. //depot/projects/vap/usr.bin/ar/acplex.l#1 branch .. //depot/projects/vap/usr.bin/ar/acpyacc.y#1 branch .. //depot/projects/vap/usr.bin/ar/ar.c#3 integrate .. //depot/projects/vap/usr.bin/ar/ar.h#3 integrate .. //depot/projects/vap/usr.bin/ar/write.c#4 integrate .. //depot/projects/vap/usr.bin/netstat/Makefile#3 integrate .. //depot/projects/vap/usr.bin/netstat/main.c#6 integrate .. //depot/projects/vap/usr.bin/netstat/netstat.h#7 integrate .. //depot/projects/vap/usr.sbin/Makefile#14 integrate .. //depot/projects/vap/usr.sbin/pmcstat/pmcstat.8#5 integrate .. //depot/projects/vap/usr.sbin/pmcstat/pmcstat.c#5 integrate .. //depot/projects/vap/usr.sbin/pstat/pstat.8#4 integrate .. //depot/projects/vap/usr.sbin/pstat/pstat.c#6 integrate .. //depot/projects/vap/usr.sbin/syslogd/syslogd.8#4 integrate .. //depot/projects/vap/usr.sbin/syslogd/syslogd.c#8 integrate .. //depot/projects/vap/usr.sbin/timed/timed/globals.h#3 integrate Differences ... ==== //depot/projects/vap/Makefile.inc1#16 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.610 2008/08/19 14:23:26 jhb Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.611 2008/09/19 16:14:42 obrien Exp $ # # Make command line options: # -DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir @@ -27,6 +27,10 @@ .include +.if ${MACHINE_ARCH} == "mips" +MK_RESCUE=no # not yet +.endif + # We must do share/info early so that installation of info `dir' # entries works correctly. Do it first since it is less likely to # grow dependencies on include and lib than vice versa. ==== //depot/projects/vap/ObsoleteFiles.inc#19 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/ObsoleteFiles.inc,v 1.160 2008/09/14 17:49:46 antoine Exp $ +# $FreeBSD: src/ObsoleteFiles.inc,v 1.162 2008/09/21 16:11:11 antoine Exp $ # # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and # directories (OLD_DIRS) which should get removed at an update. Recently @@ -14,6 +14,9 @@ # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last. # +# 20080917: removal of manpage for axed kernel primitive suser(9) +OLD_FILES+=usr/share/man/man9/suser.9.gz +OLD_FILES+=usr/share/man/man9/suser_cred.9.gz # 20080913: pax removed from rescue OLD_FILES+=rescue/pax # 20080823: removal of unneeded pt_chown, to implement grantpt(3) ==== //depot/projects/vap/cddl/contrib/opensolaris/lib/libdtrace/common/dt_printf.c#3 (text+ko) ==== @@ -306,7 +306,7 @@ case sizeof (double): return (dt_printf(dtp, fp, format, *((double *)addr) / n)); -#if !defined(__arm__) && !defined(__powerpc__) +#if !defined(__arm__) && !defined(__powerpc__) && !defined(__mips__) case sizeof (long double): return (dt_printf(dtp, fp, format, *((long double *)addr) / ldn)); ==== //depot/projects/vap/contrib/libpcap/pcap-bpf.c#3 (text+ko) ==== @@ -18,7 +18,7 @@ * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. * - * $FreeBSD: src/contrib/libpcap/pcap-bpf.c,v 1.4 2007/10/16 02:07:55 mlaier Exp $ + * $FreeBSD: src/contrib/libpcap/pcap-bpf.c,v 1.5 2008/09/16 20:32:29 csjp Exp $ */ #ifndef lint static const char rcsid[] _U_ = @@ -30,6 +30,7 @@ #endif #include /* optionally get BSD define */ +#include #include #include #include @@ -86,6 +87,10 @@ #endif /* _AIX */ +#ifdef BIOCSETBUFMODE +#include +#endif + #include #include #include @@ -139,6 +144,159 @@ return (0); } +#ifdef BIOCGETBUFMODE +/* + * Zero-copy BPF buffer routines to check for and acknowledge BPF data in + * shared memory buffers. + * + * pcap_next_zbuf_shm(): Check for a newly available shared memory buffer, + * and set up p->buffer and cc to reflect one if available. Notice that if + * there was no prior buffer, we select zbuf1 as this will be the first + * buffer filled for a fresh BPF session. + */ +static int +pcap_next_zbuf_shm(pcap_t *p, int *cc) +{ + struct bpf_zbuf_header *bzh; + + if (p->zbuffer == p->zbuf2 || p->zbuffer == NULL) { + bzh = (struct bpf_zbuf_header *)p->zbuf1; + if (bzh->bzh_user_gen != + atomic_load_acq_int(&bzh->bzh_kernel_gen)) { + p->bzh = bzh; + p->zbuffer = (u_char *)p->zbuf1; + p->buffer = p->zbuffer + sizeof(*bzh); + *cc = bzh->bzh_kernel_len; + return (1); + } + } else if (p->zbuffer == p->zbuf1) { + bzh = (struct bpf_zbuf_header *)p->zbuf2; + if (bzh->bzh_user_gen != + atomic_load_acq_int(&bzh->bzh_kernel_gen)) { + p->bzh = bzh; + p->zbuffer = (u_char *)p->zbuf2; + p->buffer = p->zbuffer + sizeof(*bzh); + *cc = bzh->bzh_kernel_len; + return (1); + } + } + *cc = 0; + return (0); +} + +/* + * pcap_next_zbuf() -- Similar to pcap_next_zbuf_shm(), except wait using + * select() for data or a timeout, and possibly force rotation of the buffer + * in the event we time out or are in immediate mode. Invoke the shared + * memory check before doing system calls in order to avoid doing avoidable + * work. + */ +static int +pcap_next_zbuf(pcap_t *p, int *cc) +{ + struct bpf_zbuf bz; + struct timeval tv; + struct timespec cur; + fd_set r_set; + int data, r; + int tmout, expire; + +#define TSTOMILLI(ts) (((ts)->tv_sec * 1000) + ((ts)->tv_nsec / 1000000)) + /* + * Start out by seeing whether anything is waiting by checking the + * next shared memory buffer for data. + */ + data = pcap_next_zbuf_shm(p, cc); + if (data) + return (data); + /* + * If a previous sleep was interrupted due to signal delivery, make + * sure that the timeout gets adjusted accordingly. This requires + * that we analyze when the timeout should be been expired, and + * subtract the current time from that. If after this operation, + * our timeout is less then or equal to zero, handle it like a + * regular timeout. + */ + tmout = p->to_ms; + if (tmout) + (void) clock_gettime(CLOCK_MONOTONIC, &cur); + if (p->interrupted && p->to_ms) { + expire = TSTOMILLI(&p->firstsel) + p->to_ms; + tmout = expire - TSTOMILLI(&cur); +#undef TSTOMILLI + if (tmout <= 0) { + p->interrupted = 0; + data = pcap_next_zbuf_shm(p, cc); + if (data) + return (data); + if (ioctl(p->fd, BIOCROTZBUF, &bz) < 0) { + (void) snprintf(p->errbuf, PCAP_ERRBUF_SIZE, + "BIOCROTZBUF: %s", strerror(errno)); + return (-1); + } + return (pcap_next_zbuf_shm(p, cc)); + } + } + /* + * No data in the buffer, so must use select() to wait for data or + * the next timeout. + */ + FD_ZERO(&r_set); + FD_SET(p->fd, &r_set); + if (tmout != 0) { + tv.tv_sec = tmout / 1000; + tv.tv_usec = (tmout * 1000) % 1000000; + } + r = select(p->fd + 1, &r_set, NULL, NULL, p->to_ms != 0 ? &tv : + NULL); + if (r < 0 && errno == EINTR) { + if (!p->interrupted && p->to_ms) { + p->interrupted = 1; + p->firstsel = cur; + } + return (0); + } else if (r < 0) { + (void) snprintf(p->errbuf, PCAP_ERRBUF_SIZE, + "select: %s", strerror(errno)); + return (-1); + } + p->interrupted = 0; + /* + * Check again for data, which may exist now that we've either been + * woken up as a result of data or timed out. Try the "there's data" + * case first since it doesn't require a system call. + */ + data = pcap_next_zbuf_shm(p, cc); + if (data) + return (data); + + /* + * Try forcing a buffer rotation to dislodge timed out or immediate + * data. + */ + if (ioctl(p->fd, BIOCROTZBUF, &bz) < 0) { + (void) snprintf(p->errbuf, PCAP_ERRBUF_SIZE, + "BIOCROTZBUF: %s", strerror(errno)); + return (-1); + } + return (pcap_next_zbuf_shm(p, cc)); +} + +/* + * Notify kernel that we are done with the buffer. We don't reset zbuffer so + * that we know which buffer to use next time around. + */ +static int +pcap_ack_zbuf(pcap_t *p) +{ + + atomic_store_rel_int(&p->bzh->bzh_user_gen, p->bzh->bzh_kernel_gen); + p->bzh = NULL; + p->buffer = NULL; + return (0); +} +#endif + static int pcap_read_bpf(pcap_t *p, int cnt, pcap_handler callback, u_char *user) { @@ -147,6 +305,9 @@ register u_char *bp, *ep; u_char *datap; struct bpf_insn *fcode; +#ifdef BIOCSETBUFMODE + int i; +#endif #ifdef PCAP_FDDIPAD register int pad; #endif @@ -167,7 +328,27 @@ } cc = p->cc; if (p->cc == 0) { - cc = read(p->fd, (char *)p->buffer, p->bufsize); + /* + * When reading without zero-copy from a file descriptor, we + * use a single buffer and return a length of data in the + * buffer. With zero-copy, we update the p->buffer pointer + * to point at whatever underlying buffer contains the next + * data and update cc to reflect the data found in the + * buffer. + */ +#ifdef BIOCSETBUFMODE + if (p->zerocopy) { + if (p->buffer != NULL) + pcap_ack_zbuf(p); + i = pcap_next_zbuf(p, &cc); + if (i == 0) + goto again; + if (i < 0) + return (-1); + } else +#endif + cc = read(p->fd, (char *)p->buffer, p->bufsize); + if (cc < 0) { /* Don't choke when we get ptraced */ switch (errno) { @@ -609,6 +790,10 @@ struct bpf_insn total_insn; struct bpf_program total_prog; struct utsname osinfo; +#ifdef BIOCSETBUFMODE + struct bpf_zbuf bz; + u_int bufmode, zbufmax; +#endif #ifdef HAVE_DAG_API if (strstr(device, "dag")) { @@ -646,41 +831,105 @@ goto bad; } +#ifdef BIOCSETBUFMODE /* - * Try finding a good size for the buffer; 32768 may be too - * big, so keep cutting it in half until we find a size - * that works, or run out of sizes to try. If the default - * is larger, don't make it smaller. - * - * XXX - there should be a user-accessible hook to set the - * initial buffer size. + * If the BPF extension to set buffer mode is present, try setting + * the mode to zero-copy. If that fails, use regular buffering. If + * it succeeds but other setup fails, return an error to the user. */ - if ((ioctl(fd, BIOCGBLEN, (caddr_t)&v) < 0) || v < 32768) - v = 32768; - for ( ; v != 0; v >>= 1) { - /* Ignore the return value - this is because the call fails - * on BPF systems that don't have kernel malloc. And if - * the call fails, it's no big deal, we just continue to - * use the standard buffer size. + bufmode = BPF_BUFMODE_ZBUF; + if (ioctl(fd, BIOCSETBUFMODE, (caddr_t)&bufmode) == 0) { + p->zerocopy = 1; + + /* + * How to pick a buffer size: first, query the maximum buffer + * size supported by zero-copy. This also lets us quickly + * determine whether the kernel generally supports zero-copy. + * Then, query the default buffer size, which reflects kernel + * policy for a desired default. Round to the nearest page + * size. */ - (void) ioctl(fd, BIOCSBLEN, (caddr_t)&v); - + if (ioctl(fd, BIOCGETZMAX, (caddr_t)&zbufmax) < 0) { + snprintf(ebuf, PCAP_ERRBUF_SIZE, "BIOCGETZMAX: %s", + pcap_strerror(errno)); + goto bad; + } + if ((ioctl(fd, BIOCGBLEN, (caddr_t)&v) < 0) || v < 32768) + v = 32768; +#ifndef roundup +#define roundup(x, y) ((((x)+((y)-1))/(y))*(y)) /* to any y */ +#endif + p->zbufsize = roundup(v, getpagesize()); + if (p->zbufsize > zbufmax) + p->zbufsize = zbufmax; + p->zbuf1 = mmap(NULL, p->zbufsize, PROT_READ | PROT_WRITE, + MAP_ANON, -1, 0); + p->zbuf2 = mmap(NULL, p->zbufsize, PROT_READ | PROT_WRITE, + MAP_ANON, -1, 0); + if (p->zbuf1 == MAP_FAILED || p->zbuf2 == MAP_FAILED) { + snprintf(ebuf, PCAP_ERRBUF_SIZE, "mmap: %s", + pcap_strerror(errno)); + goto bad; + } + bzero(&bz, sizeof(bz)); + bz.bz_bufa = p->zbuf1; + bz.bz_bufb = p->zbuf2; + bz.bz_buflen = p->zbufsize; + if (ioctl(fd, BIOCSETZBUF, (caddr_t)&bz) < 0) { + snprintf(ebuf, PCAP_ERRBUF_SIZE, "BIOCSETZBUF: %s", + pcap_strerror(errno)); + goto bad; + } (void)strncpy(ifr.ifr_name, device, sizeof(ifr.ifr_name)); - if (ioctl(fd, BIOCSETIF, (caddr_t)&ifr) >= 0) - break; /* that size worked; we're done */ - - if (errno != ENOBUFS) { + if (ioctl(fd, BIOCSETIF, (caddr_t)&ifr) < 0) { snprintf(ebuf, PCAP_ERRBUF_SIZE, "BIOCSETIF: %s: %s", device, pcap_strerror(errno)); goto bad; } - } + v = p->zbufsize - sizeof(struct bpf_zbuf_header); + } else { +#endif + + /* + * Try finding a good size for the buffer; 32768 may be too + * big, so keep cutting it in half until we find a size + * that works, or run out of sizes to try. If the default + * is larger, don't make it smaller. + * + * XXX - there should be a user-accessible hook to set the >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat Sep 27 20:54:53 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 946071065696; Sat, 27 Sep 2008 20:54:53 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 588441065694 for ; Sat, 27 Sep 2008 20:54:53 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 461678FC14 for ; Sat, 27 Sep 2008 20:54:53 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id m8RKsrom013669 for ; Sat, 27 Sep 2008 20:54:53 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m8RKsrp0013667 for perforce@freebsd.org; Sat, 27 Sep 2008 20:54:53 GMT (envelope-from sam@freebsd.org) Date: Sat, 27 Sep 2008 20:54:53 GMT Message-Id: <200809272054.m8RKsrp0013667@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 150579 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 27 Sep 2008 20:54:53 -0000 http://perforce.freebsd.org/chv.cgi?CH=150579 Change 150579 by sam@sam_ebb on 2008/09/27 20:54:04 IFC Affected files ... .. //depot/projects/vap/sys/conf/files#50 integrate .. //depot/projects/vap/sys/conf/files.amd64#12 integrate .. //depot/projects/vap/sys/conf/files.i386#19 integrate .. //depot/projects/vap/sys/conf/kern.pre.mk#10 integrate Differences ... ==== //depot/projects/vap/sys/conf/files#50 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.1332 2008/08/23 20:59:12 rnoland Exp $ +# $FreeBSD: src/sys/conf/files,v 1.1334 2008/09/23 14:45:10 obrien Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -518,21 +518,36 @@ dev/cs/if_cs.c optional cs dev/cs/if_cs_isa.c optional cs isa dev/cs/if_cs_pccard.c optional cs pccard -dev/cxgb/cxgb_main.c optional cxgb pci -dev/cxgb/cxgb_offload.c optional cxgb pci -dev/cxgb/cxgb_sge.c optional cxgb pci -dev/cxgb/cxgb_multiq.c optional cxgb pci -dev/cxgb/common/cxgb_mc5.c optional cxgb pci -dev/cxgb/common/cxgb_vsc7323.c optional cxgb pci -dev/cxgb/common/cxgb_vsc8211.c optional cxgb pci -dev/cxgb/common/cxgb_ael1002.c optional cxgb pci -dev/cxgb/common/cxgb_mv88e1xxx.c optional cxgb pci -dev/cxgb/common/cxgb_xgmac.c optional cxgb pci -dev/cxgb/common/cxgb_t3_hw.c optional cxgb pci -dev/cxgb/common/cxgb_tn1010.c optional cxgb pci -dev/cxgb/sys/uipc_mvec.c optional cxgb pci -dev/cxgb/sys/cxgb_support.c optional cxgb pci -dev/cxgb/cxgb_t3fw.c optional cxgb cxgb_t3fw +dev/cxgb/cxgb_main.c optional cxgb pci \ + compile-with "${NORMAL_C} -I$S/dev/cxgb" +dev/cxgb/cxgb_offload.c optional cxgb pci \ + compile-with "${NORMAL_C} -I$S/dev/cxgb" +dev/cxgb/cxgb_sge.c optional cxgb pci \ + compile-with "${NORMAL_C} -I$S/dev/cxgb" +dev/cxgb/cxgb_multiq.c optional cxgb pci \ + compile-with "${NORMAL_C} -I$S/dev/cxgb" +dev/cxgb/common/cxgb_mc5.c optional cxgb pci \ + compile-with "${NORMAL_C} -I$S/dev/cxgb" +dev/cxgb/common/cxgb_vsc7323.c optional cxgb pci \ + compile-with "${NORMAL_C} -I$S/dev/cxgb" +dev/cxgb/common/cxgb_vsc8211.c optional cxgb pci \ + compile-with "${NORMAL_C} -I$S/dev/cxgb" +dev/cxgb/common/cxgb_ael1002.c optional cxgb pci \ + compile-with "${NORMAL_C} -I$S/dev/cxgb" +dev/cxgb/common/cxgb_mv88e1xxx.c optional cxgb pci \ + compile-with "${NORMAL_C} -I$S/dev/cxgb" +dev/cxgb/common/cxgb_xgmac.c optional cxgb pci \ + compile-with "${NORMAL_C} -I$S/dev/cxgb" +dev/cxgb/common/cxgb_t3_hw.c optional cxgb pci \ + compile-with "${NORMAL_C} -I$S/dev/cxgb" +dev/cxgb/common/cxgb_tn1010.c optional cxgb pci \ + compile-with "${NORMAL_C} -I$S/dev/cxgb" +dev/cxgb/sys/uipc_mvec.c optional cxgb pci \ + compile-with "${NORMAL_C} -I$S/dev/cxgb" +dev/cxgb/sys/cxgb_support.c optional cxgb pci \ + compile-with "${NORMAL_C} -I$S/dev/cxgb" +dev/cxgb/cxgb_t3fw.c optional cxgb cxgb_t3fw \ + compile-with "${NORMAL_C} -I$S/dev/cxgb" dev/cy/cy.c optional cy dev/cy/cy_isa.c optional cy isa dev/cy/cy_pci.c optional cy pci @@ -1728,6 +1743,7 @@ libkern/index.c standard libkern/inet_ntoa.c standard libkern/mcount.c optional profiling-routine +libkern/memcmp.c standard libkern/qsort.c standard libkern/qsort_r.c standard libkern/random.c standard ==== //depot/projects/vap/sys/conf/files.amd64#12 (text+ko) ==== @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $FreeBSD: src/sys/conf/files.amd64,v 1.122 2008/08/08 16:26:53 stas Exp $ +# $FreeBSD: src/sys/conf/files.amd64,v 1.123 2008/09/22 16:09:16 obrien Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -220,6 +220,7 @@ amd64/ia32/ia32_signal.c optional compat_ia32 amd64/ia32/ia32_sigtramp.S optional compat_ia32 amd64/ia32/ia32_syscall.c optional compat_ia32 +compat/freebsd32/freebsd32_ioctl.c optional compat_ia32 compat/freebsd32/freebsd32_misc.c optional compat_ia32 compat/freebsd32/freebsd32_syscalls.c optional compat_ia32 compat/freebsd32/freebsd32_sysent.c optional compat_ia32 ==== //depot/projects/vap/sys/conf/files.i386#19 (text+ko) ==== @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $FreeBSD: src/sys/conf/files.i386,v 1.606 2008/09/09 22:37:29 rpaulo Exp $ +# $FreeBSD: src/sys/conf/files.i386,v 1.608 2008/09/23 03:13:33 kmacy Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -216,6 +216,9 @@ dev/nvram/nvram.c optional nvram isa dev/pcf/pcf_isa.c optional pcf dev/random/nehemiah.c optional random +dev/sbni/if_sbni.c optional sbni +dev/sbni/if_sbni_isa.c optional sbni isa +dev/sbni/if_sbni_pci.c optional sbni pci dev/sio/sio.c optional sio dev/sio/sio_isa.c optional sio isa dev/sio/sio_pccard.c optional sio pccard @@ -287,10 +290,12 @@ i386/i386/mem.c optional mem i386/i386/minidump_machdep.c standard i386/i386/mp_clock.c optional smp -i386/i386/mp_machdep.c optional smp +i386/i386/mp_machdep.c optional native smp +i386/xen/mp_machdep.c optional xen smp i386/i386/mp_watchdog.c optional mp_watchdog smp -i386/i386/mpboot.s optional smp -i386/i386/mptable.c optional apic +i386/i386/mpboot.s optional smp native +i386/i386/mptable.c optional apic native +i386/xen/mptable.c optional apic xen i386/i386/mptable_pci.c optional apic pci i386/i386/msi.c optional apic pci i386/i386/nexus.c standard ==== //depot/projects/vap/sys/conf/kern.pre.mk#10 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/kern.pre.mk,v 1.100 2008/06/25 21:33:28 ru Exp $ +# $FreeBSD: src/sys/conf/kern.pre.mk,v 1.101 2008/09/23 03:16:54 kmacy Exp $ # Part of a unified Makefile for building kernels. This part contains all # of the definitions that need to be before %BEFORE_DEPEND. @@ -81,6 +81,9 @@ # ... and OpenSolaris INCLUDES+= -I$S/contrib/opensolaris/compat +# ... and the same for cxgb +INCLUDES+= -I$S/dev/cxgb + .endif CFLAGS= ${COPTFLAGS} ${C_DIALECT} ${DEBUG} ${CWARNFLAGS} From owner-p4-projects@FreeBSD.ORG Sat Sep 27 22:35:36 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1128810656A0; Sat, 27 Sep 2008 22:35:36 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C7920106569C for ; Sat, 27 Sep 2008 22:35:35 +0000 (UTC) (envelope-from snb@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id B505D8FC1D for ; Sat, 27 Sep 2008 22:35:35 +0000 (UTC) (envelope-from snb@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id m8RMZZJj032772 for ; Sat, 27 Sep 2008 22:35:35 GMT (envelope-from snb@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m8RMZZo2032766 for perforce@freebsd.org; Sat, 27 Sep 2008 22:35:35 GMT (envelope-from snb@FreeBSD.org) Date: Sat, 27 Sep 2008 22:35:35 GMT Message-Id: <200809272235.m8RMZZo2032766@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to snb@FreeBSD.org using -f From: Nick Barkas To: Perforce Change Reviews Cc: Subject: PERFORCE change 150582 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 27 Sep 2008 22:35:36 -0000 http://perforce.freebsd.org/chv.cgi?CH=150582 Change 150582 by snb@snb_toro on 2008/09/27 22:35:21 IFC Affected files ... .. //depot/projects/soc2008/snb-dirhash/sys-ufs-ufs/dirhash.h#5 integrate .. //depot/projects/soc2008/snb-dirhash/sys-ufs-ufs/ufs_dirhash.c#11 integrate Differences ... ==== //depot/projects/soc2008/snb-dirhash/sys-ufs-ufs/dirhash.h#5 (text+ko) ==== @@ -28,6 +28,9 @@ #ifndef _UFS_UFS_DIRHASH_H_ #define _UFS_UFS_DIRHASH_H_ +#include +#include + /* * For fast operations on large directories, we maintain a hash * that maps the file name to the offset of the directory entry within @@ -80,7 +83,8 @@ ((dh)->dh_hash[(slot) >> DH_BLKOFFSHIFT][(slot) & DH_BLKOFFMASK]) struct dirhash { - struct lock dh_lock; /* protects all fields except list & score */ + struct sx dh_lock; /* protects all fields except list & score */ + int dh_refcount; doff_t **dh_hash; /* the hash array (2-level) */ int dh_narrays; /* number of entries in dh_hash */ ==== //depot/projects/soc2008/snb-dirhash/sys-ufs-ufs/ufs_dirhash.c#11 (text+ko) ==== @@ -38,7 +38,6 @@ #include #include #include -#include #include #include #include @@ -47,7 +46,9 @@ #include #include #include +#include #include +#include #include #include #include @@ -109,7 +110,7 @@ #define DIRHASH_BLKALLOC_WAITOK() uma_zalloc(ufsdirhash_zone, M_WAITOK) #define DIRHASH_BLKFREE(ptr) uma_zfree(ufsdirhash_zone, (ptr)) #define DIRHASH_ASSERT_LOCKED(dh) \ - lockmgr_assert(&(dh)->dh_lock, KA_LOCKED) + sx_assert(&(dh)->dh_lock, SA_LOCKED) /* Dirhash list; recently-used entries are near the tail. */ static TAILQ_HEAD(, dirhash) ufsdirhash_list; @@ -123,7 +124,12 @@ * * The relationship between inode and dirhash is protected either by an * exclusive vnode lock or the vnode interlock where a shared vnode lock - * may be used. The dirhash_mtx is acquired after the dirhash lock. + * may be used. The dirhash_mtx is acquired after the dirhash lock. To + * handle teardown races, code wishing to lock the dirhash for an inode + * when using a shared vnode lock must obtain a private reference on the + * dirhash while holding the vnode interlock. They can drop it once they + * have obtained the dirhash lock and verified that the dirhash wasn't + * recycled while they waited for the dirhash lock. * * ufsdirhash_build() acquires a shared lock on the dirhash when it is * successful. This lock is released after a call to ufsdirhash_lookup(). @@ -134,6 +140,23 @@ * The dirhash lock may be held across io operations. */ +static void +ufsdirhash_hold(struct dirhash *dh) +{ + + refcount_acquire(&dh->dh_refcount); +} + +static void +ufsdirhash_drop(struct dirhash *dh) +{ + + if (refcount_release(&dh->dh_refcount)) { + sx_destroy(&dh->dh_lock); + free(dh, M_DIRHASH); + } +} + /* * Release the lock on a dirhash. */ @@ -141,7 +164,7 @@ ufsdirhash_release(struct dirhash *dh) { - lockmgr(&dh->dh_lock, LK_RELEASE, 0); + sx_unlock(&dh->dh_lock); } /* @@ -169,8 +192,9 @@ M_NOWAIT | M_ZERO); if (ndh == NULL) return (NULL); - lockinit(&ndh->dh_lock, PRIBIO, "dirhash", 0, 0); - lockmgr(&ndh->dh_lock, LK_EXCLUSIVE, NULL); + refcount_init(&ndh->dh_refcount, 1); + sx_init(&ndh->dh_lock, "dirhash"); + sx_xlock(&ndh->dh_lock); } /* * Check i_dirhash. If it's NULL just try to use a @@ -185,31 +209,39 @@ continue; return (ndh); } - /* Try to acquire shared on existing hashes. */ - if (lockmgr(&dh->dh_lock, LK_SHARED | LK_INTERLOCK, - VI_MTX(vp))) - continue; + ufsdirhash_hold(dh); + VI_UNLOCK(vp); + + /* Acquire a shared lock on existing hashes. */ + sx_slock(&dh->dh_lock); + /* The hash could've been recycled while we were waiting. */ + VI_LOCK(vp); if (ip->i_dirhash != dh) { + VI_UNLOCK(vp); ufsdirhash_release(dh); + ufsdirhash_drop(dh); continue; } + VI_UNLOCK(vp); + ufsdirhash_drop(dh); + /* If the hash is still valid we've succeeded. */ if (dh->dh_hash != NULL) break; /* * If the hash is NULL it has been recycled. Try to upgrade - * so we can recreate it. If we fail the upgrade another - * thread must've already exclusively locked it. + * so we can recreate it. If we fail the upgrade, drop our + * lock and try again. */ - if (lockmgr(&dh->dh_lock, LK_UPGRADE | LK_SLEEPFAIL, NULL) == 0) + if (sx_try_upgrade(&dh->dh_lock)) break; + sx_sunlock(&dh->dh_lock); } /* Free the preallocated structure if it was not necessary. */ if (ndh) { - lockmgr(&ndh->dh_lock, LK_RELEASE, NULL); - lockdestroy(&ndh->dh_lock); - FREE(ndh, M_DIRHASH); + ufsdirhash_release(ndh); + ufsdirhash_drop(ndh); } return (dh); } @@ -231,7 +263,7 @@ dh = ip->i_dirhash; if (dh == NULL) return (NULL); - lockmgr(&dh->dh_lock, LK_EXCLUSIVE, 0); + sx_xlock(&dh->dh_lock); if (dh->dh_hash != NULL) return (dh); ufsdirhash_free_locked(ip); @@ -250,18 +282,34 @@ vp = ip->i_vnode; for (;;) { + /* Grab a reference on this inode's dirhash if it has one. */ VI_LOCK(vp); dh = ip->i_dirhash; if (dh == NULL) { VI_UNLOCK(vp); return; } - if (lockmgr(&dh->dh_lock, LK_EXCLUSIVE | LK_INTERLOCK, - VI_MTX(vp))) - continue; - if (ip->i_dirhash == dh) + ufsdirhash_hold(dh); + VI_UNLOCK(vp); + + /* Exclusively lock the dirhash. */ + sx_xlock(&dh->dh_lock); + + /* If this dirhash still belongs to this inode, then free it. */ + VI_LOCK(vp); + if (ip->i_dirhash == dh) { + VI_UNLOCK(vp); + ufsdirhash_drop(dh); break; + } + VI_UNLOCK(vp); + + /* + * This inode's dirhash has changed while we were + * waiting for the dirhash lock, so try again. + */ ufsdirhash_release(dh); + ufsdirhash_drop(dh); } ufsdirhash_free_locked(ip); } @@ -395,7 +443,7 @@ TAILQ_INSERT_TAIL(&ufsdirhash_list, dh, dh_list); dh->dh_onlist = 1; DIRHASHLIST_UNLOCK(); - lockmgr(&dh->dh_lock, LK_DOWNGRADE, 0); + sx_downgrade(&dh->dh_lock); return (0); fail: @@ -414,6 +462,7 @@ int i; DIRHASH_ASSERT_LOCKED(ip->i_dirhash); + /* * Clear the pointer in the inode to prevent new threads from * finding the dead structure. @@ -423,12 +472,25 @@ dh = ip->i_dirhash; ip->i_dirhash = NULL; VI_UNLOCK(vp); + + /* + * Remove the hash from the list since we are going to free its + * memory. + */ + DIRHASHLIST_LOCK(); + if (dh->dh_onlist) + TAILQ_REMOVE(&ufsdirhash_list, dh, dh_list); + ufs_dirhashmem -= dh->dh_memreq; + DIRHASHLIST_UNLOCK(); + /* - * Drain waiters. They will abort when they see that ip->i_dirhash - * is NULL after locking. + * At this point, any waiters for the lock should hold their + * own reference on the dirhash structure. They will drop + * that reference once they grab the vnode interlock and see + * that ip->i_dirhash is NULL. */ - lockmgr(&dh->dh_lock, LK_RELEASE, 0); - lockmgr(&dh->dh_lock, LK_DRAIN, 0); + sx_xunlock(&dh->dh_lock); + /* * Handle partially recycled as well as fully constructed hashes. */ @@ -440,19 +502,11 @@ if (dh->dh_blkfree != NULL) FREE(dh->dh_blkfree, M_DIRHASH); } - DIRHASHLIST_LOCK(); - if (dh->dh_onlist) - TAILQ_REMOVE(&ufsdirhash_list, dh, dh_list); - ufs_dirhashmem -= dh->dh_memreq; - DIRHASHLIST_UNLOCK(); + /* - * Release the lock and reclaim datastructure memory. + * Drop the inode's reference to the data structure. */ - lockmgr(&dh->dh_lock, LK_RELEASE, 0); - lockdestroy(&dh->dh_lock); - FREE(dh, M_DIRHASH); - - return; + ufsdirhash_drop(dh); } /* @@ -1155,7 +1209,7 @@ * If we can't lock it it's in use and we don't want to * recycle it anyway. */ - if (lockmgr(&dh->dh_lock, LK_EXCLUSIVE | LK_NOWAIT, NULL)) { + if (!sx_try_xlock(&dh->dh_lock)) { dh = TAILQ_NEXT(dh, dh_list); continue; } @@ -1189,13 +1243,13 @@ */ for (dh = TAILQ_FIRST(&ufsdirhash_list); dh != NULL; dh = TAILQ_NEXT(dh, dh_list)) { - if (lockmgr(&dh->dh_lock, LK_EXCLUSIVE | LK_NOWAIT, NULL)) + if (!sx_try_xlock(&dh->dh_lock)) continue; if (time_second - dh->dh_lastused > ufs_dirhashreclaimage) memfreed += ufsdirhash_destroy(dh); /* Unlock if we didn't delete the dirhash */ else - lockmgr(&dh->dh_lock, LK_RELEASE, 0); + ufsdirhash_release(dh); } /* @@ -1205,7 +1259,7 @@ */ for (dh = TAILQ_FIRST(&ufsdirhash_list); memfreed < memwanted && dh !=NULL; dh = TAILQ_NEXT(dh, dh_list)) { - if (lockmgr(&dh->dh_lock, LK_EXCLUSIVE | LK_NOWAIT, NULL)) + if (!sx_try_xlock(&dh->dh_lock)) continue; memfreed += ufsdirhash_destroy(dh); } From owner-p4-projects@FreeBSD.ORG Sat Sep 27 22:54:56 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 190DC106568A; Sat, 27 Sep 2008 22:54:56 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D17A81065687 for ; Sat, 27 Sep 2008 22:54:55 +0000 (UTC) (envelope-from snb@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id C00CD8FC0C for ; Sat, 27 Sep 2008 22:54:55 +0000 (UTC) (envelope-from snb@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id m8RMst0f053469 for ; Sat, 27 Sep 2008 22:54:55 GMT (envelope-from snb@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m8RMstUZ053463 for perforce@freebsd.org; Sat, 27 Sep 2008 22:54:55 GMT (envelope-from snb@FreeBSD.org) Date: Sat, 27 Sep 2008 22:54:55 GMT Message-Id: <200809272254.m8RMstUZ053463@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to snb@FreeBSD.org using -f From: Nick Barkas To: Perforce Change Reviews Cc: Subject: PERFORCE change 150584 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 27 Sep 2008 22:54:56 -0000 http://perforce.freebsd.org/chv.cgi?CH=150584 Change 150584 by snb@snb_toro on 2008/09/27 22:54:01 Add some notes to the README. There are lots of different benchmark scripts now. Affected files ... .. //depot/projects/soc2008/snb-dirhash/README#2 edit Differences ... ==== //depot/projects/soc2008/snb-dirhash/README#2 (text+ko) ==== @@ -1,1 +1,9 @@ +This branch is for working on making dirhash's memory usage dynamic. The +sys-ufs-ufs directory contains the branched code from sys/ufs/ufs, and the +freebsd7 subdirectory there contains different versions of these files branched +from RELENG_7. The benchmark directory contains a few scripts used for +benchmarking dirhash. dh_bench.py is the most complex of these, but the other +older scripts might also be useful. + +More info: http://wiki.freebsd.org/DirhashDynamicMemory