From 0008bb59882acebb9a65f8ce76357686fb5a6e8c Mon Sep 17 00:00:00 2001
From: Andrej Filipcic <andrej.filipcic@ijs.si>
Date: Tue, 3 Feb 2004 05:57:49 +0000
Subject: [PATCH] amd64-update-20040202

FIXES 2756

deal with types in newer amd64 distributions
initialize some variables
---
 src/afs/LINUX/osi_groups.c |  4 ++--
 src/afs/LINUX/osi_module.c | 22 +++++++++++-----------
 src/afs/afs_call.c         |  2 +-
 src/afs/afs_pioctl.c       |  2 +-
 4 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/src/afs/LINUX/osi_groups.c b/src/afs/LINUX/osi_groups.c
index 2e2cb225af..fec9eb91d4 100644
--- a/src/afs/LINUX/osi_groups.c
+++ b/src/afs/LINUX/osi_groups.c
@@ -185,9 +185,9 @@ afs_xsetgroups32(int gidsetsize, gid_t * grouplist)
 
 #if defined(AFS_SPARC64_LINUX20_ENV) || defined(AFS_AMD64_LINUX20_ENV)
 /* Intercept the uid16 system call as used by 32bit programs. */
-extern long (*sys32_setgroupsp) (int gidsetsize, old_gid_t * grouplist);
+extern long (*sys32_setgroupsp) (int gidsetsize, u16 * grouplist);
 asmlinkage long
-afs32_xsetgroups(int gidsetsize, old_gid_t * grouplist)
+afs32_xsetgroups(int gidsetsize, u16 * grouplist)
 {
     long code;
     cred_t *cr = crref();
diff --git a/src/afs/LINUX/osi_module.c b/src/afs/LINUX/osi_module.c
index cb6895787d..c28a953e54 100644
--- a/src/afs/LINUX/osi_module.c
+++ b/src/afs/LINUX/osi_module.c
@@ -86,7 +86,7 @@ static void **ia32_sys_call_table;
 #endif
 
 static void *ia32_ni_syscall = 0;
-asmlinkage long (*sys32_setgroupsp) (int gidsetsize, old_gid_t * grouplist);
+asmlinkage long (*sys32_setgroupsp) (int gidsetsize, u16 * grouplist);
 #if defined(__NR_ia32_setgroups32)
 asmlinkage long (*sys32_setgroups32p) (int gidsetsize, gid_t * grouplist);
 #endif /* __NR_ia32_setgroups32 */
@@ -167,7 +167,7 @@ init_module(void)
 #endif
 {
 #if defined(AFS_IA64_LINUX20_ENV)
-    unsigned long kernel_gp;
+    unsigned long kernel_gp = 0;
     static struct fptr sys_settimeofday, sys_setgroups;
 #endif
     extern int afs_syscall();
@@ -187,19 +187,19 @@ init_module(void)
 
 #if !defined(EXPORTED_SYS_CALL_TABLE) || (defined(AFS_AMD64_LINUX20_ENV) && !defined(EXPORTED_IA32_SYS_CALL_TABLE))
     unsigned long *ptr;
-    unsigned long offset;
-    unsigned long datalen;
+    unsigned long offset=0;
+    unsigned long datalen=0;
     int ret;
-    unsigned long token;
+    unsigned long token=0;
     char *mod_name;
-    unsigned long mod_start;
-    unsigned long mod_end;
+    unsigned long mod_start=0;
+    unsigned long mod_end=0;
     char *sec_name;
-    unsigned long sec_start;
-    unsigned long sec_end;
+    unsigned long sec_start=0;
+    unsigned long sec_end=0;
     char *sym_name;
-    unsigned long sym_start;
-    unsigned long sym_end;
+    unsigned long sym_start=0;
+    unsigned long sym_end=0;
 #endif /* EXPORTED_SYS_CALL_TABLE */
 
     RWLOCK_INIT(&afs_xosi, "afs_xosi");
diff --git a/src/afs/afs_call.c b/src/afs/afs_call.c
index e661218637..c0d956580f 100644
--- a/src/afs/afs_call.c
+++ b/src/afs/afs_call.c
@@ -1109,7 +1109,7 @@ copyin_iparam(caddr_t cmarg, struct iparam *dst)
     }
 #endif /* AFS_SUN57_64BIT_ENV */
 
-#if defined(AFS_LINUX_64BIT_KERNEL) && !defined(AFS_ALPHA_LINUX20_ENV) && !defined(AFS_IA64_LINUX20_ENV)
+#if defined(AFS_LINUX_64BIT_KERNEL) && !defined(AFS_ALPHA_LINUX20_ENV) && !defined(AFS_IA64_LINUX20_ENV) && !defined(AFS_AMD64_LINUX20_ENV)
     struct iparam32 dst32;
 
 #ifdef AFS_SPARC64_LINUX24_ENV
diff --git a/src/afs/afs_pioctl.c b/src/afs/afs_pioctl.c
index c1db322736..bc2eb22b44 100644
--- a/src/afs/afs_pioctl.c
+++ b/src/afs/afs_pioctl.c
@@ -256,7 +256,7 @@ copyin_afs_ioctl(caddr_t cmarg, struct afs_ioctl *dst)
     }
 #endif /* defined(AFS_SGI_ENV) && (_MIPS_SZLONG==64) */
 
-#if defined(AFS_LINUX_64BIT_KERNEL) && !defined(AFS_ALPHA_LINUX20_ENV) && !defined(AFS_IA64_LINUX20_ENV)
+#if defined(AFS_LINUX_64BIT_KERNEL) && !defined(AFS_ALPHA_LINUX20_ENV) && !defined(AFS_IA64_LINUX20_ENV) && !defined(AFS_AMD64_LINUX20_ENV)
     struct afs_ioctl32 dst32;
 
 #ifdef AFS_SPARC64_LINUX24_ENV