DEVEL15-linux-config-h-died-20061109

FIXES 42662

config.h vanished. deal.

(cherry picked from commit ee8ae61a4d9610fea16473d87b471cd4fc128804)

diff --git a/acinclude.m4 b/acinclude.m4
index 09da9fd..99a45d5 100644 (file)
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -588,6 +588,7 @@ case $AFS_SYSNAME in *_linux* | *_umlinux*)
                   [LINUX_BUILD_VNODE_FROM_INODE(${srcdir}/src/config,src/afs/LINUX,${srcdir}/src/afs/LINUX)]
                 )
 
+                LINUX_CONFIG_H_EXISTS
                 LINUX_COMPLETION_H_EXISTS
                 LINUX_DEFINES_FOR_EACH_PROCESS
                 LINUX_DEFINES_PREV_TASK

diff --git a/src/afs/LINUX/osi_probe.c b/src/afs/LINUX/osi_probe.c
index 06364ca..c2d3ce4 100644 (file)
--- a/src/afs/LINUX/osi_probe.c
+++ b/src/afs/LINUX/osi_probe.c
@@ -59,7 +59,9 @@
 #include "afsincludes.h"
 #endif
 #include <linux/version.h>
+#ifdef CONFIG_H_EXISTS
 #include <linux/config.h>
+#endif
 #include <linux/linkage.h>
 #include <linux/init.h>
 #include <linux/unistd.h>

diff --git a/src/afs/LINUX/osi_sysctl.c b/src/afs/LINUX/osi_sysctl.c
index 081e560..3870563 100644 (file)
--- a/src/afs/LINUX/osi_sysctl.c
+++ b/src/afs/LINUX/osi_sysctl.c
@@ -14,7 +14,9 @@
 #include "afs/afs_stats.h"     /* afs statistics */
 
 #include <linux/sysctl.h>
+#ifdef CONFIG_H_EXISTS
 #include <linux/config.h>
+#endif
 
 /* From afs_util.c */
 extern afs_int32 afs_new_inum;

diff --git a/src/cf/linux-test3.m4 b/src/cf/linux-test3.m4
index 2c9ea99..8c3b296 100644 (file)
--- a/src/cf/linux-test3.m4
+++ b/src/cf/linux-test3.m4
@@ -33,6 +33,9 @@ AC_SUBST(RHCONFIG_SP)
 AC_SUBST(RHCONFIG_MP)
 ])
 
