From ed514965f18c0a80e70c27bffc5fb529b96f94c8 Mon Sep 17 00:00:00 2001 From: johann <johann> Date: Thu, 2 Aug 2007 06:12:12 +0000 Subject: [PATCH] Branch b1_6 b=11802 i=green i=scjody attachment 11752 / rely on AUTOCONF_INCLUDED instead of HAVE_KERNEL_CONFIG_H --- lustre/include/linux/lprocfs_status.h | 2 +- lustre/include/linux/obd_support.h | 2 +- lustre/llite/llite_mmap.c | 2 +- lustre/llite/rw.c | 2 +- lustre/llite/rw24.c | 2 +- lustre/llite/rw26.c | 2 +- lustre/lvfs/upcall_cache.c | 2 +- lustre/mdc/mdc_reint.c | 2 +- lustre/mds/mds_lib.c | 2 +- lustre/mds/mds_log.c | 2 +- lustre/mds/mds_unlink_open.c | 2 +- lustre/obdclass/linux/linux-module.c | 2 +- lustre/obdfilter/filter.c | 2 +- lustre/obdfilter/filter_io.c | 2 +- lustre/obdfilter/filter_io_24.c | 2 +- lustre/obdfilter/filter_io_26.c | 2 +- lustre/obdfilter/filter_log.c | 2 +- lustre/obdfilter/filter_lvb.c | 2 +- 18 files changed, 18 insertions(+), 18 deletions(-) diff --git a/lustre/include/linux/lprocfs_status.h b/lustre/include/linux/lprocfs_status.h index db4b7d5315..85574fa0d3 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 5c466c3466..0ccc5a19c5 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 bba41b4302..fc5d1ff250 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 6ab6fcf9bd..8b80424e18 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 cf666da38f..07be4feb3a 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 c631c2bea6..d32a4472bb 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 87c6b8ee9f..b9023d0f38 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 c7ed24b5a7..e983e85730 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 f24f6ece8a..7769cdddd4 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 a33a313964..189707f3c0 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 cc7ffe059e..a435df5c37 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 17fe1de556..9d57d4f17c 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 fcf1097080..a85fbfbe94 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 3869cf117c..8e55e5f412 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 c126aa5a3c..0ff1a0f201 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 65aa4dbbd0..652e6c1f36 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 3b3bb2d01d..50a1acee95 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 3dfa30e83d..6c71a9bbf0 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> -- GitLab