From: Paul Mackerras Date: Tue, 18 Oct 2005 04:53:41 +0000 (+1000) Subject: Merge rsync://oak/kernels/iseries/work/ X-Git-Tag: v2.6.16.28-rc1~2806^2~154 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=46aab8c584ea69cdbe1060f5eae5bf092763f710;p=karo-tx-linux.git Merge rsync://oak/kernels/iseries/work/ --- 46aab8c584ea69cdbe1060f5eae5bf092763f710 diff --cc arch/powerpc/kernel/systbl.S index 1b807f79d5da,2103f78f6445..65eaea91b499 --- a/arch/powerpc/kernel/systbl.S +++ b/arch/powerpc/kernel/systbl.S @@@ -293,11 -291,11 +291,11 @@@ COMPAT_SYS(clock_gettime COMPAT_SYS(clock_getres) COMPAT_SYS(clock_nanosleep) SYSX(ppc64_swapcontext,ppc32_swapcontext,ppc_swapcontext) - SYSCALL32(tgkill) - SYSCALL32(utimes) + COMPAT_SYS(tgkill) + COMPAT_SYS(utimes) COMPAT_SYS(statfs64) COMPAT_SYS(fstatfs64) -SYSX(sys_ni_syscall, ppc32_fadvise64_64, sys_fadvise64_64) +SYSX(sys_ni_syscall, ppc_fadvise64_64, ppc_fadvise64_64) PPC_SYS(rtas) OLDSYS(debug_setcontext) SYSCALL(ni_syscall) diff --cc arch/ppc64/kernel/misc.S index 755d73f222e2,ea8b6cf32c38..c2c3421b8f38 --- a/arch/ppc64/kernel/misc.S +++ b/arch/ppc64/kernel/misc.S @@@ -1171,11 -1171,11 +1171,11 @@@ _GLOBAL(sys_call_table32 .llong .compat_sys_clock_getres .llong .compat_sys_clock_nanosleep .llong .ppc32_swapcontext - .llong .sys32_tgkill /* 250 */ - .llong .sys32_utimes + .llong .compat_sys_tgkill /* 250 */ + .llong .compat_sys_utimes .llong .compat_sys_statfs64 .llong .compat_sys_fstatfs64 - .llong .ppc32_fadvise64_64 /* 32bit only fadvise64_64 */ + .llong .ppc_fadvise64_64 /* 32bit only fadvise64_64 */ .llong .ppc_rtas /* 255 */ .llong .sys_ni_syscall /* 256 reserved for sys_debug_setcontext */ .llong .sys_ni_syscall /* 257 reserved for vserver */