diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-10-12 09:05:39 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-10-12 09:05:39 -0400 |
| commit | a9b9e81c915e4a57ac3b21d1a7fa7ff184639780 (patch) | |
| tree | 98304395fbb5b9c74fca35b196cd414c1949f280 /arch/s390/kernel/compat_wrapper.S | |
| parent | a8b71a2810386a5ac8f43d2095fe3355f0d8db37 (diff) | |
| parent | fd048088306656824958e7783ffcee27e241b361 (diff) | |
Merge branch 'linus' into x86/memory-corruption-check
Diffstat (limited to 'arch/s390/kernel/compat_wrapper.S')
| -rw-r--r-- | arch/s390/kernel/compat_wrapper.S | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/s390/kernel/compat_wrapper.S b/arch/s390/kernel/compat_wrapper.S index 328a20e880b5..ee51ca9e23b5 100644 --- a/arch/s390/kernel/compat_wrapper.S +++ b/arch/s390/kernel/compat_wrapper.S | |||
| @@ -128,8 +128,6 @@ sys32_alarm_wrapper: | |||
| 128 | llgfr %r2,%r2 # unsigned int | 128 | llgfr %r2,%r2 # unsigned int |
| 129 | jg sys_alarm # branch to system call | 129 | jg sys_alarm # branch to system call |
| 130 | 130 | ||
| 131 | #sys32_pause_wrapper # void | ||
| 132 | |||
| 133 | .globl compat_sys_utime_wrapper | 131 | .globl compat_sys_utime_wrapper |
| 134 | compat_sys_utime_wrapper: | 132 | compat_sys_utime_wrapper: |
| 135 | llgtr %r2,%r2 # char * | 133 | llgtr %r2,%r2 # char * |