Merge rsync://oak/kernels/iseries/work/

diff --cc arch/powerpc/kernel/sys_ppc32.c
Simple merge

diff --cc arch/powerpc/kernel/systbl.S
index 1b807f79d5da06d9d8db9f52825b89181b65b887,2103f78f6445bd98ffcd0530a21fff204692f46f..65eaea91b499ee96787c4755c10ad70f426950e0
--- 1/arch/powerpc/kernel/systbl.S
--- 2/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 755d73f222e2eecb036157621e74baa3beaed111,ea8b6cf32c386c47a68a03d7b0f92d5d3c13ca5f..c2c3421b8f3846930f63af7f5cc08248201d1a83
--- 1/arch/ppc64/kernel/misc.S
--- 2/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 */