---

yaml --- r: 74566 b: refs/heads/master c: 7af0d6f h: refs/heads/master v: v3
git-mirror · Dec 4, 2007 · 2bc17b9 · 2bc17b9
1 parent ae209e7
commit 2bc17b9
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ab1809b4ed9a3aaf3b34133a776a94f9fad54cc4
+refs/heads/master: 7af0d6f753f5adf773f99470666b50490d3379f1
diff --git a/trunk/arch/s390/kernel/setup.c b/trunk/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);
 	}