linux-26-updates-20040515

FIXES 4027

update autoconf for linux 2.6

diff --git a/src/afs/LINUX/osi_misc.c b/src/afs/LINUX/osi_misc.c
index f0aca2f..3a67257 100644 (file)
--- 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 f891c19..da397b3 100644 (file)
--- 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 751444e..350a0f7 100644 (file)
--- 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 efba6f4..67e2c46 100644 (file)
--- 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 \