diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-12-04 09:37:39 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-12-04 09:37:39 -0800 |
| commit | 2254c2e0184c603f92fc9b81016ff4bb53da622d (patch) | |
| tree | c1410c58f07f82e5203d46b52a705d321d1cba97 /arch | |
| parent | a3aaabd6b402d8b0ede5aa4a040e9fdbbfdf9116 (diff) | |
| parent | 7af0d6f753f5adf773f99470666b50490d3379f1 (diff) | |
| download | kernel-crypto-2254c2e0184c603f92fc9b81016ff4bb53da622d.tar.gz kernel-crypto-2254c2e0184c603f92fc9b81016ff4bb53da622d.tar.xz kernel-crypto-2254c2e0184c603f92fc9b81016ff4bb53da622d.zip | |
Merge branch 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6
* 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6:
[S390] Make sure the restore psw masks are initialized.
[S390] Fix compile error on 31bit without preemption
[S390] dcssblk: prevent early access without own make_request function
[S390] cio: add missing reprobe loop end statement
[S390] cio: Issue SenseID per path.
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/s390/kernel/entry.S | 2 | ||||
| -rw-r--r-- | arch/s390/kernel/setup.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/arch/s390/kernel/entry.S b/arch/s390/kernel/entry.S index b2b2edc40eb..1a6dac8df6f 100644 --- a/arch/s390/kernel/entry.S +++ b/arch/s390/kernel/entry.S @@ -1079,8 +1079,10 @@ cleanup_io_leave_insn: .Lexecve_tail: .long execve_tail .Ljump_table: .long pgm_check_table .Lschedule: .long schedule +#ifdef CONFIG_PREEMPT .Lpreempt_schedule_irq: .long preempt_schedule_irq +#endif .Ltrace: .long syscall_trace .Lschedtail: .long schedule_tail .Lsysc_table: .long sys_call_table diff --git a/arch/s390/kernel/setup.c b/arch/s390/kernel/setup.c index 50f8f1e3760..577aa7dd660 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); } |