From: Chas Williams <chas@cmf.nrl.navy.mil>
Date: Tue, 23 Apr 2002 14:46:55 +0000 (+0000)
Subject: STABLE12-linux-ia64-cleanup-casting-20020423
X-Git-Tag: openafs-stable-1_2_4~24
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=e1bc640e773da866d88a520c862d4156ae5be341;p=packages%2Fo%2Fopenafs.git

STABLE12-linux-ia64-cleanup-casting-20020423


so we don't need the SYSCALL2POINTER change


(cherry picked from commit 8268bf34acd715d28137a3d601252fd235d1a9fb)
---

diff --git a/src/afs/LINUX/osi_module.c b/src/afs/LINUX/osi_module.c
index fecb72c74..74f851478 100644
--- a/src/afs/LINUX/osi_module.c
+++ b/src/afs/LINUX/osi_module.c
@@ -139,7 +139,7 @@ unsigned char *afs_syscall_stub, *afs_xsetgroups_stub;
 
 struct fptr
 {
-	unsigned long ip;
+	void *ip;
 	unsigned long gp;
 };
 
@@ -154,12 +154,8 @@ asmlinkage int (*sys_setgroups32p)(int gidsetsize, __kernel_gid32_t *grouplist);
 #define SYSCALL2POINTER (void *)(long)
 #else
 #define POINTER2SYSCALL (void *)
-#ifdef AFS_IA64_LINUX20_ENV
-#define SYSCALL2POINTER (long)
-#else
 #define SYSCALL2POINTER (void *)
 #endif
-#endif
 
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,0)
 int __init afs_init(void)