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 09da9fdab3255e9327c570c3fa172024ab94cfa9..99a45d57b8999922d8f776161d885fb946cee5ed 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 06364ca68973f53986441936d12a61dbf2471132..c2d3ce4a167342a9d8558aaaec7dd52121e649b8 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 081e560add2e2754da22c741df0239d2635f518d..387056329fc635bb4049ff79c75268d2627faf2c 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 2c9ea990364e01bbf4bc314ebf6dbd001670115a..8c3b296f98aba910127c57a24c23ef929ef10f5c 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 4693871306278f93913ac668b9d8422453d6c1de..60bb85183fc5641b4f313096100a512f307e96ff 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 48163252634f2f7b33885c3eb1ac7acf7ce3a91e..20398953c28efd4f47e7304538f12a8f6e7c2300 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 31da56eee427b6e6d433a35135de046608d50618..4a565a6abb2b2ca2d1a992ae922c685520f2f599 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 3ba85d18dee9b977aff5b334d91212bddaa7fabc..d44edc4013ff7a17777974f7edd7e6feba2de587 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 44a9994f6757196f4c692154bd627443566c2f61..6e1e8083ccbfc4b8cbfda5fd94c975d9ce8ea85e 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 52c05ec876572b242f95353c4d4ffdeb84f7e693..570fdb546e678cc4f36abcb91f8d4214af6ca77f 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 24f3183d464267587f45bf9849d3159847fb40fd..686f9573bab9d34b715553278d5cfc525aa3266d 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 a357fa04a5e09d3c1a43677d28d5cd31e49998c5..4c31183a786f0547ba83abe769eb7bf72bd3560b 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 0ad2cd7bdab5168304f5b8175088c9d0bc0cd850..02110d3bad9a61612d9ca7d4cb8719a046e8ac66 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 55c7c70f9338569e11c120077b26702e8c628c01..1193b949726995d7ff131c6e1fa58aaea8dc453e 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 7b43b59bfde29d3ee8eaa3db165ce8abff804928..77e312e9e8dfb8085d4d09b23b11f9766e4b2910 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 e16cae4435336067a0c1464b667cf41d283e1ae8..c17b11ce564bab013c5843699a0fdf62df36382d 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 74b9d8e2552de5e8b20531bbc53e18ca4fb7e87c..e5f9a49bb39ca78eddab0af7cbb9da8eb2b37212 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 d8c884a16048c8f9934a8def99aa2921aeeb5218..563e2068de4e183c16a0615b7bca1447d90f7de2 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 4a41882dcc35e82e6aa10c9794d12ca79d2efc5f..ad7506f5e5ea85a45c4d29a979797be7f986b570 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 5ea7a37f53a5e7f245226dc63417282b54690f25..12dda5e0345ae278b9ddbb289410bed805786e43 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 7a23aa1ce47e13a537e5a6eeff96abcf3b96d43c..5a4fa7f46bc2b025c89e687ef8b2420fbfc08e1f 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 26f3d7fe57879fe122a5e23772758fe0097d7f97..bb0b72f3f7aae88e72578a429af2ed6c0879f992 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 da0f49a2dffff2fe197687811d9fcfbf11badf97..dcf062e7f1758839bc489d1c3183d55686baf848 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 c8d4e211d6558eddd03f6d50ca57b73f71c0e8b1..31707516854fb6bbb93e6c531300107b0c1276e4 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 c19b3997ba0fc902891d46869cbe0f77ce6369f0..6d97e6281082b7d134bc5adab4879c99e37e5786 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 738ff2c0856ff1094bbf2634413a7f36e8163256..69130a7f4beed9c29b8db9ee3020769c41e2e2e2 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 bb99cabc3f306be1192beea04bf8ef68b44766c8..01b6f7b73447e450403727d49cc985404e197e91 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 81d416348257346c7f33296e820ad360351b1b03..49c7d93afd62141fb760eec9630cfa10660f601f 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 f70909763581784874bf9b07aff30546dcdd3dbc..322d482e8e830a96906ac7c0b536e0e2f16dcab2 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 bd5547c8de4708d6d83a7237b5ea47e2edca1252..b7c0811085c6d3cf369c9fb35c36e96d331e1d47 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 78193052ddfe76491a443ba5389279a3fd4af12d..0f5e6044ee0c106879bf6bb18c9d7d9480e786ce 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 4231d97b463adc2c8cf97f388f97a4bd8c0e3dc2..2148103fe3f3f9374eecf7ebeec1beabb616489e 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 d2a2eb789c39f1f1f054c397269000de77ed2856..a1f3d97b297d4fef9512c8ac31911421dac38bd4 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 3834f48a17f87eac3fa7dac424320878edd3e2f7..3082a524e7cf267f2a4e61c68f6f0a18afb3f50b 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