iscsi-scst, srpt: Rename the PRE_CFLAGS variable into CONFTEST_FLAGS

The latter name reflects better the role of this variable. Remove the CPPFLAGS assignment from srpt/src/Kbuild because it is not useful. git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@9082 d57e44dd-8a1f-0410-8b47-8ef2f437770f
2026-05-14 01:01:27 +00:00 · 2020-07-26 03:34:35 +00:00
parent 214628043e
commit bd3355500a
53 changed files with 69 additions and 68 deletions
--- a/iscsi-scst/Makefile
+++ b/iscsi-scst/Makefile
@@ -110,7 +110,7 @@ run_conftest = $(shell							\
  else									\
    output=conftest/$1/build-output-$(KVER).txt;			\
  fi;									\
-  if MAKEFLAGS= make -C $(KDIR) V=$(V) M="$(shell pwd)/conftest/$1" PRE_CFLAGS="-Werror $(OFED_CFLAGS)" $(OFED_CONFIG) KBUILD_EXTRA_SYMBOLS="$(OFED_MODULE_SYMVERS)" 1>&2 2>$${output}; then						\
+  if MAKEFLAGS= make -C $(KDIR) V=$(V) M="$(shell pwd)/conftest/$1" CONFTEST_CFLAGS="-Werror $(OFED_CFLAGS)" $(OFED_CONFIG) KBUILD_EXTRA_SYMBOLS="$(OFED_MODULE_SYMVERS)" 1>&2 2>$${output}; then					\
    echo "$(strip $2)";							\
  else									\
    echo "$(strip $3)";							\
@@ -123,19 +123,18 @@ CONFTEST_OUTPUTS = $(shell			\
 		echo $$t/result-$(KVER).txt;	\
 	done)

-PRE_CFLAGS = $(shell					\
-	for t in $(CONFTESTS); do			\
-		cat $$t/result-$(KVER).txt 2>/dev/null;	\
+CONFTEST_CFLAGS = $(OFED_CFLAGS)			\
+	-DOFED_FLAVOR=$(OFED_FLAVOR)			\
+	$(shell for t in $(CONFTESTS); do 		\
+		cat $$t/result-$(KVER).txt 2>/dev/null; \
 	done)

-ISER_CFLAGS = $(OFED_CFLAGS) -DOFED_FLAVOR=$(OFED_FLAVOR) $(PRE_CFLAGS)
-
 mods: include/iscsi_scst_itf_ver.h $(CONFTEST_OUTPUTS)
-	$(MAKE) -C $(KDIR) M=$(KMOD) PRE_CFLAGS="$(PRE_CFLAGS)" modules
+	$(MAKE) -C $(KDIR) M=$(KMOD) CONFTEST_CFLAGS="$(CONFTEST_CFLAGS)" modules
 	echo "$@:  INFINIBAND_ENABLED = $(INFINIBAND_ENABLED)"
 	if $(INFINIBAND_ENABLED); then					       \
 	  echo "  Building against $(OFED_FLAVOR) RDMA kernel headers.";       \
-	  $(MAKE) -C $(KDIR) M=$(ISERTMOD) PRE_CFLAGS="$(ISER_CFLAGS)"         \
+	  $(MAKE) -C $(KDIR) M=$(ISERTMOD) CONFTEST_CFLAGS="$(CONFTEST_CFLAGS)"\
 	  $(OFED_CONFIG) modules;					       \
 	fi

--- a/iscsi-scst/conftest/bad_wr_mod/Kbuild
+++ b/iscsi-scst/conftest/bad_wr_mod/Kbuild
@@ -1,3 +1,3 @@
-LINUXINCLUDE := $(PRE_CFLAGS) $(LINUXINCLUDE)
+LINUXINCLUDE := $(CONFTEST_CFLAGS) $(LINUXINCLUDE)

 obj-m += bad_wr_mod.o
--- a/iscsi-scst/conftest/cm_event_mod/Kbuild
+++ b/iscsi-scst/conftest/cm_event_mod/Kbuild
@@ -1,3 +1,3 @@
-LINUXINCLUDE := $(PRE_CFLAGS) $(LINUXINCLUDE)
+LINUXINCLUDE := $(CONFTEST_CFLAGS) $(LINUXINCLUDE)

 obj-m += cm_event_mod.o
--- a/iscsi-scst/conftest/cm_listen/Kbuild
+++ b/iscsi-scst/conftest/cm_listen/Kbuild
@@ -1,3 +1,3 @@
-LINUXINCLUDE := $(PRE_CFLAGS) $(LINUXINCLUDE)
+LINUXINCLUDE := $(CONFTEST_CFLAGS) $(LINUXINCLUDE)

 obj-m += cm_listen.o
--- a/iscsi-scst/conftest/create_cq/Kbuild
+++ b/iscsi-scst/conftest/create_cq/Kbuild
@@ -1,3 +1,3 @@
-LINUXINCLUDE := $(PRE_CFLAGS) $(LINUXINCLUDE)
+LINUXINCLUDE := $(CONFTEST_CFLAGS) $(LINUXINCLUDE)

 obj-m += create_cq.o
--- a/iscsi-scst/conftest/create_send_mad_ah/Kbuild
+++ b/iscsi-scst/conftest/create_send_mad_ah/Kbuild
@@ -1,3 +1,3 @@
-LINUXINCLUDE := $(PRE_CFLAGS) $(LINUXINCLUDE)
+LINUXINCLUDE := $(CONFTEST_CFLAGS) $(LINUXINCLUDE)

 obj-m += create_send_mad_ah.o
--- a/iscsi-scst/conftest/create_send_mad_base/Kbuild
+++ b/iscsi-scst/conftest/create_send_mad_base/Kbuild
@@ -1,3 +1,3 @@
-LINUXINCLUDE := $(PRE_CFLAGS) $(LINUXINCLUDE)
+LINUXINCLUDE := $(CONFTEST_CFLAGS) $(LINUXINCLUDE)

 obj-m += create_send_mad_base.o
--- a/iscsi-scst/conftest/dev_attr_max_recv_sge/Kbuild
+++ b/iscsi-scst/conftest/dev_attr_max_recv_sge/Kbuild
@@ -1,3 +1,3 @@
-LINUXINCLUDE := $(PRE_CFLAGS) $(LINUXINCLUDE)
+LINUXINCLUDE := $(CONFTEST_CFLAGS) $(LINUXINCLUDE)

 obj-m += dev_attr_max_recv_sge.o
--- a/iscsi-scst/conftest/gid_change/Kbuild
+++ b/iscsi-scst/conftest/gid_change/Kbuild
@@ -1,3 +1,3 @@
-LINUXINCLUDE := $(PRE_CFLAGS) $(LINUXINCLUDE)
+LINUXINCLUDE := $(CONFTEST_CFLAGS) $(LINUXINCLUDE)

 obj-m += gid_change.o
--- a/iscsi-scst/conftest/ib_client_remove/Kbuild
+++ b/iscsi-scst/conftest/ib_client_remove/Kbuild
@@ -1,3 +1,3 @@
-LINUXINCLUDE := $(PRE_CFLAGS) $(LINUXINCLUDE)
+LINUXINCLUDE := $(CONFTEST_CFLAGS) $(LINUXINCLUDE)

 obj-m += ib_client_remove.o
--- a/iscsi-scst/conftest/ib_dma_map_ops/Kbuild
+++ b/iscsi-scst/conftest/ib_dma_map_ops/Kbuild
@@ -1,3 +1,3 @@
-LINUXINCLUDE := $(PRE_CFLAGS) $(LINUXINCLUDE)
+LINUXINCLUDE := $(CONFTEST_CFLAGS) $(LINUXINCLUDE)

 obj-m += ib_dma_map_ops.o
--- a/iscsi-scst/conftest/ib_set_cpi_resp_time/Kbuild
+++ b/iscsi-scst/conftest/ib_set_cpi_resp_time/Kbuild
@@ -1,3 +1,3 @@
-LINUXINCLUDE := $(PRE_CFLAGS) $(LINUXINCLUDE)
+LINUXINCLUDE := $(CONFTEST_CFLAGS) $(LINUXINCLUDE)

 obj-m += ib_set_cpi_resp_time.o
--- a/iscsi-scst/conftest/mad_handler_takes_send_buf/Kbuild
+++ b/iscsi-scst/conftest/mad_handler_takes_send_buf/Kbuild
@@ -1,3 +1,3 @@
-LINUXINCLUDE := $(PRE_CFLAGS) $(LINUXINCLUDE)
+LINUXINCLUDE := $(CONFTEST_CFLAGS) $(LINUXINCLUDE)

 obj-m += mad_handler_takes_send_buf.o
--- a/iscsi-scst/conftest/pd_has_local_dma_lkey/Kbuild
+++ b/iscsi-scst/conftest/pd_has_local_dma_lkey/Kbuild
@@ -1,3 +1,3 @@
-LINUXINCLUDE := $(PRE_CFLAGS) $(LINUXINCLUDE)
+LINUXINCLUDE := $(CONFTEST_CFLAGS) $(LINUXINCLUDE)

 obj-m += pd_has_local_dma_lkey.o
--- a/iscsi-scst/conftest/query_device/Kbuild
+++ b/iscsi-scst/conftest/query_device/Kbuild
@@ -1,3 +1,3 @@
-LINUXINCLUDE := $(PRE_CFLAGS) $(LINUXINCLUDE)
+LINUXINCLUDE := $(CONFTEST_CFLAGS) $(LINUXINCLUDE)

 obj-m += query_device.o
--- a/iscsi-scst/conftest/query_device_attr_arg/Kbuild
+++ b/iscsi-scst/conftest/query_device_attr_arg/Kbuild
@@ -1,3 +1,3 @@
-LINUXINCLUDE := $(PRE_CFLAGS) $(LINUXINCLUDE)
+LINUXINCLUDE := $(CONFTEST_CFLAGS) $(LINUXINCLUDE)

 obj-m += query_device_attr_arg.o
--- a/iscsi-scst/conftest/query_gid/Kbuild
+++ b/iscsi-scst/conftest/query_gid/Kbuild
@@ -1,3 +1,3 @@
-LINUXINCLUDE := $(PRE_CFLAGS) $(LINUXINCLUDE)
+LINUXINCLUDE := $(CONFTEST_CFLAGS) $(LINUXINCLUDE)

 obj-m += query_gid.o
--- a/iscsi-scst/conftest/rdma_create_id_net/Kbuild
+++ b/iscsi-scst/conftest/rdma_create_id_net/Kbuild
@@ -1,3 +1,3 @@
-LINUXINCLUDE := $(PRE_CFLAGS) $(LINUXINCLUDE)
+LINUXINCLUDE := $(CONFTEST_CFLAGS) $(LINUXINCLUDE)

 obj-m += rdma_create_id_net.o
--- a/iscsi-scst/conftest/rdma_reject/Kbuild
+++ b/iscsi-scst/conftest/rdma_reject/Kbuild
@@ -1,3 +1,3 @@
-LINUXINCLUDE := $(PRE_CFLAGS) $(LINUXINCLUDE)
+LINUXINCLUDE := $(CONFTEST_CFLAGS) $(LINUXINCLUDE)

 obj-m += rdma_reject.o
--- a/iscsi-scst/conftest/register_mad_agent/Kbuild
+++ b/iscsi-scst/conftest/register_mad_agent/Kbuild
@@ -1,3 +1,3 @@
-LINUXINCLUDE := $(PRE_CFLAGS) $(LINUXINCLUDE)
+LINUXINCLUDE := $(CONFTEST_CFLAGS) $(LINUXINCLUDE)

 obj-m += register_mad_agent.o
--- a/iscsi-scst/conftest/sock_recvmsg/Kbuild
+++ b/iscsi-scst/conftest/sock_recvmsg/Kbuild
@@ -1,3 +1,3 @@
-LINUXINCLUDE := $(PRE_CFLAGS) $(LINUXINCLUDE)
+LINUXINCLUDE := $(CONFTEST_CFLAGS) $(LINUXINCLUDE)

 obj-m += sock_recvmsg.o
--- a/iscsi-scst/conftest/use_pre_440_wr_structure/Kbuild
+++ b/iscsi-scst/conftest/use_pre_440_wr_structure/Kbuild
@@ -1,3 +1,3 @@
-LINUXINCLUDE := $(PRE_CFLAGS) $(LINUXINCLUDE)
+LINUXINCLUDE := $(CONFTEST_CFLAGS) $(LINUXINCLUDE)

 obj-m += use_pre_440_wr_structure.o
--- a/iscsi-scst/kernel/Kbuild
+++ b/iscsi-scst/kernel/Kbuild
@@ -17,7 +17,7 @@
 KBUILD_EXTRA_SYMBOLS = $(src)/../../scst/src/Module.symvers

 ccflags-y += -I$(src)/../include -I$(src)/../../scst/include
-ccflags-y += $(PRE_CFLAGS)
+ccflags-y += $(CONFTEST_CFLAGS)
 #ccflags-y += -DCONFIG_SCST_ISCSI_DEBUG_DIGEST_FAILURES

 obj-m		+= iscsi-scst.o
--- a/iscsi-scst/kernel/isert-scst/Kbuild
+++ b/iscsi-scst/kernel/isert-scst/Kbuild
@@ -14,11 +14,13 @@
 #  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
 #  GNU General Public License for more details.

-LINUXINCLUDE := $(PRE_CFLAGS) $(LINUXINCLUDE)
+LINUXINCLUDE := $(CONFTEST_CFLAGS) $(LINUXINCLUDE)
 KBUILD_EXTRA_SYMBOLS=$(src)/../../kernel/Module.symvers			       \
 		$(shell for d in /usr/src/ofa_kernel/default/Module.symvers; do\
 			[ -e $$d ] || continue; echo $$d; break; done)
-ccflags-y += -I$(src)/../../include -I$(src)/../../../scst/include
+
+ccflags-y	+= -I$(src)/../../../scst/include
+ccflags-y	+= -I$(src)/../../include

 obj-m		+= isert-scst.o
 isert-scst-objs	:= isert.o isert_login.o \
--- a/srpt/Makefile
+++ b/srpt/Makefile
@@ -87,7 +87,7 @@ run_conftest = $(shell							\
  else									\
    output=conftest/$1/build-output-$(KVER).txt;			\
  fi;									\
-  if MAKEFLAGS= make -C $(KDIR) V=$(V) M="$(shell pwd)/conftest/$1" PRE_CFLAGS="-Werror $(OFED_CFLAGS)" $(OFED_CONFIG) KBUILD_EXTRA_SYMBOLS="$(OFED_MODULE_SYMVERS)" 1>&2 2>$${output}; then						\
+  if MAKEFLAGS= make -C $(KDIR) V=$(V) M="$(shell pwd)/conftest/$1" CONFTEST_CFLAGS="-Werror $(OFED_CFLAGS)" $(OFED_CONFIG) KBUILD_EXTRA_SYMBOLS="$(OFED_MODULE_SYMVERS)" 1>&2 2>$${output}; then					\
    echo "$(strip $2)";							\
  else									\
    echo "$(strip $3)";							\
@@ -100,14 +100,14 @@ CONFTEST_OUTPUTS = $(shell			\
 		echo $$t/result-$(KVER).txt;	\
 	done)

-PRE_CFLAGS = $(OFED_CFLAGS)			\
-	-DOFED_FLAVOR=$(OFED_FLAVOR)		\
-	$(shell for t in $(CONFTESTS); do 	\
+CONFTEST_CFLAGS = $(OFED_CFLAGS)			\
+	-DOFED_FLAVOR=$(OFED_FLAVOR)			\
+	$(shell for t in $(CONFTESTS); do 		\
 		cat $$t/result-$(KVER).txt 2>/dev/null; \
 	done)

 all: check $(CONFTEST_OUTPUTS)
-	$(MAKE) -C $(KDIR) M=$(shell pwd)/src PRE_CFLAGS="$(PRE_CFLAGS)"\
+	$(MAKE) -C $(KDIR) M=$(shell pwd)/src CONFTEST_CFLAGS="$(CONFTEST_CFLAGS)"\
 		$(OFED_CONFIG) modules

 install: all
@@ -115,7 +115,7 @@ install: all
 	  find /lib/modules/$(KVER) -name ib_srpt.ko -exec rm {} \; ; \
 	  true
 	(cd src && KDIR=$(KDIR) ../../scripts/sign-modules)
-	$(MAKE) -C $(KDIR) M=$(shell pwd)/src PRE_CFLAGS="$(PRE_CFLAGS)" \
+	$(MAKE) -C $(KDIR) M=$(shell pwd)/src CONFTEST_CFLAGS="$(CONFTEST_CFLAGS)" \
 	  $$([ -n "$(DEPMOD)" ] && echo "DEPMOD=$(DEPMOD)")		 \
 	  CONFIG_MODULE_SIG_ALL= modules_install

--- a/srpt/conftest/bad_wr_mod/Kbuild
+++ b/srpt/conftest/bad_wr_mod/Kbuild
@@ -1,3 +1,3 @@
-LINUXINCLUDE := $(PRE_CFLAGS) $(LINUXINCLUDE)
+LINUXINCLUDE := $(CONFTEST_CFLAGS) $(LINUXINCLUDE)

 obj-m += bad_wr_mod.o
--- a/srpt/conftest/cm_event_mod/Kbuild
+++ b/srpt/conftest/cm_event_mod/Kbuild
@@ -1,3 +1,3 @@
-LINUXINCLUDE := $(PRE_CFLAGS) $(LINUXINCLUDE)
+LINUXINCLUDE := $(CONFTEST_CFLAGS) $(LINUXINCLUDE)

 obj-m += cm_event_mod.o
--- a/srpt/conftest/cm_listen/Kbuild
+++ b/srpt/conftest/cm_listen/Kbuild
@@ -1,3 +1,3 @@
-LINUXINCLUDE := $(PRE_CFLAGS) $(LINUXINCLUDE)
+LINUXINCLUDE := $(CONFTEST_CFLAGS) $(LINUXINCLUDE)

 obj-m += cm_listen.o
--- a/srpt/conftest/create_cq/Kbuild
+++ b/srpt/conftest/create_cq/Kbuild
@@ -1,3 +1,3 @@
-LINUXINCLUDE := $(PRE_CFLAGS) $(LINUXINCLUDE)
+LINUXINCLUDE := $(CONFTEST_CFLAGS) $(LINUXINCLUDE)

 obj-m += create_cq.o
--- a/srpt/conftest/create_send_mad_ah/Kbuild
+++ b/srpt/conftest/create_send_mad_ah/Kbuild
@@ -1,3 +1,3 @@
-LINUXINCLUDE := $(PRE_CFLAGS) $(LINUXINCLUDE)
+LINUXINCLUDE := $(CONFTEST_CFLAGS) $(LINUXINCLUDE)

 obj-m += create_send_mad_ah.o
--- a/srpt/conftest/create_send_mad_base/Kbuild
+++ b/srpt/conftest/create_send_mad_base/Kbuild
@@ -1,3 +1,3 @@
-LINUXINCLUDE := $(PRE_CFLAGS) $(LINUXINCLUDE)
+LINUXINCLUDE := $(CONFTEST_CFLAGS) $(LINUXINCLUDE)

 obj-m += create_send_mad_base.o
--- a/srpt/conftest/dev_attr_max_send_sge/Kbuild
+++ b/srpt/conftest/dev_attr_max_send_sge/Kbuild
@@ -1,3 +1,3 @@
-LINUXINCLUDE := $(PRE_CFLAGS) $(LINUXINCLUDE)
+LINUXINCLUDE := $(CONFTEST_CFLAGS) $(LINUXINCLUDE)

 obj-m += dev_attr_max_send_sge.o
--- a/srpt/conftest/gid_change/Kbuild
+++ b/srpt/conftest/gid_change/Kbuild
@@ -1,3 +1,3 @@
-LINUXINCLUDE := $(PRE_CFLAGS) $(LINUXINCLUDE)
+LINUXINCLUDE := $(CONFTEST_CFLAGS) $(LINUXINCLUDE)

 obj-m += gid_change.o
--- a/srpt/conftest/ib_client_add_one/Kbuild
+++ b/srpt/conftest/ib_client_add_one/Kbuild
@@ -1,3 +1,3 @@
-LINUXINCLUDE := $(PRE_CFLAGS) $(LINUXINCLUDE)
+LINUXINCLUDE := $(CONFTEST_CFLAGS) $(LINUXINCLUDE)

 obj-m += add_one.o
--- a/srpt/conftest/ib_client_remove/Kbuild
+++ b/srpt/conftest/ib_client_remove/Kbuild
@@ -1,3 +1,3 @@
-LINUXINCLUDE := $(PRE_CFLAGS) $(LINUXINCLUDE)
+LINUXINCLUDE := $(CONFTEST_CFLAGS) $(LINUXINCLUDE)

 obj-m += ib_client_remove.o
--- a/srpt/conftest/ib_dma_map_ops/Kbuild
+++ b/srpt/conftest/ib_dma_map_ops/Kbuild
@@ -1,3 +1,3 @@
-LINUXINCLUDE := $(PRE_CFLAGS) $(LINUXINCLUDE)
+LINUXINCLUDE := $(CONFTEST_CFLAGS) $(LINUXINCLUDE)

 obj-m += ib_dma_map_ops.o
--- a/srpt/conftest/ib_set_cpi_resp_time/Kbuild
+++ b/srpt/conftest/ib_set_cpi_resp_time/Kbuild
@@ -1,3 +1,3 @@
-LINUXINCLUDE := $(PRE_CFLAGS) $(LINUXINCLUDE)
+LINUXINCLUDE := $(CONFTEST_CFLAGS) $(LINUXINCLUDE)

 obj-m += ib_set_cpi_resp_time.o
--- a/srpt/conftest/ib_sg_dma_len/Kbuild
+++ b/srpt/conftest/ib_sg_dma_len/Kbuild
@@ -1,3 +1,3 @@
-LINUXINCLUDE := $(PRE_CFLAGS) $(LINUXINCLUDE)
+LINUXINCLUDE := $(CONFTEST_CFLAGS) $(LINUXINCLUDE)

 obj-m += ib_sg_dma_len.o
--- a/srpt/conftest/mad_handler_takes_send_buf/Kbuild
+++ b/srpt/conftest/mad_handler_takes_send_buf/Kbuild
@@ -1,3 +1,3 @@
-LINUXINCLUDE := $(PRE_CFLAGS) $(LINUXINCLUDE)
+LINUXINCLUDE := $(CONFTEST_CFLAGS) $(LINUXINCLUDE)

 obj-m += mad_handler_takes_send_buf.o
--- a/srpt/conftest/pd_has_local_dma_lkey/Kbuild
+++ b/srpt/conftest/pd_has_local_dma_lkey/Kbuild
@@ -1,3 +1,3 @@
-LINUXINCLUDE := $(PRE_CFLAGS) $(LINUXINCLUDE)
+LINUXINCLUDE := $(CONFTEST_CFLAGS) $(LINUXINCLUDE)

 obj-m += pd_has_local_dma_lkey.o
--- a/srpt/conftest/query_device/Kbuild
+++ b/srpt/conftest/query_device/Kbuild
@@ -1,3 +1,3 @@
-LINUXINCLUDE := $(PRE_CFLAGS) $(LINUXINCLUDE)
+LINUXINCLUDE := $(CONFTEST_CFLAGS) $(LINUXINCLUDE)

 obj-m += query_device.o
--- a/srpt/conftest/query_device_attr_arg/Kbuild
+++ b/srpt/conftest/query_device_attr_arg/Kbuild
@@ -1,3 +1,3 @@
-LINUXINCLUDE := $(PRE_CFLAGS) $(LINUXINCLUDE)
+LINUXINCLUDE := $(CONFTEST_CFLAGS) $(LINUXINCLUDE)

 obj-m += query_device_attr_arg.o
--- a/srpt/conftest/query_gid/Kbuild
+++ b/srpt/conftest/query_gid/Kbuild
@@ -1,3 +1,3 @@
-LINUXINCLUDE := $(PRE_CFLAGS) $(LINUXINCLUDE)
+LINUXINCLUDE := $(CONFTEST_CFLAGS) $(LINUXINCLUDE)

 obj-m += query_gid.o
--- a/srpt/conftest/rdma_create_id_net/Kbuild
+++ b/srpt/conftest/rdma_create_id_net/Kbuild
@@ -1,3 +1,3 @@
-LINUXINCLUDE := $(PRE_CFLAGS) $(LINUXINCLUDE)
+LINUXINCLUDE := $(CONFTEST_CFLAGS) $(LINUXINCLUDE)

 obj-m += rdma_create_id_net.o
--- a/srpt/conftest/rdma_destroy_ah/Kbuild
+++ b/srpt/conftest/rdma_destroy_ah/Kbuild
@@ -1,3 +1,3 @@
-LINUXINCLUDE := $(PRE_CFLAGS) $(LINUXINCLUDE)
+LINUXINCLUDE := $(CONFTEST_CFLAGS) $(LINUXINCLUDE)

 obj-m += rdma_destroy_ah.o
--- a/srpt/conftest/rdma_destroy_ah_with_flags/Kbuild
+++ b/srpt/conftest/rdma_destroy_ah_with_flags/Kbuild
@@ -1,3 +1,3 @@
-LINUXINCLUDE := $(PRE_CFLAGS) $(LINUXINCLUDE)
+LINUXINCLUDE := $(CONFTEST_CFLAGS) $(LINUXINCLUDE)

 obj-m += rdma_destroy_ah_with_flags.o
--- a/srpt/conftest/rdma_query_gid/Kbuild
+++ b/srpt/conftest/rdma_query_gid/Kbuild
@@ -1,3 +1,3 @@
-LINUXINCLUDE := $(PRE_CFLAGS) $(LINUXINCLUDE)
+LINUXINCLUDE := $(CONFTEST_CFLAGS) $(LINUXINCLUDE)

 obj-m += rdma_query_gid.o
--- a/srpt/conftest/rdma_reject/Kbuild
+++ b/srpt/conftest/rdma_reject/Kbuild
@@ -1,3 +1,3 @@
-LINUXINCLUDE := $(PRE_CFLAGS) $(LINUXINCLUDE)
+LINUXINCLUDE := $(CONFTEST_CFLAGS) $(LINUXINCLUDE)

 obj-m += rdma_reject.o
--- a/srpt/conftest/register_mad_agent/Kbuild
+++ b/srpt/conftest/register_mad_agent/Kbuild
@@ -1,3 +1,3 @@
-LINUXINCLUDE := $(PRE_CFLAGS) $(LINUXINCLUDE)
+LINUXINCLUDE := $(CONFTEST_CFLAGS) $(LINUXINCLUDE)

 obj-m += register_mad_agent.o
--- a/srpt/conftest/srp_data_desc_imm/Kbuild
+++ b/srpt/conftest/srp_data_desc_imm/Kbuild
@@ -1,3 +1,3 @@
-LINUXINCLUDE := $(PRE_CFLAGS) $(LINUXINCLUDE)
+LINUXINCLUDE := $(CONFTEST_CFLAGS) $(LINUXINCLUDE)

 obj-m += srp_data_desc_imm.o
--- a/srpt/conftest/srp_login_req_rdma/Kbuild
+++ b/srpt/conftest/srp_login_req_rdma/Kbuild
@@ -1,3 +1,3 @@
-LINUXINCLUDE := $(PRE_CFLAGS) $(LINUXINCLUDE)
+LINUXINCLUDE := $(CONFTEST_CFLAGS) $(LINUXINCLUDE)

 obj-m += srp_login_req_rdma.o
--- a/srpt/conftest/use_pre_440_wr_structure/Kbuild
+++ b/srpt/conftest/use_pre_440_wr_structure/Kbuild
@@ -1,3 +1,3 @@
-LINUXINCLUDE := $(PRE_CFLAGS) $(LINUXINCLUDE)
+LINUXINCLUDE := $(CONFTEST_CFLAGS) $(LINUXINCLUDE)

 obj-m += use_pre_440_wr_structure.o
--- a/srpt/src/Kbuild
+++ b/srpt/src/Kbuild
@@ -1,8 +1,8 @@
-LINUXINCLUDE := $(PRE_CFLAGS) $(LINUXINCLUDE)
-CPPFLAGS     := $(PRE_CFLAGS) $(CPPFLAGS)
+LINUXINCLUDE := $(CONFTEST_CFLAGS) $(LINUXINCLUDE)
 KBUILD_EXTRA_SYMBOLS=$(src)/../../scst/src/Module.symvers \
 		$(shell for d in /usr/src/ofa_kernel/default/Module.symvers; do\
 			[ -e $$d ] || continue; echo $$d; break; done)
-ccflags-y    += -I$(src)/../../scst/include
+
+ccflags-y	+= -I$(src)/../../scst/include

 obj-m		+= ib_srpt.o