Merge branch 'linux-2.6'

1 files changed, 1 insertions, 3 deletions

diff --git a/arch/s390/kernel/setup.c b/arch/s390/kernel/setup.c
index 50f8f1e3760e..577aa7dd660e 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);
         }