Attached is my final solution that resolves 1538 and 1578. With this
patch, the generated autoconf.h will have slightly different content
based on whether __OFED__BUILD__ is defined. I've added this define to
the ofed makefile so it is defined when building the ofed kernel
internally. External modules including the ofed autoconf.h must _not_
define __OFED_BUILD__.
Semantically, here are the differences:
With __OFED_BUILD__ defined:
- #undef all ofed CONFIG defines
- #define only the ofed CONFIG defines enabled by the ofa kernel tree
configuration
Without __OFED_BUILD__ defined:
- #include_next <linux/autoconf.h> first to get the backing kernel
CONFIG defines
- #define only the CONFIG defines enabled by the ofa kernel tree
configuration
Comments?
If nobody barks, I'll push this up to my git tree for Vlad to pull tomorrow.
Steve.
Fix the generated autoconf.h file used by external modules.
From: Steve Wise <[email protected]>
For details on the rationale behind this change, see OFA bugs 1538
and 1578.
Create new define named __OFED_BUILD__ that is set when building the
ofed kernel tree. With __OFED_BUILD__ defined, the autoconf.h file has
the same content as previously. If it is not defined, then autoconf.h
has new semantics:
add #include_next <linux/autconf.h> to the ofed autoconf.h
do not #undef CONFIG variables that are not enabled by the ofed build.
Signed-off-by: Steve Wise <[email protected]>
---
ofed_scripts/configure | 132 +++++++++++++++++++++++++-----------------------
ofed_scripts/makefile | 1
2 files changed, 69 insertions(+), 64 deletions(-)
diff --git a/ofed_scripts/configure b/ofed_scripts/configure
index 784108c..cf1d42d 100755
--- a/ofed_scripts/configure
+++ b/ofed_scripts/configure
@@ -774,205 +774,205 @@ EOFCONFIG
if [ "X${CONFIG_MEMTRACK}" == "Xm" ]; then
DEFINE_MEMTRACK="#define CONFIG_MEMTRACK 1"
else
- DEFINE_MEMTRACK="#undef CONFIG_MEMTRACK"
+ DEFINE_MEMTRACK="/* CONFIG_MEMTRACK is not set */"
fi
if [ "X${CONFIG_DEBUG_INFO}" == "Xy" ]; then
DEFINE_DEBUG_INFO="#define CONFIG_DEBUG_INFO 1"
else
- DEFINE_DEBUG_INFO="#undef CONFIG_DEBUG_INFO"
+ DEFINE_DEBUG_INFO="/* CONFIG_DEBUG_INFO is not set */"
fi
if [ "X${CONFIG_INFINIBAND}" == "Xm" ]; then
DEFINE_INFINIBAND="#define CONFIG_INFINIBAND 1"
else
- DEFINE_INFINIBAND="#undef CONFIG_INFINIBAND"
+ DEFINE_INFINIBAND="/* CONFIG_INFINIBAND is not set */"
fi
if [ "X${CONFIG_INFINIBAND_IPOIB}" == "Xm" ]; then
DEFINE_INFINIBAND_IPOIB="#define CONFIG_INFINIBAND_IPOIB 1"
else
- DEFINE_INFINIBAND_IPOIB="#undef CONFIG_INFINIBAND_IPOIB"
+ DEFINE_INFINIBAND_IPOIB="/* CONFIG_INFINIBAND_IPOIB is not set */"
fi
if [ "X${CONFIG_INFINIBAND_IPOIB_CM}" == "Xy" ]; then
DEFINE_INFINIBAND_IPOIB_CM="#define CONFIG_INFINIBAND_IPOIB_CM 1"
else
- DEFINE_INFINIBAND_IPOIB_CM="#undef CONFIG_INFINIBAND_IPOIB_CM"
+ DEFINE_INFINIBAND_IPOIB_CM="/* CONFIG_INFINIBAND_IPOIB_CM is not set */"
fi
if [ "X${CONFIG_INFINIBAND_SDP}" == "Xm" ]; then
DEFINE_INFINIBAND_SDP="#define CONFIG_INFINIBAND_SDP 1"
else
- DEFINE_INFINIBAND_SDP="#undef CONFIG_INFINIBAND_SDP"
+ DEFINE_INFINIBAND_SDP="/* CONFIG_INFINIBAND_SDP is not set */"
fi
if [ "X${CONFIG_INFINIBAND_SRP}" == "Xm" ]; then
DEFINE_INFINIBAND_SRP="#define CONFIG_INFINIBAND_SRP 1"
else
- DEFINE_INFINIBAND_SRP="#undef CONFIG_INFINIBAND_SRP"
+ DEFINE_INFINIBAND_SRP="/* CONFIG_INFINIBAND_SRP is not set */"
fi
if [ "X${CONFIG_INFINIBAND_SRPT}" == "Xm" ]; then
DEFINE_INFINIBAND_SRPT="#define CONFIG_INFINIBAND_SRPT 1"
else
- DEFINE_INFINIBAND_SRPT="#undef CONFIG_INFINIBAND_SRPT"
+ DEFINE_INFINIBAND_SRPT="/* CONFIG_INFINIBAND_SRPT is not set */"
fi
if [ "X${CONFIG_INFINIBAND_USER_MAD}" == "Xm" ]; then
DEFINE_INFINIBAND_USER_MAD="#define CONFIG_INFINIBAND_USER_MAD 1"
else
- DEFINE_INFINIBAND_USER_MAD="#undef CONFIG_INFINIBAND_USER_MAD"
+ DEFINE_INFINIBAND_USER_MAD="/* CONFIG_INFINIBAND_USER_MAD is not set */"
fi
if [ "X${CONFIG_INFINIBAND_USER_ACCESS}" == "Xm" ]; then
DEFINE_INFINIBAND_USER_ACCESS="#define CONFIG_INFINIBAND_USER_ACCESS 1"
else
- DEFINE_INFINIBAND_USER_ACCESS="#undef CONFIG_INFINIBAND_USER_ACCESS"
+ DEFINE_INFINIBAND_USER_ACCESS="/* CONFIG_INFINIBAND_USER_ACCESS is not set */"
fi
if [ "X${CONFIG_INFINIBAND_ADDR_TRANS}" == "Xy" ]; then
DEFINE_INFINIBAND_ADDR_TRANS="#define CONFIG_INFINIBAND_ADDR_TRANS 1"
else
- DEFINE_INFINIBAND_ADDR_TRANS="#undef CONFIG_INFINIBAND_ADDR_TRANS"
+ DEFINE_INFINIBAND_ADDR_TRANS="/* CONFIG_INFINIBAND_ADDR_TRANS is not set */"
fi
if [ "X${CONFIG_INFINIBAND_USER_MEM}" == "Xy" ]; then
DEFINE_INFINIBAND_USER_MEM="#define CONFIG_INFINIBAND_USER_MEM 1"
else
- DEFINE_INFINIBAND_USER_MEM="#undef CONFIG_INFINIBAND_USER_MEM"
+ DEFINE_INFINIBAND_USER_MEM="/* CONFIG_INFINIBAND_USER_MEM is not set */"
fi
if [ "X${CONFIG_INFINIBAND_MTHCA}" == "Xm" ]; then
DEFINE_INFINIBAND_MTHCA="#define CONFIG_INFINIBAND_MTHCA 1"
else
- DEFINE_INFINIBAND_MTHCA="#undef CONFIG_INFINIBAND_MTHCA"
+ DEFINE_INFINIBAND_MTHCA="/* CONFIG_INFINIBAND_MTHCA is not set */"
fi
if [ "X${CONFIG_MLX4_CORE}" == "Xm" ]; then
DEFINE_MLX4_CORE="#define CONFIG_MLX4_CORE 1"
else
- DEFINE_MLX4_CORE="#undef CONFIG_MLX4_CORE"
+ DEFINE_MLX4_CORE="/* CONFIG_MLX4_CORE is not set */"
fi
if [ "X${CONFIG_MLX4_EN}" == "Xm" ]; then
DEFINE_MLX4_EN="#define CONFIG_MLX4_EN 1"
else
- DEFINE_MLX4_EN="#undef CONFIG_MLX4_EN"
+ DEFINE_MLX4_EN="/* CONFIG_MLX4_EN is not set */"
fi
if [ "X${CONFIG_MLX4_INFINIBAND}" == "Xm" ]; then
DEFINE_MLX4_INFINIBAND="#define CONFIG_MLX4_INFINIBAND 1"
else
- DEFINE_MLX4_INFINIBAND="#undef CONFIG_MLX4_INFINIBAND"
+ DEFINE_MLX4_INFINIBAND="/* CONFIG_MLX4_INFINIBAND is not set */"
fi
if [ "X${CONFIG_MLX4_DEBUG}" == "Xy" ]; then
DEFINE_MLX4_DEBUG="#define CONFIG_MLX4_DEBUG 1"
else
- DEFINE_MLX4_DEBUG="#undef CONFIG_MLX4_DEBUG"
+ DEFINE_MLX4_DEBUG="/* CONFIG_MLX4_DEBUG is not set */"
fi
if [ "X${CONFIG_INFINIBAND_IPOIB_DEBUG}" == "Xy" ]; then
DEFINE_INFINIBAND_IPOIB_DEBUG="#define CONFIG_INFINIBAND_IPOIB_DEBUG 1"
else
- DEFINE_INFINIBAND_IPOIB_DEBUG="#undef CONFIG_INFINIBAND_IPOIB_DEBUG"
+ DEFINE_INFINIBAND_IPOIB_DEBUG="/* CONFIG_INFINIBAND_IPOIB_DEBUG is not set */"
fi
if [ "X${CONFIG_INFINIBAND_ISER}" == "Xm" ]; then
DEFINE_INFINIBAND_ISER="#define CONFIG_INFINIBAND_ISER 1"
DEFINE_SCSI_ISCSI_ATTRS="#define CONFIG_SCSI_ISCSI_ATTRS 1"
DEFINE_ISCSI_TCP="#define CONFIG_ISCSI_TCP 1"
else
- DEFINE_INFINIBAND_ISER="#undef CONFIG_INFINIBAND_ISER"
- DEFINE_SCSI_ISCSI_ATTRS="#undef CONFIG_SCSI_ISCSI_ATTRS"
- DEFINE_ISCSI_TCP="#undef CONFIG_ISCSI_TCP"
+ DEFINE_INFINIBAND_ISER="/* CONFIG_INFINIBAND_ISER is not set */"
+ DEFINE_SCSI_ISCSI_ATTRS="/* CONFIG_SCSI_ISCSI_ATTRS is not set */"
+ DEFINE_ISCSI_TCP="/* CONFIG_ISCSI_TCP is not set */"
fi
if [ "X${CONFIG_INFINIBAND_EHCA}" == "Xm" ]; then
DEFINE_INFINIBAND_EHCA="#define CONFIG_INFINIBAND_EHCA 1"
else
- DEFINE_INFINIBAND_EHCA="#undef CONFIG_INFINIBAND_EHCA"
+ DEFINE_INFINIBAND_EHCA="/* CONFIG_INFINIBAND_EHCA is not set */"
fi
if [ "X${CONFIG_INFINIBAND_EHCA_SCALING}" == "Xy" ]; then
DEFINE_INFINIBAND_EHCA_SCALING="#define CONFIG_INFINIBAND_EHCA_SCALING 1"
else
- DEFINE_INFINIBAND_EHCA_SCALING="#undef CONFIG_INFINIBAND_EHCA_SCALING"
+ DEFINE_INFINIBAND_EHCA_SCALING="/* CONFIG_INFINIBAND_EHCA_SCALING is not set */"
fi
if [ "X${CONFIG_RDS}" == "Xm" ]; then
DEFINE_RDS="#define CONFIG_RDS 1"
DEFINE_RDS_IB="#define CONFIG_RDS_IB 1"
DEFINE_RDS_IWARP="#define CONFIG_RDS_IWARP 1"
else
- DEFINE_RDS="#undef CONFIG_RDS"
- DEFINE_RDS_IB="#undef CONFIG_RDS_IB"
- DEFINE_RDS_IWARP="#undef CONFIG_RDS_IWARP"
+ DEFINE_RDS="/* CONFIG_RDS is not set */"
+ DEFINE_RDS_IB="/* CONFIG_RDS_IB is not set */"
+ DEFINE_RDS_IWARP="/* CONFIG_RDS_IWARP is not set */"
fi
if [ "X${CONFIG_RDS_DEBUG}" == "Xy" ]; then
DEFINE_RDS_DEBUG="#define CONFIG_RDS_DEBUG 1"
else
- DEFINE_RDS_DEBUG="#undef CONFIG_RDS_DEBUG"
+ DEFINE_RDS_DEBUG="/* CONFIG_RDS_DEBUG is not set */"
fi
if [ "X${CONFIG_INFINIBAND_MADEYE}" == "Xm" ]; then
DEFINE_INFINIBAND_MADEYE="#define CONFIG_INFINIBAND_MADEYE 1"
else
- DEFINE_INFINIBAND_MADEYE="#undef CONFIG_INFINIBAND_MADEYE"
+ DEFINE_INFINIBAND_MADEYE="/* CONFIG_INFINIBAND_MADEYE is not set */"
fi
if [ "X${CONFIG_INFINIBAND_IPOIB_DEBUG_DATA}" == "Xy" ]; then
DEFINE_INFINIBAND_IPOIB_DEBUG_DATA="#define CONFIG_INFINIBAND_IPOIB_DEBUG_DATA 1"
else
- DEFINE_INFINIBAND_IPOIB_DEBUG_DATA="#undef CONFIG_INFINIBAND_IPOIB_DEBUG_DATA"
+ DEFINE_INFINIBAND_IPOIB_DEBUG_DATA="/* CONFIG_INFINIBAND_IPOIB_DEBUG_DATA is not set */"
fi
if [ "X${CONFIG_INFINIBAND_SDP_SEND_ZCOPY}" == "Xy" ]; then
DEFINE_INFINIBAND_SDP_SEND_ZCOPY="#define CONFIG_INFINIBAND_SDP_SEND_ZCOPY 1"
else
- DEFINE_INFINIBAND_SDP_SEND_ZCOPY="#undef CONFIG_INFINIBAND_SDP_SEND_ZCOPY"
+ DEFINE_INFINIBAND_SDP_SEND_ZCOPY="/* CONFIG_INFINIBAND_SDP_SEND_ZCOPY is not set */"
fi
if [ "X${CONFIG_INFINIBAND_SDP_RECV_ZCOPY}" == "Xy" ]; then
DEFINE_INFINIBAND_SDP_RECV_ZCOPY="#define CONFIG_INFINIBAND_SDP_RECV_ZCOPY 1"
else
- DEFINE_INFINIBAND_SDP_RECV_ZCOPY="#undef CONFIG_INFINIBAND_SDP_RECV_ZCOPY"
+ DEFINE_INFINIBAND_SDP_RECV_ZCOPY="/* CONFIG_INFINIBAND_SDP_RECV_ZCOPY is not set */"
fi
if [ "X${CONFIG_INFINIBAND_SDP_DEBUG}" == "Xy" ]; then
DEFINE_INFINIBAND_SDP_DEBUG="#define CONFIG_INFINIBAND_SDP_DEBUG 1"
else
- DEFINE_INFINIBAND_SDP_DEBUG="#undef CONFIG_INFINIBAND_SDP_DEBUG"
+ DEFINE_INFINIBAND_SDP_DEBUG="/* CONFIG_INFINIBAND_SDP_DEBUG is not set */"
fi
if [ "X${CONFIG_INFINIBAND_SDP_DEBUG_DATA}" == "Xy" ]; then
DEFINE_INFINIBAND_SDP_DEBUG_DATA="#define CONFIG_INFINIBAND_SDP_DEBUG_DATA 1"
else
- DEFINE_INFINIBAND_SDP_DEBUG_DATA="#undef CONFIG_INFINIBAND_SDP_DEBUG_DATA"
+ DEFINE_INFINIBAND_SDP_DEBUG_DATA="/* CONFIG_INFINIBAND_SDP_DEBUG_DATA is not set */"
fi
if [ "X${CONFIG_INFINIBAND_IPATH}" == "Xm" ]; then
DEFINE_INFINIBAND_IPATH="#define CONFIG_INFINIBAND_IPATH 1"
else
- DEFINE_INFINIBAND_IPATH="#undef CONFIG_INFINIBAND_IPATH"
+ DEFINE_INFINIBAND_IPATH="/* CONFIG_INFINIBAND_IPATH is not set */"
fi
if [ "X${CONFIG_INFINIBAND_MTHCA_DEBUG}" == "Xy" ]; then
DEFINE_INFINIBAND_MTHCA_DEBUG="#define CONFIG_INFINIBAND_MTHCA_DEBUG 1"
else
- DEFINE_INFINIBAND_MTHCA_DEBUG="#undef CONFIG_INFINIBAND_MTHCA_DEBUG"
+ DEFINE_INFINIBAND_MTHCA_DEBUG="/* CONFIG_INFINIBAND_MTHCA_DEBUG is not set */"
fi
if [ "X${CONFIG_INFINIBAND_QLGC_VNIC}" == "Xm" ]; then
DEFINE_INFINIBAND_QLGC_VNIC="#define CONFIG_INFINIBAND_QLGC_VNIC 1"
else
- DEFINE_INFINIBAND_QLGC_VNIC="#undef CONFIG_INFINIBAND_QLGC_VNIC"
+ DEFINE_INFINIBAND_QLGC_VNIC="/* CONFIG_INFINIBAND_QLGC_VNIC is not set */"
fi
if [ "X${CONFIG_INFINIBAND_QLGC_VNIC_STATS}" == "Xy" ]; then
DEFINE_INFINIBAND_QLGC_VNIC_STATS="#define CONFIG_INFINIBAND_QLGC_VNIC_STATS 1"
else
- DEFINE_INFINIBAND_QLGC_VNIC_STATS="#undef CONFIG_INFINIBAND_QLGC_VNIC_STATS"
+ DEFINE_INFINIBAND_QLGC_VNIC_STATS="/* CONFIG_INFINIBAND_QLGC_VNIC_STATS is not set */"
fi
if [ "X${CONFIG_INFINIBAND_CXGB3}" == "Xm" ]; then
DEFINE_INFINIBAND_CXGB3="#define CONFIG_INFINIBAND_CXGB3 1"
else
- DEFINE_INFINIBAND_CXGB3="#undef CONFIG_INFINIBAND_CXGB3"
+ DEFINE_INFINIBAND_CXGB3="/* CONFIG_INFINIBAND_CXGB3 is not set */"
fi
if [ "X${CONFIG_INFINIBAND_CXGB3_DEBUG}" == "Xy" ]; then
DEFINE_INFINIBAND_CXGB3_DEBUG="#define CONFIG_INFINIBAND_CXGB3_DEBUG 1"
else
- DEFINE_INFINIBAND_CXGB3_DEBUG="#undef CONFIG_INFINIBAND_CXGB3_DEBUG"
+ DEFINE_INFINIBAND_CXGB3_DEBUG="/* CONFIG_INFINIBAND_CXGB3_DEBUG is not set */"
fi
if [ "X${CONFIG_CHELSIO_T3}" == "Xm" ]; then
DEFINE_CHELSIO_T3="#define CONFIG_CHELSIO_T3 1"
else
- DEFINE_CHELSIO_T3="#undef CONFIG_CHELSIO_T3"
+ DEFINE_CHELSIO_T3="/* CONFIG_CHELSIO_T3 is not set */"
fi
if [ "X${CONFIG_INFINIBAND_NES}" == "Xm" ]; then
DEFINE_INFINIBAND_NES="#define CONFIG_INFINIBAND_NES 1"
else
- DEFINE_INFINIBAND_NES="#undef CONFIG_INFINIBAND_NES"
+ DEFINE_INFINIBAND_NES="/* CONFIG_INFINIBAND_NES is not set */"
fi
if [ "X${CONFIG_INFINIBAND_NES_DEBUG}" == "Xy" ]; then
DEFINE_INFINIBAND_NES_DEBUG="#define CONFIG_INFINIBAND_NES_DEBUG 1"
else
- DEFINE_INFINIBAND_NES_DEBUG="#undef CONFIG_INFINIBAND_NES_DEBUG"
+ DEFINE_INFINIBAND_NES_DEBUG="/* CONFIG_INFINIBAND_NES_DEBUG is not set */"
fi
if [ "X${CONFIG_INFINIBAND_AMSO1100}" == "Xm" ]; then
DEFINE_INFINIBAND_AMSO1100="#define CONFIG_INFINIBAND_AMSO1100 1"
else
- DEFINE_INFINIBAND_AMSO1100="#undef CONFIG_INFINIBAND_AMSO1100"
+ DEFINE_INFINIBAND_AMSO1100="/* CONFIG_INFINIBAND_AMSO1100 is not set */"
fi
if [ "X${CONFIG_SUNRPC_XPRT_RDMA}" == "Xm" ]; then
DEFINE_CONFIG_SUNRPC_XPRT_RDMA="#define CONFIG_SUNRPC_XPRT_RDMA 1"
@@ -997,29 +997,32 @@ if [ "X${CONFIG_SUNRPC_XPRT_RDMA}" == "Xm" ]; then
DEFINE_CONFIG_NFSD_V4="#define CONFIG_NFSD_V4 1"
DEFINE_CONFIG_NFSD_RDMA="#define CONFIG_NFSD_RDMA 1"
else
- DEFINE_CONFIG_SUNRPC_XPRT_RDMA="#undef CONFIG_SUNRPC_XPRT_RDMA"
- DEFINE_CONFIG_SUNRPC="#undef CONFIG_SUNRPC"
- DEFINE_CONFIG_SUNRPC_GSS="#undef CONFIG_SUNRPC_GSS"
- DEFINE_CONFIG_RPCSEC_GSS_KRB5="#undef CONFIG_RPCSEC_GSS_KRB5"
- DEFINE_CONFIG_RPCSEC_GSS_SPKM3="#undef CONFIG_RPCSEC_GSS_SPKM3"
- DEFINE_CONFIG_NFS_FS="#undef CONFIG_NFS_FS"
- DEFINE_CONFIG_NFS_V3="#undef CONFIG_NFS_V3"
- DEFINE_CONFIG_NFS_V3_ACL="#undef CONFIG_NFS_V3_ACL"
- DEFINE_CONFIG_NFS_V4="#undef CONFIG_NFS_V4"
- DEFINE_CONFIG_NFS_ACL_SUPPORT="#undef CONFIG_NFS_ACL_SUPPORT"
- DEFINE_CONFIG_NFS_DIRECTIO="#undef CONFIG_NFS_DIRECTIO"
- DEFINE_CONFIG_SYSCTL="#undef CONFIG_SYSCTL"
- DEFINE_CONFIG_EXPORTFS="#undef CONFIG_EXPORTFS"
- DEFINE_CONFIG_LOCKD="#undef CONFIG_LOCKD"
- DEFINE_CONFIG_LOCKD_V4="#undef CONFIG_LOCKD_V4"
- DEFINE_CONFIG_NFSD="#undef CONFIG_NFSD"
- DEFINE_CONFIG_NFSD_V2_ACL="#undef CONFIG_NFSD_V2_ACL"
- DEFINE_CONFIG_NFSD_V3="#undef CONFIG_NFSD_V3"
- DEFINE_CONFIG_NFSD_V3_ACL="#undef CONFIG_NFSD_V3_ACL"
- DEFINE_CONFIG_NFSD_V4="#undef CONFIG_NFSD_V4"
- DEFINE_CONFIG_NFSD_RDMA="#undef CONFIG_NFSD_RDMA"
+ DEFINE_CONFIG_SUNRPC_XPRT_RDMA="/* CONFIG_SUNRPC_XPRT_RDMA is not set */"
+ DEFINE_CONFIG_SUNRPC="/* CONFIG_SUNRPC is not set */"
+ DEFINE_CONFIG_SUNRPC_GSS="/* CONFIG_SUNRPC_GSS is not set */"
+ DEFINE_CONFIG_RPCSEC_GSS_KRB5="/* CONFIG_RPCSEC_GSS_KRB5 is not set */"
+ DEFINE_CONFIG_RPCSEC_GSS_SPKM3="/* CONFIG_RPCSEC_GSS_SPKM3 is not set */"
+ DEFINE_CONFIG_NFS_FS="/* CONFIG_NFS_FS is not set */"
+ DEFINE_CONFIG_NFS_V3="/* CONFIG_NFS_V3 is not set */"
+ DEFINE_CONFIG_NFS_V3_ACL="/* CONFIG_NFS_V3_ACL is not set */"
+ DEFINE_CONFIG_NFS_V4="/* CONFIG_NFS_V4 is not set */"
+ DEFINE_CONFIG_NFS_ACL_SUPPORT="/* CONFIG_NFS_ACL_SUPPORT is not set */"
+ DEFINE_CONFIG_NFS_DIRECTIO="/* CONFIG_NFS_DIRECTIO is not set */"
+ DEFINE_CONFIG_SYSCTL="/* CONFIG_SYSCTL is not set */"
+ DEFINE_CONFIG_EXPORTFS="/* CONFIG_EXPORTFS is not set */"
+ DEFINE_CONFIG_LOCKD="/* CONFIG_LOCKD is not set */"
+ DEFINE_CONFIG_LOCKD_V4="/* CONFIG_LOCKD_V4 is not set */"
+ DEFINE_CONFIG_NFSD="/* CONFIG_NFSD is not set */"
+ DEFINE_CONFIG_NFSD_V2_ACL="/* CONFIG_NFSD_V2_ACL is not set */"
+ DEFINE_CONFIG_NFSD_V3="/* CONFIG_NFSD_V3 is not set */"
+ DEFINE_CONFIG_NFSD_V3_ACL="/* CONFIG_NFSD_V3_ACL is not set */"
+ DEFINE_CONFIG_NFSD_V4="/* CONFIG_NFSD_V4 is not set */"
+ DEFINE_CONFIG_NFSD_RDMA="/* CONFIG_NFSD_RDMA is not set */"
fi
cat >> ${AUTOCONF_H} << EOFAUTOCONF
+#ifndef __OFED_BUILD__
+#include_next <linux/autoconf.h>
+#else
#undef CONFIG_MEMTRACK
#undef CONFIG_DEBUG_INFO
#undef CONFIG_INFINIBAND
@@ -1087,6 +1090,7 @@ cat >> ${AUTOCONF_H} << EOFAUTOCONF
#undef CONFIG_INFINIBAND_IPATH
#undef CONFIG_INFINIBAND_MTHCA_DEBUG
#undef CONFIG_INFINIBAND_AMSO1100
+#endif
${DEFINE_INFINIBAND}
${DEFINE_INFINIBAND_IPOIB}
diff --git a/ofed_scripts/makefile b/ofed_scripts/makefile
index 020c5e7..24ec7f2 100644
--- a/ofed_scripts/makefile
+++ b/ofed_scripts/makefile
@@ -139,6 +139,7 @@ kernel:
CONFIG_NFSD_V4=$(CONFIG_NFSD_V4) \
CONFIG_NFSD_RDMA=$(CONFIG_NFSD_RDMA) \
LINUXINCLUDE=' \
+ -D__OFED_BUILD__ \
-include include/linux/autoconf.h \
-include $(CWD)/include/linux/autoconf.h \
$(BACKPORT_INCLUDES) \
_______________________________________________
ewg mailing list
[email protected]
http://lists.openfabrics.org/cgi-bin/mailman/listinfo/ewg
