X-Git-Url: https://git.openafs.org/?p=openafs.git;a=blobdiff_plain;f=src%2Fafs%2Fafs_syscall.c;h=de3877d4b08954739cdbcab59beb73eca73e2b15;hp=5b1d7828000a099e5ee55eb991bef7ba4c6fbda0;hb=e6d321fcd4cbf0fdc6b153c0894f8d4c222093ad;hpb=125e4511a9715a5df7dda265373d97a21177ea21 diff --git a/src/afs/afs_syscall.c b/src/afs/afs_syscall.c index 5b1d782..de3877d 100644 --- a/src/afs/afs_syscall.c +++ b/src/afs/afs_syscall.c @@ -10,8 +10,6 @@ #include #include "afs/param.h" -RCSID - ("$Header$"); #include "afs/sysincludes.h" /* Standard vendor system headers */ #include "afsincludes.h" /* Afs-based standard headers */ @@ -111,7 +109,11 @@ copyin_afs_ioctl(caddr_t cmarg, struct afs_ioctl *dst) if (current->thread.flags & THREAD_IA32) #elif defined(AFS_PPC64_LINUX26_ENV) - if (current->thread_info->flags & _TIF_32BIT) +#if defined(STRUCT_TASK_STRUCT_HAS_THREAD_INFO) + if (current->thread_info->flags & _TIF_32BIT) +#else + if (task_thread_info(current)->flags & _TIF_32BIT) +#endif #elif defined(AFS_PPC64_LINUX20_ENV) if (current->thread.flags & PPC_FLAG_32BIT) @@ -219,7 +221,8 @@ syscall(syscall, p1, p2, p3, p4, p5, p6) /* * lsetpag - interface to afs_setpag(). */ -lsetpag() +int +lsetpag(void) { AFS_STATCNT(lsetpag); @@ -229,8 +232,8 @@ lsetpag() /* * lpioctl - interface to pioctl() */ -lpioctl(path, cmd, cmarg, follow) - char *path, *cmarg; +int +lpioctl(char *path, int cmd, void *cmarg, int follow) { AFS_STATCNT(lpioctl); @@ -378,7 +381,11 @@ copyin_iparam(caddr_t cmarg, struct iparam *dst) if (current->thread.flags & THREAD_IA32) #elif defined(AFS_PPC64_LINUX26_ENV) +#if defined(STRUCT_TASK_STRUCT_HAS_THREAD_INFO) if (current->thread_info->flags & _TIF_32BIT) +#else + if (task_thread_info(current)->flags & _TIF_32BIT) +#endif #elif defined(AFS_PPC64_LINUX20_ENV) if (current->thread.flags & PPC_FLAG_32BIT) @@ -482,6 +489,7 @@ afs_syscall(long syscall, long parm1, long parm2, long parm3, long parm4) /* eparm is also used by AFSCALL_CALL in afsd.c */ #else #if defined(UKERNEL) +int Afs_syscall() { register struct a { @@ -622,8 +630,8 @@ Afs_syscall() p->p_cred->pc_ucred); #else code = - afs_syscall_pioctl(uap->parm1, uap->parm2, uap->parm3, - uap->parm4); + afs_syscall_pioctl((char *)uap->parm1, (unsigned int)uap->parm2, (caddr_t)uap->parm3, + (int) uap->parm4); #endif AFS_GUNLOCK(); } else if (uap->syscall == AFSCALL_ICREATE) {