From 68879a67d0f49323e1e2f8358d19bc1d94bb9f30 Mon Sep 17 00:00:00 2001
From: Andrew Waterman <waterman@s144.Millennium.Berkeley.EDU>
Date: Sun, 17 Oct 2010 19:16:26 -0700
Subject: Revert "[pk] restore correct value to $x1/$x2 after trap"

This reverts commit c08c11ad7ea573313668b0231a18a5ea4515eea5.
---
 pk/entry.S | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'pk')

diff --git a/pk/entry.S b/pk/entry.S
index fa64a80..b128e93 100644
--- a/pk/entry.S
+++ b/pk/entry.S
@@ -79,7 +79,7 @@ pop_tf:	# write the trap frame onto the stack
 	LOAD	$x1,1*REGBYTES($a0)
 	mtpcr	$x1,ASM_CR(PCR_K0)
 	LOAD	$x1,2*REGBYTES($a0)
-	mtpcr	$x2,ASM_CR(PCR_K1)
+	mtpcr	$x1,ASM_CR(PCR_K1)
 	move	$x1,$a0
 	LOAD	$x3,3*REGBYTES($x1)
 	LOAD	$x4,4*REGBYTES($x1)
-- 
cgit v1.1