diff --git a/scst/include/scst.h b/scst/include/scst.h index acaafa4a0..9ec5c8016 100644 --- a/scst/include/scst.h +++ b/scst/include/scst.h @@ -3995,10 +3995,18 @@ static inline int cancel_delayed_work_sync(struct delayed_work *work) #endif #endif +#ifndef RHEL_RELEASE_VERSION +#define RHEL_RELEASE_VERSION(maj, min) 0 +#endif + #ifdef CONFIG_DEBUG_LOCK_ALLOC extern struct lockdep_map scst_suspend_dep_map; -#define scst_assert_activity_suspended() \ +#if !defined(RHEL_RELEASE_CODE) || (RHEL_RELEASE_CODE -0 < RHEL_RELEASE_VERSION(6, 4)) +# define scst_assert_activity_suspended() \ WARN_ON(debug_locks && !lock_is_held(&scst_suspend_dep_map)); +# else +# define scst_assert_activity_suspended() do { } while (0) +# endif #else #define scst_assert_activity_suspended() do { } while (0) #endif