- unbreak vmmon/vmnet removing the PHOLD/PRELE calls that are not

present anymore.
- while there, regen patches.

ok todd@

emulators/vmware/3/Makefile

@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.11 2007/02/09 23:15:21 ian Exp $
+# $OpenBSD: Makefile,v 1.12 2007/05/31 20:31:36 aanriot Exp $
 
 ONLY_FOR_ARCHS= i386
 
 COMMENT=	"VMware emulator"
 DISTNAME=	VMware-workstation-3.2.1-2242
-PKGNAME=	vmware-3.2.1_2242p6
+PKGNAME=	vmware-3.2.1_2242p7
 CATEGORIES=	emulators
 MASTER_SITES=	http://download3.vmware.com/software/wkst/
 MASTER_SITES0=	http://monkey.org/~marius/vmware-openbsd/

emulators/vmware/3/patches/patch-source_vmmon_include_x86_h

@@ -1,7 +1,7 @@
-$OpenBSD: patch-source_vmmon_include_x86_h,v 1.1 2006/07/16 15:13:27 mcbride Exp $
+$OpenBSD: patch-source_vmmon_include_x86_h,v 1.2 2007/05/31 20:31:36 aanriot Exp $
---- source/vmmon/include/x86.h.orig	Fri Jul 14 11:13:04 2006
+--- source/vmmon/include/x86.h.orig	Mon Jul 21 14:39:10 2003
-+++ source/vmmon/include/x86.h	Fri Jul 14 11:12:52 2006
++++ source/vmmon/include/x86.h	Wed May 30 22:53:16 2007
-@@ -299,14 +299,16 @@ OpsizeValue(uint32 value,	// IN: The 32 
+@@ -299,14 +299,16 @@ OpsizeValue(uint32 value,	// IN: The 32 bit value to b
  
  #define MSR_L2CFG            0x0000011e
  #if !defined(__NetBSD__) || !defined(MSR_TSC)

emulators/vmware/3/patches/patch-source_vmmon_openbsd_drv_c

@@ -1,7 +1,7 @@
-$OpenBSD: patch-source_vmmon_openbsd_drv_c,v 1.3 2006/07/16 15:13:27 mcbride Exp $
+$OpenBSD: patch-source_vmmon_openbsd_drv_c,v 1.4 2007/05/31 20:31:36 aanriot Exp $
---- source/vmmon/openbsd/drv.c.orig	Sun Mar 14 15:58:50 2004
+--- source/vmmon/openbsd/drv.c.orig	Sun Mar 14 14:58:50 2004
-+++ source/vmmon/openbsd/drv.c	Fri Jul 14 11:15:49 2006
++++ source/vmmon/openbsd/drv.c	Wed May 30 22:53:16 2007
-@@ -414,6 +414,7 @@ vmmon_fake_clonedev(dev_t dev, int flag,
+@@ -414,6 +414,7 @@ vmmon_fake_clonedev(dev_t dev, int flag, struct proc *
  #endif 
  
  	p->p_dupfd = fd;
@@ -9,7 +9,7 @@ $OpenBSD: patch-source_vmmon_openbsd_drv_c,v 1.3 2006/07/16 15:13:27 mcbride Exp
  
  	return ENXIO;
  }
-@@ -436,6 +437,7 @@ vmmon_alloc_low_pages(struct vmx86_softc
+@@ -436,6 +437,7 @@ vmmon_alloc_low_pages(struct vmx86_softc *vmxsc, unsig
  	int error, n;
  	extern paddr_t avail_end;
  	struct rmem_pgrange *pgrp;
@@ -17,7 +17,7 @@ $OpenBSD: patch-source_vmmon_openbsd_drv_c,v 1.3 2006/07/16 15:13:27 mcbride Exp
  #if 0
  #define ISA_DMA_BOUNCE_THRESHOLD (16UL * 1024 * 1024)
  #else
-@@ -445,6 +447,7 @@ vmmon_alloc_low_pages(struct vmx86_softc
+@@ -445,6 +447,7 @@ vmmon_alloc_low_pages(struct vmx86_softc *vmxsc, unsig
  	 * So just use any pages we can get.
  	 */
  #define ISA_DMA_BOUNCE_THRESHOLD (3072UL * 1024 * 1024)

emulators/vmware/3/patches/patch-source_vmmon_openbsd_host_c

@@ -1,6 +1,6 @@
-$OpenBSD: patch-source_vmmon_openbsd_host_c,v 1.1 2006/07/16 15:13:27 mcbride Exp $
+$OpenBSD: patch-source_vmmon_openbsd_host_c,v 1.2 2007/05/31 20:31:36 aanriot Exp $
---- source/vmmon/openbsd/host.c.orig	Sun Mar 14 21:58:50 2004
+--- source/vmmon/openbsd/host.c.orig	Sun Mar 14 14:58:50 2004
-+++ source/vmmon/openbsd/host.c	Sun Jul 16 12:31:29 2006
++++ source/vmmon/openbsd/host.c	Wed May 30 23:07:39 2007
 @@ -59,6 +59,8 @@ lyaev Exp $
  #include <sys/proc.h>
  
@@ -29,3 +29,19 @@ $OpenBSD: patch-source_vmmon_openbsd_host_c,v 1.1 2006/07/16 15:13:27 mcbride Ex
  }
  
  /*
+@@ -665,7 +664,6 @@ HostIF_UserToDriverPtr(VMDriver *vm, // IN
+ 	if (vm->crossvaddr != NULL)
+ 		Warning("KernelAddr already allocated\n");
+ 
+-	PHOLD(CURLWP);
+ 	uvm_vslock(curproc, addr, PAGE_SIZE,
+ 	    VM_PROT_READ|VM_PROT_WRITE|VM_PROT_EXECUTE);
+ 
+@@ -674,7 +672,6 @@ HostIF_UserToDriverPtr(VMDriver *vm, // IN
+ 	pmap_extract(vm_map_pmap(&curproc->p_vmspace->vm_map), uaddr, &paddr);
+ 	pmap_kenter_pa(kvaddr, paddr,
+ 	    VM_PROT_READ | VM_PROT_WRITE | VM_PROT_EXECUTE);
+-	PRELE(CURLWP);
+ 	vm->crossvaddr = (void *)kvaddr;
+ 	vm->crossuaddr = addr;
+ #ifdef DEBUG

emulators/vmware/3/patches/patch-source_vmnet_if_hubmod_c

@@ -1,7 +1,40 @@
-$OpenBSD: patch-source_vmnet_if_hubmod_c,v 1.2 2006/04/10 21:33:36 todd Exp $
+$OpenBSD: patch-source_vmnet_if_hubmod_c,v 1.3 2007/05/31 20:31:36 aanriot Exp $
---- source/vmnet/if_hubmod.c.orig	Sun Mar 14 15:58:51 2004
+--- source/vmnet/if_hubmod.c.orig	Sun Mar 14 14:58:51 2004
-+++ source/vmnet/if_hubmod.c	Mon Apr 10 16:17:15 2006
++++ source/vmnet/if_hubmod.c	Wed May 30 23:02:25 2007
-@@ -604,6 +604,7 @@ hub_fake_clonedev(dev_t dev, int flag, s
+@@ -399,7 +399,6 @@ port_mappoll(struct hubport_softc *portsc, vaddr_t uad
+ 	kpage = uvm_km_valloc_wait(kernel_map, PAGE_SIZE);
+ 	kaddr = kpage + off;
+ 
+-	PHOLD(CURLWP);
+ 	error = uvm_vslock(curproc, (void *)upage, PAGE_SIZE,
+ 	    VM_PROT_READ|VM_PROT_WRITE);
+ 	if (error)
+@@ -411,14 +410,12 @@ port_mappoll(struct hubport_softc *portsc, vaddr_t uad
+ #if 1
+ 	pmap_update(pmap_kernel());
+ #endif
+-	PRELE(CURLWP);
+ 	portsc->port_kpollpage = kpage;
+ 	portsc->port_upollpage = upage;
+ 	portsc->port_pollptr = (u_int32_t *)kaddr;
+ 	return 0;
+ 
+     err:
+-	PRELE(CURLWP);
+ 	uvm_km_free_wakeup(kernel_map, kpage, PAGE_SIZE);
+ 	return (error);
+ }
+@@ -431,9 +428,7 @@ port_unmappoll(struct hubport_softc *portsc)
+ 	pmap_update(pmap_kernel());
+ #endif
+ 	uvm_km_free_wakeup(kernel_map, portsc->port_kpollpage, PAGE_SIZE);
+-	PHOLD(CURLWP);
+ 	uvm_vsunlock(curproc, (void *)portsc->port_upollpage, PAGE_SIZE);
+-	PRELE(CURLWP);
+ 	portsc->port_pollptr = NULL;
+ 	portsc->port_kpollpage = 0;
+ 	portsc->port_upollpage = 0;
+@@ -604,6 +599,7 @@ hub_fake_clonedev(dev_t dev, int flag, struct proc *p)
  #endif
  
  	p->p_dupfd = fd;
@@ -9,7 +42,7 @@ $OpenBSD: patch-source_vmnet_if_hubmod_c,v 1.2 2006/04/10 21:33:36 todd Exp $
  
  	return ENXIO;
  }
-@@ -651,7 +652,7 @@ hub_sendchain(struct hubport_softc *port
+@@ -651,7 +647,7 @@ hub_sendchain(struct hubport_softc *portsc, struct mbu
  			 */
  #if NBPFILTER > 0
  			if (ifp2->if_bpf)
@@ -18,7 +51,7 @@ $OpenBSD: patch-source_vmnet_if_hubmod_c,v 1.2 2006/04/10 21:33:36 todd Exp $
  #endif
  			s = splnet();
  			drops1 = ifp2->if_snd.ifq_drops;
-@@ -732,7 +733,7 @@ hub_ifstart(struct ifnet *ifp)
+@@ -732,7 +728,7 @@ hub_ifstart(struct ifnet *ifp)
  	hub_sendchain(portsc, m);
  #if NBPFILTER > 0
  	if (ifp->if_bpf)