Now that the phys_map_vaddr bug is out of the way, it's time to bring back

diffs which had been suspected of breakage while they were just helping this
bug to trigger.

Don't flush user tlb in the scheduler, since pmap_activate() will take care
of it if necessary.

2 files changed, 2 insertions, 21 deletions

diff --git a/sys/arch/mvme88k/mvme88k/cmmu.c b/sys/arch/mvme88k/mvme88k/cmmu.c
index defd3f9012f..6c9abd24c91 100644
--- a/sys/arch/mvme88k/mvme88k/cmmu.c
+++ b/sys/arch/mvme88k/mvme88k/cmmu.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cmmu.c,v 1.25 2004/01/09 00:23:08 miod Exp $	*/
+/*	$OpenBSD: cmmu.c,v 1.26 2004/01/17 22:35:41 miod Exp $	*/
 /*
  * Copyright (c) 1998 Steve Murphree, Jr.
  * Copyright (c) 1996 Nivas Madhur
@@ -77,12 +77,3 @@ int      max_cpus, max_cmmus;
 int      cpu_cmmu_ratio;
 
 struct cmmu_p *cmmu;
-
-void md_cmmu_flush_tlb(unsigned kernel, vaddr_t vaddr, int size);
-
-/* This is here so that process.S doesn't have to decide the CPU type */
-void
-md_cmmu_flush_tlb(unsigned kernel, vaddr_t vaddr, int size)
-{
-	cmmu_flush_tlb(cpu_number(), kernel, vaddr, size);
-}
diff --git a/sys/arch/mvme88k/mvme88k/process.S b/sys/arch/mvme88k/mvme88k/process.S
index 33fa55ff440..76984a44e08 100644
--- a/sys/arch/mvme88k/mvme88k/process.S
+++ b/sys/arch/mvme88k/mvme88k/process.S
@@ -1,4 +1,4 @@
-/*	$OpenBSD: process.S,v 1.28 2004/01/13 14:15:56 miod Exp $	*/
+/*	$OpenBSD: process.S,v 1.29 2004/01/17 22:35:41 miod Exp $	*/
 /*
  * Copyright (c) 1996 Nivas Madhur
  * All rights reserved.
@@ -237,16 +237,6 @@ ASLOCAL(Ldoneloop)
 	 or	r2, r0, r9
 	addu	r31, r31,48
 
-				/* flush tlb of any user addresses */
-	or	r2, r0, 0	/* 0 = user space */
-	or	r3, r0, 0	/* start at addr 0 */
-	subu	r31, r31,48
-	/* r2 = 1 : kernel ? user, r3 = address, r4 = size */
-	/* cmmu_flush_tlb(0, 0, 0xffff) */
-	bsr.n	_C_LABEL(md_cmmu_flush_tlb)
-	 sub	r4, r0, 1	/* flush entire va space */
-	addu	r31, r31,48
-
 	or.u	r10, r0,  hi16(_C_LABEL(curpcb))
 	ld	r10, r10,  lo16(_C_LABEL(curpcb))
 	/* XXX Is this correct/necessary? */