From de0d237ab0ba55ecb2dd3dfd4b28152c2963f022 Mon Sep 17 00:00:00 2001
From: Renato Pereyra <renatopereyra@google.com>
Date: Fri, 28 Jun 2024 16:31:10 -0500
Subject: [PATCH] intel/perf: Move sysmacros.h include from header to
 implementation

sysmacros.h defines macros `minor()` and `major()`. These macros conflict
with a definition of `minor()` in the Perfetto SDK header. Move the
sysmacros.h include to intel_perf.c because the Perfetto header is only
included at the same time as intel_perf.h not *.c (in intel_driver_ds.cc).

Unbeknown to anyone, the definition of `minor()` in the Perfetto header is
being replaced with the macro. See the MR attachment for an example.

Signed-off-by: Renato Pereyra <renatopereyra@chromium.org>
Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/29974>
---
 src/intel/perf/intel_perf.c | 7 +++++++
 src/intel/perf/intel_perf.h | 6 ------
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/intel/perf/intel_perf.c b/src/intel/perf/intel_perf.c
index 7ca19a9a0b2..396c5446509 100644
--- a/src/intel/perf/intel_perf.c
+++ b/src/intel/perf/intel_perf.c
@@ -25,6 +25,13 @@
 
 #include <sys/types.h>
 #include <sys/stat.h>
+
+#if defined(MAJOR_IN_SYSMACROS)
+#include <sys/sysmacros.h>
+#elif defined(MAJOR_IN_MKDEV)
+#include <sys/mkdev.h>
+#endif
+
 #include <fcntl.h>
 #include <unistd.h>
 #include <errno.h>
diff --git a/src/intel/perf/intel_perf.h b/src/intel/perf/intel_perf.h
index ded3c88ca26..feaabf5c1aa 100644
--- a/src/intel/perf/intel_perf.h
+++ b/src/intel/perf/intel_perf.h
@@ -29,12 +29,6 @@
 #include <stdint.h>
 #include <string.h>
 
-#if defined(MAJOR_IN_SYSMACROS)
-#include <sys/sysmacros.h>
-#elif defined(MAJOR_IN_MKDEV)
-#include <sys/mkdev.h>
-#endif
-
 #include "compiler/glsl/list.h"
 #include "dev/intel_device_info.h"
 #include "util/bitscan.h"