From ae209e755d9ed60dccec9401abdde93a4153cea3 Mon Sep 17 00:00:00 2001 From: Christian Borntraeger Date: Tue, 4 Dec 2007 16:09:04 +0100 Subject: [PATCH] --- yaml --- r: 74565 b: refs/heads/master c: ab1809b4ed9a3aaf3b34133a776a94f9fad54cc4 h: refs/heads/master i: 74563: ca9374775f821b0ec3bab1a7fdd88703f71cd7db v: v3 --- [refs] | 2 +- trunk/arch/s390/kernel/entry.S | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index ff855270eb27..bc4ed927b90e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 436d1bc7fe6e78e37fe5f5022ea4d5c133d825eb +refs/heads/master: ab1809b4ed9a3aaf3b34133a776a94f9fad54cc4 diff --git a/trunk/arch/s390/kernel/entry.S b/trunk/arch/s390/kernel/entry.S index b2b2edc40eb1..1a6dac8df6fb 100644 --- a/trunk/arch/s390/kernel/entry.S +++ b/trunk/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