diff --git a/src/base/logging.hh b/src/base/logging.hh
index 650aecd647..050f2c63f5 100644
--- a/src/base/logging.hh
+++ b/src/base/logging.hh
@@ -199,7 +199,7 @@ class Logger
  */
 #define panic_if(cond, ...)                                  \
     do {                                                     \
-        if (M5_UNLIKELY(cond)) {                             \
+        if (GEM5_UNLIKELY(cond)) {                             \
             panic("panic condition " # cond " occurred: %s", \
                   csprintf(__VA_ARGS__));                    \
         }                                                    \
@@ -221,7 +221,7 @@ class Logger
  */
 #define fatal_if(cond, ...)                                     \
     do {                                                        \
-        if (M5_UNLIKELY(cond)) {                                \
+        if (GEM5_UNLIKELY(cond)) {                                \
             fatal("fatal condition " # cond " occurred: %s",    \
                   csprintf(__VA_ARGS__));                       \
         }                                                       \
@@ -265,13 +265,13 @@ class Logger
  */
 #define warn_if(cond, ...) \
     do { \
-        if (M5_UNLIKELY(cond)) \
+        if (GEM5_UNLIKELY(cond)) \
             warn(__VA_ARGS__); \
     } while (0)
 
 #define warn_if_once(cond, ...) \
     do { \
-        if (M5_UNLIKELY(cond)) \
+        if (GEM5_UNLIKELY(cond)) \
             warn_once(__VA_ARGS__); \
     } while (0)
 /** @} */ // end of api_logger
@@ -294,7 +294,7 @@ class Logger
 #else //!NDEBUG
 #define chatty_assert(cond, ...)                                        \
     do {                                                                \
-        if (M5_UNLIKELY(!(cond)))                                       \
+        if (GEM5_UNLIKELY(!(cond)))                                       \
             panic("assert(" # cond ") failed: %s", csprintf(__VA_ARGS__)); \
     } while (0)
 #endif // NDEBUG
diff --git a/src/base/trace.hh b/src/base/trace.hh
index c1804e8fed..fff05f7644 100644
--- a/src/base/trace.hh
+++ b/src/base/trace.hh
@@ -174,34 +174,34 @@ const std::string &name();
  */
 
 #define DDUMP(x, data, count) do {               \
-    if (M5_UNLIKELY(TRACING_ON && Debug::x))     \
+    if (GEM5_UNLIKELY(TRACING_ON && Debug::x))     \
         Trace::getDebugLogger()->dump(           \
             curTick(), name(), data, count, #x); \
 } while (0)
 
 #define DPRINTF(x, ...) do {                     \
-    if (M5_UNLIKELY(TRACING_ON && Debug::x)) {   \
+    if (GEM5_UNLIKELY(TRACING_ON && Debug::x)) {   \
         Trace::getDebugLogger()->dprintf_flag(   \
             curTick(), name(), #x, __VA_ARGS__); \
     }                                            \
 } while (0)
 
 #define DPRINTFS(x, s, ...) do {                        \
-    if (M5_UNLIKELY(TRACING_ON && Debug::x)) {          \
+    if (GEM5_UNLIKELY(TRACING_ON && Debug::x)) {          \
         Trace::getDebugLogger()->dprintf_flag(          \
                 curTick(), s->name(), #x, __VA_ARGS__); \
     }                                                   \
 } while (0)
 
 #define DPRINTFR(x, ...) do {                          \
-    if (M5_UNLIKELY(TRACING_ON && Debug::x)) {         \
+    if (GEM5_UNLIKELY(TRACING_ON && Debug::x)) {         \
         Trace::getDebugLogger()->dprintf_flag(         \
             (Tick)-1, std::string(), #x, __VA_ARGS__); \
     }                                                  \
 } while (0)
 
 #define DPRINTFV(x, ...) do {                          \
-    if (M5_UNLIKELY(TRACING_ON && (x))) {              \
+    if (GEM5_UNLIKELY(TRACING_ON && (x))) {              \
         Trace::getDebugLogger()->dprintf_flag(         \
             curTick(), name(), x.name(), __VA_ARGS__); \
     }                                                  \