Merge in 1.0.1 changes

diff --git a/src/Makefile b/src/Makefile
index 9efddf958a40940e9b7ae94ec0a9656d3e2d220e..239a4b5bce843c832f969ae5ba276e4ff2c2006a 100644 (file)
--- a/src/Makefile
+++ b/src/Makefile
@@ -254,12 +254,6 @@ vfsck:     minproject vol
                echo skip vfsck for ${SYS_NAME} ;; \
        rs_aix42)       \
                echo skip vfsck for ${SYS_NAME} ;; \
-       sun4x_55 )  \
-               echo skip vfsck for ${SYS_NAME} ;; \
-       sun4x_56 )  \
-               echo skip vfsck for ${SYS_NAME} ;; \
-       sun4x_57 )  \
-               echo skip vfsck for ${SYS_NAME} ;; \
        sun4x_58 )  \
                echo skip vfsck for ${SYS_NAME} ;; \
         * ) \

diff --git a/src/afs/UKERNEL/sysincludes.h b/src/afs/UKERNEL/sysincludes.h
index 55a3ab2b0c48c1607538a7ea304280eea83bbffd..2a5e9352dc1b8977bfc35afbe102d69617058d85 100644 (file)
--- a/src/afs/UKERNEL/sysincludes.h
+++ b/src/afs/UKERNEL/sysincludes.h
@@ -111,9 +111,9 @@
 #include  <arpa/inet.h>
 #define FREAD                  0x0001
 #endif /* AFS_USR_LINUX22_ENV */
-/*glibc 2.1 does not implement pthread_attr_setstacksize but 2.2 does*/
-#if (defined(AFS_LINUX22_ENV) || defined(AFS_USR_LINUX22_ENV)) \
-&& (__GLIBC_MINOR__ < 2)
+
+/* glibc 2.2 has pthread_attr_setstacksize */
+#if defined(AFS_LINUX22_ENV) || defined(AFS_USR_LINUX22_ENV) && (__GLIBC_MINOR__ < 2)
 #define pthread_attr_setstacksize(a,b) 0
 #endif
 

diff --git a/src/config/linux-version b/src/config/linux-version
index 1e4de4c122d767a633d37a92cfbe367ae9e8b08b..1944ae9941df5fc4d81ebffdaf9d2adc4a9b718f 100644 (file)
--- a/src/config/linux-version
+++ b/src/config/linux-version
@@ -58,9 +58,18 @@ for VERS in $LINUX_VERS ; do
            echo "       No UTS_RELEASE string found in $header."
            continue
        elif [ "$VERS" != "$vers" ] ; then
-           echo "ERROR: Cannot build $VERS. Wrong version '('$vers')' in $header."
+# Redhat kernel source has the problem that they create one version.h for
+# all their builds; So, we have to be creative here.
+#          echo "ERROR: Cannot build $VERS. Wrong version '('$vers')' in $header."
+#          errors=true
+#          continue
            errors=true
-           continue
+           for subvers in $vers ; do
+               if [ "x$subvers" = "x$VERS" ] ; then
+                   errors=false
+                   continue
+               fi
+           done
        fi
        CAN_BUILD="$CAN_BUILD $VERS"
         found_one="true"

diff --git a/src/lwp/lwp.h b/src/lwp/lwp.h
index 2df046f42b1ec90a75301a80b8babd35ef34dc42..d8cb02d2edf4583df9ac127c4b4602b8f5bd7ae6 100644 (file)
--- a/src/lwp/lwp.h
+++ b/src/lwp/lwp.h
@@ -286,7 +286,11 @@ extern
  * cases, and also between machines apparently running the same OS
  * version.
  */
-#define AFS_LWP_MINSTACKSIZE   (180 * 1024)
+#if defined(AFS_LINUX22_ENV)
+#define AFS_LWP_MINSTACKSIZE   (192 * 1024)
+#else
+#define AFS_LWP_MINSTACKSIZE   (48 * 1024)
+#endif
 
 /* Action to take on stack overflow. */
 #define LWP_SOQUIET    1               /* do nothing */

diff --git a/src/venus/kdump.c b/src/venus/kdump.c
index 41e62c5e828cb90b3db15060f8a720daf8f4116e..54d4e98366b1663b6f07b3930cb90fe02cd6cd4f 100644 (file)
--- a/src/venus/kdump.c
+++ b/src/venus/kdump.c
@@ -7,6 +7,10 @@
  * directory or online at http://www.openafs.org/dl/license10.html
  */
 
+#include <stdio.h>
+#include <stdlib.h>    /* for malloc() */
+#include <string.h>
+
 #ifdef __linux__
 #define _CFS_HEADER_
 #define _AFFS_FS_I
@@ -46,10 +50,6 @@ struct ntfs_inode_info{};
 
 #include <afs/param.h>
 
-#include <stdio.h>
-#include <stdlib.h>    /* for malloc() */
-#include <string.h>
-
 /*
  * Need to include <netdb.h> before _KERNEL is defined since on IRIX 6.5
  * <netdb.h> includes <netinet/in.h>, which in turn declares inet_addr()