From: Derrick Brashear <shadow@dementia.org>
Date: Mon, 28 Jan 2008 19:30:22 +0000 (+0000)
Subject: STABLE14-revert-linux-2624-rc5-updates-20080127
X-Git-Tag: openafs-stable-1_4_7pre1~52
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=cd14e748d0e7ba0d6b9aaee84fb1abb4e554d368;p=packages%2Fo%2Fopenafs.git

STABLE14-revert-linux-2624-rc5-updates-20080127

LICENSE IPL10
FIXES 83716

the generic 2.6.24 patch should address all this.


(cherry picked from commit a0fd168db5e24fca5f08ccf67d53f58c6f05fa35)
---

diff --git a/acinclude.m4 b/acinclude.m4
index 2f5815074..28fdb69c9 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -657,10 +657,6 @@ case $AFS_SYSNAME in *_linux* | *_umlinux*)
 		  AC_DEFINE(FREEZER_H_EXISTS, 1, [define if you have linux/freezer.h])
 		 fi
 		 LINUX_REFRIGERATOR
-		 LINUX_KEY_TYPE_H_EXISTS
-		 if test "x$ac_cv_linux_key_type_h_exists" = "xyes" ; then
-		  AC_DEFINE(KEY_TYPE_H_EXISTS, 1, [define if you have linux/key-type.h])
-		 fi
 		 LINUX_LINUX_KEYRING_SUPPORT
 		 LINUX_KEY_ALLOC_NEEDS_STRUCT_TASK
 		 LINUX_DO_SYNC_READ
diff --git a/src/afs/LINUX/osi_groups.c b/src/afs/LINUX/osi_groups.c
index 01ddb0765..c0d827027 100644
--- a/src/afs/LINUX/osi_groups.c
+++ b/src/afs/LINUX/osi_groups.c
@@ -17,9 +17,6 @@
 #include "afs/param.h"
 #ifdef LINUX_KEYRING_SUPPORT
 #include <linux/seq_file.h>
-#if KEY_TYPE_H_EXISTS
-#include <linux/key-type.h>
-#endif
 #endif
 
 RCSID
diff --git a/src/cf/linux-test4.m4 b/src/cf/linux-test4.m4
index c65bcece4..3f1937c1f 100644
--- a/src/cf/linux-test4.m4
+++ b/src/cf/linux-test4.m4
@@ -777,7 +777,7 @@ AC_DEFUN([LINUX_DO_SYNC_READ], [
   AC_MSG_CHECKING([for linux do_sync_read()])
   AC_CACHE_VAL([ac_cv_linux_do_sync_read], [
     save_CPPFLAGS="$CPPFLAGS"
-    EXTRA_FLAGS="$CPPFLAGS -Werror-implicit-function-declaration"
+    CPPFLAGS="$CPPFLAGS -Werror-implicit-function-declaration"
     AC_TRY_KBUILD(
 [#include <linux/fs.h>],
 [do_sync_read(NULL, NULL, 0, NULL);],