From: johann Date: Thu, 2 Aug 2007 06:12:12 +0000 (+0000) Subject: Branch b1_6 X-Git-Tag: v1_8_0_110~1396 X-Git-Url: https://git.whamcloud.com/gitweb?a=commitdiff_plain;h=ed514965f18c0a80e70c27bffc5fb529b96f94c8;p=fs%2Flustre-release.git Branch b1_6 b=11802 i=green i=scjody attachment 11752 / rely on AUTOCONF_INCLUDED instead of HAVE_KERNEL_CONFIG_H --- diff --git a/lustre/include/linux/lprocfs_status.h b/lustre/include/linux/lprocfs_status.h index db4b7d5..85574fa 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 #endif #include diff --git a/lustre/include/linux/obd_support.h b/lustre/include/linux/obd_support.h index 5c466c3..0ccc5a1 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 #endif #include diff --git a/lustre/llite/llite_mmap.c b/lustre/llite/llite_mmap.c index bba41b4..fc5d1ff 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 #endif #include diff --git a/lustre/llite/rw.c b/lustre/llite/rw.c index 6ab6fcf..8b80424 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 #endif #include diff --git a/lustre/llite/rw24.c b/lustre/llite/rw24.c index cf666da..07be4fe 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 #endif #include diff --git a/lustre/llite/rw26.c b/lustre/llite/rw26.c index c631c2b..d32a447 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 #endif #include diff --git a/lustre/lvfs/upcall_cache.c b/lustre/lvfs/upcall_cache.c index 87c6b8e..b9023d0 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 #endif #include diff --git a/lustre/mdc/mdc_reint.c b/lustre/mdc/mdc_reint.c index c7ed24b..e983e85 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 #endif # include diff --git a/lustre/mds/mds_lib.c b/lustre/mds/mds_lib.c index f24f6ec..7769cdd 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 #endif #include diff --git a/lustre/mds/mds_log.c b/lustre/mds/mds_log.c index a33a313..189707f3 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 #endif #include diff --git a/lustre/mds/mds_unlink_open.c b/lustre/mds/mds_unlink_open.c index cc7ffe0..a435df5 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 #endif #include diff --git a/lustre/obdclass/linux/linux-module.c b/lustre/obdclass/linux/linux-module.c index 17fe1de..9d57d4f 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 /* for CONFIG_PROC_FS */ #endif #include diff --git a/lustre/obdfilter/filter.c b/lustre/obdfilter/filter.c index fcf1097..a85fbfb 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 #endif #include diff --git a/lustre/obdfilter/filter_io.c b/lustre/obdfilter/filter_io.c index 3869cf1..8e55e5f 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 #endif #include diff --git a/lustre/obdfilter/filter_io_24.c b/lustre/obdfilter/filter_io_24.c index c126aa5..0ff1a0f 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 #endif #include diff --git a/lustre/obdfilter/filter_io_26.c b/lustre/obdfilter/filter_io_26.c index 65aa4db..652e6c1 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 #endif #include diff --git a/lustre/obdfilter/filter_log.c b/lustre/obdfilter/filter_log.c index 3b3bb2d..50a1ace 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 #endif #include diff --git a/lustre/obdfilter/filter_lvb.c b/lustre/obdfilter/filter_lvb.c index 3dfa30e..6c71a9b 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 #endif #include