diff --git a/build/autoconf/lustre-build-linux.m4 b/build/autoconf/lustre-build-linux.m4 index 0c040ecff1cedd5d30d57089869148f81356b27d..8e7c8c142014f0d02a93a4bee381b4d2b36fb6ea 100644 --- a/build/autoconf/lustre-build-linux.m4 +++ b/build/autoconf/lustre-build-linux.m4 @@ -160,12 +160,6 @@ LB_CHECK_FILES([$LINUX_OBJ/include/linux/autoconf.h $LINUX_OBJ/include/linux/version.h ],[], [AC_MSG_ERROR([Run make config in $LINUX.])]) -# -LB_CHECK_FILE([$LINUX_OBJ/include/linux/config.h], - [ AC_DEFINE(HAVE_KERNEL_CONFIG_H, 1, - [kernel modules need to include config.h]) - ] -) # ------------ rhconfig.h includes runtime-generated bits -- # red hat kernel-source checks @@ -334,7 +328,7 @@ AC_DEFUN([LB_LINUX_TRY_COMPILE], AC_DEFUN([LB_LINUX_CONFIG], [AC_MSG_CHECKING([if Linux was built with CONFIG_$1]) LB_LINUX_TRY_COMPILE([ -#ifdef HAVE_KERNEL_CONFIG_H +#ifndef AUTOCONF_INCLUDED #include <linux/config.h> #endif ],[ diff --git a/lnet/include/libcfs/linux/kp30.h b/lnet/include/libcfs/linux/kp30.h index 9f84da4b11a1fd37a445458237b80a0a72616207..46bab8bc4aa78cdc9265c89ba3cf17691cbce824 100644 --- a/lnet/include/libcfs/linux/kp30.h +++ b/lnet/include/libcfs/linux/kp30.h @@ -9,7 +9,7 @@ #endif #ifdef __KERNEL__ -#ifdef HAVE_KERNEL_CONFIG_H +#ifndef AUTOCONF_INCLUDED # include <linux/config.h> #endif # include <linux/kernel.h> diff --git a/lnet/include/libcfs/linux/linux-prim.h b/lnet/include/libcfs/linux/linux-prim.h index 4efeef41c508a5e9dcd2edd738e592dc2ad36713..72af0ac6cbe8b3820083100339d3de81433432d9 100644 --- a/lnet/include/libcfs/linux/linux-prim.h +++ b/lnet/include/libcfs/linux/linux-prim.h @@ -30,7 +30,7 @@ #endif #ifdef __KERNEL__ -#ifdef HAVE_KERNEL_CONFIG_H +#ifndef AUTOCONF_INCLUDED #include <linux/config.h> #endif #include <linux/module.h> diff --git a/lnet/include/libcfs/linux/linux-time.h b/lnet/include/libcfs/linux/linux-time.h index 56523e29081b820237845fb7195aab80f7435a53..1b31dd87bd8ddb1b2128942bbf8e8e517c50dc19 100644 --- a/lnet/include/libcfs/linux/linux-time.h +++ b/lnet/include/libcfs/linux/linux-time.h @@ -73,7 +73,7 @@ #define ONE_MILLION 1000000 #ifdef __KERNEL__ -#ifdef HAVE_KERNEL_CONFIG_H +#ifndef AUTOCONF_INCLUDED #include <linux/config.h> #endif #include <linux/module.h> diff --git a/lnet/klnds/gmlnd/gmlnd.h b/lnet/klnds/gmlnd/gmlnd.h index 2d568112ca930c977a384d8ebc4479aafb7308b5..5eb844dc37d900269dd19acb06fa2fcc94a35ca4 100644 --- a/lnet/klnds/gmlnd/gmlnd.h +++ b/lnet/klnds/gmlnd/gmlnd.h @@ -38,7 +38,7 @@ #ifndef EXPORT_SYMTAB # define EXPORT_SYMTAB #endif -#ifdef HAVE_KERNEL_CONFIG_H +#ifndef AUTOCONF_INCLUDED #include <linux/config.h> #endif #include "linux/module.h" diff --git a/lnet/klnds/iiblnd/iiblnd.h b/lnet/klnds/iiblnd/iiblnd.h index 06c678298fe139b7346708902ee6e5ed20baad3f..e75e87226ef40bc1ef5222df9e5aa0bd104f4a40 100644 --- a/lnet/klnds/iiblnd/iiblnd.h +++ b/lnet/klnds/iiblnd/iiblnd.h @@ -24,7 +24,7 @@ #ifndef EXPORT_SYMTAB # define EXPORT_SYMTAB #endif -#ifdef HAVE_KERNEL_CONFIG_H +#ifndef AUTOCONF_INCLUDED #include <linux/config.h> #endif #include <linux/module.h> diff --git a/lnet/klnds/mxlnd/mxlnd.h b/lnet/klnds/mxlnd/mxlnd.h index 46fe3c23abda3aa4e312fca97049f1f6b9a9a9da..ca03e84f70f3d08b40f213e1f3dedaae53696709 100644 --- a/lnet/klnds/mxlnd/mxlnd.h +++ b/lnet/klnds/mxlnd/mxlnd.h @@ -25,7 +25,7 @@ #ifndef EXPORT_SYMTAB #define EXPORT_SYMTAB #endif -#ifdef HAVE_KERNEL_CONFIG_H +#ifndef AUTOCONF_INCLUDED #include <linux/config.h> #endif #include <linux/module.h> /* module */ diff --git a/lnet/klnds/o2iblnd/o2iblnd.h b/lnet/klnds/o2iblnd/o2iblnd.h index 0b566b227bfb94e530004191ab6acf4a3e2b6ab2..7c6b0be415aedfebafa1a06eb1f4a7b36b2101d8 100644 --- a/lnet/klnds/o2iblnd/o2iblnd.h +++ b/lnet/klnds/o2iblnd/o2iblnd.h @@ -24,7 +24,7 @@ #ifndef EXPORT_SYMTAB # define EXPORT_SYMTAB #endif -#ifdef HAVE_KERNEL_CONFIG_H +#ifndef AUTOCONF_INCLUDED #include <linux/config.h> #endif #include <linux/module.h> diff --git a/lnet/klnds/openiblnd/openiblnd.h b/lnet/klnds/openiblnd/openiblnd.h index 56871b68196f5d064539000f81276781b4394218..39464c5014ef8753aa3d1766b2b9baa32dfdca76 100644 --- a/lnet/klnds/openiblnd/openiblnd.h +++ b/lnet/klnds/openiblnd/openiblnd.h @@ -24,7 +24,7 @@ #ifndef EXPORT_SYMTAB # define EXPORT_SYMTAB #endif -#ifdef HAVE_KERNEL_CONFIG_H +#ifndef AUTOCONF_INCLUDED #include <linux/config.h> #endif #include <linux/module.h> diff --git a/lnet/klnds/ptllnd/ptllnd.h b/lnet/klnds/ptllnd/ptllnd.h index 93c44532b16fe78d14656d18a958f6f7fc461d9a..e3e61d9f2961bcb50acbf403d112f75017ea6521 100755 --- a/lnet/klnds/ptllnd/ptllnd.h +++ b/lnet/klnds/ptllnd/ptllnd.h @@ -19,7 +19,7 @@ #ifndef EXPORT_SYMTAB # define EXPORT_SYMTAB #endif -#ifdef HAVE_KERNEL_CONFIG_H +#ifndef AUTOCONF_INCLUDED #include <linux/config.h> #endif #include <linux/module.h> diff --git a/lnet/klnds/qswlnd/qswlnd.h b/lnet/klnds/qswlnd/qswlnd.h index 7543ba4e40c9e8ef37f97d1a995c0fe14d81110a..a248e19b1b73829b85c6149cba50d93658e3944d 100644 --- a/lnet/klnds/qswlnd/qswlnd.h +++ b/lnet/klnds/qswlnd/qswlnd.h @@ -30,7 +30,7 @@ #include <qsnet/kernel.h> #undef printf /* nasty QSW #define */ -#ifdef HAVE_KERNEL_CONFIG_H +#ifndef AUTOCONF_INCLUDED #include <linux/config.h> #endif #include <linux/module.h> diff --git a/lnet/klnds/ralnd/ralnd.h b/lnet/klnds/ralnd/ralnd.h index d8fce5d5a8439cdf29e02071980e8c564bdc8dc9..cd646eb562ef721f70120f6283b1bd66f11a03d4 100644 --- a/lnet/klnds/ralnd/ralnd.h +++ b/lnet/klnds/ralnd/ralnd.h @@ -24,7 +24,7 @@ #ifndef EXPORT_SYMTAB # define EXPORT_SYMTAB #endif -#ifdef HAVE_KERNEL_CONFIG_H +#ifndef AUTOCONF_INCLUDED #include <linux/config.h> #endif #include <linux/module.h> diff --git a/lnet/klnds/socklnd/socklnd_lib-linux.h b/lnet/klnds/socklnd/socklnd_lib-linux.h index 8a5462fd109790c616957d6b8716db2b0d253596..5c4179e0eaffde03618fac6a32470a89773cf2a0 100644 --- a/lnet/klnds/socklnd/socklnd_lib-linux.h +++ b/lnet/klnds/socklnd/socklnd_lib-linux.h @@ -6,7 +6,7 @@ #ifndef __LINUX_SOCKNAL_LIB_H__ #define __LINUX_SOCKNAL_LIB_H__ -#ifdef HAVE_KERNEL_CONFIG_H +#ifndef AUTOCONF_INCLUDED #include <linux/config.h> #endif #include <linux/module.h> diff --git a/lnet/klnds/viblnd/viblnd.h b/lnet/klnds/viblnd/viblnd.h index a7e5f1cd6131ee1a1502678eed7f7a5aeee7c0d8..2b1ffd58b2b18e50fda692cbedef8774eefb9d6b 100644 --- a/lnet/klnds/viblnd/viblnd.h +++ b/lnet/klnds/viblnd/viblnd.h @@ -25,7 +25,7 @@ #ifndef EXPORT_SYMTAB # define EXPORT_SYMTAB #endif -#ifdef HAVE_KERNEL_CONFIG_H +#ifndef AUTOCONF_INCLUDED #include <linux/config.h> #endif #include <linux/module.h> diff --git a/lnet/libcfs/linux/linux-debug.c b/lnet/libcfs/linux/linux-debug.c index d1db71a19b38822653f97d4a450e3a17770633c2..ad487df0f80cf395edb42c017d4623962be18147 100644 --- a/lnet/libcfs/linux/linux-debug.c +++ b/lnet/libcfs/linux/linux-debug.c @@ -24,7 +24,7 @@ # define EXPORT_SYMTAB #endif -#ifdef HAVE_KERNEL_CONFIG_H +#ifndef AUTOCONF_INCLUDED #include <linux/config.h> #endif #include <linux/module.h> diff --git a/lnet/libcfs/linux/linux-prim.c b/lnet/libcfs/linux/linux-prim.c index fe5d61f710fe7c85f22bbc8ca5790982b60fd45c..cc028294429178c0866b1142f6a3790d536515e9 100644 --- a/lnet/libcfs/linux/linux-prim.c +++ b/lnet/libcfs/linux/linux-prim.c @@ -7,7 +7,7 @@ */ #define DEBUG_SUBSYSTEM S_LNET -#ifdef HAVE_KERNEL_CONFIG_H +#ifndef AUTOCONF_INCLUDED #include <linux/config.h> #endif #include <linux/module.h> diff --git a/lnet/libcfs/linux/linux-proc.c b/lnet/libcfs/linux/linux-proc.c index c0bd793eb9ea984b4eeb0ee37bc59ee93e9da90a..17e65ba3cdd34918b372e5d4ed81a3a65cc250f2 100644 --- a/lnet/libcfs/linux/linux-proc.c +++ b/lnet/libcfs/linux/linux-proc.c @@ -26,7 +26,7 @@ # define EXPORT_SYMTAB #endif -#ifdef HAVE_KERNEL_CONFIG_H +#ifndef AUTOCONF_INCLUDED #include <linux/config.h> #endif #include <linux/module.h> diff --git a/lnet/libcfs/lwt.c b/lnet/libcfs/lwt.c index 3ed5d453f42ec96b0d3238f36a5f3d0de2d287fb..6455ece775c6d78e3d01a77a65b42fdae3c507c8 100644 --- a/lnet/libcfs/lwt.c +++ b/lnet/libcfs/lwt.c @@ -24,7 +24,7 @@ # define EXPORT_SYMTAB #endif -#ifdef HAVE_KERNEL_CONFIG_H +#ifndef AUTOCONF_INCLUDED #include <linux/config.h> #endif #include <linux/module.h>