From caae3b4126595c1c6bdb08640fee8a9570bd4bf5 Mon Sep 17 00:00:00 2001
From: Carsten Otte <cotte@de.ibm.com>
Date: Thu, 26 Mar 2009 15:23:57 +0100
Subject: [PATCH] --- yaml --- r: 135600 b: refs/heads/master c:
 702d9e584feb028ed7e2a6d2b103b8ea57622ff2 h: refs/heads/master v: v3

---
 [refs]                       | 2 +-
 trunk/arch/s390/mm/pgtable.c | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index d7f5917d8e1b..1023e3af55cf 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3324e60aafa9aeb1009878d45079b67367a5e2b6
+refs/heads/master: 702d9e584feb028ed7e2a6d2b103b8ea57622ff2
diff --git a/trunk/arch/s390/mm/pgtable.c b/trunk/arch/s390/mm/pgtable.c
index 6b6ddc4ea02b..9bf86125f6f3 100644
--- a/trunk/arch/s390/mm/pgtable.c
+++ b/trunk/arch/s390/mm/pgtable.c
@@ -258,6 +258,10 @@ int s390_enable_sie(void)
 	struct task_struct *tsk = current;
 	struct mm_struct *mm, *old_mm;
 
+	/* Do we have switched amode? If no, we cannot do sie */
+	if (!switch_amode)
+		return -EINVAL;
+
 	/* Do we have pgstes? if yes, we are done */
 	if (tsk->mm->context.has_pgste)
 		return 0;