mirror of
https://github.com/SCST-project/scst.git
synced 2026-05-21 20:51:27 +00:00
Merged revisions 7233-7244 via svnmerge from
svn+ssh://svn.code.sf.net/p/scst/svn/trunk ........ r7233 | bvassche | 2017-09-20 08:09:38 -0700 (Wed, 20 Sep 2017) | 4 lines ib_srpt: Support systems with more than 255 CPU cores Signed-off-by: Kirill Malkin <kirillmalkin.km@gmail.com> ........ r7234 | bvassche | 2017-09-24 18:52:53 -0700 (Sun, 24 Sep 2017) | 2 lines iscsi-scst/Makefile: Change MOFED path into /usr/src/ofa_kernel/default ........ r7235 | bvassche | 2017-09-25 16:35:49 -0700 (Mon, 25 Sep 2017) | 1 line iscsi-scst/Makefile, Ubuntu: Simplify code for version querying ........ r7236 | bvassche | 2017-10-02 16:56:47 -0700 (Mon, 02 Oct 2017) | 1 line scripts/specialize-patch: Process ENABLE_NPIV and FC_VPORT_CREATE_DEFINED correctly ........ r7237 | bvassche | 2017-10-02 17:04:53 -0700 (Mon, 02 Oct 2017) | 2 lines scripts/generate-kernel-patch: Fix a regression introduced in r7164 ........ r7238 | bvassche | 2017-10-02 17:05:42 -0700 (Mon, 02 Oct 2017) | 1 line scripts/specialize-patch: Process CONFIG_SCST_STRICT_SERIALIZING correctly ........ r7239 | bvassche | 2017-10-03 15:49:35 -0700 (Tue, 03 Oct 2017) | 1 line isert-scst: Make an error message more informative ........ r7240 | bvassche | 2017-10-03 16:08:29 -0700 (Tue, 03 Oct 2017) | 1 line scst: Port to kernel v4.13 ........ r7241 | bvassche | 2017-10-03 16:10:03 -0700 (Tue, 03 Oct 2017) | 1 line nightly build: Update kernel versions ........ r7242 | bvassche | 2017-10-05 09:57:27 -0700 (Thu, 05 Oct 2017) | 1 line scst: Port to openSUSE Leap 42.x ........ r7243 | bvassche | 2017-10-05 16:48:25 -0700 (Thu, 05 Oct 2017) | 1 line fcst: Port to openSUSE Leap ........ r7244 | bvassche | 2017-10-05 16:48:51 -0700 (Thu, 05 Oct 2017) | 1 line qla2x00t: Port to openSUSE Leap ........ git-svn-id: http://svn.code.sf.net/p/scst/svn/branches/3.3.x@7246 d57e44dd-8a1f-0410-8b47-8ef2f437770f
This commit is contained in:
@@ -108,6 +108,10 @@ 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(ENABLE_NPIV)", 0, stmnt)
|
||||
|
||||
gsub("defined(FC_VPORT_CREATE_DEFINED)", 0, stmnt)
|
||||
|
||||
gsub("LINUX_VERSION_CODE", LINUX_VERSION_CODE, stmnt)
|
||||
|
||||
pattern="KERNEL_VERSION\\([[:blank:]]*([0-9]+)[[:blank:]]*,[[:blank:]]*([0-9]+)[[:blank:]]*,[[:blank:]]*([0-9]+)[[:blank:]]*\\)"
|
||||
@@ -122,6 +126,8 @@ function evaluate(stmnt, pattern, arg, op, result) {
|
||||
|
||||
gsub("defined\\(CONFIG_SUSE_KERNEL\\)", "0", stmnt)
|
||||
|
||||
gsub("defined\\(CONFIG_SCST_STRICT_SERIALIZING\\)", "0", stmnt)
|
||||
|
||||
if (RHEL_MAJOR == "")
|
||||
{
|
||||
gsub("defined\\(RHEL_MAJOR\\)", "0", stmnt)
|
||||
@@ -337,6 +343,8 @@ function handle_if(evaluated)
|
||||
if ($0 ~ "LINUX_VERSION_CODE" \
|
||||
|| $0 ~ "CONFIG_SCST_PROC" \
|
||||
|| $0 ~ "CREATE_SEND_MAD_HAS_BASE_ARG" \
|
||||
|| $0 ~ "ENABLE_NPIV" \
|
||||
|| $0 ~ "FC_VPORT_CREATE_DEFINED" \
|
||||
|| $0 ~ "HAVE_IB_DMA_MAP_OPS" \
|
||||
|| $0 ~ "HAVE_IB_QUERY_DEVICE" \
|
||||
|| $0 ~ "HAVE_IB_SET_CPI_RESP_TIME" \
|
||||
@@ -349,6 +357,7 @@ function handle_if(evaluated)
|
||||
|| $0 ~ "IB_QUERY_GID_HAS_ATTR_ARG" \
|
||||
|| $0 ~ "INSIDE_KERNEL_TREE" \
|
||||
|| $0 ~ "MAD_HANDLER_TAKES_SEND_BUF" \
|
||||
|| $0 ~ "CONFIG_SCST_STRICT_SERIALIZING" \
|
||||
|| $0 ~ "MOFED_MAJOR" \
|
||||
|| $0 ~ "RDMA_CREATE_ID_TAKES_NET_ARG" \
|
||||
|| $0 ~ "REGISTER_MAD_AGENT_HAS_FLAGS_ARG" \
|
||||
|
||||
Reference in New Issue
Block a user