X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvppinfra%2Fcache.h;h=ac0835523cb8b5ec985ae2762238157c34960c11;hb=536953d529ea4449fb38efc3fa2a3503551b2e6d;hp=7464b77a41bfa3be1516c642b2e2bda0a29de363;hpb=6ce2232e4cd4a24f73bdfd32ae01f14cf8c1ee77;p=vpp.git

diff --git a/src/vppinfra/cache.h b/src/vppinfra/cache.h
index 7464b77a41b..ac0835523cb 100644
--- a/src/vppinfra/cache.h
+++ b/src/vppinfra/cache.h
@@ -41,21 +41,16 @@
 #include <vppinfra/error_bootstrap.h>
 
 /*
- * Allow CFLAGS to override the arch-specific cache line size
+ * Allow CFLAGS to override the configured / deduced cache line size
  */
 #ifndef CLIB_LOG2_CACHE_LINE_BYTES
 
-#if defined(__x86_64__) || defined(__ARM_ARCH_7A__) || defined(__i386__)
-#define CLIB_LOG2_CACHE_LINE_BYTES 6
-#endif
+/* defines CLIB_LOG2_CACHE_LINE_BYTES */
+#include <vppinfra/config.h>
 
-#ifdef __aarch64__
-#define CLIB_LOG2_CACHE_LINE_BYTES 7
-#endif
-
-/* Default cache line size of 32 bytes. */
+/* Default cache line size of 64 bytes. */
 #ifndef CLIB_LOG2_CACHE_LINE_BYTES
-#define CLIB_LOG2_CACHE_LINE_BYTES 5
+#define CLIB_LOG2_CACHE_LINE_BYTES 6
 #endif
 
 #endif /* CLIB_LOG2_CACHE_LINE_BYTES defined */