From b48ab0632ba0c88326c8d9466760bf56301b3676 Mon Sep 17 00:00:00 2001 From: johann Date: Thu, 2 Aug 2007 06:12:08 +0000 Subject: [PATCH] Branch b1_6 b=11802 i=green i=scjody attachment 11752 / rely on AUTOCONF_INCLUDED instead of HAVE_KERNEL_CONFIG_H --- build/autoconf/lustre-build-linux.m4 | 8 +------- lnet/include/libcfs/linux/kp30.h | 2 +- lnet/include/libcfs/linux/linux-prim.h | 2 +- lnet/include/libcfs/linux/linux-time.h | 2 +- lnet/klnds/gmlnd/gmlnd.h | 2 +- lnet/klnds/iiblnd/iiblnd.h | 2 +- lnet/klnds/mxlnd/mxlnd.h | 2 +- lnet/klnds/o2iblnd/o2iblnd.h | 2 +- lnet/klnds/openiblnd/openiblnd.h | 2 +- lnet/klnds/ptllnd/ptllnd.h | 2 +- lnet/klnds/qswlnd/qswlnd.h | 2 +- lnet/klnds/ralnd/ralnd.h | 2 +- lnet/klnds/socklnd/socklnd_lib-linux.h | 2 +- lnet/klnds/viblnd/viblnd.h | 2 +- lnet/libcfs/linux/linux-debug.c | 2 +- lnet/libcfs/linux/linux-prim.c | 2 +- lnet/libcfs/linux/linux-proc.c | 2 +- lnet/libcfs/lwt.c | 2 +- 18 files changed, 18 insertions(+), 24 deletions(-) diff --git a/build/autoconf/lustre-build-linux.m4 b/build/autoconf/lustre-build-linux.m4 index 0c040ec..8e7c8c1 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 #endif ],[ diff --git a/lnet/include/libcfs/linux/kp30.h b/lnet/include/libcfs/linux/kp30.h index 9f84da4..46bab8b 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 #endif # include diff --git a/lnet/include/libcfs/linux/linux-prim.h b/lnet/include/libcfs/linux/linux-prim.h index 4efeef4..72af0ac 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 #endif #include diff --git a/lnet/include/libcfs/linux/linux-time.h b/lnet/include/libcfs/linux/linux-time.h index 56523e2..1b31dd8 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 #endif #include diff --git a/lnet/klnds/gmlnd/gmlnd.h b/lnet/klnds/gmlnd/gmlnd.h index 2d56811..5eb844d 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 #endif #include "linux/module.h" diff --git a/lnet/klnds/iiblnd/iiblnd.h b/lnet/klnds/iiblnd/iiblnd.h index 06c6782..e75e872 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 #endif #include diff --git a/lnet/klnds/mxlnd/mxlnd.h b/lnet/klnds/mxlnd/mxlnd.h index 46fe3c2..ca03e84 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 #endif #include /* module */ diff --git a/lnet/klnds/o2iblnd/o2iblnd.h b/lnet/klnds/o2iblnd/o2iblnd.h index 0b566b2..7c6b0be 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 #endif #include diff --git a/lnet/klnds/openiblnd/openiblnd.h b/lnet/klnds/openiblnd/openiblnd.h index 56871b6..39464c5 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 #endif #include diff --git a/lnet/klnds/ptllnd/ptllnd.h b/lnet/klnds/ptllnd/ptllnd.h index 93c4453..e3e61d9 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 #endif #include diff --git a/lnet/klnds/qswlnd/qswlnd.h b/lnet/klnds/qswlnd/qswlnd.h index 7543ba4..a248e19 100644 --- a/lnet/klnds/qswlnd/qswlnd.h +++ b/lnet/klnds/qswlnd/qswlnd.h @@ -30,7 +30,7 @@ #include #undef printf /* nasty QSW #define */ -#ifdef HAVE_KERNEL_CONFIG_H +#ifndef AUTOCONF_INCLUDED #include #endif #include diff --git a/lnet/klnds/ralnd/ralnd.h b/lnet/klnds/ralnd/ralnd.h index d8fce5d..cd646eb 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 #endif #include diff --git a/lnet/klnds/socklnd/socklnd_lib-linux.h b/lnet/klnds/socklnd/socklnd_lib-linux.h index 8a5462f..5c4179e 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 #endif #include diff --git a/lnet/klnds/viblnd/viblnd.h b/lnet/klnds/viblnd/viblnd.h index a7e5f1c..2b1ffd5 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 #endif #include diff --git a/lnet/libcfs/linux/linux-debug.c b/lnet/libcfs/linux/linux-debug.c index d1db71a..ad487df 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 #endif #include diff --git a/lnet/libcfs/linux/linux-prim.c b/lnet/libcfs/linux/linux-prim.c index fe5d61f..cc02829 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 #endif #include diff --git a/lnet/libcfs/linux/linux-proc.c b/lnet/libcfs/linux/linux-proc.c index c0bd793..17e65ba 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 #endif #include diff --git a/lnet/libcfs/lwt.c b/lnet/libcfs/lwt.c index 3ed5d45..6455ece 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 #endif #include -- 1.8.3.1