diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-05-08 13:47:39 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-05-08 13:47:39 -0400 |
| commit | da1ba891f22835db9a2c349315c3763e9f4e4e67 (patch) | |
| tree | 958c53bfbe540c14370709d64c538e5c3f6cff2b /arch/s390/kernel/compat_wrapper.S | |
| parent | 8b2cc917a02936c3ea7d8da46801c7b7b6233093 (diff) | |
| parent | 45e576b1c3d0020607b8666c0247164e92c7d719 (diff) | |
Merge branch 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6
* 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6:
[S390] guest page hinting light
[S390] tty3270: fix put_char fail/success conversion.
[S390] compat ptrace cleanup
[S390] s390mach compile warning
[S390] cio: Fix parsing mechanism for blacklisted devices.
[S390] cio: Remove cio_msg kernel parameter.
[S390] s390-kvm: leave sie context on work. Removes preemption requirement
[S390] s390: Optimize user and work TIF check
Diffstat (limited to 'arch/s390/kernel/compat_wrapper.S')
| -rw-r--r-- | arch/s390/kernel/compat_wrapper.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/s390/kernel/compat_wrapper.S b/arch/s390/kernel/compat_wrapper.S index 743d54f0b8db..d003a6e16afb 100644 --- a/arch/s390/kernel/compat_wrapper.S +++ b/arch/s390/kernel/compat_wrapper.S | |||
| @@ -121,7 +121,7 @@ sys32_ptrace_wrapper: | |||
| 121 | lgfr %r3,%r3 # long | 121 | lgfr %r3,%r3 # long |
| 122 | llgtr %r4,%r4 # long | 122 | llgtr %r4,%r4 # long |
| 123 | llgfr %r5,%r5 # long | 123 | llgfr %r5,%r5 # long |
| 124 | jg sys_ptrace # branch to system call | 124 | jg compat_sys_ptrace # branch to system call |
| 125 | 125 | ||
| 126 | .globl sys32_alarm_wrapper | 126 | .globl sys32_alarm_wrapper |
| 127 | sys32_alarm_wrapper: | 127 | sys32_alarm_wrapper: |