PERFORCE change 211438 for review

[Robert Watson]

http://p4web.freebsd.org/@@211438?ac=10

Change 211438 by rwatson at rwatson_svr_ctsrd_mipsbuild on 2012/05/20 16:20:41

	Insert a restoration of userspace $c0 before another instance
	of eret.

Affected files ...

.. //depot/projects/ctsrd/cheribsd/src/sys/mips/mips/swtch.S#3 edit

Differences ...

==== //depot/projects/ctsrd/cheribsd/src/sys/mips/mips/swtch.S#3 (text+ko) ====

@@ -162,6 +162,9 @@
 	mtc0	k0, MIPS_COP_0_STATUS	# switch to user mode (when eret...)
 	HAZARD_DELAY
 	sync
+#ifdef CPU_CHERI
+	cmove		$c0, $c27	# Restore user data segment
+#endif
 	eret
 	.set	at
 END(fork_trampoline)