PERFORCE change 120307 for review
Roman Divacky
rdivacky at FreeBSD.org
Thu May 24 08:18:54 UTC 2007
http://perforce.freebsd.org/chv.cgi?CH=120307
Change 120307 by rdivacky at rdivacky_witten on 2007/05/24 08:10:52
IFC
Affected files ...
.. //depot/projects/soc2007/rdivacky/linux_futex/sys/amd64/amd64/elf_machdep.c#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_futex/sys/amd64/amd64/pmap.c#3 integrate
.. //depot/projects/soc2007/rdivacky/linux_futex/sys/amd64/amd64/support.S#4 integrate
.. //depot/projects/soc2007/rdivacky/linux_futex/sys/arm/arm/busdma_machdep.c#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_futex/sys/arm/arm/elf_machdep.c#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_futex/sys/arm/arm/genassym.c#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_futex/sys/arm/arm/machdep.c#3 integrate
.. //depot/projects/soc2007/rdivacky/linux_futex/sys/arm/arm/pmap.c#3 integrate
.. //depot/projects/soc2007/rdivacky/linux_futex/sys/arm/arm/vm_machdep.c#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_futex/sys/arm/at91/kb920x_machdep.c#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_futex/sys/arm/include/asm.h#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_futex/sys/arm/include/pmap.h#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_futex/sys/arm/include/profile.h#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_futex/sys/arm/xscale/i80321/ep80219_machdep.c#3 integrate
.. //depot/projects/soc2007/rdivacky/linux_futex/sys/arm/xscale/i80321/iq31244_machdep.c#3 integrate
.. //depot/projects/soc2007/rdivacky/linux_futex/sys/arm/xscale/ixp425/avila_machdep.c#3 integrate
.. //depot/projects/soc2007/rdivacky/linux_futex/sys/boot/i386/libi386/smbios.c#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_futex/sys/cam/cam.c#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_futex/sys/cam/scsi/scsi_all.c#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_futex/sys/compat/freebsd32/freebsd32_misc.c#3 integrate
.. //depot/projects/soc2007/rdivacky/linux_futex/sys/compat/ia32/ia32_sysvec.c#3 integrate
.. //depot/projects/soc2007/rdivacky/linux_futex/sys/compat/linux/linux_futex.c#7 integrate
.. //depot/projects/soc2007/rdivacky/linux_futex/sys/compat/ndis/kern_windrv.c#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_futex/sys/compat/opensolaris/sys/dnlc.h#1 branch
.. //depot/projects/soc2007/rdivacky/linux_futex/sys/conf/files#4 integrate
.. //depot/projects/soc2007/rdivacky/linux_futex/sys/conf/files.amd64#3 integrate
.. //depot/projects/soc2007/rdivacky/linux_futex/sys/conf/files.i386#3 integrate
.. //depot/projects/soc2007/rdivacky/linux_futex/sys/conf/files.pc98#3 integrate
.. //depot/projects/soc2007/rdivacky/linux_futex/sys/contrib/opensolaris/uts/common/fs/dnlc.c#2 delete
.. //depot/projects/soc2007/rdivacky/linux_futex/sys/contrib/opensolaris/uts/common/fs/gfs.c#3 integrate
.. //depot/projects/soc2007/rdivacky/linux_futex/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_futex/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_replay.c#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_futex/sys/contrib/opensolaris/uts/common/sys/dnlc.h#2 delete
.. //depot/projects/soc2007/rdivacky/linux_futex/sys/contrib/pf/net/pf.c#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_futex/sys/dev/bge/if_bge.c#3 integrate
.. //depot/projects/soc2007/rdivacky/linux_futex/sys/dev/bge/if_bgereg.h#3 integrate
.. //depot/projects/soc2007/rdivacky/linux_futex/sys/dev/de/if_devar.h#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_futex/sys/dev/em/if_em.c#4 integrate
.. //depot/projects/soc2007/rdivacky/linux_futex/sys/dev/firewire/firewire.c#3 integrate
.. //depot/projects/soc2007/rdivacky/linux_futex/sys/dev/firewire/firewirereg.h#3 integrate
.. //depot/projects/soc2007/rdivacky/linux_futex/sys/dev/hptmv/ioctl.c#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_futex/sys/dev/if_ndis/if_ndis.c#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_futex/sys/dev/mxge/eth_z8e.dat.gz.uu#3 integrate
.. //depot/projects/soc2007/rdivacky/linux_futex/sys/dev/mxge/ethp_z8e.dat.gz.uu#3 integrate
.. //depot/projects/soc2007/rdivacky/linux_futex/sys/dev/mxge/if_mxge.c#3 integrate
.. //depot/projects/soc2007/rdivacky/linux_futex/sys/dev/mxge/if_mxge_var.h#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_futex/sys/dev/mxge/mxge_lro.c#1 branch
.. //depot/projects/soc2007/rdivacky/linux_futex/sys/dev/mxge/mxge_mcp.h#3 integrate
.. //depot/projects/soc2007/rdivacky/linux_futex/sys/dev/pci/pci_pci.c#3 integrate
.. //depot/projects/soc2007/rdivacky/linux_futex/sys/dev/sound/isa/mss.c#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_futex/sys/dev/sound/pci/envy24.c#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_futex/sys/dev/sound/pci/envy24ht.c#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_futex/sys/dev/sound/pci/fm801.c#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_futex/sys/i386/i386/busdma_machdep.c#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_futex/sys/i386/i386/elf_machdep.c#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_futex/sys/i386/i386/machdep.c#3 integrate
.. //depot/projects/soc2007/rdivacky/linux_futex/sys/i386/i386/mp_machdep.c#3 integrate
.. //depot/projects/soc2007/rdivacky/linux_futex/sys/i386/i386/pmap.c#3 integrate
.. //depot/projects/soc2007/rdivacky/linux_futex/sys/i386/i386/support.s#3 integrate
.. //depot/projects/soc2007/rdivacky/linux_futex/sys/i386/i386/sys_machdep.c#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_futex/sys/i386/i386/vm_machdep.c#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_futex/sys/i386/include/proc.h#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_futex/sys/ia64/ia64/elf_machdep.c#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_futex/sys/ia64/ia64/exception.S#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_futex/sys/ia64/ia64/mca.c#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_futex/sys/ia64/ia64/pmap.c#3 integrate
.. //depot/projects/soc2007/rdivacky/linux_futex/sys/ia64/ia64/trap.c#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_futex/sys/kern/kern_acct.c#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_futex/sys/kern/kern_clock.c#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_futex/sys/kern/kern_sig.c#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_futex/sys/kern/kern_sx.c#4 integrate
.. //depot/projects/soc2007/rdivacky/linux_futex/sys/kern/subr_bus.c#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_futex/sys/kern/subr_prof.c#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_futex/sys/kern/subr_witness.c#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_futex/sys/kern/uipc_mqueue.c#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_futex/sys/kern/uipc_syscalls.c#4 integrate
.. //depot/projects/soc2007/rdivacky/linux_futex/sys/kern/vfs_cache.c#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_futex/sys/modules/linux/Makefile#5 integrate
.. //depot/projects/soc2007/rdivacky/linux_futex/sys/modules/mxge/mxge/Makefile#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_futex/sys/modules/zfs/Makefile#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_futex/sys/net/if_lagg.c#4 integrate
.. //depot/projects/soc2007/rdivacky/linux_futex/sys/net/route.c#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_futex/sys/netgraph/ng_nat.c#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_futex/sys/netgraph/ng_nat.h#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_futex/sys/netinet/tcp.h#3 integrate
.. //depot/projects/soc2007/rdivacky/linux_futex/sys/netinet/tcp_subr.c#4 integrate
.. //depot/projects/soc2007/rdivacky/linux_futex/sys/netinet6/nd6.c#3 integrate
.. //depot/projects/soc2007/rdivacky/linux_futex/sys/pc98/pc98/machdep.c#3 integrate
.. //depot/projects/soc2007/rdivacky/linux_futex/sys/powerpc/powerpc/elf_machdep.c#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_futex/sys/security/audit/audit.c#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_futex/sys/security/audit/audit_worker.c#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_futex/sys/sparc64/include/smp.h#3 integrate
.. //depot/projects/soc2007/rdivacky/linux_futex/sys/sparc64/include/ver.h#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_futex/sys/sparc64/pci/ofw_pcibus.c#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_futex/sys/sparc64/sparc64/elf_machdep.c#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_futex/sys/sparc64/sparc64/identcpu.c#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_futex/sys/sparc64/sparc64/mem.c#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_futex/sys/sparc64/sparc64/mp_machdep.c#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_futex/sys/sparc64/sparc64/pmap.c#3 integrate
.. //depot/projects/soc2007/rdivacky/linux_futex/sys/sun4v/include/cache.h#2 delete
.. //depot/projects/soc2007/rdivacky/linux_futex/sys/sun4v/include/iommureg.h#2 delete
.. //depot/projects/soc2007/rdivacky/linux_futex/sys/sun4v/include/iommuvar.h#2 delete
.. //depot/projects/soc2007/rdivacky/linux_futex/sys/sun4v/include/ofw_upa.h#2 delete
.. //depot/projects/soc2007/rdivacky/linux_futex/sys/sun4v/include/pmap.h#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_futex/sys/sun4v/include/upa.h#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_futex/sys/sun4v/include/ver.h#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_futex/sys/sun4v/sun4v/bus_machdep.c#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_futex/sys/sun4v/sun4v/hviommu.c#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_futex/sys/sun4v/sun4v/intr_machdep.c#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_futex/sys/sun4v/sun4v/machdep.c#3 integrate
.. //depot/projects/soc2007/rdivacky/linux_futex/sys/sun4v/sun4v/nexus.c#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_futex/sys/sun4v/sun4v/pmap.c#3 integrate
.. //depot/projects/soc2007/rdivacky/linux_futex/sys/sun4v/sun4v/tick.c#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_futex/sys/sun4v/sun4v/tsb.c#3 integrate
.. //depot/projects/soc2007/rdivacky/linux_futex/sys/sun4v/sun4v/tte_hash.c#3 integrate
.. //depot/projects/soc2007/rdivacky/linux_futex/sys/sun4v/sun4v/vm_machdep.c#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_futex/sys/sun4v/sun4v/vnex.c#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_futex/sys/sys/acct.h#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_futex/sys/sys/lock_profile.h#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_futex/sys/sys/param.h#4 integrate
.. //depot/projects/soc2007/rdivacky/linux_futex/sys/sys/sx.h#3 integrate
.. //depot/projects/soc2007/rdivacky/linux_futex/sys/sys/systm.h#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_futex/sys/sys/vmmeter.h#3 integrate
.. //depot/projects/soc2007/rdivacky/linux_futex/sys/ufs/ufs/ufs_vnops.c#2 integrate
.. //depot/projects/soc2007/rdivacky/linux_futex/sys/vm/vm_fault.c#3 integrate
.. //depot/projects/soc2007/rdivacky/linux_futex/sys/vm/vm_map.c#3 integrate
.. //depot/projects/soc2007/rdivacky/linux_futex/sys/vm/vm_page.c#4 integrate
Differences ...
==== //depot/projects/soc2007/rdivacky/linux_futex/sys/amd64/amd64/elf_machdep.c#2 (text+ko) ====
@@ -24,7 +24,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/elf_machdep.c,v 1.25 2005/12/26 21:23:56 sobomax Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/elf_machdep.c,v 1.26 2007/05/22 02:22:57 kan Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
@@ -82,7 +82,7 @@
"/libexec/ld-elf.so.1",
&elf64_freebsd_sysvec,
NULL,
- 0,
+ BI_CAN_EXEC_DYN,
};
SYSINIT(elf64, SI_SUB_EXEC, SI_ORDER_ANY,
@@ -97,7 +97,7 @@
"/usr/libexec/ld-elf.so.1",
&elf64_freebsd_sysvec,
NULL,
- 0,
+ BI_CAN_EXEC_DYN,
};
SYSINIT(oelf64, SI_SUB_EXEC, SI_ORDER_ANY,
==== //depot/projects/soc2007/rdivacky/linux_futex/sys/amd64/amd64/pmap.c#3 (text+ko) ====
@@ -77,7 +77,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.585 2007/05/18 07:10:43 jeff Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.586 2007/05/20 22:33:41 jeff Exp $");
/*
* Manages physical address maps.
@@ -1149,7 +1149,7 @@
*/
m->right = *free;
*free = m;
- VMCNT_DEC(wire_count, 1);
+ VMCNT_SUB(wire_count, 1);
return 1;
}
@@ -1459,7 +1459,7 @@
pmap->pm_pml4[PML4PML4I] = 0; /* Recursive Mapping */
m->wire_count--;
- VMCNT_DEC(wire_count, 1);
+ VMCNT_SUB(wire_count, 1);
vm_page_free_zero(m);
PMAP_LOCK_DESTROY(pmap);
}
==== //depot/projects/soc2007/rdivacky/linux_futex/sys/amd64/amd64/support.S#4 (text+ko) ====
@@ -27,7 +27,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/sys/amd64/amd64/support.S,v 1.126 2007/03/31 01:47:37 jkim Exp $
+ * $FreeBSD: src/sys/amd64/amd64/support.S,v 1.127 2007/05/23 08:33:04 kib Exp $
*/
#include "opt_ddb.h"
==== //depot/projects/soc2007/rdivacky/linux_futex/sys/arm/arm/busdma_machdep.c#2 (text+ko) ====
@@ -29,7 +29,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/arm/arm/busdma_machdep.c,v 1.29 2007/02/13 07:19:26 kevlo Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/arm/busdma_machdep.c,v 1.30 2007/05/19 13:17:31 cognet Exp $");
/*
* ARM bus dma support routines
@@ -1003,7 +1003,7 @@
bus_dmamap_callback2_t *callback, void *callback_arg,
int flags)
{
- vm_offset_t lastaddr;
+ vm_offset_t lastaddr = 0;
#ifdef __CC_SUPPORTS_DYNAMIC_ARRAY_INIT
bus_dma_segment_t dm_segments[dmat->nsegments];
#else
@@ -1079,7 +1079,7 @@
return;
}
-static __inline void
+static void
bus_dmamap_sync_buf(void *buf, int len, bus_dmasync_op_t op)
{
char _tmp_cl[arm_dcache_align], _tmp_clend[arm_dcache_align];
==== //depot/projects/soc2007/rdivacky/linux_futex/sys/arm/arm/elf_machdep.c#2 (text+ko) ====
@@ -24,7 +24,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/arm/arm/elf_machdep.c,v 1.6 2005/12/26 21:23:56 sobomax Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/arm/elf_machdep.c,v 1.7 2007/05/22 02:22:57 kan Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
@@ -82,7 +82,7 @@
"/libexec/ld-elf.so.1",
&elf32_freebsd_sysvec,
NULL,
- 0,
+ BI_CAN_EXEC_DYN,
};
SYSINIT(elf32, SI_SUB_EXEC, SI_ORDER_ANY,
@@ -97,7 +97,7 @@
"/usr/libexec/ld-elf.so.1",
&elf32_freebsd_sysvec,
NULL,
- 0,
+ BI_CAN_EXEC_DYN,
};
SYSINIT(oelf32, SI_SUB_EXEC, SI_ORDER_ANY,
==== //depot/projects/soc2007/rdivacky/linux_futex/sys/arm/arm/genassym.c#2 (text+ko) ====
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/arm/arm/genassym.c,v 1.8 2006/11/30 04:17:04 jb Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/arm/genassym.c,v 1.9 2007/05/23 13:21:57 cognet Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/assym.h>
@@ -41,7 +41,6 @@
#include <machine/cpu.h>
#include <machine/proc.h>
#include <machine/cpufunc.h>
-#include <machine/pcb.h>
#include <machine/pte.h>
#include <machine/intr.h>
#include <machine/sysarch.h>
==== //depot/projects/soc2007/rdivacky/linux_futex/sys/arm/arm/machdep.c#3 (text+ko) ====
@@ -44,7 +44,7 @@
#include "opt_compat.h"
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/arm/arm/machdep.c,v 1.26 2007/05/18 07:10:43 jeff Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/arm/machdep.c,v 1.27 2007/05/19 13:32:58 cognet Exp $");
#include <sys/param.h>
#include <sys/proc.h>
@@ -547,7 +547,7 @@
set_mcontext(struct thread *td, const mcontext_t *mcp)
{
struct trapframe *tf = td->td_frame;
- __greg_t *gr = mcp->__gregs;
+ const __greg_t *gr = mcp->__gregs;
tf->tf_r0 = gr[_REG_R0];
tf->tf_r1 = gr[_REG_R1];
==== //depot/projects/soc2007/rdivacky/linux_futex/sys/arm/arm/pmap.c#3 (text+ko) ====
@@ -147,7 +147,7 @@
#include "opt_vm.h"
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/arm/arm/pmap.c,v 1.79 2007/05/18 07:10:43 jeff Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/arm/pmap.c,v 1.81 2007/05/19 13:21:41 cognet Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
@@ -431,10 +431,10 @@
l1->l1_kva = l1pt;
l1->l1_domain_use_count = 0;
- l1->l1_domain_first = 0;
+ l1->l1_domain_first = 1;
for (i = 0; i < PMAP_DOMAINS; i++)
- l1->l1_domain_free[i] = i + 1;
+ l1->l1_domain_free[i] = i + 2;
/*
* Copy the kernel's L1 entries to each new L1.
@@ -2910,7 +2910,7 @@
/*
* remove a page rom the kernel pagetables
*/
-PMAP_INLINE void
+void
pmap_kremove(vm_offset_t va)
{
struct l2_bucket *l2b;
==== //depot/projects/soc2007/rdivacky/linux_futex/sys/arm/arm/vm_machdep.c#2 (text+ko) ====
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/arm/arm/vm_machdep.c,v 1.30 2007/01/17 00:53:05 cognet Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/arm/vm_machdep.c,v 1.31 2007/05/23 13:19:00 cognet Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -55,12 +55,11 @@
#include <machine/cpu.h>
#include <machine/pcb.h>
#include <machine/sysarch.h>
-#include <vm/vm.h>
-#include <vm/pmap.h>
#include <sys/lock.h>
#include <sys/mutex.h>
#include <vm/vm.h>
+#include <vm/pmap.h>
#include <vm/vm_extern.h>
#include <vm/vm_kern.h>
#include <vm/vm_page.h>
==== //depot/projects/soc2007/rdivacky/linux_futex/sys/arm/at91/kb920x_machdep.c#2 (text) ====
@@ -48,7 +48,7 @@
#include "opt_at91.h"
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/arm/at91/kb920x_machdep.c,v 1.21 2007/03/27 06:29:19 kevlo Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/at91/kb920x_machdep.c,v 1.22 2007/05/23 13:20:50 cognet Exp $");
#define _ARM32_BUS_DMA_PRIVATE
#include <sys/param.h>
@@ -77,7 +77,6 @@
#include <vm/vm.h>
#include <vm/pmap.h>
-#include <vm/vm.h>
#include <vm/vm_object.h>
#include <vm/vm_page.h>
#include <vm/vm_pager.h>
==== //depot/projects/soc2007/rdivacky/linux_futex/sys/arm/include/asm.h#2 (text+ko) ====
@@ -33,7 +33,7 @@
*
* from: @(#)asm.h 5.5 (Berkeley) 5/7/91
*
- * $FreeBSD: src/sys/arm/include/asm.h,v 1.5 2006/08/30 11:45:07 cognet Exp $
+ * $FreeBSD: src/sys/arm/include/asm.h,v 1.6 2007/05/19 16:20:37 cognet Exp $
*/
#ifndef _MACHINE_ASM_H_
@@ -80,7 +80,7 @@
#ifdef GPROF
# define _PROF_PROLOGUE \
- mov ip, lr; bl _mcount
+ mov ip, lr; bl __mcount
#else
# define _PROF_PROLOGUE
#endif
==== //depot/projects/soc2007/rdivacky/linux_futex/sys/arm/include/pmap.h#2 (text+ko) ====
@@ -44,7 +44,7 @@
* from: @(#)pmap.h 7.4 (Berkeley) 5/12/91
* from: FreeBSD: src/sys/i386/include/pmap.h,v 1.70 2000/11/30
*
- * $FreeBSD: src/sys/arm/include/pmap.h,v 1.24 2007/01/17 00:53:05 cognet Exp $
+ * $FreeBSD: src/sys/arm/include/pmap.h,v 1.25 2007/05/19 12:47:34 cognet Exp $
*/
#ifndef _MACHINE_PMAP_H_
@@ -237,8 +237,8 @@
/*
* Definitions for MMU domains
*/
-#define PMAP_DOMAINS 15 /* 15 'user' domains (0-14) */
-#define PMAP_DOMAIN_KERNEL 15 /* The kernel uses domain #15 */
+#define PMAP_DOMAINS 15 /* 15 'user' domains (1-15) */
+#define PMAP_DOMAIN_KERNEL 0 /* The kernel uses domain #0 */
/*
* The new pmap ensures that page-tables are always mapping Write-Thru.
==== //depot/projects/soc2007/rdivacky/linux_futex/sys/arm/include/profile.h#2 (text+ko) ====
@@ -31,7 +31,7 @@
* SUCH DAMAGE.
*
* @(#)profile.h 8.1 (Berkeley) 6/11/93
- * $FreeBSD: src/sys/arm/include/profile.h,v 1.6 2005/01/05 21:58:48 imp Exp $
+ * $FreeBSD: src/sys/arm/include/profile.h,v 1.7 2007/05/19 16:20:37 cognet Exp $
*/
#ifndef _MACHINE_PROFILE_H_
@@ -61,9 +61,9 @@
#define MCOUNT \
__asm__(".text"); \
__asm__(".align 0"); \
- __asm__(".type _mcount ,%function"); \
- __asm__(".global _mcount"); \
- __asm__("_mcount:"); \
+ __asm__(".type __mcount ,%function"); \
+ __asm__(".global __mcount"); \
+ __asm__("__mcount:"); \
/* \
* Preserve registers that are trashed during mcount \
*/ \
==== //depot/projects/soc2007/rdivacky/linux_futex/sys/arm/xscale/i80321/ep80219_machdep.c#3 (text+ko) ====
@@ -49,7 +49,7 @@
#include "opt_ddb.h"
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/arm/xscale/i80321/ep80219_machdep.c,v 1.6 2007/05/03 09:51:12 kevlo Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/xscale/i80321/ep80219_machdep.c,v 1.7 2007/05/23 13:20:50 cognet Exp $");
#define _ARM32_BUS_DMA_PRIVATE
#include <sys/param.h>
@@ -78,7 +78,6 @@
#include <vm/vm.h>
#include <vm/pmap.h>
-#include <vm/vm.h>
#include <vm/vm_object.h>
#include <vm/vm_page.h>
#include <vm/vm_pager.h>
==== //depot/projects/soc2007/rdivacky/linux_futex/sys/arm/xscale/i80321/iq31244_machdep.c#3 (text+ko) ====
@@ -49,7 +49,7 @@
#include "opt_ddb.h"
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/arm/xscale/i80321/iq31244_machdep.c,v 1.27 2007/05/03 09:51:12 kevlo Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/xscale/i80321/iq31244_machdep.c,v 1.28 2007/05/23 13:20:50 cognet Exp $");
#define _ARM32_BUS_DMA_PRIVATE
#include <sys/param.h>
@@ -78,7 +78,6 @@
#include <vm/vm.h>
#include <vm/pmap.h>
-#include <vm/vm.h>
#include <vm/vm_object.h>
#include <vm/vm_page.h>
#include <vm/vm_pager.h>
==== //depot/projects/soc2007/rdivacky/linux_futex/sys/arm/xscale/ixp425/avila_machdep.c#3 (text+ko) ====
@@ -49,7 +49,7 @@
#include "opt_ddb.h"
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/arm/xscale/ixp425/avila_machdep.c,v 1.4 2007/05/03 09:51:12 kevlo Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/xscale/ixp425/avila_machdep.c,v 1.5 2007/05/23 13:20:50 cognet Exp $");
#define _ARM32_BUS_DMA_PRIVATE
#include <sys/param.h>
@@ -78,7 +78,6 @@
#include <vm/vm.h>
#include <vm/pmap.h>
-#include <vm/vm.h>
#include <vm/vm_object.h>
#include <vm/vm_page.h>
#include <vm/vm_pager.h>
==== //depot/projects/soc2007/rdivacky/linux_futex/sys/boot/i386/libi386/smbios.c#2 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/boot/i386/libi386/smbios.c,v 1.6 2006/03/14 19:02:00 jkim Exp $");
+__FBSDID("$FreeBSD: src/sys/boot/i386/libi386/smbios.c,v 1.7 2007/05/21 18:48:18 jkim Exp $");
#include <stand.h>
#include <bootstrap.h>
@@ -239,9 +239,9 @@
break;
}
if (f != 16 && z != 16) {
- sprintf(uuid, "%02X%02X%02X%02X-"
- "%02X%02X-%02X%02X-%02X%02X-"
- "%02X%02X%02X%02X%02X%02X",
+ sprintf(uuid, "%02x%02x%02x%02x-"
+ "%02x%02x-%02x%02x-%02x%02x-"
+ "%02x%02x%02x%02x%02x%02x",
idp[0], idp[1], idp[2], idp[3],
idp[4], idp[5], idp[6], idp[7], idp[8], idp[9],
idp[10], idp[11], idp[12], idp[13], idp[14], idp[15]);
==== //depot/projects/soc2007/rdivacky/linux_futex/sys/cam/cam.c#2 (text+ko) ====
@@ -27,11 +27,10 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/cam/cam.c,v 1.10 2006/04/18 21:53:39 mjacob Exp $");
+__FBSDID("$FreeBSD: src/sys/cam/cam.c,v 1.11 2007/05/23 13:27:37 cognet Exp $");
#include <sys/param.h>
#ifdef _KERNEL
-#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
#include <sys/sysctl.h>
==== //depot/projects/soc2007/rdivacky/linux_futex/sys/cam/scsi/scsi_all.c#2 (text+ko) ====
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_all.c,v 1.49 2006/08/21 13:24:50 ken Exp $");
+__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_all.c,v 1.50 2007/05/23 13:27:37 cognet Exp $");
#include <sys/param.h>
@@ -727,8 +727,6 @@
#endif
-#include <sys/param.h>
-
#if !defined(SCSI_NO_SENSE_STRINGS)
#define SST(asc, ascq, action, desc) \
asc, ascq, action, desc
==== //depot/projects/soc2007/rdivacky/linux_futex/sys/compat/freebsd32/freebsd32_misc.c#3 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/compat/freebsd32/freebsd32_misc.c,v 1.63 2007/05/01 17:10:01 alc Exp $");
+__FBSDID("$FreeBSD: src/sys/compat/freebsd32/freebsd32_misc.c,v 1.64 2007/05/23 13:32:21 cognet Exp $");
#include "opt_compat.h"
@@ -48,8 +48,6 @@
#include <sys/module.h>
#include <sys/mount.h>
#include <sys/mutex.h>
-#include <sys/namei.h>
-#include <sys/param.h>
#include <sys/proc.h>
#include <sys/reboot.h>
#include <sys/resource.h>
@@ -67,7 +65,6 @@
#include <sys/sysctl.h>
#include <sys/sysent.h>
#include <sys/sysproto.h>
-#include <sys/systm.h>
#include <sys/thr.h>
#include <sys/unistd.h>
#include <sys/ucontext.h>
==== //depot/projects/soc2007/rdivacky/linux_futex/sys/compat/ia32/ia32_sysvec.c#3 (text+ko) ====
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/compat/ia32/ia32_sysvec.c,v 1.24 2007/05/14 22:40:04 jhb Exp $");
+__FBSDID("$FreeBSD: src/sys/compat/ia32/ia32_sysvec.c,v 1.25 2007/05/22 02:22:57 kan Exp $");
#include "opt_compat.h"
@@ -138,7 +138,7 @@
"/libexec/ld-elf.so.1",
&ia32_freebsd_sysvec,
"/libexec/ld-elf32.so.1",
- 0,
+ BI_CAN_EXEC_DYN,
};
SYSINIT(ia32, SI_SUB_EXEC, SI_ORDER_ANY,
@@ -153,7 +153,7 @@
"/usr/libexec/ld-elf.so.1",
&ia32_freebsd_sysvec,
"/libexec/ld-elf32.so.1",
- 0,
+ BI_CAN_EXEC_DYN,
};
SYSINIT(oia32, SI_SUB_EXEC, SI_ORDER_ANY,
==== //depot/projects/soc2007/rdivacky/linux_futex/sys/compat/linux/linux_futex.c#7 (text+ko) ====
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/compat/linux/linux_futex.c,v 1.9 2007/03/30 01:07:28 jkim Exp $");
+__FBSDID("$FreeBSD: src/sys/compat/linux/linux_futex.c,v 1.10 2007/05/23 08:33:05 kib Exp $");
#if 0
__KERNEL_RCSID(1, "$NetBSD: linux_futex.c,v 1.7 2006/07/24 19:01:49 manu Exp $");
#endif
@@ -275,7 +275,7 @@
#ifdef DEBUG
if (ldebug(sys_futex))
printf("FUTEX_WAKE_OP: %d: uaddr = %p, op = %d, "
- "val = %d, uaddr2 = %p, val3 = %d\n",
+ "val = %x, uaddr2 = %p, val3 = %x\n",
td->td_proc->p_pid, args->uaddr, args->op,
args->val, args->uaddr2, args->val3);
#endif
@@ -287,8 +287,11 @@
* negative as errors
*/
op_ret = futex_atomic_op(td, args->val3, args->uaddr2);
+#ifdef DEBUG
+ if (ldebug(sys_futex))
+ printf("futex_atomic_op ret %d\n", op_ret);
+#endif
if (op_ret < 0) {
-
/* XXX: We don't handle the EFAULT yet. */
if (op_ret != -EFAULT) {
futex_put(f);
@@ -302,7 +305,6 @@
FUTEX_SYSTEM_UNLOCK;
return (EFAULT);
-
}
ret = futex_wake(f, args->val, NULL, 0);
@@ -328,7 +330,7 @@
args->op);
break;
}
- return 0;
+ return (0);
}
static struct futex *
@@ -463,8 +465,10 @@
oparg = 1 << oparg;
#ifdef DEBUG
- printf("futex_atomic_op: op = %d, cmp = %d, oparg = %d, cmparg = %d, "
- "uaddr = %p\n", op, cmp, oparg, cmparg, uaddr);
+ if (ldebug(sys_futex))
+ printf("futex_atomic_op: op = %d, cmp = %d, oparg = %x, "
+ "cmparg = %x, uaddr = %p\n",
+ op, cmp, oparg, cmparg, uaddr);
#endif
/* XXX: linux verifies access here and returns EFAULT */
@@ -486,31 +490,26 @@
break;
default:
ret = -ENOSYS;
+ break;
}
- if (!ret)
- switch (cmp) {
- case FUTEX_OP_CMP_EQ:
- ret = (oldval == cmparg);
- break;
- case FUTEX_OP_CMP_NE:
- ret = (oldval != cmparg);
- break;
- case FUTEX_OP_CMP_LT:
- ret = (oldval < cmparg);
- break;
- case FUTEX_OP_CMP_GE:
- ret = (oldval >= cmparg);
- break;
- case FUTEX_OP_CMP_LE:
- ret = (oldval <= cmparg);
- break;
- case FUTEX_OP_CMP_GT:
- ret = (oldval > cmparg);
- break;
- default:
- ret = -ENOSYS;
- }
+ if (ret)
+ return (ret);
- return (ret);
+ switch (cmp) {
+ case FUTEX_OP_CMP_EQ:
+ return (oldval == cmparg);
+ case FUTEX_OP_CMP_NE:
+ return (oldval != cmparg);
+ case FUTEX_OP_CMP_LT:
+ return (oldval < cmparg);
+ case FUTEX_OP_CMP_GE:
+ return (oldval >= cmparg);
+ case FUTEX_OP_CMP_LE:
+ return (oldval <= cmparg);
+ case FUTEX_OP_CMP_GT:
+ return (oldval > cmparg);
+ default:
+ return (-ENOSYS);
+ }
}
==== //depot/projects/soc2007/rdivacky/linux_futex/sys/compat/ndis/kern_windrv.c#2 (text+ko) ====
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/compat/ndis/kern_windrv.c,v 1.13 2005/11/02 18:01:04 wpaul Exp $");
+__FBSDID("$FreeBSD: src/sys/compat/ndis/kern_windrv.c,v 1.14 2007/05/20 22:03:57 jeff Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -883,9 +883,9 @@
struct gdt gtable;
uint16_t ltable;
- mtx_lock_spin(&sched_lock);
+ t = curthread;
- t = curthread;
+ mtx_lock_spin(&dt_lock);
/* Grab location of existing GDT. */
@@ -904,7 +904,7 @@
x86_setldt(>able, ltable);
- mtx_unlock_spin(&sched_lock);
+ mtx_unlock_spin(&dt_lock);
return;
}
@@ -918,9 +918,9 @@
struct x86desc *l;
struct thread *t;
- mtx_lock_spin(&sched_lock);
+ t = curthread;
- t = curthread;
+ mtx_lock_spin(&dt_lock);
/* Grab location of existing GDT. */
@@ -952,7 +952,7 @@
x86_setldt(>able, ltable);
- mtx_unlock_spin(&sched_lock);
+ mtx_unlock_spin(&dt_lock);
/* Whew. */
==== //depot/projects/soc2007/rdivacky/linux_futex/sys/conf/files#4 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/conf/files,v 1.1209 2007/05/17 01:29:55 marcel Exp $
+# $FreeBSD: src/sys/conf/files,v 1.1210 2007/05/22 12:00:31 mav Exp $
#
# The long compile-with and dependency lines are required because of
# limitations in config: backslash-newline doesn't work in strings, and
@@ -1585,6 +1585,8 @@
net/if_tun.c optional tun
net/if_tap.c optional tap
net/if_vlan.c optional vlan
+net/mppcc.c optional netgraph_mppc_compression
+net/mppcd.c optional netgraph_mppc_compression
net/netisr.c standard
net/ppp_deflate.c optional ppp_deflate
net/ppp_tty.c optional ppp
==== //depot/projects/soc2007/rdivacky/linux_futex/sys/conf/files.amd64#3 (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.101 2007/04/06 04:51:50 kan Exp $
+# $FreeBSD: src/sys/conf/files.amd64,v 1.103 2007/05/23 15:45:51 kib Exp $
#
# The long compile-with and dependency lines are required because of
# limitations in config: backslash-newline doesn't work in strings, and
@@ -231,10 +231,11 @@
amd64/linux32/linux32_locore.s optional compat_linux32 \
dependency "linux32_assym.h"
amd64/linux32/linux32_machdep.c optional compat_linux32
-amd64/linux32/linux32_support.s optional compat_linux32
+amd64/linux32/linux32_support.s optional compat_linux32 \
+ dependency "linux32_assym.h"
amd64/linux32/linux32_sysent.c optional compat_linux32
amd64/linux32/linux32_sysvec.c optional compat_linux32
-compat/linux/linux_emul.c optional compat_linux32
+compat/linux/linux_emul.c optional compat_linux32
compat/linux/linux_file.c optional compat_linux32
compat/linux/linux_futex.c optional compat_linux32
compat/linux/linux_getcwd.c optional compat_linux32
==== //depot/projects/soc2007/rdivacky/linux_futex/sys/conf/files.i386#3 (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.574 2007/04/06 11:29:52 nyan Exp $
+# $FreeBSD: src/sys/conf/files.i386,v 1.576 2007/05/23 15:45:51 kib Exp $
#
# The long compile-with and dependency lines are required because of
# limitations in config: backslash-newline doesn't work in strings, and
@@ -345,7 +345,8 @@
dependency "linux_assym.h"
i386/linux/linux_machdep.c optional compat_linux
i386/linux/linux_ptrace.c optional compat_linux
-i386/linux/linux_support.s optional compat_linux
+i386/linux/linux_support.s optional compat_linux \
+ dependency "linux_assym.h"
i386/linux/linux_sysent.c optional compat_linux
i386/linux/linux_sysvec.c optional compat_linux
i386/pci/pci_bus.c optional pci
==== //depot/projects/soc2007/rdivacky/linux_futex/sys/conf/files.pc98#3 (text+ko) ====
@@ -3,7 +3,7 @@
#
# modified for PC-9801/PC-9821
#
-# $FreeBSD: src/sys/conf/files.pc98,v 1.352 2007/04/06 11:30:31 nyan Exp $
+# $FreeBSD: src/sys/conf/files.pc98,v 1.354 2007/05/23 15:45:51 kib Exp $
#
# The long compile-with and dependency lines are required because of
# limitations in config: backslash-newline doesn't work in strings, and
@@ -221,7 +221,8 @@
dependency "linux_assym.h"
i386/linux/linux_machdep.c optional compat_linux
i386/linux/linux_ptrace.c optional compat_linux
-i386/linux/linux_support.s optional compat_linux
+i386/linux/linux_support.s optional compat_linux \
+ dependency "linux_assym.h"
i386/linux/linux_sysent.c optional compat_linux
i386/linux/linux_sysvec.c optional compat_linux
i386/pci/pci_bus.c optional pci
==== //depot/projects/soc2007/rdivacky/linux_futex/sys/contrib/opensolaris/uts/common/fs/gfs.c#3 (text+ko) ====
@@ -195,9 +195,10 @@
return (-1);
}
+ /* XXX: This can change in the future. */
+ st->grd_dirent->d_type = DT_DIR;
st->grd_dirent->d_reclen = (ushort_t)reclen;
st->grd_dirent->d_namlen = namlen;
- /* TODO: d_type */
if (uiomove((caddr_t)st->grd_dirent, reclen, UIO_READ, uiop))
return (EFAULT);
@@ -232,7 +233,6 @@
st->grd_dirent->d_ino = ino;
(void) strncpy(st->grd_dirent->d_name, name, st->grd_namlen);
- /* TODO: d_type */
/*
* Inter-entry offsets are invalid, so we assume a record size of
==== //depot/projects/soc2007/rdivacky/linux_futex/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c#2 (text+ko) ====
@@ -1773,6 +1773,7 @@
}
static struct task zfs_start_task;
+static struct root_hold_token *zfs_root_token;
static void
zfs_start(void *context __unused, int pending __unused)
@@ -1783,6 +1784,7 @@
zfs_init();
zvol_init();
printf("ZFS storage pool version " ZFS_VERSION_STRING "\n");
+ root_mount_rel(zfs_root_token);
}
static int
@@ -1793,6 +1795,7 @@
error = EOPNOTSUPP;
switch (type) {
case MOD_LOAD:
+ zfs_root_token = root_mount_hold("ZFS");
printf("WARNING: ZFS is considered to be an experimental "
"feature in FreeBSD.\n");
TASK_INIT(&zfs_start_task, 0, zfs_start, NULL);
@@ -1820,4 +1823,4 @@
zfs_modevent,
0
};
-DECLARE_MODULE(zfsctrl, zfs_mod, SI_SUB_MOUNT_ROOT, SI_ORDER_ANY);
+DECLARE_MODULE(zfsctrl, zfs_mod, SI_SUB_VFS, SI_ORDER_ANY);
==== //depot/projects/soc2007/rdivacky/linux_futex/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_replay.c#2 (text+ko) ====
@@ -158,6 +158,7 @@
cn.cn_namelen = strlen(name);
cn.cn_nameiop = DELETE;
cn.cn_flags = ISLASTCN | SAVENAME;
+ cn.cn_lkflags = LK_EXCLUSIVE | LK_RETRY;
cn.cn_cred = kcred;
cn.cn_thread = curthread;
vn_lock(ZTOV(dzp), LK_EXCLUSIVE | LK_RETRY, curthread);
@@ -249,6 +250,7 @@
scn.cn_namelen = strlen(sname);
scn.cn_nameiop = DELETE;
scn.cn_flags = ISLASTCN | SAVENAME;
+ scn.cn_lkflags = LK_EXCLUSIVE | LK_RETRY;
scn.cn_cred = kcred;
scn.cn_thread = td;
vn_lock(ZTOV(sdzp), LK_EXCLUSIVE | LK_RETRY, td);
@@ -262,6 +264,7 @@
tcn.cn_namelen = strlen(tname);
tcn.cn_nameiop = RENAME;
tcn.cn_flags = ISLASTCN | SAVENAME;
+ tcn.cn_lkflags = LK_EXCLUSIVE | LK_RETRY;
tcn.cn_cred = kcred;
tcn.cn_thread = td;
vn_lock(ZTOV(tdzp), LK_EXCLUSIVE | LK_RETRY, td);
==== //depot/projects/soc2007/rdivacky/linux_futex/sys/contrib/pf/net/pf.c#2 (text+ko) ====
@@ -1,4 +1,4 @@
-/* $FreeBSD: src/sys/contrib/pf/net/pf.c,v 1.43 2006/12/29 13:59:03 mlaier Exp $ */
+/* $FreeBSD: src/sys/contrib/pf/net/pf.c,v 1.44 2007/05/21 20:08:59 dhartmei Exp $ */
/* $OpenBSD: pf.c,v 1.483 2005/03/15 17:38:43 dhartmei Exp $ */
/*
@@ -6780,7 +6780,7 @@
struct pf_state *s = NULL;
struct pf_ruleset *ruleset = NULL;
struct pf_pdesc pd;
- int off, terminal = 0, dirndx;
+ int off, terminal = 0, dirndx, rh_cnt = 0;
#ifdef __FreeBSD__
PF_LOCK();
@@ -6844,6 +6844,18 @@
m = *m0;
h = mtod(m, struct ip6_hdr *);
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list