PERFORCE change 133513 for review
Andre Oppermann
andre at FreeBSD.org
Thu Jan 17 15:59:40 PST 2008
http://perforce.freebsd.org/chv.cgi?CH=133513
Change 133513 by andre at andre_flirtbox on 2008/01/17 23:59:01
Integrate 133512
Affected files ...
.. //depot/projects/tcp_reass/amd64/amd64/pmap.c#2 integrate
.. //depot/projects/tcp_reass/amd64/include/_types.h#2 integrate
.. //depot/projects/tcp_reass/amd64/include/float.h#2 integrate
.. //depot/projects/tcp_reass/amd64/isa/clock.c#2 integrate
.. //depot/projects/tcp_reass/arm/arm/pmap.c#2 integrate
.. //depot/projects/tcp_reass/arm/arm/support.S#2 integrate
.. //depot/projects/tcp_reass/arm/xscale/ixp425/if_npe.c#2 integrate
.. //depot/projects/tcp_reass/boot/forth/loader.conf.5#2 integrate
.. //depot/projects/tcp_reass/cam/scsi/scsi_da.c#2 integrate
.. //depot/projects/tcp_reass/compat/linux/linux_file.c#2 integrate
.. //depot/projects/tcp_reass/compat/linux/linux_misc.c#2 integrate
.. //depot/projects/tcp_reass/compat/ndis/subr_ndis.c#2 integrate
.. //depot/projects/tcp_reass/compat/opensolaris/kern/opensolaris_kobj.c#2 integrate
.. //depot/projects/tcp_reass/compat/opensolaris/kern/opensolaris_vfs.c#2 integrate
.. //depot/projects/tcp_reass/compat/opensolaris/sys/vnode.h#2 integrate
.. //depot/projects/tcp_reass/compat/pecoff/imgact_pecoff.c#2 integrate
.. //depot/projects/tcp_reass/compat/svr4/imgact_svr4.c#2 integrate
.. //depot/projects/tcp_reass/compat/svr4/svr4_fcntl.c#2 integrate
.. //depot/projects/tcp_reass/compat/svr4/svr4_misc.c#2 integrate
.. //depot/projects/tcp_reass/conf/files#2 integrate
.. //depot/projects/tcp_reass/contrib/dev/acpica/evgpe.c#2 integrate
.. //depot/projects/tcp_reass/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c#2 integrate
.. //depot/projects/tcp_reass/contrib/opensolaris/uts/common/fs/zfs/zfs_replay.c#2 integrate
.. //depot/projects/tcp_reass/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#2 integrate
.. //depot/projects/tcp_reass/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#2 integrate
.. //depot/projects/tcp_reass/crypto/rijndael/rijndael-api.c#2 integrate
.. //depot/projects/tcp_reass/crypto/rijndael/test00.c#2 integrate
.. //depot/projects/tcp_reass/dev/acpica/Osd/OsdSchedule.c#2 integrate
.. //depot/projects/tcp_reass/dev/acpica/acpi_hpet.c#2 integrate
.. //depot/projects/tcp_reass/dev/acpica/acpi_hpet.h#1 branch
.. //depot/projects/tcp_reass/dev/ath/if_ath.c#2 integrate
.. //depot/projects/tcp_reass/dev/cxgb/cxgb_adapter.h#2 integrate
.. //depot/projects/tcp_reass/dev/cxgb/cxgb_main.c#2 integrate
.. //depot/projects/tcp_reass/dev/cxgb/cxgb_multiq.c#1 branch
.. //depot/projects/tcp_reass/dev/cxgb/cxgb_osdep.h#2 integrate
.. //depot/projects/tcp_reass/dev/cxgb/cxgb_sge.c#2 integrate
.. //depot/projects/tcp_reass/dev/cxgb/sys/cxgb_support.c#2 integrate
.. //depot/projects/tcp_reass/dev/cxgb/sys/mvec.h#2 integrate
.. //depot/projects/tcp_reass/dev/cxgb/sys/uipc_mvec.c#2 integrate
.. //depot/projects/tcp_reass/dev/drm/drm_drv.c#2 integrate
.. //depot/projects/tcp_reass/dev/gem/if_gem.c#2 integrate
.. //depot/projects/tcp_reass/dev/hptrr/hptrr_osm_bsd.c#2 integrate
.. //depot/projects/tcp_reass/dev/hwpmc/hwpmc_mod.c#2 integrate
.. //depot/projects/tcp_reass/dev/if_ndis/if_ndis.c#2 integrate
.. //depot/projects/tcp_reass/dev/md/md.c#2 integrate
.. //depot/projects/tcp_reass/dev/msk/if_msk.c#2 integrate
.. //depot/projects/tcp_reass/dev/mxge/eth_z8e.h#2 integrate
.. //depot/projects/tcp_reass/dev/mxge/ethp_z8e.h#2 integrate
.. //depot/projects/tcp_reass/dev/mxge/if_mxge.c#2 integrate
.. //depot/projects/tcp_reass/dev/mxge/if_mxge_var.h#2 integrate
.. //depot/projects/tcp_reass/dev/mxge/mxge_lro.c#2 integrate
.. //depot/projects/tcp_reass/dev/mxge/mxge_mcp.h#2 integrate
.. //depot/projects/tcp_reass/dev/mxge/mxge_rss_eth_z8e.c#1 branch
.. //depot/projects/tcp_reass/dev/mxge/mxge_rss_ethp_z8e.c#1 branch
.. //depot/projects/tcp_reass/dev/mxge/rss_eth_z8e.h#1 branch
.. //depot/projects/tcp_reass/dev/mxge/rss_ethp_z8e.h#1 branch
.. //depot/projects/tcp_reass/dev/nfe/if_nfe.c#2 integrate
.. //depot/projects/tcp_reass/dev/pci/pci_user.c#2 integrate
.. //depot/projects/tcp_reass/dev/puc/pucdata.c#2 integrate
.. //depot/projects/tcp_reass/dev/re/if_re.c#2 integrate
.. //depot/projects/tcp_reass/dev/stge/if_stge.c#2 integrate
.. //depot/projects/tcp_reass/dev/stge/if_stgereg.h#2 integrate
.. //depot/projects/tcp_reass/dev/wpi/if_wpi.c#2 integrate
.. //depot/projects/tcp_reass/fs/cd9660/cd9660_lookup.c#2 integrate
.. //depot/projects/tcp_reass/fs/cd9660/cd9660_vfsops.c#2 integrate
.. //depot/projects/tcp_reass/fs/coda/coda_vnops.c#2 integrate
.. //depot/projects/tcp_reass/fs/devfs/devfs_devs.c#2 integrate
.. //depot/projects/tcp_reass/fs/devfs/devfs_vfsops.c#2 integrate
.. //depot/projects/tcp_reass/fs/devfs/devfs_vnops.c#2 integrate
.. //depot/projects/tcp_reass/fs/fdescfs/fdesc_vnops.c#2 integrate
.. //depot/projects/tcp_reass/fs/fifofs/fifo_vnops.c#2 integrate
.. //depot/projects/tcp_reass/fs/hpfs/hpfs_vfsops.c#2 integrate
.. //depot/projects/tcp_reass/fs/hpfs/hpfs_vnops.c#2 integrate
.. //depot/projects/tcp_reass/fs/msdosfs/msdosfs_lookup.c#2 integrate
.. //depot/projects/tcp_reass/fs/msdosfs/msdosfs_vfsops.c#2 integrate
.. //depot/projects/tcp_reass/fs/msdosfs/msdosfs_vnops.c#2 integrate
.. //depot/projects/tcp_reass/fs/ntfs/ntfs_vfsops.c#2 integrate
.. //depot/projects/tcp_reass/fs/ntfs/ntfs_vnops.c#2 integrate
.. //depot/projects/tcp_reass/fs/nullfs/null_vfsops.c#2 integrate
.. //depot/projects/tcp_reass/fs/nullfs/null_vnops.c#2 integrate
.. //depot/projects/tcp_reass/fs/nwfs/nwfs_vfsops.c#2 integrate
.. //depot/projects/tcp_reass/fs/nwfs/nwfs_vnops.c#2 integrate
.. //depot/projects/tcp_reass/fs/procfs/procfs.c#2 integrate
.. //depot/projects/tcp_reass/fs/pseudofs/pseudofs_vncache.c#2 integrate
.. //depot/projects/tcp_reass/fs/pseudofs/pseudofs_vnops.c#2 integrate
.. //depot/projects/tcp_reass/fs/smbfs/smbfs_vfsops.c#2 integrate
.. //depot/projects/tcp_reass/fs/smbfs/smbfs_vnops.c#2 integrate
.. //depot/projects/tcp_reass/fs/tmpfs/tmpfs_vfsops.c#2 integrate
.. //depot/projects/tcp_reass/fs/tmpfs/tmpfs_vnops.c#2 integrate
.. //depot/projects/tcp_reass/fs/udf/udf_vfsops.c#2 integrate
.. //depot/projects/tcp_reass/fs/udf/udf_vnops.c#2 integrate
.. //depot/projects/tcp_reass/fs/unionfs/union_subr.c#2 integrate
.. //depot/projects/tcp_reass/fs/unionfs/union_vfsops.c#2 integrate
.. //depot/projects/tcp_reass/fs/unionfs/union_vnops.c#2 integrate
.. //depot/projects/tcp_reass/gnu/fs/ext2fs/ext2_lookup.c#2 integrate
.. //depot/projects/tcp_reass/gnu/fs/ext2fs/ext2_vfsops.c#2 integrate
.. //depot/projects/tcp_reass/gnu/fs/ext2fs/ext2_vnops.c#2 integrate
.. //depot/projects/tcp_reass/gnu/fs/ext2fs/fs.h#2 integrate
.. //depot/projects/tcp_reass/gnu/fs/reiserfs/reiserfs_inode.c#2 integrate
.. //depot/projects/tcp_reass/gnu/fs/reiserfs/reiserfs_namei.c#2 integrate
.. //depot/projects/tcp_reass/gnu/fs/reiserfs/reiserfs_vfsops.c#2 integrate
.. //depot/projects/tcp_reass/gnu/fs/xfs/FreeBSD/xfs_mountops.c#2 integrate
.. //depot/projects/tcp_reass/gnu/fs/xfs/FreeBSD/xfs_super.c#2 integrate
.. //depot/projects/tcp_reass/gnu/fs/xfs/FreeBSD/xfs_vnode.c#2 integrate
.. //depot/projects/tcp_reass/gnu/fs/xfs/FreeBSD/xfs_vnops.c#2 integrate
.. //depot/projects/tcp_reass/i386/i386/pmap.c#2 integrate
.. //depot/projects/tcp_reass/i386/ibcs2/ibcs2_misc.c#2 integrate
.. //depot/projects/tcp_reass/i386/ibcs2/imgact_coff.c#2 integrate
.. //depot/projects/tcp_reass/i386/include/pmap.h#2 integrate
.. //depot/projects/tcp_reass/i386/isa/clock.c#2 integrate
.. //depot/projects/tcp_reass/i386/linux/imgact_linux.c#2 integrate
.. //depot/projects/tcp_reass/kern/imgact_aout.c#2 integrate
.. //depot/projects/tcp_reass/kern/imgact_elf.c#2 integrate
.. //depot/projects/tcp_reass/kern/imgact_gzip.c#2 integrate
.. //depot/projects/tcp_reass/kern/kern_acct.c#2 integrate
.. //depot/projects/tcp_reass/kern/kern_alq.c#2 integrate
.. //depot/projects/tcp_reass/kern/kern_cpu.c#2 integrate
.. //depot/projects/tcp_reass/kern/kern_descrip.c#2 integrate
.. //depot/projects/tcp_reass/kern/kern_exec.c#2 integrate
.. //depot/projects/tcp_reass/kern/kern_exit.c#2 integrate
.. //depot/projects/tcp_reass/kern/kern_jail.c#2 integrate
.. //depot/projects/tcp_reass/kern/kern_ktrace.c#2 integrate
.. //depot/projects/tcp_reass/kern/kern_linker.c#2 integrate
.. //depot/projects/tcp_reass/kern/kern_mib.c#2 integrate
.. //depot/projects/tcp_reass/kern/kern_rwlock.c#2 integrate
.. //depot/projects/tcp_reass/kern/kern_sig.c#2 integrate
.. //depot/projects/tcp_reass/kern/link_elf.c#2 integrate
.. //depot/projects/tcp_reass/kern/link_elf_obj.c#2 integrate
.. //depot/projects/tcp_reass/kern/sched_ule.c#2 integrate
.. //depot/projects/tcp_reass/kern/tty_cons.c#2 integrate
.. //depot/projects/tcp_reass/kern/uipc_mbuf.c#2 integrate
.. //depot/projects/tcp_reass/kern/uipc_mqueue.c#2 integrate
.. //depot/projects/tcp_reass/kern/uipc_shm.c#2 integrate
.. //depot/projects/tcp_reass/kern/uipc_syscalls.c#2 integrate
.. //depot/projects/tcp_reass/kern/uipc_usrreq.c#2 integrate
.. //depot/projects/tcp_reass/kern/vfs_acl.c#2 integrate
.. //depot/projects/tcp_reass/kern/vfs_aio.c#2 integrate
.. //depot/projects/tcp_reass/kern/vfs_bio.c#2 integrate
.. //depot/projects/tcp_reass/kern/vfs_cache.c#2 integrate
.. //depot/projects/tcp_reass/kern/vfs_default.c#2 integrate
.. //depot/projects/tcp_reass/kern/vfs_extattr.c#2 integrate
.. //depot/projects/tcp_reass/kern/vfs_lookup.c#2 integrate
.. //depot/projects/tcp_reass/kern/vfs_mount.c#2 integrate
.. //depot/projects/tcp_reass/kern/vfs_subr.c#2 integrate
.. //depot/projects/tcp_reass/kern/vfs_syscalls.c#2 integrate
.. //depot/projects/tcp_reass/kern/vfs_vnops.c#2 integrate
.. //depot/projects/tcp_reass/kern/vnode_if.src#2 integrate
.. //depot/projects/tcp_reass/modules/cxgb/cxgb/Makefile#2 integrate
.. //depot/projects/tcp_reass/modules/mxge/Makefile#2 integrate
.. //depot/projects/tcp_reass/modules/mxge/mxge_rss_eth_z8e/Makefile#1 branch
.. //depot/projects/tcp_reass/modules/mxge/mxge_rss_ethp_z8e/Makefile#1 branch
.. //depot/projects/tcp_reass/net/if_bridge.c#2 integrate
.. //depot/projects/tcp_reass/netinet/tcp_reass.c#10 edit
.. //depot/projects/tcp_reass/netinet/tcp_var.h#4 edit
.. //depot/projects/tcp_reass/nfs4client/nfs4_vfsops.c#2 integrate
.. //depot/projects/tcp_reass/nfs4client/nfs4_vnops.c#2 integrate
.. //depot/projects/tcp_reass/nfsclient/nfs_socket.c#2 integrate
.. //depot/projects/tcp_reass/nfsclient/nfs_subs.c#2 integrate
.. //depot/projects/tcp_reass/nfsclient/nfs_vfsops.c#2 integrate
.. //depot/projects/tcp_reass/nfsclient/nfs_vnops.c#2 integrate
.. //depot/projects/tcp_reass/nfsserver/nfs_serv.c#2 integrate
.. //depot/projects/tcp_reass/nfsserver/nfs_srvsubs.c#2 integrate
.. //depot/projects/tcp_reass/pci/if_rlreg.h#2 integrate
.. //depot/projects/tcp_reass/security/audit/audit_arg.c#2 integrate
.. //depot/projects/tcp_reass/security/audit/audit_syscalls.c#2 integrate
.. //depot/projects/tcp_reass/security/audit/audit_worker.c#2 integrate
.. //depot/projects/tcp_reass/security/mac/mac_process.c#2 integrate
.. //depot/projects/tcp_reass/security/mac/mac_syscalls.c#2 integrate
.. //depot/projects/tcp_reass/sys/mbuf.h#2 integrate
.. //depot/projects/tcp_reass/sys/param.h#2 integrate
.. //depot/projects/tcp_reass/sys/pmc.h#2 integrate
.. //depot/projects/tcp_reass/sys/vnode.h#2 integrate
.. //depot/projects/tcp_reass/ufs/ffs/ffs_rawread.c#2 integrate
.. //depot/projects/tcp_reass/ufs/ffs/ffs_snapshot.c#2 integrate
.. //depot/projects/tcp_reass/ufs/ffs/ffs_softdep.c#2 integrate
.. //depot/projects/tcp_reass/ufs/ffs/ffs_vfsops.c#2 integrate
.. //depot/projects/tcp_reass/ufs/ffs/ffs_vnops.c#2 integrate
.. //depot/projects/tcp_reass/ufs/ufs/ufs_extattr.c#2 integrate
.. //depot/projects/tcp_reass/ufs/ufs/ufs_lookup.c#2 integrate
.. //depot/projects/tcp_reass/ufs/ufs/ufs_quota.c#2 integrate
.. //depot/projects/tcp_reass/ufs/ufs/ufs_vnops.c#2 integrate
.. //depot/projects/tcp_reass/vm/swap_pager.c#2 integrate
.. //depot/projects/tcp_reass/vm/vm_contig.c#2 integrate
.. //depot/projects/tcp_reass/vm/vm_object.c#2 integrate
.. //depot/projects/tcp_reass/vm/vnode_pager.c#2 integrate
Differences ...
==== //depot/projects/tcp_reass/amd64/amd64/pmap.c#2 (text+ko) ====
@@ -77,7 +77,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.603 2008/01/08 08:30:30 alc Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.605 2008/01/17 18:25:51 alc Exp $");
/*
* Manages physical address maps.
@@ -149,11 +149,7 @@
#define PMAP_SHPGPERPROC 200
#endif
-#if defined(DIAGNOSTIC)
-#define PMAP_DIAGNOSTIC
-#endif
-
-#if !defined(PMAP_DIAGNOSTIC)
+#if !defined(DIAGNOSTIC)
#define PMAP_INLINE __gnu89_inline
#else
#define PMAP_INLINE
@@ -2249,12 +2245,9 @@
boolean_t invlva;
va = trunc_page(va);
-#ifdef PMAP_DIAGNOSTIC
- if (va > VM_MAX_KERNEL_ADDRESS)
- panic("pmap_enter: toobig");
- if ((va >= UPT_MIN_ADDRESS) && (va < UPT_MAX_ADDRESS))
- panic("pmap_enter: invalid to pmap_enter page table pages (va: 0x%lx)", va);
-#endif
+ KASSERT(va <= VM_MAX_KERNEL_ADDRESS, ("pmap_enter: toobig"));
+ KASSERT(va < UPT_MIN_ADDRESS || va >= UPT_MAX_ADDRESS,
+ ("pmap_enter: invalid to pmap_enter page table pages (va: 0x%lx)", va));
mpte = NULL;
@@ -2268,19 +2261,9 @@
if (va < VM_MAXUSER_ADDRESS) {
mpte = pmap_allocpte(pmap, va, M_WAITOK);
}
-#if 0 && defined(PMAP_DIAGNOSTIC)
- else {
- pd_entry_t *pdeaddr = pmap_pde(pmap, va);
- origpte = *pdeaddr;
- if ((origpte & PG_V) == 0) {
- panic("pmap_enter: invalid kernel page table page, pde=%p, va=%p\n",
- origpte, va);
- }
- }
-#endif
pde = pmap_pde(pmap, va);
- if (pde != NULL) {
+ if (pde != NULL && (*pde & PG_V) != 0) {
if ((*pde & PG_PS) != 0)
panic("pmap_enter: attempted pmap_enter on 2MB page");
pte = pmap_pde_to_pte(pde, va);
@@ -2291,7 +2274,7 @@
* Page Directory table entry not valid, we need a new PT page
*/
if (pte == NULL)
- panic("pmap_enter: invalid page directory va=%#lx\n", va);
+ panic("pmap_enter: invalid page directory va=%#lx", va);
pa = VM_PAGE_TO_PHYS(m);
om = NULL;
@@ -2745,8 +2728,8 @@
pdp_entry_t *pdpe;
pd_entry_t srcptepaddr, *pde;
- if (addr >= UPT_MIN_ADDRESS)
- panic("pmap_copy: invalid to pmap_copy page tables");
+ KASSERT(addr < UPT_MIN_ADDRESS,
+ ("pmap_copy: invalid to pmap_copy page tables"));
pml4e = pmap_pml4e(src_pmap, addr);
if ((*pml4e & PG_V) == 0) {
@@ -2784,8 +2767,8 @@
}
srcmpte = PHYS_TO_VM_PAGE(srcptepaddr & PG_FRAME);
- if (srcmpte->wire_count == 0)
- panic("pmap_copy: source page table page is unused");
+ KASSERT(srcmpte->wire_count > 0,
+ ("pmap_copy: source page table page is unused"));
if (va_next > end_addr)
va_next = end_addr;
@@ -3104,7 +3087,7 @@
PMAP_LOCK(pmap);
pde = pmap_pde(pmap, addr);
if (pde != NULL && (*pde & PG_V)) {
- pte = vtopte(addr);
+ pte = pmap_pde_to_pte(pde, addr);
rv = (*pte & PG_V) == 0;
}
PMAP_UNLOCK(pmap);
==== //depot/projects/tcp_reass/amd64/include/_types.h#2 (text+ko) ====
@@ -33,7 +33,7 @@
*
* From: @(#)ansi.h 8.2 (Berkeley) 1/4/94
* From: @(#)types.h 8.3 (Berkeley) 1/5/94
- * $FreeBSD: src/sys/amd64/include/_types.h,v 1.11 2006/01/09 06:05:56 imp Exp $
+ * $FreeBSD: src/sys/amd64/include/_types.h,v 1.12 2008/01/17 13:12:46 bde Exp $
*/
#ifndef _MACHINE__TYPES_H_
@@ -64,7 +64,7 @@
typedef unsigned int __cpumask_t;
typedef __int64_t __critical_t;
typedef double __double_t;
-typedef double __float_t;
+typedef float __float_t;
typedef __int64_t __intfptr_t;
typedef __int64_t __intmax_t;
typedef __int64_t __intptr_t;
==== //depot/projects/tcp_reass/amd64/include/float.h#2 (text+ko) ====
@@ -27,7 +27,7 @@
* SUCH DAMAGE.
*
* from: @(#)float.h 7.1 (Berkeley) 5/8/90
- * $FreeBSD: src/sys/amd64/include/float.h,v 1.15 2005/01/05 20:17:20 imp Exp $
+ * $FreeBSD: src/sys/amd64/include/float.h,v 1.16 2008/01/17 13:12:46 bde Exp $
*/
#ifndef _MACHINE_FLOAT_H_
@@ -42,7 +42,7 @@
#define FLT_RADIX 2 /* b */
#define FLT_ROUNDS __flt_rounds()
#if __ISO_C_VISIBLE >= 1999
-#define FLT_EVAL_METHOD (-1) /* i387 semantics are...interesting */
+#define FLT_EVAL_METHOD 0 /* no promotions */
#define DECIMAL_DIG 21 /* max precision in decimal digits */
#endif
==== //depot/projects/tcp_reass/amd64/isa/clock.c#2 (text+ko) ====
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/isa/clock.c,v 1.235 2007/10/26 03:23:53 peter Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/isa/clock.c,v 1.236 2008/01/17 18:59:38 jhb Exp $");
/*
* Routines to handle clock hardware.
@@ -286,6 +286,7 @@
start = rdtsc();
end = start + (tsc_freq * n) / 1000000;
do {
+ cpu_spinwait();
now = rdtsc();
} while (now < end || (now > start && end < start));
sched_unpin();
==== //depot/projects/tcp_reass/arm/arm/pmap.c#2 (text+ko) ====
@@ -147,7 +147,7 @@
#include "opt_vm.h"
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/arm/arm/pmap.c,v 1.96 2008/01/03 07:34:33 alc Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/arm/pmap.c,v 1.97 2008/01/17 12:41:59 cognet Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
@@ -3828,7 +3828,8 @@
bzero(&pmap->pm_stats, sizeof pmap->pm_stats);
pmap->pm_stats.resident_count = 1;
if (vector_page < KERNBASE) {
- pmap_enter(pmap, vector_page, PHYS_TO_VM_PAGE(systempage.pv_pa),
+ pmap_enter(pmap, vector_page,
+ VM_PROT_READ, PHYS_TO_VM_PAGE(systempage.pv_pa),
VM_PROT_READ, 1);
}
return (1);
==== //depot/projects/tcp_reass/arm/arm/support.S#2 (text+ko) ====
@@ -23,10 +23,79 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*/
+/*
+ * Copyright 2003 Wasabi Systems, Inc.
+ * All rights reserved.
+ *
+ * Written by Steve C. Woodford for Wasabi Systems, Inc.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ * must display the following acknowledgement:
+ * This product includes software developed for the NetBSD Project by
+ * Wasabi Systems, Inc.
+ * 4. The name of Wasabi Systems, Inc. may not be used to endorse
+ * or promote products derived from this software without specific prior
+ * written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY WASABI SYSTEMS, INC. ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL WASABI SYSTEMS, INC
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+/*
+ * Copyright (c) 1997 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Neil A. Carson and Mark Brinicombe
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ * must display the following acknowledgement:
+ * This product includes software developed by the NetBSD
+ * Foundation, Inc. and its contributors.
+ * 4. Neither the name of The NetBSD Foundation nor the names of its
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
#include <machine/asm.h>
#include <machine/asmacros.h>
-__FBSDID("$FreeBSD: src/sys/arm/arm/support.S,v 1.13 2007/10/13 12:05:03 cognet Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/arm/support.S,v 1.14 2008/01/12 21:11:43 cognet Exp $");
#include "assym.s"
==== //depot/projects/tcp_reass/arm/xscale/ixp425/if_npe.c#2 (text+ko) ====
@@ -23,7 +23,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/arm/xscale/ixp425/if_npe.c,v 1.7 2007/11/04 21:54:52 cognet Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/xscale/ixp425/if_npe.c,v 1.8 2008/01/17 23:37:46 jhb Exp $");
/*
* Intel XScale NPE Ethernet driver.
@@ -1140,90 +1140,6 @@
}
/*
- * Defragment an mbuf chain, returning at most maxfrags separate
- * mbufs+clusters. If this is not possible NULL is returned and
- * the original mbuf chain is left in it's present (potentially
- * modified) state. We use two techniques: collapsing consecutive
- * mbufs and replacing consecutive mbufs by a cluster.
- */
-static struct mbuf *
-npe_defrag(struct mbuf *m0, int how, int maxfrags)
-{
- struct mbuf *m, *n, *n2, **prev;
- u_int curfrags;
-
- /*
- * Calculate the current number of frags.
- */
- curfrags = 0;
- for (m = m0; m != NULL; m = m->m_next)
- curfrags++;
- /*
- * First, try to collapse mbufs. Note that we always collapse
- * towards the front so we don't need to deal with moving the
- * pkthdr. This may be suboptimal if the first mbuf has much
- * less data than the following.
- */
- m = m0;
-again:
- for (;;) {
- n = m->m_next;
- if (n == NULL)
- break;
- if ((m->m_flags & M_RDONLY) == 0 &&
- n->m_len < M_TRAILINGSPACE(m)) {
- bcopy(mtod(n, void *), mtod(m, char *) + m->m_len,
- n->m_len);
- m->m_len += n->m_len;
- m->m_next = n->m_next;
- m_free(n);
- if (--curfrags <= maxfrags)
- return m0;
- } else
- m = n;
- }
- KASSERT(maxfrags > 1,
- ("maxfrags %u, but normal collapse failed", maxfrags));
- /*
- * Collapse consecutive mbufs to a cluster.
- */
- prev = &m0->m_next; /* NB: not the first mbuf */
- while ((n = *prev) != NULL) {
- if ((n2 = n->m_next) != NULL &&
- n->m_len + n2->m_len < MCLBYTES) {
- m = m_getcl(how, MT_DATA, 0);
- if (m == NULL)
- goto bad;
- bcopy(mtod(n, void *), mtod(m, void *), n->m_len);
- bcopy(mtod(n2, void *), mtod(m, char *) + n->m_len,
- n2->m_len);
- m->m_len = n->m_len + n2->m_len;
- m->m_next = n2->m_next;
- *prev = m;
- m_free(n);
- m_free(n2);
- if (--curfrags <= maxfrags) /* +1 cl -2 mbufs */
- return m0;
- /*
- * Still not there, try the normal collapse
- * again before we allocate another cluster.
- */
- goto again;
- }
- prev = &n->m_next;
- }
- /*
- * No place where we can collapse to a cluster; punt.
- * This can occur if, for example, you request 2 frags
- * but the packet requires that both be clusters (we
- * never reallocate the first mbuf to avoid moving the
- * packet header).
- */
-bad:
- return NULL;
-}
-
-/*
* Dequeue packets and place on the h/w transmit queue.
*/
static void
@@ -1254,7 +1170,7 @@
error = bus_dmamap_load_mbuf_sg(dma->mtag, npe->ix_map,
m, segs, &nseg, 0);
if (error == EFBIG) {
- n = npe_defrag(m, M_DONTWAIT, NPE_MAXSEG);
+ n = m_collapse(m, M_DONTWAIT, NPE_MAXSEG);
if (n == NULL) {
if_printf(ifp, "%s: too many fragments %u\n",
__func__, nseg);
==== //depot/projects/tcp_reass/boot/forth/loader.conf.5#2 (text+ko) ====
@@ -22,8 +22,8 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD: src/sys/boot/forth/loader.conf.5,v 1.26 2005/11/18 10:34:24 ru Exp $
-.Dd November 15, 2005
+.\" $FreeBSD: src/sys/boot/forth/loader.conf.5,v 1.28 2008/01/16 07:00:55 keramida Exp $
+.Dd January 16, 2008
.Dt LOADER.CONF 5
.Os
.Sh NAME
@@ -238,6 +238,16 @@
.Xr boot 8 ,
.Xr loader 8 ,
.Xr loader.4th 8
+.Sh BUGS
+The
+.Xr loader 8
+stops reading
+.Nm
+when it encounters a syntax error, so any options which are vital for
+booting a particular system (i.e.\&
+.Dq Va hw.ata.ata_dma Ns "=0" )
+should precede any experimental additions to
+.Nm .
.Sh HISTORY
The file
.Nm
==== //depot/projects/tcp_reass/cam/scsi/scsi_da.c#2 (text+ko) ====
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_da.c,v 1.225 2007/12/11 06:41:38 davidxu Exp $");
+__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_da.c,v 1.226 2008/01/12 19:24:55 maxim Exp $");
#include <sys/param.h>
@@ -477,7 +477,7 @@
* PR: usb/96546
*/
{T_DIRECT, SIP_MEDIA_REMOVABLE, "EM732X", "MP3 Player*",
- "1.0"}, /*quirks*/ DA_Q_NO_SYNC_CACHE
+ "1.00"}, /*quirks*/ DA_Q_NO_SYNC_CACHE
},
{
/*
==== //depot/projects/tcp_reass/compat/linux/linux_file.c#2 (text+ko) ====
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/compat/linux/linux_file.c,v 1.108 2008/01/10 01:10:41 attilio Exp $");
+__FBSDID("$FreeBSD: src/sys/compat/linux/linux_file.c,v 1.109 2008/01/13 14:43:59 attilio Exp $");
#include "opt_compat.h"
#include "opt_mac.h"
@@ -598,7 +598,7 @@
if (cookies)
free(cookies, M_TEMP);
- VOP_UNLOCK(vp, 0, td);
+ VOP_UNLOCK(vp, 0);
VFS_UNLOCK_GIANT(vfslocked);
fdrop(fp, td);
free(buf, M_TEMP);
==== //depot/projects/tcp_reass/compat/linux/linux_misc.c#2 (text+ko) ====
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/compat/linux/linux_misc.c,v 1.215 2007/10/24 19:03:52 rwatson Exp $");
+__FBSDID("$FreeBSD: src/sys/compat/linux/linux_misc.c,v 1.216 2008/01/13 14:43:59 attilio Exp $");
#include "opt_compat.h"
#include "opt_mac.h"
@@ -377,7 +377,7 @@
* Lock no longer needed
*/
locked = 0;
- VOP_UNLOCK(vp, 0, td);
+ VOP_UNLOCK(vp, 0);
VFS_UNLOCK_GIANT(vfslocked);
/*
@@ -458,7 +458,7 @@
cleanup:
/* Unlock vnode if needed */
if (locked) {
- VOP_UNLOCK(vp, 0, td);
+ VOP_UNLOCK(vp, 0);
VFS_UNLOCK_GIANT(vfslocked);
}
==== //depot/projects/tcp_reass/compat/ndis/subr_ndis.c#2 (text+ko) ====
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/compat/ndis/subr_ndis.c,v 1.110 2007/12/03 23:43:58 thompsa Exp $");
+__FBSDID("$FreeBSD: src/sys/compat/ndis/subr_ndis.c,v 1.111 2008/01/13 14:43:59 attilio Exp $");
/*
* This file implements a translation layer between the BSD networking
@@ -2970,7 +2970,7 @@
/* Get the file size. */
VOP_GETATTR(nd.ni_vp, vap, td->td_ucred, td);
- VOP_UNLOCK(nd.ni_vp, 0, td);
+ VOP_UNLOCK(nd.ni_vp, 0);
VFS_UNLOCK_GIANT(vfslocked);
fh->nf_vp = nd.ni_vp;
==== //depot/projects/tcp_reass/compat/opensolaris/kern/opensolaris_kobj.c#2 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/compat/opensolaris/kern/opensolaris_kobj.c,v 1.5 2008/01/10 01:10:42 attilio Exp $");
+__FBSDID("$FreeBSD: src/sys/compat/opensolaris/kern/opensolaris_kobj.c,v 1.6 2008/01/13 14:43:59 attilio Exp $");
#include <sys/types.h>
#include <sys/systm.h>
@@ -77,12 +77,12 @@
flags = FREAD;
NDINIT(&nd, LOOKUP, NOFOLLOW, UIO_SYSSPACE, file, td);
- error = vn_open_cred(&nd, &flags, 0, td->td_ucred, NULL);
+ error = vn_open_cred(&nd, &flags, 0, curthread->td_ucred, NULL);
NDFREE(&nd, NDF_ONLY_PNBUF);
if (error != 0)
return (NULL);
/* We just unlock so we hold a reference. */
- VOP_UNLOCK(nd.ni_vp, 0, td);
+ VOP_UNLOCK(nd.ni_vp, 0);
return (nd.ni_vp);
}
@@ -125,7 +125,7 @@
vn_lock(vp, LK_SHARED | LK_RETRY);
error = VOP_GETATTR(vp, &va, td->td_ucred, td);
- VOP_UNLOCK(vp, 0, td);
+ VOP_UNLOCK(vp, 0);
if (error == 0)
*size = (uint64_t)va.va_size;
return (error);
@@ -178,7 +178,7 @@
vn_lock(vp, LK_SHARED | LK_RETRY);
error = VOP_READ(vp, &auio, IO_UNIT | IO_SYNC, td->td_ucred);
- VOP_UNLOCK(vp, 0, td);
+ VOP_UNLOCK(vp, 0);
return (error != 0 ? -1 : size - auio.uio_resid);
}
==== //depot/projects/tcp_reass/compat/opensolaris/kern/opensolaris_vfs.c#2 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/compat/opensolaris/kern/opensolaris_vfs.c,v 1.8 2008/01/10 01:10:42 attilio Exp $");
+__FBSDID("$FreeBSD: src/sys/compat/opensolaris/kern/opensolaris_vfs.c,v 1.9 2008/01/13 14:43:59 attilio Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
@@ -194,7 +194,7 @@
*/
vn_lock(vp, LK_SHARED | LK_RETRY);
mp = vfs_mount_alloc(vp, vfsp, fspath, td);
- VOP_UNLOCK(vp, 0, td);
+ VOP_UNLOCK(vp, 0);
mp->mnt_optnew = NULL;
vfs_setmntopt(mp, "from", fspec, 0);
@@ -260,7 +260,7 @@
panic("mount: lost mount");
mountcheckdirs(vp, mvp);
vput(mvp);
- VOP_UNLOCK(vp, 0, td);
+ VOP_UNLOCK(vp, 0);
if ((mp->mnt_flag & MNT_RDONLY) == 0)
error = vfs_allocate_syncvnode(mp);
vfs_unbusy(mp, td);
@@ -272,7 +272,7 @@
VI_LOCK(vp);
vp->v_iflag &= ~VI_MOUNT;
VI_UNLOCK(vp);
- VOP_UNLOCK(vp, 0, td);
+ VOP_UNLOCK(vp, 0);
vfs_unbusy(mp, td);
vfs_mount_destroy(mp);
}
==== //depot/projects/tcp_reass/compat/opensolaris/sys/vnode.h#2 (text+ko) ====
@@ -23,7 +23,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/sys/compat/opensolaris/sys/vnode.h,v 1.4 2008/01/10 01:10:42 attilio Exp $
+ * $FreeBSD: src/sys/compat/opensolaris/sys/vnode.h,v 1.5 2008/01/13 14:44:01 attilio Exp $
*/
#ifndef _OPENSOLARIS_SYS_VNODE_H_
@@ -175,7 +175,7 @@
if (error == 0) {
/* We just unlock so we hold a reference. */
VN_HOLD(nd.ni_vp);
- VOP_UNLOCK(nd.ni_vp, 0, td);
+ VOP_UNLOCK(nd.ni_vp, 0);
*vpp = nd.ni_vp;
}
return (error);
@@ -213,7 +213,6 @@
static __inline int
zfs_vop_fsync(vnode_t *vp, int flag, cred_t *cr)
{
- struct thread *td = curthread;
struct mount *mp;
int error, vfslocked;
@@ -223,8 +222,8 @@
if ((error = vn_start_write(vp, &mp, V_WAIT | PCATCH)) != 0)
goto drop;
vn_lock(vp, LK_EXCLUSIVE | LK_RETRY);
- error = VOP_FSYNC(vp, MNT_WAIT, td);
- VOP_UNLOCK(vp, 0, td);
+ error = VOP_FSYNC(vp, MNT_WAIT, curthread);
+ VOP_UNLOCK(vp, 0);
vn_finished_write(mp);
drop:
VFS_UNLOCK_GIANT(vfslocked);
==== //depot/projects/tcp_reass/compat/pecoff/imgact_pecoff.c#2 (text+ko) ====
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/compat/pecoff/imgact_pecoff.c,v 1.42 2008/01/10 01:10:42 attilio Exp $");
+__FBSDID("$FreeBSD: src/sys/compat/pecoff/imgact_pecoff.c,v 1.43 2008/01/13 14:44:01 attilio Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -316,7 +316,7 @@
* Check permissions, modes, uid, etc on the file, and "open" it.
*/
error = exec_check_permissions(imgp);
- VOP_UNLOCK(nd.ni_vp, 0, td);
+ VOP_UNLOCK(nd.ni_vp, 0);
if (error)
goto fail;
if ((error = pecoff_read_from(td, imgp->vp, 0, (caddr_t) & dh, sizeof(dh))) != 0)
@@ -579,14 +579,13 @@
imgp->image_header;
struct coff_filehdr *fp;
int error, peofs;
- struct thread *td = curthread;
error = pecoff_signature(FIRST_THREAD_IN_PROC(imgp->proc),
imgp->vp, dp);
if (error) {
return -1;
}
- VOP_UNLOCK(imgp->vp, 0, td);
+ VOP_UNLOCK(imgp->vp, 0);
peofs = dp->d_peofs + sizeof(signature) - 1;
fp = malloc(PECOFF_HDR_SIZE, M_TEMP, M_WAITOK);
==== //depot/projects/tcp_reass/compat/svr4/imgact_svr4.c#2 (text+ko) ====
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/compat/svr4/imgact_svr4.c,v 1.27 2008/01/10 01:10:42 attilio Exp $");
+__FBSDID("$FreeBSD: src/sys/compat/svr4/imgact_svr4.c,v 1.28 2008/01/13 14:44:01 attilio Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -68,7 +68,6 @@
vm_offset_t buffer;
unsigned long bss_size;
int error;
- struct thread *td = curthread;
if (((a_out->a_magic >> 16) & 0xff) != 0x64)
return -1;
@@ -115,7 +114,7 @@
}
PROC_UNLOCK(imgp->proc);
- VOP_UNLOCK(imgp->vp, 0, td);
+ VOP_UNLOCK(imgp->vp, 0);
/*
* Destroy old process VM and create a new one (with a new stack)
==== //depot/projects/tcp_reass/compat/svr4/svr4_fcntl.c#2 (text+ko) ====
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/compat/svr4/svr4_fcntl.c,v 1.42 2008/01/10 01:10:42 attilio Exp $");
+__FBSDID("$FreeBSD: src/sys/compat/svr4/svr4_fcntl.c,v 1.43 2008/01/13 14:44:01 attilio Exp $");
#include "opt_mac.h"
@@ -272,7 +272,7 @@
#ifdef MAC
vn_lock(vp, LK_EXCLUSIVE | LK_RETRY);
error = mac_vnode_check_revoke(td->td_ucred, vp);
- VOP_UNLOCK(vp, 0, td);
+ VOP_UNLOCK(vp, 0);
if (error)
goto out;
#endif
==== //depot/projects/tcp_reass/compat/svr4/svr4_misc.c#2 (text+ko) ====
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/compat/svr4/svr4_misc.c,v 1.99 2008/01/10 01:10:43 attilio Exp $");
+__FBSDID("$FreeBSD: src/sys/compat/svr4/svr4_misc.c,v 1.100 2008/01/13 14:44:01 attilio Exp $");
#include "opt_mac.h"
@@ -396,7 +396,7 @@
eof:
td->td_retval[0] = nbytes - resid;
out:
- VOP_UNLOCK(vp, 0, td);
+ VOP_UNLOCK(vp, 0);
VFS_UNLOCK_GIANT(vfslocked);
fdrop(fp, td);
if (cookies)
@@ -529,7 +529,7 @@
eof:
*retval = uap->nbytes - resid;
out:
- VOP_UNLOCK(vp, 0, td);
+ VOP_UNLOCK(vp, 0);
VFS_UNLOCK_GIANT(vfslocked);
fdrop(fp, td);
if (cookiebuf)
@@ -629,7 +629,7 @@
if (error)
goto fail;
#endif
- VOP_UNLOCK(vp, 0, td);
+ VOP_UNLOCK(vp, 0);
error = change_root(vp, td);
vrele(vp);
VFS_UNLOCK_GIANT(vfslocked);
==== //depot/projects/tcp_reass/conf/files#2 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/conf/files,v 1.1262 2008/01/08 21:58:14 jhb Exp $
+# $FreeBSD: src/sys/conf/files,v 1.1264 2008/01/15 20:34:47 gallatin Exp $
#
# The long compile-with and dependency lines are required because of
# limitations in config: backslash-newline doesn't work in strings, and
@@ -518,6 +518,7 @@
dev/cxgb/cxgb_l2t.c optional cxgb pci
dev/cxgb/cxgb_lro.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
@@ -828,6 +829,8 @@
dev/mxge/mxge_lro.c optional mxge pci
dev/mxge/mxge_eth_z8e.c optional mxge pci
dev/mxge/mxge_ethp_z8e.c optional mxge pci
+dev/mxge/mxge_rss_eth_z8e.c optional mxge pci
+dev/mxge/mxge_rss_ethp_z8e.c optional mxge pci
dev/my/if_my.c optional my
dev/ncv/ncr53c500.c optional ncv
dev/ncv/ncr53c500_pccard.c optional ncv pccard
==== //depot/projects/tcp_reass/contrib/dev/acpica/evgpe.c#2 (text+ko) ====
@@ -123,6 +123,10 @@
/* Local prototypes */
+static void
+AcpiEvAsynchEnableGpe (
+ void *Context);
+
static void ACPI_SYSTEM_XFACE
AcpiEvAsynchExecuteGpeMethod (
void *Context);
@@ -684,14 +688,26 @@
}
}
- if ((LocalGpeEventInfo.Flags & ACPI_GPE_XRUPT_TYPE_MASK) ==
+ /* Defer enabling of GPE until all notify handlers are done */
+ AcpiOsExecute(OSL_NOTIFY_HANDLER, AcpiEvAsynchEnableGpe, GpeEventInfo);
+ return_VOID;
+}
+
+static void
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list