+
+dnl This depends on LINUX_CONFIG_H_EXISTS running first!
+
 AC_DEFUN([LINUX_WHICH_MODULES],[
 if test "x$enable_redhat_buildsys" = "xyes"; then
   MPS=Default
@@ -40,12 +43,17 @@ else
   save_CPPFLAGS="$CPPFLAGS"
   CPPFLAGS="-I${LINUX_KERNEL_PATH}/include -D__KERNEL__ $RHCONFIG_SP $CPPFLAGS"
   AC_MSG_CHECKING(which kernel modules to build)
+  if test "x$ac_cv_linux_config_h_exists" = "xyes"; then
+    CPPFLAGS="-DCONFIG_H_EXISTS $CPPFLAGS"
+  fi
   if test "x$ac_linux_rhconfig" = "xyes"; then
       MPS="MP SP"
   else
   AC_CACHE_VAL(ac_cv_linux_config_smp, [
-  AC_TRY_COMPILE(
-[#include <linux/config.h>
+  AC_TRY_KBUILD(
+[#ifdef CONFIG_H_EXISTS
+#include <linux/config.h>
+#endif
 ],
 [#ifndef CONFIG_SMP
 lose;

diff --git a/src/cf/linux-test4.m4 b/src/cf/linux-test4.m4
index 4693871..60bb851 100644 (file)
--- a/src/cf/linux-test4.m4
+++ b/src/cf/linux-test4.m4
@@ -1,3 +1,17 @@
+AC_DEFUN([LINUX_CONFIG_H_EXISTS], [
+  AC_MSG_CHECKING([for linux/config.h existance])
+  AC_CACHE_VAL([ac_cv_linux_config_h_exists], [
+    AC_TRY_KBUILD(
+[#include <linux/config.h>],
+[return;],
+      ac_cv_linux_config_h_exists=yes,
+      ac_cv_linux_config_h_exists=no)])
+  AC_MSG_RESULT($ac_cv_linux_config_h_exists)
+  if test "x$ac_cv_linux_config_h_exists" = "xyes"; then
+    AC_DEFINE([CONFIG_H_EXISTS], 1, [define if linux/config.h exists])
+  fi])
+
+
 AC_DEFUN([LINUX_COMPLETION_H_EXISTS], [
   AC_MSG_CHECKING([for linux/completion.h existance])
   AC_CACHE_VAL([ac_cv_linux_completion_h_exists], [

diff --git a/src/config/param.alpha_linux_22.h b/src/config/param.alpha_linux_22.h
index 4816325..2039895 100644 (file)
--- a/src/config/param.alpha_linux_22.h
+++ b/src/config/param.alpha_linux_22.h
@@ -30,7 +30,6 @@
 #define AFS_64BITPOINTER_ENV   1       /* pointers are 64 bits. */
 
 #if defined(__KERNEL__) && !defined(KDUMP_KERNEL)
-#include <linux/config.h>
 #ifdef CONFIG_SMP
 #undef CONFIG_SMP
 #endif

diff --git a/src/config/param.alpha_linux_24.h b/src/config/param.alpha_linux_24.h
index 31da56e..4a565a6 100644 (file)
--- a/src/config/param.alpha_linux_24.h
+++ b/src/config/param.alpha_linux_24.h
@@ -32,7 +32,6 @@
 #define AFS_64BITPOINTER_ENV   1       /* pointers are 64 bits. */
 
 #if defined(__KERNEL__) && !defined(KDUMP_KERNEL)
-#include <linux/config.h>
 #ifdef CONFIG_SMP
 #undef CONFIG_SMP
 #endif

diff --git a/src/config/param.alpha_linux_26.h b/src/config/param.alpha_linux_26.h
index 3ba85d1..d44edc4 100644 (file)
--- a/src/config/param.alpha_linux_26.h
+++ b/src/config/param.alpha_linux_26.h
@@ -35,9 +35,7 @@
 
 
 #if defined(__KERNEL__) && !defined(KDUMP_KERNEL)
-#include <linux/threads.h>
 
-#include <linux/config.h>
 #ifdef CONFIG_SMP
 #ifndef AFS_SMP
 #define AFS_SMP 1

diff --git a/src/config/param.amd64_linux24.h b/src/config/param.amd64_linux24.h
index 44a9994..6e1e808 100644 (file)
--- a/src/config/param.amd64_linux24.h
+++ b/src/config/param.amd64_linux24.h
@@ -41,9 +41,7 @@
 #define AFS_64BITPOINTER_ENV   1       /* pointers are 64 bits. */
 
 #if defined(__KERNEL__) && !defined(KDUMP_KERNEL)
-#include <linux/threads.h>
 
-#include <linux/config.h>
 #ifdef CONFIG_SMP
 #undef CONFIG_SMP
 #endif
@@ -89,7 +87,6 @@
 #endif
 #endif /* KERNEL */
 
-#define USE_UCONTEXT           /* should be in afsconfig.h */
 
 #endif /* _PARAM_AMD64_LINUX20_H_ */
 
@@ -160,7 +157,6 @@
 #define CMSERVERPREF
 #endif
 
-#define USE_UCONTEXT           /* should be in afsconfig.h */
 
 #endif /* AFS_PARAM_H */
 

diff --git a/src/config/param.amd64_linux26.h b/src/config/param.amd64_linux26.h
index 52c05ec..570fdb5 100644 (file)
--- a/src/config/param.amd64_linux26.h
+++ b/src/config/param.amd64_linux26.h
@@ -30,9 +30,7 @@
 #define AFS_64BITPOINTER_ENV   1       /* pointers are 64 bits */
 
 #if defined(__KERNEL__) && !defined(KDUMP_KERNEL)
-#include <linux/threads.h>
 
-#include <linux/config.h>
 #ifdef CONFIG_SMP
 #ifndef AFS_SMP
 #define AFS_SMP 1

diff --git a/src/config/param.i386_linux22.h b/src/config/param.i386_linux22.h
index 24f3183..686f957 100644 (file)
--- a/src/config/param.i386_linux22.h
+++ b/src/config/param.i386_linux22.h
@@ -32,7 +32,6 @@
 #define AFS_NAMEI_ENV     1    /* User space interface to file system */
 
 #if defined(__KERNEL__) && !defined(KDUMP_KERNEL)
-#include <linux/config.h>
 #ifdef CONFIG_SMP
 #undef CONFIG_SMP
 #endif

diff --git a/src/config/param.i386_linux24.h b/src/config/param.i386_linux24.h
index a357fa0..4c31183 100644 (file)
--- a/src/config/param.i386_linux24.h
+++ b/src/config/param.i386_linux24.h
@@ -27,9 +27,7 @@
 #define AFS_64BIT_CLIENT       1
 
 #if defined(__KERNEL__) && !defined(KDUMP_KERNEL)
-#include <linux/threads.h>
 
-#include <linux/config.h>
 #ifdef CONFIG_SMP
 #undef CONFIG_SMP
 #endif

diff --git a/src/config/param.i386_linux26.h b/src/config/param.i386_linux26.h
index 0ad2cd7..02110d3 100644 (file)
--- a/src/config/param.i386_linux26.h
+++ b/src/config/param.i386_linux26.h
@@ -28,9 +28,7 @@
 #define AFS_64BIT_CLIENT       1
 
 #if defined(__KERNEL__) && !defined(KDUMP_KERNEL)
-#include <linux/threads.h>
 
-#include <linux/config.h>
 #ifdef CONFIG_SMP
 #ifndef AFS_SMP
 #define AFS_SMP 1

diff --git a/src/config/param.i386_umlinux22.h b/src/config/param.i386_umlinux22.h
index 55c7c70..1193b94 100644 (file)
--- a/src/config/param.i386_umlinux22.h
+++ b/src/config/param.i386_umlinux22.h
@@ -34,7 +34,6 @@
 #define AFS_NAMEI_ENV     1    /* User space interface to file system */
 
 #if defined(__KERNEL__) && !defined(KDUMP_KERNEL)
-#include <linux/config.h>
 #ifdef CONFIG_SMP
 #undef CONFIG_SMP
 #endif

diff --git a/src/config/param.i386_umlinux24.h b/src/config/param.i386_umlinux24.h
index 7b43b59..77e312e 100644 (file)
--- a/src/config/param.i386_umlinux24.h
+++ b/src/config/param.i386_umlinux24.h
@@ -35,9 +35,7 @@
 
 
 #if defined(__KERNEL__) && !defined(KDUMP_KERNEL)
-#include <linux/threads.h>
 
-#include <linux/config.h>
 #ifdef CONFIG_SMP
 #undef CONFIG_SMP
 #endif

diff --git a/src/config/param.i386_umlinux26.h b/src/config/param.i386_umlinux26.h
index e16cae4..c17b11c 100644 (file)
--- a/src/config/param.i386_umlinux26.h
+++ b/src/config/param.i386_umlinux26.h
@@ -28,9 +28,7 @@
 #define AFS_64BIT_CLIENT       1
 
 #if defined(__KERNEL__) && !defined(KDUMP_KERNEL)
-#include <linux/threads.h>
 
-#include <linux/config.h>
 #ifdef CONFIG_SMP
 #ifndef AFS_SMP
 #define AFS_SMP 1

diff --git a/src/config/param.ia64_linux24.h b/src/config/param.ia64_linux24.h
index 74b9d8e..e5f9a49 100644 (file)
--- a/src/config/param.ia64_linux24.h
+++ b/src/config/param.ia64_linux24.h
@@ -41,9 +41,7 @@
 #define AFS_64BITPOINTER_ENV   1       /* pointers are 64 bits. */
 
 #if defined(__KERNEL__) && !defined(KDUMP_KERNEL)
-#include <linux/threads.h>
 
-#include <linux/config.h>
 #ifdef CONFIG_SMP
 #undef CONFIG_SMP
 #endif
@@ -89,7 +87,6 @@
 #endif
 #endif /* KERNEL */
 
-#define USE_UCONTEXT           /* should be in afsconfig.h */
 
 #endif /* _PARAM_IA64_LINUX20_H_ */
 
@@ -160,7 +157,6 @@
 #define CMSERVERPREF
 #endif
 
-#define USE_UCONTEXT           /* should be in afsconfig.h */
 
 #endif /* AFS_PARAM_H */
 

diff --git a/src/config/param.ia64_linux26.h b/src/config/param.ia64_linux26.h
index d8c884a..563e206 100644 (file)
--- a/src/config/param.ia64_linux26.h
+++ b/src/config/param.ia64_linux26.h
@@ -45,9 +45,7 @@
 #include <linux/init.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
-#include <linux/threads.h>
 
-#include <linux/config.h>
 #ifdef CONFIG_SMP
 #ifndef AFS_SMP
 #define AFS_SMP 1
@@ -97,7 +95,6 @@
 #endif
 #endif /* KERNEL */
 
-#define USE_UCONTEXT           /* should be in afsconfig.h */
 
 #endif /* _PARAM_IA64_LINUX20_H_ */
 
@@ -169,7 +166,6 @@
 #define CMSERVERPREF
 #endif
 
-#define USE_UCONTEXT           /* should be in afsconfig.h */
 
 #endif /* AFS_PARAM_H */
 

diff --git a/src/config/param.parisc_linux24.h b/src/config/param.parisc_linux24.h
index 4a41882..ad7506f 100644 (file)
--- a/src/config/param.parisc_linux24.h
+++ b/src/config/param.parisc_linux24.h
@@ -25,9 +25,7 @@
 #define AFS_NAMEI_ENV     1    /* User space interface to file system */
 
 #if defined(__KERNEL__) && !defined(KDUMP_KERNEL)
-#include <linux/threads.h>
 
-#include <linux/config.h>
 #ifdef CONFIG_SMP
 #undef CONFIG_SMP
 #endif

diff --git a/src/config/param.ppc64_linux24.h b/src/config/param.ppc64_linux24.h
index 5ea7a37..12dda5e 100644 (file)
--- a/src/config/param.ppc64_linux24.h
+++ b/src/config/param.ppc64_linux24.h
@@ -29,9 +29,7 @@
 #define AFS_64BITPOINTER_ENV   1     /* pointers are 64 bits. */
 
 #if defined(__KERNEL__) && !defined(KDUMP_KERNEL)
-#include <linux/threads.h>
 
-#include <linux/config.h>
 #ifdef CONFIG_SMP
 #undef CONFIG_SMP
 #endif

diff --git a/src/config/param.ppc64_linux26.h b/src/config/param.ppc64_linux26.h
index 7a23aa1..5a4fa7f 100644 (file)
--- a/src/config/param.ppc64_linux26.h
+++ b/src/config/param.ppc64_linux26.h
@@ -30,9 +30,7 @@
 #define AFS_64BITPOINTER_ENV   1     /* pointers are 64 bits. */
 
 #if defined(__KERNEL__) && !defined(KDUMP_KERNEL)
-#include <linux/threads.h>
 
-#include <linux/config.h>
 #ifdef CONFIG_SMP
 #ifndef AFS_SMP
 #define AFS_SMP 1

diff --git a/src/config/param.ppc_linux22.h b/src/config/param.ppc_linux22.h
index 26f3d7f..bb0b72f 100644 (file)
--- a/src/config/param.ppc_linux22.h
+++ b/src/config/param.ppc_linux22.h
@@ -23,7 +23,6 @@
 #define AFS_NAMEI_ENV     1    /* User space interface to file system */
 
 #if defined(__KERNEL__) && !defined(KDUMP_KERNEL)
-#include <linux/config.h>
 #ifdef CONFIG_SMP
 #undef CONFIG_SMP
 #endif

diff --git a/src/config/param.ppc_linux24.h b/src/config/param.ppc_linux24.h
index da0f49a..dcf062e 100644 (file)
--- a/src/config/param.ppc_linux24.h
+++ b/src/config/param.ppc_linux24.h
@@ -27,9 +27,7 @@
 #define AFS_NAMEI_ENV     1    /* User space interface to file system */
 
 #if defined(__KERNEL__) && !defined(KDUMP_KERNEL)
-#include <linux/threads.h>
 
-#include <linux/config.h>
 #ifdef CONFIG_SMP
 #undef CONFIG_SMP
 #endif

diff --git a/src/config/param.ppc_linux26.h b/src/config/param.ppc_linux26.h
index c8d4e21..3170751 100644 (file)
--- a/src/config/param.ppc_linux26.h
+++ b/src/config/param.ppc_linux26.h
@@ -28,9 +28,7 @@
 #define AFS_NAMEI_ENV     1    /* User space interface to file system */
 
 #if defined(__KERNEL__) && !defined(KDUMP_KERNEL)
-#include <linux/threads.h>
 
-#include <linux/config.h>
 #ifdef CONFIG_SMP
 #ifndef AFS_SMP
 #define AFS_SMP 1

diff --git a/src/config/param.s390_linux22.h b/src/config/param.s390_linux22.h
index c19b399..6d97e62 100644 (file)
--- a/src/config/param.s390_linux22.h
+++ b/src/config/param.s390_linux22.h
@@ -33,7 +33,6 @@
 #define AFS_NAMEI_ENV     1    /* User space interface to file system */
 
 #if defined(__KERNEL__) && !defined(KDUMP_KERNEL)
-#include <linux/config.h>
 #ifdef CONFIG_SMP
 #undef CONFIG_SMP
 #endif

diff --git a/src/config/param.s390_linux24.h b/src/config/param.s390_linux24.h
index 738ff2c..69130a7 100644 (file)
--- a/src/config/param.s390_linux24.h
+++ b/src/config/param.s390_linux24.h
@@ -37,9 +37,7 @@
 #define AFS_NAMEI_ENV     1    /* User space interface to file system */
 
 #if defined(__KERNEL__) && !defined(KDUMP_KERNEL)
-#include <linux/threads.h>
 
-#include <linux/config.h>
 #ifdef CONFIG_SMP
 #undef CONFIG_SMP
 #endif

diff --git a/src/config/param.s390_linux26.h b/src/config/param.s390_linux26.h
index bb99cab..01b6f7b 100644 (file)
--- a/src/config/param.s390_linux26.h
+++ b/src/config/param.s390_linux26.h
@@ -38,9 +38,7 @@
 #define AFS_NAMEI_ENV     1    /* User space interface to file system */
 
 #if defined(__KERNEL__) && !defined(KDUMP_KERNEL)
-#include <linux/threads.h>
 
-#include <linux/config.h>
 #ifdef CONFIG_SMP
 #undef CONFIG_SMP
 #endif

diff --git a/src/config/param.s390x_linux24.h b/src/config/param.s390x_linux24.h
index 81d4163..49c7d93 100644 (file)
--- a/src/config/param.s390x_linux24.h
+++ b/src/config/param.s390x_linux24.h
@@ -42,9 +42,7 @@
 #define AFS_NAMEI_ENV     1    /* User space interface to file system */
 
 #if defined(__KERNEL__) && !defined(KDUMP_KERNEL)
-#include <linux/threads.h>
 
-#include <linux/config.h>
 #ifdef CONFIG_SMP
 #undef CONFIG_SMP
 #endif

diff --git a/src/config/param.s390x_linux26.h b/src/config/param.s390x_linux26.h
index f709097..322d482 100644 (file)
--- a/src/config/param.s390x_linux26.h
+++ b/src/config/param.s390x_linux26.h
@@ -44,9 +44,7 @@
 #define AFS_NAMEI_ENV     1    /* User space interface to file system */
 
 #if defined(__KERNEL__) && !defined(KDUMP_KERNEL)
-#include <linux/threads.h>
 
-#include <linux/config.h>
 #ifdef CONFIG_SMP
 #ifndef AFS_SMP
 #define AFS_SMP 1

diff --git a/src/config/param.sparc64_linux22.h b/src/config/param.sparc64_linux22.h
index bd5547c..b7c0811 100644 (file)
--- a/src/config/param.sparc64_linux22.h
+++ b/src/config/param.sparc64_linux22.h
@@ -38,7 +38,6 @@
 #define AFS_64BITPOINTER_ENV   1       /* pointers are 64 bits. */
 
 #if defined(__KERNEL__) && !defined(KDUMP_KERNEL)
-#include <linux/config.h>
 #ifdef CONFIG_SMP
 #undef CONFIG_SMP
 #endif

diff --git a/src/config/param.sparc64_linux24.h b/src/config/param.sparc64_linux24.h
index 7819305..0f5e604 100644 (file)
--- a/src/config/param.sparc64_linux24.h
+++ b/src/config/param.sparc64_linux24.h
@@ -41,9 +41,7 @@
 #define AFS_64BITPOINTER_ENV   1       /* pointers are 64 bits. */
 
 #if defined(__KERNEL__) && !defined(KDUMP_KERNEL)
-#include <linux/threads.h>
 
-#include <linux/config.h>
 #if defined(MODULE) && defined(CONFIG_MODVERSIONS)
 #define MODVERSIONS
 #include <linux/modversions.h>

diff --git a/src/config/param.sparc64_linux26.h b/src/config/param.sparc64_linux26.h
index 4231d97..2148103 100644 (file)
--- a/src/config/param.sparc64_linux26.h
+++ b/src/config/param.sparc64_linux26.h
@@ -42,9 +42,7 @@
 #define AFS_64BITPOINTER_ENV   1       /* pointers are 64 bits. */
 
 #if defined(__KERNEL__) && !defined(KDUMP_KERNEL)
-#include <linux/threads.h>
 
-#include <linux/config.h>
 #ifdef CONFIG_SMP
 #ifndef AFS_SMP
 #define AFS_SMP 1

diff --git a/src/config/param.sparc_linux22.h b/src/config/param.sparc_linux22.h
index d2a2eb7..a1f3d97 100644 (file)
--- a/src/config/param.sparc_linux22.h
+++ b/src/config/param.sparc_linux22.h
@@ -33,7 +33,6 @@
 #define AFS_NAMEI_ENV     1    /* User space interface to file system */
 
 #if defined(__KERNEL__) && !defined(KDUMP_KERNEL)
-#include <linux/config.h>
 #ifdef CONFIG_SMP
 #undef CONFIG_SMP
 #endif

diff --git a/src/config/param.sparc_linux24.h b/src/config/param.sparc_linux24.h
index 3834f48..3082a52 100644 (file)
--- a/src/config/param.sparc_linux24.h
+++ b/src/config/param.sparc_linux24.h
@@ -36,9 +36,7 @@
 #define AFS_NAMEI_ENV     1    /* User space interface to file system */
 
 #if defined(__KERNEL__) && !defined(KDUMP_KERNEL)
-#include <linux/threads.h>
 
-#include <linux/config.h>
 #ifdef CONFIG_SMP
 #undef CONFIG_SMP
 #endif