From b1ae3fc1a6e30392e08b93177b005cc6fa79f27f Mon Sep 17 00:00:00 2001
From: Chas Williams <chas@cmf.nrl.navy.mil>
Date: Sat, 15 May 2004 07:43:09 +0000
Subject: [PATCH] linux-26-updates-20040515

FIXES 4027

update autoconf for linux 2.6
---
 src/afs/LINUX/osi_misc.c          |  3 ++-
 src/afs/LINUX/osi_module.c        |  1 -
 src/cf/osconf.m4                  | 18 +-----------------
 src/libafs/MakefileProto.LINUX.in |  1 +
 4 files changed, 4 insertions(+), 19 deletions(-)

diff --git a/src/afs/LINUX/osi_misc.c b/src/afs/LINUX/osi_misc.c
index f0aca2f0a..3a6725745 100644
--- a/src/afs/LINUX/osi_misc.c
+++ b/src/afs/LINUX/osi_misc.c
@@ -334,7 +334,8 @@ afs_osi_SetTime(osi_timeval_t * tvp)
     AFS_STATCNT(osi_SetTime);
 
     TO_USER_SPACE();
-    (void)(*sys_settimeofdayp) (tvp, NULL);
+    if (sys_settimeofdayp)
+	(void)(*sys_settimeofdayp) (tvp, NULL);
     TO_KERNEL_SPACE();
 #endif
 }
diff --git a/src/afs/LINUX/osi_module.c b/src/afs/LINUX/osi_module.c
index f891c197f..da397b34c 100644
--- a/src/afs/LINUX/osi_module.c
+++ b/src/afs/LINUX/osi_module.c
@@ -369,7 +369,6 @@ init_module(void)
 #endif /* EXPORTED_KALLSYMS_ADDRESS */
     if (!sys_call_table) {
 	printf("Failed to find address of sys_call_table\n");
-	sys_settimeofdayp = 0;
     } else {
 	printf("Found sys_call_table at %x\n", sys_call_table);
 #ifdef AFS_SPARC64_LINUX20_ENV
diff --git a/src/cf/osconf.m4 b/src/cf/osconf.m4
index 751444e65..350a0f73e 100644
--- a/src/cf/osconf.m4
+++ b/src/cf/osconf.m4
@@ -253,22 +253,6 @@ case $AFS_SYSNAME in
 		SHLIB_LINKER="${MT_CC} -shared"
 		;;
 
-	i386_linux22)
-		CC="gcc -pipe"
-		CCOBJ="gcc -pipe"
-		MT_CC="gcc -pipe"
-		KERN_OPTMZ=-O2
-		LEX="flex -l"
-		MT_CFLAGS='-DAFS_PTHREAD_ENV -pthread -D_REENTRANT ${XCFLAGS}'
-		MT_LIBS="-lpthread"
-		PAM_CFLAGS="-O2 -Dlinux -DLINUX_PAM -fPIC"
-		SHLIB_LDFLAGS="-shared -Xlinker -x"
-		TXLIBS="-lncurses"
-		XCFLAGS="-O2 -D_LARGEFILE64_SOURCE"
-		YACC="bison -y"
-		SHLIB_LINKER="${MT_CC} -shared"
-		;;
-
 	i386_umlinux22)
 		CC="gcc -pipe"
 		CCOBJ="gcc -pipe"
@@ -285,7 +269,7 @@ case $AFS_SYSNAME in
 		SHLIB_LINKER="${MT_CC} -shared"
 		;;
 
-	i386_linux24)
+	i386_linux*)
 		CC="gcc -pipe"
 		CCOBJ="gcc -pipe"
 		MT_CC="gcc -pipe"
diff --git a/src/libafs/MakefileProto.LINUX.in b/src/libafs/MakefileProto.LINUX.in
index efba6f412..67e2c4629 100644
--- a/src/libafs/MakefileProto.LINUX.in
+++ b/src/libafs/MakefileProto.LINUX.in
@@ -154,6 +154,7 @@ ${COMPDIRS} ${INSTDIRS} ${DESTDIRS}:
 <ia64_linux24>
 	ln -fs ${LINUX_KERNEL_PATH}/include/asm-ia64 asm
 <i386_linux26>
+	$(RM) -f mach
 	ln -fs ${LINUX_KERNEL_PATH}/include/asm-i386/mach-default mach
 <all>
 	for m in ${MPS} ; do \
-- 
2.39.5