diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-08-09 06:46:45 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-08-09 06:46:49 -0400 |
| commit | e3560336be655c6791316482fe288b119f34c427 (patch) | |
| tree | 43ca9a6b489aaa3918b773f78a7eda37458ef0a8 /arch/mips/kernel/scall32-o32.S | |
| parent | 26528e773ecc74fb1b61b7275f86f761cbb340ec (diff) | |
| parent | 7b2aa037e878c939676675969983284a02958ae3 (diff) | |
Merge branch 'linus' into tracing/urgent
Merge reason: Merge up to almost-rc6 to pick up latest perfcounters
(on which we'll queue up a dependent fix)
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/mips/kernel/scall32-o32.S')
| -rw-r--r-- | arch/mips/kernel/scall32-o32.S | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/mips/kernel/scall32-o32.S b/arch/mips/kernel/scall32-o32.S index 20a86e08fd58..b57082123536 100644 --- a/arch/mips/kernel/scall32-o32.S +++ b/arch/mips/kernel/scall32-o32.S | |||
| @@ -654,6 +654,7 @@ einval: li v0, -ENOSYS | |||
| 654 | sys sys_pwritev 6 | 654 | sys sys_pwritev 6 |
| 655 | sys sys_rt_tgsigqueueinfo 4 | 655 | sys sys_rt_tgsigqueueinfo 4 |
| 656 | sys sys_perf_counter_open 5 | 656 | sys sys_perf_counter_open 5 |
| 657 | sys sys_accept4 4 | ||
| 657 | .endm | 658 | .endm |
| 658 | 659 | ||
| 659 | /* We pre-compute the number of _instruction_ bytes needed to | 660 | /* We pre-compute the number of _instruction_ bytes needed to |