From owner-p4-projects@FreeBSD.ORG Wed Mar 4 09:31:02 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 705531065673; Wed, 4 Mar 2009 09:31: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 2A21A106566C for ; Wed, 4 Mar 2009 09:31:02 +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 164138FC14 for ; Wed, 4 Mar 2009 09:31:02 +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 n249V1wu068866 for ; Wed, 4 Mar 2009 09:31:01 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n249UvvB068852 for perforce@freebsd.org; Wed, 4 Mar 2009 09:30:57 GMT (envelope-from hselasky@FreeBSD.org) Date: Wed, 4 Mar 2009 09:30:57 GMT Message-Id: <200903040930.n249UvvB068852@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 158661 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 04 Mar 2009 09:31:04 -0000 http://perforce.freebsd.org/chv.cgi?CH=158661 Change 158661 by hselasky@hselasky_laptop001 on 2009/03/04 09:30:30 IFC @ 158658 Affected files ... .. //depot/projects/usb/src/sys/amd64/amd64/vm_machdep.c#10 integrate .. //depot/projects/usb/src/sys/bsm/audit.h#10 integrate .. //depot/projects/usb/src/sys/bsm/audit_kevents.h#11 integrate .. //depot/projects/usb/src/sys/cddl/compat/opensolaris/kern/opensolaris_vfs.c#5 integrate .. //depot/projects/usb/src/sys/cddl/compat/opensolaris/sys/sysmacros.h#4 integrate .. //depot/projects/usb/src/sys/compat/freebsd32/freebsd32_misc.c#14 integrate .. //depot/projects/usb/src/sys/conf/files.amd64#17 integrate .. //depot/projects/usb/src/sys/conf/files.i386#19 integrate .. //depot/projects/usb/src/sys/conf/files.ia64#11 integrate .. //depot/projects/usb/src/sys/conf/files.mips#6 integrate .. //depot/projects/usb/src/sys/conf/files.pc98#16 integrate .. //depot/projects/usb/src/sys/conf/files.powerpc#18 integrate .. //depot/projects/usb/src/sys/conf/files.sparc64#13 integrate .. //depot/projects/usb/src/sys/conf/files.sun4v#8 integrate .. //depot/projects/usb/src/sys/conf/kern.mk#10 integrate .. //depot/projects/usb/src/sys/dev/ata/ata-all.c#14 integrate .. //depot/projects/usb/src/sys/dev/ata/ata-all.h#11 integrate .. //depot/projects/usb/src/sys/dev/ata/ata-disk.c#13 integrate .. //depot/projects/usb/src/sys/dev/ata/ata-queue.c#12 integrate .. //depot/projects/usb/src/sys/dev/ata/ata-raid.c#9 integrate .. //depot/projects/usb/src/sys/dev/ata/ata-usb.c#40 integrate .. //depot/projects/usb/src/sys/dev/ata/atapi-cam.c#10 integrate .. //depot/projects/usb/src/sys/dev/ata/atapi-cd.c#10 integrate .. //depot/projects/usb/src/sys/dev/ata/atapi-fd.c#8 integrate .. //depot/projects/usb/src/sys/dev/ata/atapi-tape.c#9 integrate .. //depot/projects/usb/src/sys/dev/ata/chipsets/ata-ahci.c#4 integrate .. //depot/projects/usb/src/sys/dev/ata/chipsets/ata-promise.c#3 integrate .. //depot/projects/usb/src/sys/dev/bce/if_bce.c#17 integrate .. //depot/projects/usb/src/sys/dev/bce/if_bcefw.h#7 integrate .. //depot/projects/usb/src/sys/dev/bce/if_bcereg.h#11 integrate .. //depot/projects/usb/src/sys/dev/ichwd/ichwd.c#7 integrate .. //depot/projects/usb/src/sys/dev/ofw/ofw_iicbus.c#3 integrate .. //depot/projects/usb/src/sys/dev/pccard/pccard.c#6 integrate .. //depot/projects/usb/src/sys/dev/pccard/pccardvar.h#4 integrate .. //depot/projects/usb/src/sys/dev/pccard/pccardvarp.h#5 integrate .. //depot/projects/usb/src/sys/dev/pci/pci.c#15 integrate .. //depot/projects/usb/src/sys/dev/pci/pci_private.h#5 integrate .. //depot/projects/usb/src/sys/dev/pci/pcireg.h#11 integrate .. //depot/projects/usb/src/sys/dev/sound/usb/uaudio.c#37 integrate .. //depot/projects/usb/src/sys/dev/usb/bluetooth/ng_ubt.c#2 integrate .. //depot/projects/usb/src/sys/dev/usb/bluetooth/ubtbcmfw.c#3 integrate .. //depot/projects/usb/src/sys/dev/usb/image/uscanner.c#3 integrate .. //depot/projects/usb/src/sys/dev/usb/input/uhid.c#3 integrate .. //depot/projects/usb/src/sys/dev/usb/input/ukbd.c#2 integrate .. //depot/projects/usb/src/sys/dev/usb/input/ums.c#3 integrate .. //depot/projects/usb/src/sys/dev/usb/misc/udbp.c#2 integrate .. //depot/projects/usb/src/sys/dev/usb/misc/ufm.c#3 integrate .. //depot/projects/usb/src/sys/dev/usb/net/if_aue.c#2 integrate .. //depot/projects/usb/src/sys/dev/usb/net/if_axe.c#2 integrate .. //depot/projects/usb/src/sys/dev/usb/net/if_cdce.c#2 integrate .. //depot/projects/usb/src/sys/dev/usb/net/if_cue.c#2 integrate .. //depot/projects/usb/src/sys/dev/usb/net/if_kue.c#2 integrate .. //depot/projects/usb/src/sys/dev/usb/net/if_rue.c#2 integrate .. //depot/projects/usb/src/sys/dev/usb/net/if_udav.c#2 integrate .. //depot/projects/usb/src/sys/dev/usb/serial/u3g.c#2 integrate .. //depot/projects/usb/src/sys/dev/usb/serial/uark.c#2 integrate .. //depot/projects/usb/src/sys/dev/usb/serial/ubsa.c#2 integrate .. //depot/projects/usb/src/sys/dev/usb/serial/ubser.c#2 integrate .. //depot/projects/usb/src/sys/dev/usb/serial/uchcom.c#2 integrate .. //depot/projects/usb/src/sys/dev/usb/serial/ucycom.c#2 integrate .. //depot/projects/usb/src/sys/dev/usb/serial/ufoma.c#2 integrate .. //depot/projects/usb/src/sys/dev/usb/serial/uftdi.c#2 integrate .. //depot/projects/usb/src/sys/dev/usb/serial/ugensa.c#2 integrate .. //depot/projects/usb/src/sys/dev/usb/serial/uipaq.c#2 integrate .. //depot/projects/usb/src/sys/dev/usb/serial/ulpt.c#3 integrate .. //depot/projects/usb/src/sys/dev/usb/serial/umct.c#2 integrate .. //depot/projects/usb/src/sys/dev/usb/serial/umodem.c#2 integrate .. //depot/projects/usb/src/sys/dev/usb/serial/umoscom.c#2 integrate .. //depot/projects/usb/src/sys/dev/usb/serial/uplcom.c#2 integrate .. //depot/projects/usb/src/sys/dev/usb/serial/uslcom.c#2 integrate .. //depot/projects/usb/src/sys/dev/usb/serial/uvisor.c#2 integrate .. //depot/projects/usb/src/sys/dev/usb/serial/uvscom.c#2 integrate .. //depot/projects/usb/src/sys/dev/usb/storage/umass.c#2 integrate .. //depot/projects/usb/src/sys/dev/usb/storage/urio.c#3 integrate .. //depot/projects/usb/src/sys/dev/usb/storage/ustorage_fs.c#2 integrate .. //depot/projects/usb/src/sys/dev/usb/usb_compat_linux.c#29 integrate .. //depot/projects/usb/src/sys/dev/usb/usb_dev.c#5 integrate .. //depot/projects/usb/src/sys/dev/usb/usb_dev.h#4 integrate .. //depot/projects/usb/src/sys/dev/usb/usb_device.c#4 integrate .. //depot/projects/usb/src/sys/dev/usb/usb_device.h#4 integrate .. //depot/projects/usb/src/sys/dev/usb/usb_hub.c#2 integrate .. //depot/projects/usb/src/sys/dev/usb/usbdevs#47 integrate .. //depot/projects/usb/src/sys/dev/usb/wlan/if_rum.c#5 integrate .. //depot/projects/usb/src/sys/dev/usb/wlan/if_ural.c#5 integrate .. //depot/projects/usb/src/sys/dev/usb/wlan/if_zyd.c#5 integrate .. //depot/projects/usb/src/sys/fs/procfs/procfs_dbregs.c#4 integrate .. //depot/projects/usb/src/sys/fs/procfs/procfs_fpregs.c#3 integrate .. //depot/projects/usb/src/sys/fs/procfs/procfs_regs.c#3 integrate .. //depot/projects/usb/src/sys/fs/udf/udf_vnops.c#14 integrate .. //depot/projects/usb/src/sys/gnu/fs/xfs/FreeBSD/xfs_compat.h#3 integrate .. //depot/projects/usb/src/sys/kern/kern_priv.c#6 integrate .. //depot/projects/usb/src/sys/kern/subr_smp.c#10 integrate .. //depot/projects/usb/src/sys/kern/subr_witness.c#17 integrate .. //depot/projects/usb/src/sys/kern/sys_process.c#10 integrate .. //depot/projects/usb/src/sys/kern/sysv_shm.c#7 integrate .. //depot/projects/usb/src/sys/kern/tty.c#18 integrate .. //depot/projects/usb/src/sys/kern/tty_info.c#5 integrate .. //depot/projects/usb/src/sys/kern/tty_pts.c#11 integrate .. //depot/projects/usb/src/sys/kern/vfs_mount.c#18 integrate .. //depot/projects/usb/src/sys/kern/vfs_subr.c#18 integrate .. //depot/projects/usb/src/sys/libkern/memmove.c#1 branch .. //depot/projects/usb/src/sys/mips/mips/pmap.c#7 integrate .. //depot/projects/usb/src/sys/net/bpf.c#14 integrate .. //depot/projects/usb/src/sys/net/if_var.h#12 integrate .. //depot/projects/usb/src/sys/net/netisr.h#4 integrate .. //depot/projects/usb/src/sys/net/vnet.h#5 integrate .. //depot/projects/usb/src/sys/net80211/ieee80211_freebsd.h#12 integrate .. //depot/projects/usb/src/sys/netgraph/atm/ng_ccatm.h#2 integrate .. //depot/projects/usb/src/sys/netgraph/atm/uni/ng_uni_cust.h#3 integrate .. //depot/projects/usb/src/sys/netgraph/ng_l2tp.c#8 integrate .. //depot/projects/usb/src/sys/netgraph/ng_pppoe.c#5 integrate .. //depot/projects/usb/src/sys/netgraph/ng_pppoe.h#4 integrate .. //depot/projects/usb/src/sys/netinet/igmp.h#3 integrate .. //depot/projects/usb/src/sys/netinet/in.h#9 integrate .. //depot/projects/usb/src/sys/netinet/in_mcast.c#9 integrate .. //depot/projects/usb/src/sys/netinet/ip6.h#5 integrate .. //depot/projects/usb/src/sys/netinet/ip_dummynet.c#11 integrate .. //depot/projects/usb/src/sys/netinet/ip_fw.h#12 integrate .. //depot/projects/usb/src/sys/netinet/ip_fw2.c#19 integrate .. //depot/projects/usb/src/sys/netinet/ip_options.c#11 integrate .. //depot/projects/usb/src/sys/netinet/ip_options.h#3 integrate .. //depot/projects/usb/src/sys/netinet/ip_output.c#15 integrate .. //depot/projects/usb/src/sys/netinet/tcp_timewait.c#9 integrate .. //depot/projects/usb/src/sys/netinet/vinet.h#6 integrate .. //depot/projects/usb/src/sys/netinet6/ip6_output.c#12 integrate .. //depot/projects/usb/src/sys/netinet6/route6.c#8 integrate .. //depot/projects/usb/src/sys/netinet6/vinet6.h#6 integrate .. //depot/projects/usb/src/sys/netipsec/vipsec.h#4 integrate .. //depot/projects/usb/src/sys/pci/viapm.c#8 integrate .. //depot/projects/usb/src/sys/powerpc/booke/pmap.c#7 integrate .. //depot/projects/usb/src/sys/security/audit/audit_bsm_errno.c#3 integrate .. //depot/projects/usb/src/sys/security/audit/audit_bsm_token.c#12 integrate .. //depot/projects/usb/src/sys/security/mac/mac_framework.c#5 integrate .. //depot/projects/usb/src/sys/sys/cdefs.h#7 integrate .. //depot/projects/usb/src/sys/sys/fcntl.h#4 integrate .. //depot/projects/usb/src/sys/sys/mbuf.h#11 integrate .. //depot/projects/usb/src/sys/sys/mount.h#15 integrate .. //depot/projects/usb/src/sys/sys/param.h#23 integrate .. //depot/projects/usb/src/sys/sys/priv.h#11 integrate .. //depot/projects/usb/src/sys/sys/sdt.h#2 integrate .. //depot/projects/usb/src/sys/sys/shm.h#3 integrate .. //depot/projects/usb/src/sys/sys/stat.h#5 integrate .. //depot/projects/usb/src/sys/sys/systm.h#12 integrate .. //depot/projects/usb/src/sys/sys/tree.h#5 integrate .. //depot/projects/usb/src/sys/sys/vimage.h#5 integrate .. //depot/projects/usb/src/sys/xdr/xdr_mem.c#2 integrate Differences ... ==== //depot/projects/usb/src/sys/amd64/amd64/vm_machdep.c#10 (text+ko) ==== @@ -41,7 +41,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/vm_machdep.c,v 1.259 2008/10/05 02:03:54 davidxu Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/vm_machdep.c,v 1.260 2009/03/02 18:43:50 kib Exp $"); #include "opt_isa.h" #include "opt_cpu.h" @@ -62,6 +62,7 @@ #include #include #include +#include #include #include #include @@ -80,12 +81,6 @@ #include -#ifdef COMPAT_IA32 - -extern struct sysentvec ia32_freebsd_sysvec; - -#endif - static void cpu_reset_real(void); #ifdef SMP static void cpu_reset_proxy(void); @@ -331,7 +326,7 @@ cpu_thread_clean(td); #ifdef COMPAT_IA32 - if (td->td_proc->p_sysent == &ia32_freebsd_sysvec) { + if (td->td_proc->p_sysent->sv_flags & SV_ILP32) { /* * Set the trap frame to point at the beginning of the uts * function. @@ -377,7 +372,7 @@ return (EINVAL); #ifdef COMPAT_IA32 - if (td->td_proc->p_sysent == &ia32_freebsd_sysvec) { + if (td->td_proc->p_sysent->sv_flags & SV_ILP32) { if (td == curthread) { critical_enter(); td->td_pcb->pcb_gsbase = (register_t)tls_base; ==== //depot/projects/usb/src/sys/bsm/audit.h#10 (text) ==== @@ -26,8 +26,8 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * P4: //depot/projects/trustedbsd/openbsm/sys/bsm/audit.h#4 - * $FreeBSD: src/sys/bsm/audit.h,v 1.14 2009/01/14 10:44:16 rwatson Exp $ + * P4: //depot/projects/trustedbsd/openbsm/sys/bsm/audit.h#5 + * $FreeBSD: src/sys/bsm/audit.h,v 1.15 2009/03/02 13:29:18 rwatson Exp $ */ #ifndef _BSM_AUDIT_H @@ -66,8 +66,9 @@ #define AUDIT_TRIGGER_CLOSE_AND_DIE 4 /* Terminate audit. */ #define AUDIT_TRIGGER_NO_SPACE 5 /* Below min free space. */ #define AUDIT_TRIGGER_ROTATE_USER 6 /* User requests rotate. */ -#define AUDIT_TRIGGER_INITIALIZE 7 /* Initialize audit. */ -#define AUDIT_TRIGGER_MAX 7 +#define AUDIT_TRIGGER_INITIALIZE 7 /* User initialize of auditd. */ +#define AUDIT_TRIGGER_EXPIRE_TRAILS 8 /* User expiration of trails. */ +#define AUDIT_TRIGGER_MAX 8 /* * The special device filename (FreeBSD). ==== //depot/projects/usb/src/sys/bsm/audit_kevents.h#11 (text) ==== @@ -26,8 +26,8 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * P4: //depot/projects/trustedbsd/openbsm/sys/bsm/audit_kevents.h#4 - * $FreeBSD: src/sys/bsm/audit_kevents.h,v 1.18 2009/01/14 10:44:16 rwatson Exp $ + * P4: //depot/projects/trustedbsd/openbsm/sys/bsm/audit_kevents.h#5 + * $FreeBSD: src/sys/bsm/audit_kevents.h,v 1.19 2009/03/02 13:29:18 rwatson Exp $ */ #ifndef _BSM_AUDIT_KEVENTS_H_ @@ -587,6 +587,8 @@ #define AUE_CAP_GETMODE 43189 /* TrustedBSD. */ #define AUE_POSIX_SPAWN 43190 /* Darwin. */ #define AUE_FSGETPATH 43191 /* Darwin. */ +#define AUE_PREAD 43192 /* Darwin/FreeBSD. */ +#define AUE_PWRITE 43193 /* Darwin/FreeBSD. */ /* * Darwin BSM uses a number of AUE_O_* definitions, which are aliased to the @@ -658,7 +660,6 @@ /* * Possible desired future values based on review of BSD/Darwin system calls. */ -#define AUE_ACCESSEXTENDED AUE_NULL #define AUE_ATGETMSG AUE_NULL #define AUE_ATPUTMSG AUE_NULL #define AUE_ATSOCKET AUE_NULL @@ -669,11 +670,9 @@ #define AUE_BSDTHREADCREATE AUE_NULL #define AUE_BSDTHREADTERMINATE AUE_NULL #define AUE_BSDTHREADREGISTER AUE_NULL -#define AUE_CHMODEXTENDED AUE_NULL #define AUE_CHUD AUE_NULL #define AUE_CSOPS AUE_NULL #define AUE_DUP AUE_NULL -#define AUE_FCHMODEXTENDED AUE_NULL #define AUE_FDATASYNC AUE_NULL #define AUE_FFSCTL AUE_NULL #define AUE_FGETATTRLIST AUE_NULL @@ -683,11 +682,10 @@ #define AUE_FSCTL AUE_NULL #define AUE_FSETATTRLIST AUE_NULL #define AUE_FSETXATTR AUE_NULL -#define AUE_FSTATEXTENDED AUE_NULL #define AUE_FSTATFS64 AUE_NULL #define AUE_FSTATV AUE_NULL #define AUE_FSTAT64 AUE_NULL -#define AUE_FSTAT64EXTENDED AUE_NULL +#define AUE_FSTAT64_EXTENDED AUE_NULL #define AUE_GCCONTROL AUE_NULL #define AUE_GETDIRENTRIES64 AUE_NULL #define AUE_GETDTABLESIZE AUE_NULL @@ -721,21 +719,15 @@ #define AUE_ISSETUGID AUE_NULL #define AUE_LIOLISTIO AUE_NULL #define AUE_LISTXATTR AUE_NULL -#define AUE_LSTATEXTENDED AUE_NULL #define AUE_LSTATV AUE_NULL #define AUE_LSTAT64 AUE_NULL -#define AUE_LSTAT64EXTENDED AUE_NULL +#define AUE_LSTAT64_EXTENDED AUE_NULL #define AUE_MADVISE AUE_NULL #define AUE_MINCORE AUE_NULL #define AUE_MKCOMPLEX AUE_NULL -#define AUE_MKDIREXTENDED AUE_NULL -#define AUE_MKFIFOEXTENDED AUE_NULL #define AUE_MODWATCH AUE_NULL #define AUE_MSGCL AUE_NULL #define AUE_MSYNC AUE_NULL -#define AUE_OPENEXTENDED AUE_NULL -#define AUE_PREAD AUE_NULL -#define AUE_PWRITE AUE_NULL #define AUE_PREADV AUE_NULL #define AUE_PROCINFO AUE_NULL #define AUE_PTHREADCANCELED AUE_NULL @@ -779,15 +771,13 @@ #define AUE_SIGWAIT AUE_NULL #define AUE_SSTK AUE_NULL #define AUE_STACKSNAPSHOT AUE_NULL -#define AUE_STATEXTENDED AUE_NULL #define AUE_STATFS64 AUE_NULL #define AUE_STATV AUE_NULL #define AUE_STAT64 AUE_NULL -#define AUE_STAT64EXTENDED AUE_NULL +#define AUE_STAT64_EXTENDED AUE_NULL #define AUE_SYNC AUE_NULL #define AUE_SYSCALL AUE_NULL #define AUE_TABLE AUE_NULL -#define AUE_UMASKEXTENDED AUE_NULL #define AUE_VMPRESSUREMONITOR AUE_NULL #define AUE_WAITEVENT AUE_NULL #define AUE_WAITID AUE_NULL ==== //depot/projects/usb/src/sys/cddl/compat/opensolaris/kern/opensolaris_vfs.c#5 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cddl/compat/opensolaris/kern/opensolaris_vfs.c,v 1.13 2008/11/17 20:49:29 pjd Exp $"); +__FBSDID("$FreeBSD: src/sys/cddl/compat/opensolaris/kern/opensolaris_vfs.c,v 1.14 2009/03/02 23:26:30 jamie Exp $"); #include #include @@ -39,14 +39,6 @@ MALLOC_DECLARE(M_MOUNT); -TAILQ_HEAD(vfsoptlist, vfsopt); -struct vfsopt { - TAILQ_ENTRY(vfsopt) link; - char *name; - void *value; - int len; -}; - void vfs_setmntopt(vfs_t *vfsp, const char *name, const char *arg, int flags __unused) @@ -64,6 +56,8 @@ namesize = strlen(name) + 1; opt->name = malloc(namesize, M_MOUNT, M_WAITOK); strlcpy(opt->name, name, namesize); + opt->pos = -1; + opt->seen = 1; if (arg == NULL) { opt->value = NULL; @@ -80,22 +74,9 @@ void vfs_clearmntopt(vfs_t *vfsp, const char *name) { - struct vfsopt *opt; - if (vfsp->mnt_opt == NULL) - return; /* TODO: Locking. */ - TAILQ_FOREACH(opt, vfsp->mnt_opt, link) { - if (strcmp(opt->name, name) == 0) - break; - } - if (opt != NULL) { - TAILQ_REMOVE(vfsp->mnt_opt, opt, link); - free(opt->name, M_MOUNT); - if (opt->value != NULL) - free(opt->value, M_MOUNT); - free(opt, M_MOUNT); - } + vfs_deleteopt(vfsp->mnt_opt, name); } int ==== //depot/projects/usb/src/sys/cddl/compat/opensolaris/sys/sysmacros.h#4 (text+ko) ==== @@ -19,7 +19,7 @@ * * CDDL HEADER END * - * $FreeBSD: src/sys/cddl/compat/opensolaris/sys/sysmacros.h,v 1.4 2008/11/17 20:49:29 pjd Exp $ + * $FreeBSD: src/sys/cddl/compat/opensolaris/sys/sysmacros.h,v 1.5 2009/02/28 16:21:25 ed Exp $ */ /* Copyright (c) 1984, 1986, 1987, 1988, 1989 AT&T */ /* All Rights Reserved */ @@ -97,10 +97,6 @@ #define P2SAMEHIGHBIT_TYPED(x, y, type) \ (((type)(x) ^ (type)(y)) < ((type)(x) & (type)(y))) -#ifdef _KERNEL -#define memmove(dst, src, size) bcopy((src), (dst), (size)) -#endif - /* * Find highest one bit set. * Returns bit number + 1 of highest bit that is set, otherwise returns 0. ==== //depot/projects/usb/src/sys/compat/freebsd32/freebsd32_misc.c#14 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/freebsd32/freebsd32_misc.c,v 1.86 2008/12/29 12:58:45 ed Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/freebsd32/freebsd32_misc.c,v 1.87 2009/03/02 23:26:30 jamie Exp $"); #include "opt_compat.h" @@ -2639,8 +2639,7 @@ } */ *uap) { struct uio *auio; - struct iovec *iov; - int error, k; + int error; AUDIT_ARG(fflags, uap->flags); @@ -2662,14 +2661,8 @@ 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); - error = vfs_donmount(td, uap->flags, auio); free(auio, M_IOV); return error; } ==== //depot/projects/usb/src/sys/conf/files.amd64#17 (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.130 2009/02/15 20:24:21 thompsa Exp $ +# $FreeBSD: src/sys/conf/files.amd64,v 1.131 2009/02/28 16:21:25 ed Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -271,4 +271,5 @@ i386/cpufreq/est.c optional cpufreq i386/cpufreq/p4tcc.c optional cpufreq # +libkern/memmove.c standard libkern/memset.c standard ==== //depot/projects/usb/src/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.614 2009/02/15 20:24:21 thompsa Exp $ +# $FreeBSD: src/sys/conf/files.i386,v 1.615 2009/02/28 16:21:25 ed Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -366,6 +366,7 @@ libkern/divdi3.c standard libkern/ffsl.c standard libkern/flsl.c standard +libkern/memmove.c standard libkern/memset.c standard libkern/moddi3.c standard libkern/qdivrem.c standard ==== //depot/projects/usb/src/sys/conf/files.ia64#11 (text+ko) ==== @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $FreeBSD: src/sys/conf/files.ia64,v 1.97 2009/02/15 20:24:21 thompsa Exp $ +# $FreeBSD: src/sys/conf/files.ia64,v 1.98 2009/02/28 16:21:25 ed Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -130,4 +130,5 @@ libkern/ia64/__umodsi3.S standard libkern/ia64/bswap16.S standard libkern/ia64/bswap32.S standard +libkern/memmove.c standard libkern/memset.c standard ==== //depot/projects/usb/src/sys/conf/files.mips#6 (text+ko) ==== @@ -18,7 +18,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.6 2008/12/01 16:53:01 sam Exp $ +# $FreeBSD: src/sys/conf/files.mips,v 1.7 2009/02/28 16:21:25 ed Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -82,6 +82,7 @@ libkern/fls.c standard libkern/flsl.c standard libkern/lshrdi3.c standard +libkern/memmove.c standard libkern/moddi3.c standard libkern/qdivrem.c standard libkern/udivdi3.c standard ==== //depot/projects/usb/src/sys/conf/files.pc98#16 (text+ko) ==== @@ -3,7 +3,7 @@ # # modified for PC-9801/PC-9821 # -# $FreeBSD: src/sys/conf/files.pc98,v 1.372 2009/02/15 20:24:21 thompsa Exp $ +# $FreeBSD: src/sys/conf/files.pc98,v 1.373 2009/02/28 16:21:25 ed Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -224,6 +224,7 @@ libkern/divdi3.c standard libkern/ffsl.c standard libkern/flsl.c standard +libkern/memmove.c standard libkern/memset.c standard libkern/moddi3.c standard libkern/qdivrem.c standard ==== //depot/projects/usb/src/sys/conf/files.powerpc#18 (text+ko) ==== @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $FreeBSD: src/sys/conf/files.powerpc,v 1.93 2009/02/21 02:15:08 nwhitehorn Exp $ +# $FreeBSD: src/sys/conf/files.powerpc,v 1.94 2009/02/28 16:21:25 ed Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -63,6 +63,7 @@ libkern/fls.c standard libkern/flsl.c standard libkern/lshrdi3.c standard +libkern/memmove.c standard libkern/memset.c standard libkern/moddi3.c standard libkern/qdivrem.c standard ==== //depot/projects/usb/src/sys/conf/files.sparc64#13 (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.105 2009/02/15 20:24:21 thompsa Exp $ +# $FreeBSD: src/sys/conf/files.sparc64,v 1.106 2009/02/28 16:21:25 ed Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -65,6 +65,7 @@ libkern/ffsl.c standard libkern/fls.c standard libkern/flsl.c standard +libkern/memmove.c standard sparc64/central/central.c optional central sparc64/ebus/ebus.c optional ebus sparc64/fhc/clkbrd.c optional fhc ==== //depot/projects/usb/src/sys/conf/files.sun4v#8 (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.sun4v,v 1.18 2008/12/20 00:33:10 nwhitehorn Exp $ +# $FreeBSD: src/sys/conf/files.sun4v,v 1.19 2009/02/28 16:21:25 ed Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -34,6 +34,7 @@ libkern/ffsl.c standard libkern/fls.c standard libkern/flsl.c standard +libkern/memmove.c standard sparc64/sparc64/autoconf.c standard sun4v/sun4v/bus_machdep.c standard sun4v/sun4v/clock.c standard ==== //depot/projects/usb/src/sys/conf/kern.mk#10 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/kern.mk,v 1.58 2009/02/22 18:45:30 nwhitehorn Exp $ +# $FreeBSD: src/sys/conf/kern.mk,v 1.59 2009/03/03 18:53:47 imp Exp $ # # Warning flags for compiling the kernel and components of the kernel. @@ -91,7 +91,7 @@ # .if ${MACHINE_ARCH} == "mips" CFLAGS+= -msoft-float -mno-dsp -INLINE_LIMIT?= 15000 +INLINE_LIMIT?= 8000 .endif # ==== //depot/projects/usb/src/sys/dev/ata/ata-all.c#14 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/ata-all.c,v 1.301 2009/02/26 23:07:40 mav Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/ata-all.c,v 1.303 2009/02/28 22:07:15 mav Exp $"); #include "opt_ata.h" #include @@ -291,7 +291,7 @@ ATA_LOCKING(dev, ATA_LF_UNLOCK); /* Add new children. */ - ata_identify(dev); +/* ata_identify(dev); */ if (bootverbose) device_printf(dev, "reinit done ..\n"); @@ -627,7 +627,7 @@ request->timeout = 1; request->retries = 0; request->u.ata.command = command; - request->flags = (ATA_R_READ|ATA_R_AT_HEAD|ATA_R_THREAD); + request->flags = (ATA_R_READ|ATA_R_AT_HEAD|ATA_R_DIRECT); if (!bootverbose) request->flags |= ATA_R_QUIET; request->data = (void *)&atadev->param; ==== //depot/projects/usb/src/sys/dev/ata/ata-all.h#11 (text+ko) ==== @@ -23,7 +23,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/ata/ata-all.h,v 1.140 2009/02/26 21:33:48 mav Exp $ + * $FreeBSD: src/sys/dev/ata/ata-all.h,v 1.142 2009/02/28 22:07:15 mav Exp $ */ /* ATA register defines */ @@ -367,6 +367,7 @@ #define ATA_R_AT_HEAD 0x00000200 #define ATA_R_REQUEUE 0x00000400 #define ATA_R_THREAD 0x00000800 +#define ATA_R_DIRECT 0x00001000 #define ATA_R_DEBUG 0x10000000 #define ATA_R_DANGER1 0x20000000 ==== //depot/projects/usb/src/sys/dev/ata/ata-disk.c#13 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/ata-disk.c,v 1.213 2009/02/21 16:39:26 mav Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/ata-disk.c,v 1.215 2009/02/28 22:07:15 mav Exp $"); #include "opt_ata.h" #include ==== //depot/projects/usb/src/sys/dev/ata/ata-queue.c#12 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/ata-queue.c,v 1.82 2009/02/26 23:21:32 mav Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/ata-queue.c,v 1.83 2009/02/28 22:07:15 mav Exp $"); #include "opt_ata.h" #include @@ -237,8 +237,14 @@ void ata_finish(struct ata_request *request) { + struct ata_channel *ch = device_get_softc(request->parent); - if (dumping) { + /* + * if in ATA_STALL_QUEUE state or request has ATA_R_DIRECT flags set + * we need to call ata_complete() directly here (no taskqueue involvement) + */ + if (dumping || + (ch->state & ATA_STALL_QUEUE) || (request->flags & ATA_R_DIRECT)) { ATA_DEBUG_RQ(request, "finish directly"); ata_completed(request, 0); } ==== //depot/projects/usb/src/sys/dev/ata/ata-raid.c#9 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/ata-raid.c,v 1.132 2009/02/26 21:33:48 mav Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/ata-raid.c,v 1.133 2009/02/28 22:07:15 mav Exp $"); #include "opt_ata.h" #include @@ -275,7 +275,7 @@ request->u.ata.feature = 0; request->timeout = 1; request->retries = 0; - request->flags |= ATA_R_ORDERED | ATA_R_THREAD; + request->flags |= ATA_R_ORDERED | ATA_R_DIRECT; ata_queue_request(request); } return 0; @@ -1570,7 +1570,7 @@ if (!(meta = malloc(size, M_AR, M_NOWAIT | M_ZERO))) return ENOMEM; if (ata_raid_rw(rdp->disks[disk].dev, lba, meta, size, - ATA_R_WRITE | ATA_R_THREAD)) { + ATA_R_WRITE | ATA_R_DIRECT)) { device_printf(rdp->disks[disk].dev, "wipe metadata failed\n"); error = EIO; } @@ -2264,7 +2264,7 @@ if (ata_raid_rw(rdp->disks[disk].dev, HPTV2_LBA(rdp->disks[disk].dev), meta, sizeof(struct promise_raid_conf), - ATA_R_WRITE | ATA_R_THREAD)) { + ATA_R_WRITE | ATA_R_DIRECT)) { device_printf(rdp->disks[disk].dev, "write metadata failed\n"); error = EIO; } @@ -2710,7 +2710,7 @@ if (rdp->disks[disk].dev) { if (ata_raid_rw(rdp->disks[disk].dev, INTEL_LBA(rdp->disks[disk].dev), - meta, 1024, ATA_R_WRITE | ATA_R_THREAD)) { + meta, 1024, ATA_R_WRITE | ATA_R_DIRECT)) { device_printf(rdp->disks[disk].dev, "write metadata failed\n"); error = EIO; } @@ -3055,7 +3055,7 @@ if (ata_raid_rw(rdp->disks[disk].dev, JMICRON_LBA(rdp->disks[disk].dev), meta, sizeof(struct jmicron_raid_conf), - ATA_R_WRITE | ATA_R_THREAD)) { + ATA_R_WRITE | ATA_R_DIRECT)) { device_printf(rdp->disks[disk].dev, "write metadata failed\n"); error = EIO; } @@ -3778,7 +3778,7 @@ if (ata_raid_rw(rdp->disks[disk].dev, PROMISE_LBA(rdp->disks[disk].dev), meta, sizeof(struct promise_raid_conf), - ATA_R_WRITE | ATA_R_THREAD)) { + ATA_R_WRITE | ATA_R_DIRECT)) { device_printf(rdp->disks[disk].dev, "write metadata failed\n"); error = EIO; } @@ -4126,7 +4126,7 @@ if (ata_raid_rw(rdp->disks[disk].dev, SIS_LBA(rdp->disks[disk].dev), meta, sizeof(struct sis_raid_conf), - ATA_R_WRITE | ATA_R_THREAD)) { + ATA_R_WRITE | ATA_R_DIRECT)) { device_printf(rdp->disks[disk].dev, "write metadata failed\n"); error = EIO; } @@ -4351,7 +4351,7 @@ if (ata_raid_rw(rdp->disks[disk].dev, VIA_LBA(rdp->disks[disk].dev), meta, sizeof(struct via_raid_conf), - ATA_R_WRITE | ATA_R_THREAD)) { + ATA_R_WRITE | ATA_R_DIRECT)) { device_printf(rdp->disks[disk].dev, "write metadata failed\n"); error = EIO; } ==== //depot/projects/usb/src/sys/dev/ata/ata-usb.c#40 (text) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/ata-usb.c,v 1.13 2009/02/27 19:27:33 mav Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/ata-usb.c,v 1.14 2009/03/02 05:37:05 thompsa Exp $"); #include "usbdevs.h" #include @@ -271,7 +271,7 @@ .size = sizeof(struct atausb2_softc), }; -DRIVER_MODULE(atausb, ushub, atausb2_driver, atausb2_devclass, 0, 0); +DRIVER_MODULE(atausb, uhub, atausb2_driver, atausb2_devclass, 0, 0); MODULE_DEPEND(atausb, usb, 1, 1, 1); MODULE_VERSION(atausb, 1); ==== //depot/projects/usb/src/sys/dev/ata/atapi-cam.c#10 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/atapi-cam.c,v 1.59 2009/02/04 20:23:42 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/atapi-cam.c,v 1.61 2009/02/28 22:07:15 mav Exp $"); #include #include ==== //depot/projects/usb/src/sys/dev/ata/atapi-cd.c#10 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/atapi-cd.c,v 1.203 2009/02/21 16:39:26 mav Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/atapi-cd.c,v 1.205 2009/02/28 22:07:15 mav Exp $"); #include "opt_ata.h" #include ==== //depot/projects/usb/src/sys/dev/ata/atapi-fd.c#8 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/atapi-fd.c,v 1.117 2009/02/21 16:39:26 mav Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/atapi-fd.c,v 1.119 2009/02/28 22:07:15 mav Exp $"); #include #include ==== //depot/projects/usb/src/sys/dev/ata/atapi-tape.c#9 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/atapi-tape.c,v 1.111 2009/02/21 16:39:26 mav Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/atapi-tape.c,v 1.113 2009/02/28 22:07:15 mav Exp $"); #include "opt_ata.h" #include ==== //depot/projects/usb/src/sys/dev/ata/chipsets/ata-ahci.c#4 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/chipsets/ata-ahci.c,v 1.16 2009/02/23 08:19:30 mav Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/chipsets/ata-ahci.c,v 1.18 2009/03/01 22:50:14 mav Exp $"); #include "opt_ata.h" #include @@ -470,7 +470,7 @@ clp->cmd_table_phys = htole64(ch->dma.work_bus + ATA_AHCI_CT_OFFSET); /* set PM port */ - ATA_OUTL(ctlr->r_res2, ATA_AHCI_P_FBS + offset, (port << 8) | 0x00000001); + //ATA_OUTL(ctlr->r_res2, ATA_AHCI_P_FBS + offset, (port << 8) | 0x00000001); /* issue command to controller */ ATA_OUTL(ctlr->r_res2, ATA_AHCI_P_CI + offset, 1); @@ -683,8 +683,7 @@ ctp->cfis[1] = port & 0x0f; //ctp->cfis[7] = ATA_D_LBA | ATA_D_IBM; ctp->cfis[15] = ATA_A_4BIT; - if (ata_ahci_issue_cmd(dev, 0, 0)) - return -1; + ata_ahci_issue_cmd(dev, 0, 1000); if (ata_ahci_wait_ready(dev, 1000)) { device_printf(dev, "software reset clear timeout\n"); ==== //depot/projects/usb/src/sys/dev/ata/chipsets/ata-promise.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/chipsets/ata-promise.c,v 1.6 2009/02/23 08:19:30 mav Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/chipsets/ata-promise.c,v 1.7 2009/03/03 06:39:38 mav Exp $"); #include "opt_ata.h" #include @@ -690,8 +690,11 @@ ATA_OUTL(ctlr->r_res2, (ch->unit + 1) << 2, 0x00000001); - /* set portmultiplier port */ - ATA_OUTB(ctlr->r_res2, 0x4e8 + (ch->unit << 8), atadev->unit & 0x0f); + if ((ctlr->chip->cfg2 == PR_SATA2) || + ((ctlr->chip->cfg2 == PR_CMBO2) && (ch->unit < 2))) { + /* set portmultiplier port */ + ATA_OUTB(ctlr->r_res2, 0x4e8 + (ch->unit << 8), atadev->unit & 0x0f); + } /* XXX SOS add ATAPI commands support later */ switch (request->u.ata.command) { ==== //depot/projects/usb/src/sys/dev/bce/if_bce.c#17 (text) ==== @@ -29,7 +29,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/bce/if_bce.c,v 1.51 2009/02/27 19:25:06 davidch Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/bce/if_bce.c,v 1.52 2009/03/04 00:05:40 davidch Exp $"); /* * The following controllers are supported by this driver: @@ -38,7 +38,7 @@ * BCM5708C B1, B2 * BCM5708S B1, B2 * BCM5709C A1, C0 - * BCM5716 C0 + * BCM5716C C0 * * The following controllers are not supported by this driver: * BCM5706C A0, A1 (pre-production) @@ -71,19 +71,19 @@ /* 1073741824 = 1 in 2 */ /* Controls how often the l2_fhdr frame error check will fail. */ - int bce_debug_l2fhdr_status_check = 0; + int l2fhdr_error_sim_control = 0; /* Controls how often the unexpected attention check will fail. */ - int bce_debug_unexpected_attention = 0; + int unexpected_attention_sim_control = 0; /* Controls how often to simulate an mbuf allocation failure. */ - int bce_debug_mbuf_allocation_failure = 0; + int mbuf_alloc_failed_sim_control = 0; /* Controls how often to simulate a DMA mapping failure. */ - int bce_debug_dma_map_addr_failure = 0; + int dma_map_addr_failed_sim_control = 0; /* Controls how often to simulate a bootcode failure. */ - int bce_debug_bootcode_running_failure = 0; + int bootcode_running_failure_sim_control = 0; #endif /****************************************************************************/ @@ -495,7 +495,8 @@ /* ToDo: Add tunable to enable/disable strict MTU handling. */ /* Currently allows "loose" RX MTU checking (i.e. sets the */ /* H/W RX MTU to the size of the largest receive buffer, or */ -/* 2048 bytes). */ +/* 2048 bytes). This will cause a UNH failure but is more */ +/* desireable from a functional perspective. */ /****************************************************************************/ @@ -595,7 +596,7 @@ } /* Firmware version and device features. */ - printf("F/W (0x%08X); Flags( ", sc->bce_fw_ver); + printf("B/C (0x%08X); Flags( ", sc->bce_bc_ver); #ifdef ZERO_COPY_SOCKETS printf("SPLT "); #endif @@ -846,7 +847,7 @@ __FUNCTION__, sc->bce_shmem_base); /* Fetch the bootcode revision. */ - sc->bce_fw_ver = REG_RD_IND(sc, sc->bce_shmem_base + + sc->bce_bc_ver = REG_RD_IND(sc, sc->bce_shmem_base + BCE_DEV_INFO_BC_REV); /* Check if any management firmware is running. */ @@ -2863,20 +2864,16 @@ bus_addr_t *busaddr = arg; >>> TRUNCATED FOR MAIL (1000 lines) <<<