revert-linux-2624-rc5-updates-20080127

LICENSE IPL10
FIXES 83716

the generic 2.6.24 patch should address all this.

diff --git a/acinclude.m4 b/acinclude.m4
index 0d09c77..9994709 100644 (file)
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -659,10 +659,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 184a3e3..ed7516c 100644 (file)
--- 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 f6d037b..126f75f 100644 (file)
--- a/src/cf/linux-test4.m4
+++ b/src/cf/linux-test4.m4
@@ -786,7 +786,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);],