summaryrefslogtreecommitdiffstats
path: root/arch/ppc64/kernel/misc.S
diff options
context:
space:
mode:
authorPaul Mackerras <paulus@samba.org>2005-10-17 12:10:13 +0200
committerPaul Mackerras <paulus@samba.org>2005-10-17 12:10:13 +0200
commit30286ef6e044bc3d9019c3d8b900572e3fa05e65 (patch)
tree4d73bf0eb0da75d3c52613325d4085f139efdd39 /arch/ppc64/kernel/misc.S
parentpowerpc: Initialize btext subsystem later, after prom_init (diff)
downloadlinux-30286ef6e044bc3d9019c3d8b900572e3fa05e65.tar.xz
linux-30286ef6e044bc3d9019c3d8b900572e3fa05e65.zip
powerpc: Merge syscalls.c and sys_ppc32.c.
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch/ppc64/kernel/misc.S')
-rw-r--r--arch/ppc64/kernel/misc.S8
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/ppc64/kernel/misc.S b/arch/ppc64/kernel/misc.S
index f9f2131d2fb5..eb407c429bb0 100644
--- a/arch/ppc64/kernel/misc.S
+++ b/arch/ppc64/kernel/misc.S
@@ -980,7 +980,7 @@ _GLOBAL(sys_call_table32)
.llong .sys_ni_syscall /* old mpx syscall */
.llong .sys32_setpgid
.llong .sys_ni_syscall /* old ulimit syscall */
- .llong .sys32_olduname
+ .llong .sys_olduname
.llong .sys32_umask /* 60 */
.llong .sys_chroot
.llong .sys_ustat
@@ -1030,7 +1030,7 @@ _GLOBAL(sys_call_table32)
.llong .compat_sys_newstat
.llong .compat_sys_newlstat
.llong .compat_sys_newfstat
- .llong .sys32_uname
+ .llong .sys_uname
.llong .sys_ni_syscall /* 110 old iopl syscall */
.llong .sys_vhangup
.llong .sys_ni_syscall /* old idle syscall */
@@ -1043,7 +1043,7 @@ _GLOBAL(sys_call_table32)
.llong .ppc32_sigreturn
.llong .ppc_clone /* 120 */
.llong .sys32_setdomainname
- .llong .ppc64_newuname
+ .llong .ppc_newuname
.llong .sys_ni_syscall /* old modify_ldt syscall */
.llong .sys32_adjtimex
.llong .sys_mprotect /* 125 */
@@ -1324,7 +1324,7 @@ _GLOBAL(sys_call_table)
.llong .sys_ni_syscall
.llong .ppc_clone /* 120 */
.llong .sys_setdomainname
- .llong .ppc64_newuname
+ .llong .ppc_newuname
.llong .sys_ni_syscall /* old modify_ldt syscall */
.llong .sys_adjtimex
.llong .sys_mprotect /* 125 */