Merge rsync://oak/kernels/iseries/work/
Paul Mackerras [Tue, 18 Oct 2005 04:53:41 +0000 (14:53 +1000)]
1  2 
arch/powerpc/kernel/sys_ppc32.c
arch/powerpc/kernel/systbl.S
arch/ppc64/kernel/misc.S

Simple merge
@@@ -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)
@@@ -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 */