summaryrefslogtreecommitdiffstats
path: root/arch/s390
diff options
context:
space:
mode:
authorChristian Borntraeger <borntraeger@de.ibm.com>2007-12-04 16:09:04 +0100
committerMartin Schwidefsky <schwidefsky@de.ibm.com>2007-12-04 16:09:58 +0100
commitab1809b4ed9a3aaf3b34133a776a94f9fad54cc4 (patch)
treec7fab86191370781d8d2a43df33f059e70b9e4e1 /arch/s390
parent436d1bc7fe6e78e37fe5f5022ea4d5c133d825eb (diff)
downloadlinux-stable-ab1809b4ed9a3aaf3b34133a776a94f9fad54cc4.tar.gz
linux-stable-ab1809b4ed9a3aaf3b34133a776a94f9fad54cc4.tar.bz2
linux-stable-ab1809b4ed9a3aaf3b34133a776a94f9fad54cc4.zip
[S390] Fix compile error on 31bit without preemption
Commit b8e7a54cd06b0b0174029ef3a7f5a1415a2c28f2 introduced a compile error if CONFIG_PREEMPT is not set: arch/s390/kernel/built-in.o: In function `cleanup_io_leave_insn': /space/kvm/arch/s390/kernel/entry.S:(.text+0xbfce): undefined reference to `preempt_schedule_irq' This patch hides preempt_schedule_irq if CONFIG_PREEMPT is not set. Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com> Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Diffstat (limited to 'arch/s390')
-rw-r--r--arch/s390/kernel/entry.S2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/s390/kernel/entry.S b/arch/s390/kernel/entry.S
index b2b2edc40eb1..1a6dac8df6fb 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