From 14b567d8a61530b4835fb8b02122ee5b871639d3 Mon Sep 17 00:00:00 2001 From: Bart Van Assche Date: Sun, 4 Nov 2018 04:31:02 +0000 Subject: [PATCH] Merge r7450 from trunk git-svn-id: http://svn.code.sf.net/p/scst/svn/branches/3.3.x@7703 d57e44dd-8a1f-0410-8b47-8ef2f437770f --- scst/include/scst.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scst/include/scst.h b/scst/include/scst.h index 7a43769db..ee92ec00e 100644 --- a/scst/include/scst.h +++ b/scst/include/scst.h @@ -4975,7 +4975,7 @@ static inline struct scatterlist *sg_next_inline(struct scatterlist *sg) static inline void sg_clear(struct scatterlist *sg) { memset(sg, 0, sizeof(*sg)); -#ifdef CONFIG_DEBUG_SG +#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 18, 0) && defined(CONFIG_DEBUG_SG) sg->sg_magic = SG_MAGIC; #endif }