From 235f1fa1ee8c68685bbe5f6d16367542717c573d Mon Sep 17 00:00:00 2001 From: "Aarian P. Aleahmad" Date: Wed, 24 Aug 2016 11:12:42 +0430 Subject: [PATCH 1/2] fixed compilation on kernel 3.15.x --- Driver/enhanceio/eio_conf.c | 2 +- Driver/enhanceio/eio_ttc.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Driver/enhanceio/eio_conf.c b/Driver/enhanceio/eio_conf.c index cabf236..c5aafa5 100644 --- a/Driver/enhanceio/eio_conf.c +++ b/Driver/enhanceio/eio_conf.c @@ -101,7 +101,7 @@ int eio_wait_schedule(void *unused) return 0; } -#if (LINUX_VERSION_CODE < KERNEL_VERSION(3,15,0)) +#if (LINUX_VERSION_CODE < KERNEL_VERSION(3,16,0)) #define smp_mb__after_atomic smp_mb__after_clear_bit #endif diff --git a/Driver/enhanceio/eio_ttc.c b/Driver/enhanceio/eio_ttc.c index 078bbc3..8816b18 100644 --- a/Driver/enhanceio/eio_ttc.c +++ b/Driver/enhanceio/eio_ttc.c @@ -36,7 +36,7 @@ #define wait_on_bit_lock_action wait_on_bit_lock #endif -#if (LINUX_VERSION_CODE < KERNEL_VERSION(3,15,0)) +#if (LINUX_VERSION_CODE < KERNEL_VERSION(3,16,0)) #define smp_mb__after_atomic smp_mb__after_clear_bit #endif From 4b096e1db1ab0ce3edb37c5ab66ce89c5adbe90b Mon Sep 17 00:00:00 2001 From: "Aarian P. Aleahmad" Date: Wed, 24 Aug 2016 11:16:26 +0430 Subject: [PATCH 2/2] fixed compilation on kernel 3.10.0-327.28.2.el7 used by CentOS 7 --- Driver/enhanceio/eio_conf.c | 2 +- Driver/enhanceio/eio_ttc.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Driver/enhanceio/eio_conf.c b/Driver/enhanceio/eio_conf.c index c5aafa5..96b2e8c 100644 --- a/Driver/enhanceio/eio_conf.c +++ b/Driver/enhanceio/eio_conf.c @@ -101,7 +101,7 @@ int eio_wait_schedule(void *unused) return 0; } -#if (LINUX_VERSION_CODE < KERNEL_VERSION(3,16,0)) +#if (LINUX_VERSION_CODE < KERNEL_VERSION(3,16,0)) && !defined(smp_mb__after_atomic) #define smp_mb__after_atomic smp_mb__after_clear_bit #endif diff --git a/Driver/enhanceio/eio_ttc.c b/Driver/enhanceio/eio_ttc.c index 8816b18..d701aad 100644 --- a/Driver/enhanceio/eio_ttc.c +++ b/Driver/enhanceio/eio_ttc.c @@ -36,7 +36,7 @@ #define wait_on_bit_lock_action wait_on_bit_lock #endif -#if (LINUX_VERSION_CODE < KERNEL_VERSION(3,16,0)) +#if (LINUX_VERSION_CODE < KERNEL_VERSION(3,16,0)) && !defined(smp_mb__after_atomic) #define smp_mb__after_atomic smp_mb__after_clear_bit #endif