diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2011-05-20 14:06:24 -0400 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2011-05-20 14:08:05 -0400 |
| commit | 250f972d85effad5b6e10da4bbd877e6a4b503b6 (patch) | |
| tree | 007393a6fc6439af7e0121dd99a6f9f9fb8405bc /arch/mips/kernel/scall32-o32.S | |
| parent | 7372b0b122af0f6675f3ab65bfd91c8a438e0480 (diff) | |
| parent | bbe7b8bef48c567f5ff3f6041c1fb011292e8f12 (diff) | |
Merge branch 'timers/urgent' into timers/core
Reason: Get upstream fixes and kfree_rcu which is necessary for a
follow up patch.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'arch/mips/kernel/scall32-o32.S')
| -rw-r--r-- | arch/mips/kernel/scall32-o32.S | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/mips/kernel/scall32-o32.S b/arch/mips/kernel/scall32-o32.S index 7f5468b38d4c..7a8e1dd7f6f2 100644 --- a/arch/mips/kernel/scall32-o32.S +++ b/arch/mips/kernel/scall32-o32.S | |||
| @@ -88,8 +88,7 @@ syscall_trace_entry: | |||
| 88 | SAVE_STATIC | 88 | SAVE_STATIC |
| 89 | move s0, t2 | 89 | move s0, t2 |
| 90 | move a0, sp | 90 | move a0, sp |
| 91 | li a1, 0 | 91 | jal syscall_trace_enter |
| 92 | jal do_syscall_trace | ||
| 93 | 92 | ||
| 94 | move t0, s0 | 93 | move t0, s0 |
| 95 | RESTORE_STATIC | 94 | RESTORE_STATIC |
| @@ -565,7 +564,7 @@ einval: li v0, -ENOSYS | |||
| 565 | sys sys_ioprio_get 2 /* 4315 */ | 564 | sys sys_ioprio_get 2 /* 4315 */ |
| 566 | sys sys_utimensat 4 | 565 | sys sys_utimensat 4 |
| 567 | sys sys_signalfd 3 | 566 | sys sys_signalfd 3 |
| 568 | sys sys_ni_syscall 0 | 567 | sys sys_ni_syscall 0 /* was timerfd */ |
| 569 | sys sys_eventfd 1 | 568 | sys sys_eventfd 1 |
| 570 | sys sys_fallocate 6 /* 4320 */ | 569 | sys sys_fallocate 6 /* 4320 */ |
| 571 | sys sys_timerfd_create 2 | 570 | sys sys_timerfd_create 2 |