diff --git a/lustre/include/linux/lprocfs_status.h b/lustre/include/linux/lprocfs_status.h index db4b7d531507dae780923fda35046213d8fc98cc..85574fa0d3e73098153c7e390d1d4aa61a52ad7d 100644 --- a/lustre/include/linux/lprocfs_status.h +++ b/lustre/include/linux/lprocfs_status.h @@ -29,7 +29,7 @@ #endif #ifdef __KERNEL__ -#ifdef HAVE_KERNEL_CONFIG_H +#ifndef AUTOCONF_INCLUDED #include <linux/config.h> #endif #include <linux/autoconf.h> diff --git a/lustre/include/linux/obd_support.h b/lustre/include/linux/obd_support.h index 5c466c3466f8d7cbd123b2f02772c30337815ab1..0ccc5a19c5573cc002fa0b4f77a6a8632a22edfd 100644 --- a/lustre/include/linux/obd_support.h +++ b/lustre/include/linux/obd_support.h @@ -28,7 +28,7 @@ #endif #ifdef __KERNEL__ -#ifdef HAVE_KERNEL_CONFIG_H +#ifndef AUTOCONF_INCLUDED #include <linux/config.h> #endif #include <linux/autoconf.h> diff --git a/lustre/llite/llite_mmap.c b/lustre/llite/llite_mmap.c index bba41b43020f152303412cb23f98f7c2acfa525d..fc5d1ff250daef173c8e4215b092df626f9ae0f0 100644 --- a/lustre/llite/llite_mmap.c +++ b/lustre/llite/llite_mmap.c @@ -18,7 +18,7 @@ * along with Lustre; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#ifdef HAVE_KERNEL_CONFIG_H +#ifndef AUTOCONF_INCLUDED #include <linux/config.h> #endif #include <linux/kernel.h> diff --git a/lustre/llite/rw.c b/lustre/llite/rw.c index 6ab6fcf9bd184e4c6ae88d6106db7caf89900934..8b80424e1879e9af493f2dd0b016b6aa8daef5e2 100644 --- a/lustre/llite/rw.c +++ b/lustre/llite/rw.c @@ -20,7 +20,7 @@ * along with Lustre; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#ifdef HAVE_KERNEL_CONFIG_H +#ifndef AUTOCONF_INCLUDED #include <linux/config.h> #endif #include <linux/kernel.h> diff --git a/lustre/llite/rw24.c b/lustre/llite/rw24.c index cf666da38f2964aa3a7d416c8d5070582f1594c2..07be4feb3ac23ca862003e4225a5e651f1051040 100644 --- a/lustre/llite/rw24.c +++ b/lustre/llite/rw24.c @@ -20,7 +20,7 @@ * along with Lustre; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#ifdef HAVE_KERNEL_CONFIG_H +#ifndef AUTOCONF_INCLUDED #include <linux/config.h> #endif #include <linux/kernel.h> diff --git a/lustre/llite/rw26.c b/lustre/llite/rw26.c index c631c2bea6c990be3e0cabcee1def59d0aed18de..d32a4472bb3807c53906b4f1b827a076c1362fef 100644 --- a/lustre/llite/rw26.c +++ b/lustre/llite/rw26.c @@ -20,7 +20,7 @@ * along with Lustre; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#ifdef HAVE_KERNEL_CONFIG_H +#ifndef AUTOCONF_INCLUDED #include <linux/config.h> #endif #include <linux/kernel.h> diff --git a/lustre/lvfs/upcall_cache.c b/lustre/lvfs/upcall_cache.c index 87c6b8ee9fce94b796025eed23349497f32bf504..b9023d0f38281c361fc5d03f25208efcfbd1dc78 100644 --- a/lustre/lvfs/upcall_cache.c +++ b/lustre/lvfs/upcall_cache.c @@ -23,7 +23,7 @@ #define DEBUG_SUBSYSTEM S_SEC -#ifdef HAVE_KERNEL_CONFIG_H +#ifndef AUTOCONF_INCLUDED #include <linux/config.h> #endif #include <linux/module.h> diff --git a/lustre/mdc/mdc_reint.c b/lustre/mdc/mdc_reint.c index c7ed24b5a7cd3cdf0fad004cc8e49c3e6edd6bc8..e983e85730bb192bb743ca8a0f57b8f23260caa7 100644 --- a/lustre/mdc/mdc_reint.c +++ b/lustre/mdc/mdc_reint.c @@ -28,7 +28,7 @@ #define DEBUG_SUBSYSTEM S_MDC #ifdef __KERNEL__ -#ifdef HAVE_KERNEL_CONFIG_H +#ifndef AUTOCONF_INCLUDED # include <linux/config.h> #endif # include <linux/module.h> diff --git a/lustre/mds/mds_lib.c b/lustre/mds/mds_lib.c index f24f6ece8a8260bbbc7700ff5f7df68cb7dc6feb..7769cdddd4fd27fba92d3f1ad98e90538e5d2ed9 100644 --- a/lustre/mds/mds_lib.c +++ b/lustre/mds/mds_lib.c @@ -24,7 +24,7 @@ #define DEBUG_SUBSYSTEM S_MDS -#ifdef HAVE_KERNEL_CONFIG_H +#ifndef AUTOCONF_INCLUDED #include <linux/config.h> #endif #include <linux/module.h> diff --git a/lustre/mds/mds_log.c b/lustre/mds/mds_log.c index a33a313964acc1a05994b86801f59a133a03daee..189707f3c0023cf12e1366aedcc823458e575432 100644 --- a/lustre/mds/mds_log.c +++ b/lustre/mds/mds_log.c @@ -29,7 +29,7 @@ #define DEBUG_SUBSYSTEM S_MDS -#ifdef HAVE_KERNEL_CONFIG_H +#ifndef AUTOCONF_INCLUDED #include <linux/config.h> #endif #include <linux/module.h> diff --git a/lustre/mds/mds_unlink_open.c b/lustre/mds/mds_unlink_open.c index cc7ffe059e3a14f99f690922785cef49de3c1e5b..a435df5c371a25b260bddf5e1d0a18b4ed5dfe2b 100644 --- a/lustre/mds/mds_unlink_open.c +++ b/lustre/mds/mds_unlink_open.c @@ -31,7 +31,7 @@ #define DEBUG_SUBSYSTEM S_MDS -#ifdef HAVE_KERNEL_CONFIG_H +#ifndef AUTOCONF_INCLUDED #include <linux/config.h> #endif #include <linux/module.h> diff --git a/lustre/obdclass/linux/linux-module.c b/lustre/obdclass/linux/linux-module.c index 17fe1de5563fba3d70ae2eecd8934cd3d08d288a..9d57d4f17c75fd91d3f9e646a977c46ebf3982f6 100644 --- a/lustre/obdclass/linux/linux-module.c +++ b/lustre/obdclass/linux/linux-module.c @@ -29,7 +29,7 @@ #endif #ifdef __KERNEL__ -#ifdef HAVE_KERNEL_CONFIG_H +#ifndef AUTOCONF_INCLUDED #include <linux/config.h> /* for CONFIG_PROC_FS */ #endif #include <linux/module.h> diff --git a/lustre/obdfilter/filter.c b/lustre/obdfilter/filter.c index fcf10970805ea85e216522358063e1db10203148..a85fbfbe94247704b7351da9262e0d403460f6fb 100644 --- a/lustre/obdfilter/filter.c +++ b/lustre/obdfilter/filter.c @@ -34,7 +34,7 @@ */ #define DEBUG_SUBSYSTEM S_FILTER -#ifdef HAVE_KERNEL_CONFIG_H +#ifndef AUTOCONF_INCLUDED #include <linux/config.h> #endif #include <linux/module.h> diff --git a/lustre/obdfilter/filter_io.c b/lustre/obdfilter/filter_io.c index 3869cf117c04f6d809a2250b3b81a109f3e9d6c6..8e55e5f4122b71ff0dd6e7940192ddf383471ffb 100644 --- a/lustre/obdfilter/filter_io.c +++ b/lustre/obdfilter/filter_io.c @@ -29,7 +29,7 @@ #define DEBUG_SUBSYSTEM S_FILTER -#ifdef HAVE_KERNEL_CONFIG_H +#ifndef AUTOCONF_INCLUDED #include <linux/config.h> #endif #include <linux/module.h> diff --git a/lustre/obdfilter/filter_io_24.c b/lustre/obdfilter/filter_io_24.c index c126aa5a3c28d6bd8a63cb20fa7dc6e2247dc40a..0ff1a0f2017094462c41d846d5c694dd60bb8d6d 100644 --- a/lustre/obdfilter/filter_io_24.c +++ b/lustre/obdfilter/filter_io_24.c @@ -27,7 +27,7 @@ * license text for more details. */ -#ifdef HAVE_KERNEL_CONFIG_H +#ifndef AUTOCONF_INCLUDED #include <linux/config.h> #endif #include <linux/module.h> diff --git a/lustre/obdfilter/filter_io_26.c b/lustre/obdfilter/filter_io_26.c index 65aa4dbbd0e887cd7e96ddc2c563507a37d60b2e..652e6c1f367e3775f5c2accfd1857c823b9c679c 100644 --- a/lustre/obdfilter/filter_io_26.c +++ b/lustre/obdfilter/filter_io_26.c @@ -27,7 +27,7 @@ * license text for more details. */ -#ifdef HAVE_KERNEL_CONFIG_H +#ifndef AUTOCONF_INCLUDED #include <linux/config.h> #endif #include <linux/module.h> diff --git a/lustre/obdfilter/filter_log.c b/lustre/obdfilter/filter_log.c index 3b3bb2d01d0cc856a65b53af1a511377a4f8a2a1..50a1acee9553dd7b64a27ad78dfe8423d1c437da 100644 --- a/lustre/obdfilter/filter_log.c +++ b/lustre/obdfilter/filter_log.c @@ -29,7 +29,7 @@ #define DEBUG_SUBSYSTEM S_FILTER -#ifdef HAVE_KERNEL_CONFIG_H +#ifndef AUTOCONF_INCLUDED #include <linux/config.h> #endif #include <linux/module.h> diff --git a/lustre/obdfilter/filter_lvb.c b/lustre/obdfilter/filter_lvb.c index 3dfa30e83d1c1f684e14afb92f0896868b296a95..6c71a9bbf0f2f8c0d7c6e41305dcc1bf96c83a88 100644 --- a/lustre/obdfilter/filter_lvb.c +++ b/lustre/obdfilter/filter_lvb.c @@ -29,7 +29,7 @@ #define DEBUG_SUBSYSTEM S_FILTER -#ifdef HAVE_KERNEL_CONFIG_H +#ifndef AUTOCONF_INCLUDED #include <linux/config.h> #endif #include <linux/module.h>