diff options
| author | Paul Mackerras <paulus@samba.org> | 2007-12-09 23:41:22 -0500 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2007-12-09 23:41:22 -0500 |
| commit | b242a60206881559bb3102110048762422e6b74e (patch) | |
| tree | 86459efa47b9c3f69d865b4495beede9c4184003 /arch/s390/kernel/entry.S | |
| parent | e1fd18656c2963e383d67b7006c0e06c9c1d9c79 (diff) | |
| parent | 94545baded0bfbabdc30a3a4cb48b3db479dd6ef (diff) | |
Merge branch 'linux-2.6'
Diffstat (limited to 'arch/s390/kernel/entry.S')
| -rw-r--r-- | arch/s390/kernel/entry.S | 2 |
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: | |||
| 1079 | .Lexecve_tail: .long execve_tail | 1079 | .Lexecve_tail: .long execve_tail |
| 1080 | .Ljump_table: .long pgm_check_table | 1080 | .Ljump_table: .long pgm_check_table |
| 1081 | .Lschedule: .long schedule | 1081 | .Lschedule: .long schedule |
| 1082 | #ifdef CONFIG_PREEMPT | ||
| 1082 | .Lpreempt_schedule_irq: | 1083 | .Lpreempt_schedule_irq: |
| 1083 | .long preempt_schedule_irq | 1084 | .long preempt_schedule_irq |
| 1085 | #endif | ||
| 1084 | .Ltrace: .long syscall_trace | 1086 | .Ltrace: .long syscall_trace |
| 1085 | .Lschedtail: .long schedule_tail | 1087 | .Lschedtail: .long schedule_tail |
| 1086 | .Lsysc_table: .long sys_call_table | 1088 | .Lsysc_table: .long sys_call_table |