From bf77741599f4bdfa3509a4a73ff462c4746fcd4e Mon Sep 17 00:00:00 2001 From: johann <johann> Date: Thu, 2 Aug 2007 06:40:38 +0000 Subject: [PATCH] Branch HEAD 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/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/mdt/mdt_identity.c | 2 +- lustre/mdt/mdt_idmap.c | 2 +- lustre/mdt/mdt_rmtacl.c | 2 +- lustre/obdclass/linux/linux-module.c | 2 +- lustre/obdfilter/filter.c | 2 +- lustre/obdfilter/filter_io.c | 2 +- lustre/obdfilter/filter_io_26.c | 2 +- lustre/obdfilter/filter_log.c | 2 +- lustre/obdfilter/filter_lvb.c | 2 +- 19 files changed, 19 insertions(+), 19 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 be35c268ae..858a04b933 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 f966cfdcd4..a00e6af10a 100644 --- a/lustre/llite/llite_mmap.c +++ b/lustre/llite/llite_mmap.c @@ -19,7 +19,7 @@ * 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 723dd908ef..005590b4bd 100644 --- a/lustre/llite/rw.c +++ b/lustre/llite/rw.c @@ -21,7 +21,7 @@ * 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 c1393917fb..aa4c5d3079 100644 --- a/lustre/llite/rw26.c +++ b/lustre/llite/rw26.c @@ -21,7 +21,7 @@ * 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 71a002291e..468d4af0c8 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 6f8fc77ccf..712a70b6a9 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 0678fe9dcc..678ce53b0a 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 887d6efef4..be4959d1ce 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 28572445fc..9694dfc914 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/mdt/mdt_identity.c b/lustre/mdt/mdt_identity.c index 9e94281bcc..f196570f6c 100644 --- a/lustre/mdt/mdt_identity.c +++ b/lustre/mdt/mdt_identity.c @@ -26,7 +26,7 @@ #endif #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/mdt/mdt_idmap.c b/lustre/mdt/mdt_idmap.c index aaa6ee9f34..567c88430b 100644 --- a/lustre/mdt/mdt_idmap.c +++ b/lustre/mdt/mdt_idmap.c @@ -27,7 +27,7 @@ #endif #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/mdt/mdt_rmtacl.c b/lustre/mdt/mdt_rmtacl.c index 0f6008d5a4..13fa70afcd 100644 --- a/lustre/mdt/mdt_rmtacl.c +++ b/lustre/mdt/mdt_rmtacl.c @@ -26,7 +26,7 @@ #endif #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 57da96649d..18d6271dc4 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 c7cc02fd50..42d9ffa0f7 100644 --- a/lustre/obdfilter/filter.c +++ b/lustre/obdfilter/filter.c @@ -35,7 +35,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 2a6a326303..04845a7024 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_26.c b/lustre/obdfilter/filter_io_26.c index 3371bdda5c..cc3bb41b77 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 b18d80d28e..63d7ad83dd 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 aaccf0ff80..86d01922c1 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