From 676b1717fb4619251eaa4322ce4ea0568f0eadcd Mon Sep 17 00:00:00 2001 From: Bart Van Assche Date: Sun, 10 May 2020 18:37:03 +0000 Subject: [PATCH] scripts/specialize-patch: More bug fixes for RHEL / CentOS kernels git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@8889 d57e44dd-8a1f-0410-8b47-8ef2f437770f --- scripts/specialize-patch | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/scripts/specialize-patch b/scripts/specialize-patch index 19a43ec22..611ce595a 100755 --- a/scripts/specialize-patch +++ b/scripts/specialize-patch @@ -92,7 +92,7 @@ function evaluate(stmnt, pattern, arg, op, result) { gsub("defined\\(IB_CLIENT_REMOVE_TAKES_TWO_ARGS\\)", "(LINUX_VERSION_CODE >= KERNEL_VERSION(4, 3, 0) || " \ - "RHEL_RELEASE_CODE -0 >= 7 * 256 + 6)", stmnt) + "RHEL_RELEASE_CODE -0 >= 7 * 256 + 5)", stmnt) gsub("defined\\(IB_QUERY_GID_HAS_ATTR_ARG\\)", "(LINUX_VERSION_CODE >= KERNEL_VERSION(4, 4, 0) || " \ @@ -139,7 +139,7 @@ function evaluate(stmnt, pattern, arg, op, result) { gsub("defined\\(MAD_HANDLER_TAKES_SEND_BUF\\)", "(LINUX_VERSION_CODE >= KERNEL_VERSION(4, 5, 0) || " \ - "RHEL_RELEASE_CODE -0 >= 7 * 256 + 6)", stmnt) + "RHEL_RELEASE_CODE -0 >= 7 * 256 + 5)", stmnt) gsub("defined\\(HAVE_IB_SET_CPI_RESP_TIME\\)", "(LINUX_VERSION_CODE >= KERNEL_VERSION(4, 7, 0) || " \ @@ -608,7 +608,8 @@ function dump_lines() { for (i = 0; i < lines; i++) { modifier = (LINUX_VERSION_CODE < version_code("4.19.0") && (RHEL_MAJOR == "" || - RHEL_MAJOR * 256 + RHEL_MINOR < 7 * 256 + 8) ? + RHEL_MAJOR * 256 + RHEL_MINOR < 7 * 256 + 7 || + RHEL_MAJOR * 256 + RHEL_MINOR == 8 * 256 + 0) ? "" : "const"); gsub("BAD_WR_MODIFIER", modifier, line[i]) gsub("CM_HANDLER_EVENT_MODIFIER", modifier, line[i])