From 7a379e3dfa902d5b1b0a4f1ee44d8a853d6883c6 Mon Sep 17 00:00:00 2001
From: Carsten Otte <cotte@de.ibm.com>
Date: Sun, 30 Oct 2011 15:16:59 +0100
Subject: [PATCH] --- yaml --- r: 272078 b: refs/heads/master c:
 69ba97436647f3b793f8e0784d1cde63adf241ea h: refs/heads/master v: v3

---
 [refs]                           | 2 +-
 trunk/arch/s390/kernel/entry64.S | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 9607d29280de..98fafd9eeccc 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d98e19ccef10c5aadccc4ffe2925e4099ff9606a
+refs/heads/master: 69ba97436647f3b793f8e0784d1cde63adf241ea
diff --git a/trunk/arch/s390/kernel/entry64.S b/trunk/arch/s390/kernel/entry64.S
index e34907560c23..83a93747e2fd 100644
--- a/trunk/arch/s390/kernel/entry64.S
+++ b/trunk/arch/s390/kernel/entry64.S
@@ -1081,6 +1081,7 @@ sie_exit:
 	lghi	%r2,0
 	br	%r14
 sie_fault:
+	lctlg	%c1,%c1,__LC_USER_ASCE		# load primary asce
 	lg	%r14,__LC_THREAD_INFO		# pointer thread_info struct
 	ni	__TI_flags+6(%r14),255-(_TIF_SIE>>8)
 	lg	%r14,__SF_EMPTY+8(%r15)		# load guest register save area