From e12859bed90a0bd896150b7cfc137d0ef52e48c3 Mon Sep 17 00:00:00 2001
From: Chas Williams <chas@cmf.nrl.navy.mil>
Date: Tue, 23 Apr 2002 04:03:29 +0000
Subject: [PATCH] linux-ia64-updates-20020422

updates to make it work with later 2.4

SYSCALL2POINTER change may be unnecessary (sparc64 way should work)
but without any way to test...
---
 Makefile.in                       |  2 +-
 src/afs/LINUX/osi_module.c        |  4 ++++
 src/cf/osconf.m4                  | 10 ++++++++++
 src/kauth/client.c                |  4 ++++
 src/libafs/MakefileProto.LINUX.in |  2 +-
 5 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index e4c907d34..c8a4d2864 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -275,7 +275,7 @@ login: project kauth rxkad
 		${COMPILE_PART1} sia ${COMPILE_PART2} ;; \
 	sun4x_55 ) \
 		${COMPILE_PART1} login ${COMPILE_PART2} ;; \
-	parisc_linux24) \
+	parisc_linux24|ia64_linux24) \
 		echo Skipping pam/login for parisc_linux24 ;; \
 	sun4x_* | sunx86_* | hp_ux11* | *linux* | *fbsd* ) \
 		${COMPILE_PART1} pam ${COMPILE_PART2} ;; \
diff --git a/src/afs/LINUX/osi_module.c b/src/afs/LINUX/osi_module.c
index bf7c9bb85..fecb72c74 100644
--- a/src/afs/LINUX/osi_module.c
+++ b/src/afs/LINUX/osi_module.c
@@ -154,8 +154,12 @@ 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)
diff --git a/src/cf/osconf.m4 b/src/cf/osconf.m4
index 6f029b12c..8c689b91f 100644
--- a/src/cf/osconf.m4
+++ b/src/cf/osconf.m4
@@ -184,6 +184,16 @@ case $AFS_SYSNAME in
 		YACC="bison -y"
 		;;
 
+	ia64_linux24)
+		LEX="flex -l"
+		MT_CFLAGS='-DAFS_PTHREAD_ENV -pthread -D_REENTRANT ${XCFLAGS}'
+		MT_LIBS="-lpthread"
+		PAM_CFLAGS="-g -O2 -Dlinux -DLINUX_PAM -fPIC"
+		SHLIB_LDFLAGS="-shared -Xlinker -x"
+		TXLIBS="/usr/lib/libncurses.so"
+		XCFLAGS="-g -O2 -D_LARGEFILE64_SOURCE"
+		;;
+
 	i386_linux22)
 		LEX="flex -l"
 		MT_CFLAGS='-DAFS_PTHREAD_ENV -pthread -D_REENTRANT ${XCFLAGS}'
diff --git a/src/kauth/client.c b/src/kauth/client.c
index 8678c579c..1351ae8ce 100644
--- a/src/kauth/client.c
+++ b/src/kauth/client.c
@@ -44,6 +44,10 @@ RCSID("$Header$");
 #include <strings.h>
 #endif
 #endif
+#ifdef HAVE_UNISTD_H
+#define __USE_XOPEN
+#include <unistd.h>
+#endif
 #include <afs/cellconfig.h>
 #include <afs/auth.h>
 #include <afs/afsutil.h>
diff --git a/src/libafs/MakefileProto.LINUX.in b/src/libafs/MakefileProto.LINUX.in
index 2734bca29..9d33ede0c 100644
--- a/src/libafs/MakefileProto.LINUX.in
+++ b/src/libafs/MakefileProto.LINUX.in
@@ -73,7 +73,7 @@ CCFLAGS =   $(KDEBUG) -O2 $(FOMIT) \
         -mdisable-fpregs -ffunction-sections -march=1.1 -mschedule=7100
 DEFINES = -D__KERNEL__  -D__linux__ -DKERNEL -D_KERNEL -DMODULE ${SMP_DEF}
 <ia64_linux24>
-CCFLAGS =   $(KDEBUG) -O2 $(FOMIT) -fno-strict-aliasing -pipe \
+CCFLAGS =   $(KDEBUG) -O2 $(FOMIT) -fno-strict-aliasing -fno-common -pipe \
 	-ffixed-r13 -mfixed-range=f10-f15,f32-f127 -falign-functions=32 -mb-step
 DEFINES = -D__KERNEL__ -DKERNEL -D_KERNEL ${SMP_DEF} -DMODULE
 <all>
-- 
2.39.5