diff options
author | Paul Mackerras <paulus@samba.org> | 2007-12-10 15:41:22 +1100 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2007-12-10 15:41:22 +1100 |
commit | b242a60206881559bb3102110048762422e6b74e (patch) | |
tree | 86459efa47b9c3f69d865b4495beede9c4184003 /arch/s390/kernel/setup.c | |
parent | [POWERPC] Improved documentation of device tree 'ranges' (diff) | |
parent | Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev (diff) | |
download | linux-dev-b242a60206881559bb3102110048762422e6b74e.tar.xz linux-dev-b242a60206881559bb3102110048762422e6b74e.zip |
Merge branch 'linux-2.6'
Diffstat (limited to 'arch/s390/kernel/setup.c')
-rw-r--r-- | arch/s390/kernel/setup.c | 4 |
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); } |