From 11c2c0ec77125041e9c8143a80e7e51aede653ea Mon Sep 17 00:00:00 2001 From: Wally Wang Date: Wed, 11 Jul 2012 13:14:20 -0700 Subject: [PATCH] LU-812 kernel: AUTOCONF_INCLUDED removed AUTOCONF_INCLUDED has been removed since 2.6.37 and no longer there has . Change-Id: I68611638f61012b2becddc4e0dec613ed2b17c99 Signed-off-by: Wally Wang Reviewed-on: http://review.whamcloud.com/2146 Tested-by: Hudson Tested-by: Maloo Reviewed-by: James Simmons Reviewed-by: Peng Tao Reviewed-by: Andreas Dilger --- build/autoconf/lustre-build-linux.m4 | 3 +-- libcfs/include/libcfs/linux/kp30.h | 3 --- libcfs/include/libcfs/linux/linux-prim.h | 3 --- libcfs/include/libcfs/linux/linux-time.h | 3 --- libcfs/libcfs/linux/linux-debug.c | 3 --- libcfs/libcfs/linux/linux-prim.c | 3 --- libcfs/libcfs/linux/linux-proc.c | 3 --- lnet/klnds/mxlnd/mxlnd.h | 3 --- lnet/klnds/o2iblnd/o2iblnd.h | 3 --- lnet/klnds/ptllnd/ptllnd.h | 3 --- lnet/klnds/qswlnd/qswlnd.h | 3 --- lnet/klnds/ralnd/ralnd.h | 3 --- lnet/klnds/socklnd/socklnd_lib-linux.h | 3 --- lustre/include/linux/lprocfs_status.h | 3 --- lustre/include/linux/obd_support.h | 3 --- lustre/llite/llite_mmap.c | 3 --- lustre/llite/lloop.c | 3 --- lustre/llite/rw26.c | 3 --- lustre/mdc/mdc_reint.c | 3 --- lustre/mds/mds_log.c | 3 --- lustre/mdt/mdt_identity.c | 3 --- lustre/mdt/mdt_idmap.c | 3 --- lustre/obdclass/linux/linux-module.c | 3 --- lustre/obdfilter/filter.c | 3 --- lustre/obdfilter/filter_io.c | 3 --- lustre/obdfilter/filter_io_26.c | 3 --- lustre/obdfilter/filter_log.c | 3 --- lustre/obdfilter/filter_lvb.c | 3 --- lustre/ptlrpc/wirehdr.c | 3 --- lustre/ptlrpc/wiretest.c | 3 --- 30 files changed, 1 insertion(+), 89 deletions(-) diff --git a/build/autoconf/lustre-build-linux.m4 b/build/autoconf/lustre-build-linux.m4 index 1896190..0833328 100644 --- a/build/autoconf/lustre-build-linux.m4 +++ b/build/autoconf/lustre-build-linux.m4 @@ -233,8 +233,7 @@ LB_CHECK_FILE([$LINUX_CONFIG],[], # and at more old has only one line # include LB_CHECK_FILE([$LINUX_OBJ/include/linux/autoconf.h],[AUTOCONF_HDIR=linux], - [LB_CHECK_FILE([$LINUX_OBJ/include/generated/autoconf.h],[AUTOCONF_HDIR=generated - AC_DEFINE(AUTOCONF_INCLUDED, 1, [autoconf.h not define it while move to generated])], + [LB_CHECK_FILE([$LINUX_OBJ/include/generated/autoconf.h],[AUTOCONF_HDIR=generated], [AC_MSG_ERROR([Run make config in $LINUX.])])]) AC_SUBST(AUTOCONF_HDIR) LB_CHECK_FILE([$LINUX_OBJ/include/linux/version.h],[], diff --git a/libcfs/include/libcfs/linux/kp30.h b/libcfs/include/libcfs/linux/kp30.h index e132f83d..2e1ead7 100644 --- a/libcfs/include/libcfs/linux/kp30.h +++ b/libcfs/include/libcfs/linux/kp30.h @@ -38,9 +38,6 @@ #define __LIBCFS_LINUX_KP30_H__ -#ifndef AUTOCONF_INCLUDED -# include -#endif #include #include #include diff --git a/libcfs/include/libcfs/linux/linux-prim.h b/libcfs/include/libcfs/linux/linux-prim.h index 534a7df..8e8f7e7 100644 --- a/libcfs/include/libcfs/linux/linux-prim.h +++ b/libcfs/include/libcfs/linux/linux-prim.h @@ -47,9 +47,6 @@ #error This include is only for kernel use. #endif -#ifndef AUTOCONF_INCLUDED -#include -#endif #include #include #include diff --git a/libcfs/include/libcfs/linux/linux-time.h b/libcfs/include/libcfs/linux/linux-time.h index a82097c..cb274c4 100644 --- a/libcfs/include/libcfs/linux/linux-time.h +++ b/libcfs/include/libcfs/linux/linux-time.h @@ -96,9 +96,6 @@ #error This include is only for kernel use. #endif -#ifndef AUTOCONF_INCLUDED -#include -#endif #include #include #include diff --git a/libcfs/libcfs/linux/linux-debug.c b/libcfs/libcfs/linux/linux-debug.c index 3417631..9fc64e6 100644 --- a/libcfs/libcfs/linux/linux-debug.c +++ b/libcfs/libcfs/linux/linux-debug.c @@ -38,9 +38,6 @@ * Author: Phil Schwan */ -#ifndef AUTOCONF_INCLUDED -#include -#endif #include #include #include diff --git a/libcfs/libcfs/linux/linux-prim.c b/libcfs/libcfs/linux/linux-prim.c index ae7df19..1df8542 100644 --- a/libcfs/libcfs/linux/linux-prim.c +++ b/libcfs/libcfs/linux/linux-prim.c @@ -35,9 +35,6 @@ */ #define DEBUG_SUBSYSTEM S_LNET -#ifndef AUTOCONF_INCLUDED -#include -#endif #include #include #include diff --git a/libcfs/libcfs/linux/linux-proc.c b/libcfs/libcfs/linux/linux-proc.c index 99dcb32..5294e08 100644 --- a/libcfs/libcfs/linux/linux-proc.c +++ b/libcfs/libcfs/linux/linux-proc.c @@ -40,9 +40,6 @@ * Author: Phil Schwan */ -#ifndef AUTOCONF_INCLUDED -#include -#endif #include #include #include diff --git a/lnet/klnds/mxlnd/mxlnd.h b/lnet/klnds/mxlnd/mxlnd.h index 2072e74..69b2978 100644 --- a/lnet/klnds/mxlnd/mxlnd.h +++ b/lnet/klnds/mxlnd/mxlnd.h @@ -39,9 +39,6 @@ * Author: Scott Atchley */ -#ifndef AUTOCONF_INCLUDED -#include -#endif #include /* module */ #include /* module */ #include diff --git a/lnet/klnds/o2iblnd/o2iblnd.h b/lnet/klnds/o2iblnd/o2iblnd.h index 735a872..ce80d76 100644 --- a/lnet/klnds/o2iblnd/o2iblnd.h +++ b/lnet/klnds/o2iblnd/o2iblnd.h @@ -38,9 +38,6 @@ * Author: Eric Barton */ -#ifndef AUTOCONF_INCLUDED -#include -#endif #include #include #include diff --git a/lnet/klnds/ptllnd/ptllnd.h b/lnet/klnds/ptllnd/ptllnd.h index 93ba94c..c51d82d 100644 --- a/lnet/klnds/ptllnd/ptllnd.h +++ b/lnet/klnds/ptllnd/ptllnd.h @@ -36,9 +36,6 @@ * Author: PJ Kirner */ -#ifndef AUTOCONF_INCLUDED -#include -#endif #include #include #include diff --git a/lnet/klnds/qswlnd/qswlnd.h b/lnet/klnds/qswlnd/qswlnd.h index cd2ffcf..33e44b0c1 100644 --- a/lnet/klnds/qswlnd/qswlnd.h +++ b/lnet/klnds/qswlnd/qswlnd.h @@ -41,9 +41,6 @@ #include #undef printf /* nasty QSW #define */ -#ifndef AUTOCONF_INCLUDED -#include -#endif #include #include diff --git a/lnet/klnds/ralnd/ralnd.h b/lnet/klnds/ralnd/ralnd.h index 9d6fcab..fbea48d 100644 --- a/lnet/klnds/ralnd/ralnd.h +++ b/lnet/klnds/ralnd/ralnd.h @@ -36,9 +36,6 @@ * Author: Eric Barton */ -#ifndef AUTOCONF_INCLUDED -#include -#endif #include #include #include diff --git a/lnet/klnds/socklnd/socklnd_lib-linux.h b/lnet/klnds/socklnd/socklnd_lib-linux.h index 07e59a1..2a943c0 100644 --- a/lnet/klnds/socklnd/socklnd_lib-linux.h +++ b/lnet/klnds/socklnd/socklnd_lib-linux.h @@ -37,9 +37,6 @@ #ifndef __LINUX_SOCKNAL_LIB_H__ #define __LINUX_SOCKNAL_LIB_H__ -#ifndef AUTOCONF_INCLUDED -#include -#endif #include #include #include diff --git a/lustre/include/linux/lprocfs_status.h b/lustre/include/linux/lprocfs_status.h index 272c95c..cfbd4c3 100644 --- a/lustre/include/linux/lprocfs_status.h +++ b/lustre/include/linux/lprocfs_status.h @@ -47,9 +47,6 @@ #endif #ifdef __KERNEL__ -#ifndef AUTOCONF_INCLUDED -#include -#endif #include #include #include diff --git a/lustre/include/linux/obd_support.h b/lustre/include/linux/obd_support.h index f5a09c2..4fdb4e5 100644 --- a/lustre/include/linux/obd_support.h +++ b/lustre/include/linux/obd_support.h @@ -42,11 +42,8 @@ #endif #ifdef __KERNEL__ -#ifndef AUTOCONF_INCLUDED -#include #include #include -#endif #include #include #include diff --git a/lustre/llite/llite_mmap.c b/lustre/llite/llite_mmap.c index 0115b6c..ec74d35 100644 --- a/lustre/llite/llite_mmap.c +++ b/lustre/llite/llite_mmap.c @@ -34,9 +34,6 @@ * Lustre is a trademark of Sun Microsystems, Inc. */ -#ifndef AUTOCONF_INCLUDED -#include -#endif #include #include #include diff --git a/lustre/llite/lloop.c b/lustre/llite/lloop.c index 8c867c5..b98f640 100644 --- a/lustre/llite/lloop.c +++ b/lustre/llite/lloop.c @@ -79,9 +79,6 @@ * */ -#ifndef AUTOCONF_INCLUDED -#include -#endif #include #include diff --git a/lustre/llite/rw26.c b/lustre/llite/rw26.c index a85c6f2..80a3a61 100644 --- a/lustre/llite/rw26.c +++ b/lustre/llite/rw26.c @@ -38,9 +38,6 @@ * Lustre Lite I/O page cache routines for the 2.5/2.6 kernel version */ -#ifndef AUTOCONF_INCLUDED -#include -#endif #include #include #include diff --git a/lustre/mdc/mdc_reint.c b/lustre/mdc/mdc_reint.c index 0ba1512..6922c57 100644 --- a/lustre/mdc/mdc_reint.c +++ b/lustre/mdc/mdc_reint.c @@ -37,9 +37,6 @@ #define DEBUG_SUBSYSTEM S_MDC #ifdef __KERNEL__ -#ifndef AUTOCONF_INCLUDED -# include -#endif # include # include #else diff --git a/lustre/mds/mds_log.c b/lustre/mds/mds_log.c index 879af6b..53cf411 100644 --- a/lustre/mds/mds_log.c +++ b/lustre/mds/mds_log.c @@ -42,9 +42,6 @@ #define DEBUG_SUBSYSTEM S_MDS -#ifndef AUTOCONF_INCLUDED -#include -#endif #include #include diff --git a/lustre/mdt/mdt_identity.c b/lustre/mdt/mdt_identity.c index b245c62..23c7ce4 100644 --- a/lustre/mdt/mdt_identity.c +++ b/lustre/mdt/mdt_identity.c @@ -41,9 +41,6 @@ #define DEBUG_SUBSYSTEM S_MDS -#ifndef AUTOCONF_INCLUDED -#include -#endif #include #include #include diff --git a/lustre/mdt/mdt_idmap.c b/lustre/mdt/mdt_idmap.c index 135151a..2b50225 100644 --- a/lustre/mdt/mdt_idmap.c +++ b/lustre/mdt/mdt_idmap.c @@ -39,9 +39,6 @@ #define DEBUG_SUBSYSTEM S_MDS -#ifndef AUTOCONF_INCLUDED -#include -#endif #include #include #include diff --git a/lustre/obdclass/linux/linux-module.c b/lustre/obdclass/linux/linux-module.c index e585a47..6990177 100644 --- a/lustre/obdclass/linux/linux-module.c +++ b/lustre/obdclass/linux/linux-module.c @@ -43,9 +43,6 @@ #define DEBUG_SUBSYSTEM S_CLASS #ifdef __KERNEL__ -#ifndef AUTOCONF_INCLUDED -#include /* for CONFIG_PROC_FS */ -#endif #include #include #include diff --git a/lustre/obdfilter/filter.c b/lustre/obdfilter/filter.c index f0bba1e..422db94 100644 --- a/lustre/obdfilter/filter.c +++ b/lustre/obdfilter/filter.c @@ -51,9 +51,6 @@ #define DEBUG_SUBSYSTEM S_FILTER -#ifndef AUTOCONF_INCLUDED -#include -#endif #include #include #include diff --git a/lustre/obdfilter/filter_io.c b/lustre/obdfilter/filter_io.c index 29a0f73..701cdfd 100644 --- a/lustre/obdfilter/filter_io.c +++ b/lustre/obdfilter/filter_io.c @@ -40,9 +40,6 @@ #define DEBUG_SUBSYSTEM S_FILTER -#ifndef AUTOCONF_INCLUDED -#include -#endif #include #include // XXX kill me soon #include diff --git a/lustre/obdfilter/filter_io_26.c b/lustre/obdfilter/filter_io_26.c index 68a9a7f..363843d 100644 --- a/lustre/obdfilter/filter_io_26.c +++ b/lustre/obdfilter/filter_io_26.c @@ -40,9 +40,6 @@ * Author: Phil Schwan */ -#ifndef AUTOCONF_INCLUDED -#include -#endif #include #include // XXX kill me soon #include diff --git a/lustre/obdfilter/filter_log.c b/lustre/obdfilter/filter_log.c index 53396d3..bca819c 100644 --- a/lustre/obdfilter/filter_log.c +++ b/lustre/obdfilter/filter_log.c @@ -42,9 +42,6 @@ #define DEBUG_SUBSYSTEM S_FILTER -#ifndef AUTOCONF_INCLUDED -#include -#endif #include #include diff --git a/lustre/obdfilter/filter_lvb.c b/lustre/obdfilter/filter_lvb.c index 773e1cd..a548983 100644 --- a/lustre/obdfilter/filter_lvb.c +++ b/lustre/obdfilter/filter_lvb.c @@ -42,9 +42,6 @@ #define DEBUG_SUBSYSTEM S_FILTER -#ifndef AUTOCONF_INCLUDED -#include -#endif #include #include diff --git a/lustre/ptlrpc/wirehdr.c b/lustre/ptlrpc/wirehdr.c index dd4c4d1..ba60b20 100644 --- a/lustre/ptlrpc/wirehdr.c +++ b/lustre/ptlrpc/wirehdr.c @@ -40,9 +40,6 @@ #endif #ifdef __KERNEL__ -# ifndef AUTOCONF_INCLUDED -# include -# endif # ifdef CONFIG_FS_POSIX_ACL # include # include diff --git a/lustre/ptlrpc/wiretest.c b/lustre/ptlrpc/wiretest.c index 4ad1e5b..29ca1f4 100644 --- a/lustre/ptlrpc/wiretest.c +++ b/lustre/ptlrpc/wiretest.c @@ -40,9 +40,6 @@ #endif #ifdef __KERNEL__ -# ifndef AUTOCONF_INCLUDED -# include -# endif # ifdef CONFIG_FS_POSIX_ACL # include # include -- 1.8.3.1