From c93173fceccb978880559baabb6d0b083182d822 Mon Sep 17 00:00:00 2001
From: Chia-I Wu <olvaffe@gmail.com>
Date: Fri, 2 Sep 2022 11:26:05 -0700
Subject: [PATCH] util/perf: use ALWAYS_INLINE for tracepoints

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/18309>
---
 src/util/perf/u_trace.h  | 3 ++-
 src/util/perf/u_trace.py | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/util/perf/u_trace.h b/src/util/perf/u_trace.h
index 9d3acfc..a045f4b 100644
--- a/src/util/perf/u_trace.h
+++ b/src/util/perf/u_trace.h
@@ -28,6 +28,7 @@
 #include <stdint.h>
 #include <stdio.h>
 
+#include "util/macros.h"
 #include "util/u_atomic.h"
 #include "util/u_queue.h"
 
@@ -284,7 +285,7 @@ void u_trace_perfetto_stop(void);
  * Return whether instrumentations should be enabled or not.  This is called
  * from tracepoints.
  */
-static inline bool
+static ALWAYS_INLINE bool
 u_trace_instrument(void)
 {
    extern int _u_trace_instrument;
diff --git a/src/util/perf/u_trace.py b/src/util/perf/u_trace.py
index 9b9fbce..a6a7619 100644
--- a/src/util/perf/u_trace.py
+++ b/src/util/perf/u_trace.py
@@ -243,7 +243,7 @@ void __trace_${trace_name}(
      , ${arg.type} ${arg.var}
 %    endfor
 );
-static inline void trace_${trace_name}(
+static ALWAYS_INLINE void trace_${trace_name}(
      struct u_trace *ut
 %    if need_cs_param:
    , void *cs
-- 
2.7.4