From: Heiko Carstens <heiko.carstens@de.ibm.com>
Date: Tue, 4 Dec 2007 15:09:05 +0000 (+0100)
Subject: [S390] Make sure the restore psw masks are initialized.
X-Git-Tag: v2.6.24-rc5~111^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=7af0d6f753f5adf773f99470666b50490d3379f1;p=platform%2Fkernel%2Flinux-3.10.git

[S390] Make sure the restore psw masks are initialized.

In case of TRACE_IRQFLAGS the restore psw masks will not be
initialized if noexec is turned on. This will lead to an
immediate system crash.

Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
---

diff --git a/arch/s390/kernel/setup.c b/arch/s390/kernel/setup.c
index 50f8f1e..577aa7d 100644
--- a/arch/s390/kernel/setup.c
+++ b/arch/s390/kernel/setup.c
@@ -486,9 +486,7 @@ static void setup_addressing_mode(void)
 	if (s390_noexec) {
 		printk("S390 execute protection active, ");
 		set_amode_and_uaccess(PSW_ASC_SECONDARY, PSW32_ASC_SECONDARY);
-		return;
-	}
-	if (switch_amode) {
+	} else if (switch_amode) {
 		printk("S390 address spaces switched, ");
 		set_amode_and_uaccess(PSW_ASC_PRIMARY, PSW32_ASC_PRIMARY);
 	}