projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
[powerpc.git]
/
arch
/
s390
/
kernel
/
compat_wrapper.S
diff --git
a/arch/s390/kernel/compat_wrapper.S
b/arch/s390/kernel/compat_wrapper.S
index
71e54ef
..
9790129
100644
(file)
--- a/
arch/s390/kernel/compat_wrapper.S
+++ b/
arch/s390/kernel/compat_wrapper.S
@@
-517,10
+517,10
@@
sys32_swapoff_wrapper:
llgtr %r2,%r2 # const char *
jg sys_swapoff # branch to system call
llgtr %r2,%r2 # const char *
jg sys_swapoff # branch to system call
- .globl
sys32
_sysinfo_wrapper
-
sys32
_sysinfo_wrapper:
+ .globl
compat_sys
_sysinfo_wrapper
+
compat_sys
_sysinfo_wrapper:
llgtr %r2,%r2 # struct sysinfo_emu31 *
llgtr %r2,%r2 # struct sysinfo_emu31 *
- jg
sys32_sysinfo
# branch to system call
+ jg
compat_sys_sysinfo
# branch to system call
.globl sys32_ipc_wrapper
sys32_ipc_wrapper:
.globl sys32_ipc_wrapper
sys32_ipc_wrapper: