| --- a/src/atomicvar.h | 
 | +++ b/src/atomicvar.h | 
 | @@ -81,7 +81,7 @@ | 
 |  #define ANNOTATE_HAPPENS_AFTER(v)  ((void) v) | 
 |  #endif | 
 |   | 
 | -#if !defined(__ATOMIC_VAR_FORCE_SYNC_MACROS) && defined(__STDC_VERSION__) && \ | 
 | +#if defined(CONFIG_EDAC_ATOMIC_SCRUB) && !defined(__ATOMIC_VAR_FORCE_SYNC_MACROS) && defined(__STDC_VERSION__) && \ | 
 |      (__STDC_VERSION__ >= 201112L) && !defined(__STDC_NO_ATOMICS__) | 
 |  /* Use '_Atomic' keyword if the compiler supports. */ | 
 |  #undef  redisAtomic | 
 | @@ -126,7 +126,7 @@ | 
 |      __atomic_store_n(&var,value,__ATOMIC_SEQ_CST) | 
 |  #define REDIS_ATOMIC_API "atomic-builtin" | 
 |   | 
 | -#elif defined(HAVE_ATOMIC) | 
 | +#elif defined(CONFIG_EDAC_ATOMIC_SCRUB) && defined(HAVE_ATOMIC) | 
 |  /* Implementation using __sync macros. */ | 
 |   | 
 |  #define atomicIncr(var,count) __sync_add_and_fetch(&var,(count)) |