diff --git a/sys/powerpc/aim/swtch32.S b/sys/powerpc/aim/swtch32.S
index a44b861f9c0d..76bb0f404353 100644
--- a/sys/powerpc/aim/swtch32.S
+++ b/sys/powerpc/aim/swtch32.S
@@ -113,6 +113,7 @@ ENTRY(cpu_switch)
 	mr	%r3,%r14		/* restore old thread ptr */
 	bl	pmap_deactivate		/* Deactivate the current pmap */
 
+	sync				/* Make sure all of that finished */
 	stw	%r16,TD_LOCK(%r14)	/* ULE:	update old thread's lock */
 
 cpu_switchin:
diff --git a/sys/powerpc/aim/swtch64.S b/sys/powerpc/aim/swtch64.S
index 3b09adf3209e..857ae40b1771 100644
--- a/sys/powerpc/aim/swtch64.S
+++ b/sys/powerpc/aim/swtch64.S
@@ -139,6 +139,7 @@ ENTRY(cpu_switch)
 
 	addi	%r1,%r1,48
 
+	sync				/* Make sure all of that finished */
 	std	%r16,TD_LOCK(%r14)	/* ULE:	update old thread's lock */
 
 cpu_switchin: