From 0d4ee34d4941585373be63ec3bdf9f1e2277c0e9 Mon Sep 17 00:00:00 2001
From: Sam Hartman <hartmans@debian.org>
Date: Sun, 3 Dec 2000 06:50:54 +0000
Subject: [PATCH] Merge in 1.0.1 changes

---
 src/Makefile                  |  6 ------
 src/afs/UKERNEL/sysincludes.h |  6 +++---
 src/config/linux-version      | 13 +++++++++++--
 src/lwp/lwp.h                 |  6 +++++-
 src/venus/kdump.c             |  8 ++++----
 5 files changed, 23 insertions(+), 16 deletions(-)

diff --git a/src/Makefile b/src/Makefile
index 9efddf958..239a4b5bc 100644
--- 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 55a3ab2b0..2a5e9352d 100644
--- 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 1e4de4c12..1944ae994 100644
--- 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 2df046f42..d8cb02d2e 100644
--- 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 41e62c5e8..54d4e9836 100644
--- 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()
-- 
2.39.5