From 8b64f2f5adb69a4dced8320803a80596bb938d65 Mon Sep 17 00:00:00 2001
From: Olivier Houchard <cognet@FreeBSD.org>
Date: Mon, 10 Jan 2005 22:41:08 +0000
Subject: [PATCH] Don't assume pmap_update() will cpwait for us, pmap_update
 will disappear soon.

---
 sys/arm/arm/cpufunc_asm_xscale.S | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/sys/arm/arm/cpufunc_asm_xscale.S b/sys/arm/arm/cpufunc_asm_xscale.S
index bc02d31ad7f..b4700e4a481 100644
--- a/sys/arm/arm/cpufunc_asm_xscale.S
+++ b/sys/arm/arm/cpufunc_asm_xscale.S
@@ -171,13 +171,11 @@ ENTRY(xscale_setttb)
 /*
  * TLB functions
  *
- * Note: We don't need to worry about issuing a CPWAIT after
- * TLB operations, because we expect a pmap_update() to follow.
  */
 ENTRY(xscale_tlb_flushID_SE)
 	mcr	p15, 0, r0, c8, c6, 1	/* flush D tlb single entry */
 	mcr	p15, 0, r0, c8, c5, 1	/* flush I tlb single entry */
-	RET
+	CPWAIT_AND_RETURN(r0)
 
 /*
  * Cache functions