From ffb1b505cc823068d20013560890c8bea21cf6f7 Mon Sep 17 00:00:00 2001 From: Bart Van Assche Date: Mon, 23 Dec 2019 15:37:37 +0000 Subject: [PATCH 1/2] scripts/specialize-patch: Fix expansion of HAVE_IB_SG_DMA_LEN This patch fixes commit ac145e1cb6a5 ("ib_srpt: Detect ib_sg_dma_len() presence at compile time"; r8655). git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@8691 d57e44dd-8a1f-0410-8b47-8ef2f437770f --- scripts/specialize-patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/specialize-patch b/scripts/specialize-patch index e75c60c46..40563a6fa 100755 --- a/scripts/specialize-patch +++ b/scripts/specialize-patch @@ -148,7 +148,7 @@ function evaluate(stmnt, pattern, arg, op, result) { gsub("defined\\(HAVE_IB_DMA_MAP_OPS\\)", "(LINUX_VERSION_CODE >= KERNEL_VERSION(0, 0, 0))", stmnt) - gsub("defined\\(HAVE_IB_SG_DMA_LEN\\)", + gsub("HAVE_IB_SG_DMA_LEN", "(LINUX_VERSION_CODE < KERNEL_VERSION(5, 1, 0))", stmnt) gsub("defined(ENABLE_NPIV)", 0, stmnt) From 11ca9d67044634c10d4a8f2f503bfba0c165ddd9 Mon Sep 17 00:00:00 2001 From: Bart Van Assche Date: Mon, 23 Dec 2019 15:38:58 +0000 Subject: [PATCH 2/2] scst/kernel/in-tree/Makefile.drivers.Linux-5.4.patch: Add to the source tree Signed-off-by: Sietse van Zanen git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@8692 d57e44dd-8a1f-0410-8b47-8ef2f437770f --- scst/kernel/in-tree/Makefile.drivers.Linux-5.4.patch | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 scst/kernel/in-tree/Makefile.drivers.Linux-5.4.patch diff --git a/scst/kernel/in-tree/Makefile.drivers.Linux-5.4.patch b/scst/kernel/in-tree/Makefile.drivers.Linux-5.4.patch new file mode 100644 index 000000000..26831e87c --- /dev/null +++ b/scst/kernel/in-tree/Makefile.drivers.Linux-5.4.patch @@ -0,0 +1,11 @@ +diff -Naur linux-5.4.6.orig/drivers/Makefile linux-5.4.6/drivers/Makefile +--- linux-5.4.6.orig/drivers/Makefile 2019-12-21 11:05:23.000000000 +0100 ++++ linux-5.4.6/drivers/Makefile 2019-12-22 17:57:42.265448215 +0100 +@@ -146,6 +146,7 @@ + obj-$(CONFIG_VHOST_RING) += vhost/ + obj-$(CONFIG_VHOST) += vhost/ + obj-$(CONFIG_VLYNQ) += vlynq/ ++obj-$(CONFIG_SCST) += scst/ + obj-$(CONFIG_GREYBUS) += greybus/ + obj-$(CONFIG_STAGING) += staging/ + obj-y += platform/