mirror of
https://github.com/SCST-project/scst.git
synced 2026-05-16 18:21:27 +00:00
cc28ddcdf2
an external module. When applying the SCST kernel patch to the mainstream kernel tree with debugging and/or tracing enabled however, the resulting code triggers a compiler error. This is because the symbols DEBUG and TRACING conflict with symbols with the same named defined in unrelated kernel headers. The patch below resolves these conflicts by renaming the following preprocessor symbols: - DEBUG into CONFIG_SCST_DEBUG. - DEBUG_DIGEST_FAILURES into CONFIG_SCST_ISCSI_DEBUG_DIGEST_FAILURES. - DEBUG_OOM into CONFIG_SCST_DEBUG_OOM. - DEBUG_RETRY into CONFIG_SCST_DEBUG_RETRY. - DEBUG_SN into CONFIG_SCST_DEBUG_SN. - DEBUG_TM into CONFIG_SCST_DEBUG_TM. - EXTRACHECKS into CONFIG_SCST_EXTRACHECKS. - SCST_HIGHMEM into CONFIG_SCST_HIGHMEM. - STRICT_SERIALIZING into CONFIG_SCST_STRICT_SERIALIZING. - TM_DBG_GO_OFFLINE into CONFIG_SCST_TM_DBG_GO_OFFLINE. Mapped 0/1 values into macro undefined / macro defined. - TRACING into CONFIG_SCST_TRACING. - USE_EXPECTED_VALUES into CONFIG_SCST_USE_EXPECTED_VALUES. - In qla_isp/linux/isp_scst.c, renamed DEBUG into DEBUG_ISP_SCST. - In qla_isp/..., renamed SCSI_TARGET in SCST_SCSI_TARGET. - In qla_isp/..., renamed SCSI_TARGET_DEV in SCST_SCSI_TARGET_DEV. Additionally, all CONFIG_SCSI_TARGET* macro's are renamed into CONFIG_SCST* in order to avoid confusion between the STGT CONFIG-symbols and the SCST CONFIG- symbols. The following additional options are now configurable through Kconfig: - CONFIG_SCST_ISCSI_DEBUG_DIGEST_FAILURES - CONFIG_SCST_STRICT_SERIALIZING - CONFIG_SCST_STRICT_SECURITY - CONFIG_SCST_ALLOW_PASSTHROUGH_IO_SUBMIT_IN_SIRQ - CONFIG_SCST_ABORT_CONSIDER_FINISHED_TASKS_AS_NOT_EXISTING - CONFIG_SCST_USE_EXPECTED_VALUES - CONFIG_SCST_DEBUG_OOM - CONFIG_SCST_DEBUG_RETRY - CONFIG_SCST_DEBUG_SN - CONFIG_SCST_DEBUG_TM - CONFIG_SCST_TM_DBG_GO_OFFLINE The patch below has been verified as follows: - Verified that the following command does not print any new warning messages: make -s clean && make -C srpt -s clean && make -s scst iscsi-scst && make -C srpt -s - Verified as follows that the internal SCST patches still apply cleanly: for p in *patch; do patch -p0 --dry-run -f -s <$p; done - Checked that the patch generated by generate-kernel-patch still applies cleanly to the 2.6.25.7 kernel, and that the patched kernel tree still compiles, installs and boots fine, that the iscsi-scst, ib_srpt, scst_disk and scst_vdisk modules still load, and that iSCSI communication still works fine. All SCST kernel configuration options that could be enabled have been enabled during this test. Signed-off-by: Bart Van Assche <bart.vanassche@gmail.com> git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@453 d57e44dd-8a1f-0410-8b47-8ef2f437770f
44 lines
1.5 KiB
Diff
44 lines
1.5 KiB
Diff
Index: scst/src/Makefile
|
|
===================================================================
|
|
--- scst/src/Makefile (revision 233)
|
|
+++ scst/src/Makefile (working copy)
|
|
@@ -115,7 +115,7 @@ EXTRA_CFLAGS += -I$(SCST_INC_DIR) -Wextr
|
|
|
|
#EXTRA_CFLAGS += -DCONFIG_SCST_STRICT_SERIALIZING
|
|
|
|
-EXTRA_CFLAGS += -DCONFIG_SCST_EXTRACHECKS
|
|
+#EXTRA_CFLAGS += -DCONFIG_SCST_EXTRACHECKS
|
|
|
|
#EXTRA_CFLAGS += -DCONFIG_SCST_USE_EXPECTED_VALUES
|
|
#EXTRA_CFLAGS += -DALLOW_PASSTHROUGH_IO_SUBMIT_IN_SIRQ
|
|
@@ -122,9 +122,9 @@ EXTRA_CFLAGS += -DCONFIG_SCST_EXTRACHECKS
|
|
|
|
#EXTRA_CFLAGS += -fno-inline
|
|
|
|
-#EXTRA_CFLAGS += -DCONFIG_SCST_TRACING
|
|
+EXTRA_CFLAGS += -DCONFIG_SCST_TRACING
|
|
|
|
-EXTRA_CFLAGS += -DCONFIG_SCST_DEBUG -g
|
|
+#EXTRA_CFLAGS += -DCONFIG_SCST_DEBUG -g
|
|
#EXTRA_CFLAGS += -DCONFIG_SCST_DEBUG_TM -UCONFIG_SCST_TM_DBG_GO_OFFLINE
|
|
#EXTRA_CFLAGS += -DCONFIG_SCST_DEBUG_RETRY
|
|
#EXTRA_CFLAGS += -DCONFIG_SCST_DEBUG_OOM
|
|
Index: scst/src/dev_handlers/Makefile
|
|
===================================================================
|
|
--- scst/src/dev_handlers/Makefile (revision 230)
|
|
+++ scst/src/dev_handlers/Makefile (working copy)
|
|
@@ -69,10 +69,10 @@ endif
|
|
|
|
EXTRA_CFLAGS += -I$(SUBDIRS) -I$(SCST_INC_DIR) -Wextra -Wno-unused-parameter
|
|
|
|
-EXTRA_CFLAGS += -DCONFIG_SCST_EXTRACHECKS
|
|
+#EXTRA_CFLAGS += -DCONFIG_SCST_EXTRACHECKS
|
|
|
|
-#EXTRA_CFLAGS += -DCONFIG_SCST_TRACING
|
|
-EXTRA_CFLAGS += -DCONFIG_SCST_DEBUG -g
|
|
+EXTRA_CFLAGS += -DCONFIG_SCST_TRACING
|
|
+#EXTRA_CFLAGS += -DCONFIG_SCST_DEBUG -g
|
|
|
|
clean:
|
|
rm -f *.o *.ko .*.cmd *.mod.c .*.d .depend Modules.symvers \
|