diff options
| author | Ingo Molnar <mingo@kernel.org> | 2012-08-28 18:05:55 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2012-08-28 18:05:55 +0200 |
| commit | 508dc4f8eece1a70c493afc6511fdf5934fef567 (patch) | |
| tree | b852a6a5bf9977a33a87158985de02d188ba71d7 /arch/s390/kernel/compat_wrapper.S | |
| parent | 734e9a26d612f64e1c9cfd92256969b773954ae2 (diff) | |
| parent | e3e45c01ae690e65f2650e5288b9af802e95a136 (diff) | |
Merge branch 'perf/urgent' into perf/core
Pick up the latest fixes because upcoming uprobes changes will rely on it.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/s390/kernel/compat_wrapper.S')
| -rw-r--r-- | arch/s390/kernel/compat_wrapper.S | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/s390/kernel/compat_wrapper.S b/arch/s390/kernel/compat_wrapper.S index e835d6d5b7f..2d82cfcbce5 100644 --- a/arch/s390/kernel/compat_wrapper.S +++ b/arch/s390/kernel/compat_wrapper.S @@ -1635,7 +1635,7 @@ ENTRY(compat_sys_process_vm_readv_wrapper) llgfr %r6,%r6 # unsigned long llgf %r0,164(%r15) # unsigned long stg %r0,160(%r15) - jg sys_process_vm_readv + jg compat_sys_process_vm_readv ENTRY(compat_sys_process_vm_writev_wrapper) lgfr %r2,%r2 # compat_pid_t @@ -1645,4 +1645,4 @@ ENTRY(compat_sys_process_vm_writev_wrapper) llgfr %r6,%r6 # unsigned long llgf %r0,164(%r15) # unsigned long stg %r0,160(%r15) - jg sys_process_vm_writev + jg compat_sys_process_vm_writev |