From: Michael Jeanson <mjeanson@efficios.com>
Date: Mon, 26 Oct 2020 17:41:02 +0000 (-0400)
Subject: fix: objtool: Rename frame.h -> objtool.h (v5.10)
X-Git-Tag: v2.13.0-rc1~124
X-Git-Url: http://git.lttng.org/?p=lttng-modules.git;a=commitdiff_plain;h=d90539367a52330d331698eb2cca569c3782c863

fix: objtool: Rename frame.h -> objtool.h (v5.10)

See upstream commit :

  commit 00089c048eb4a8250325efb32a2724fd0da68cce
  Author: Julien Thierry <jthierry@redhat.com>
  Date:   Fri Sep 4 16:30:25 2020 +0100

    objtool: Rename frame.h -> objtool.h

    Header frame.h is getting more code annotations to help objtool analyze
    object files.

    Rename the file to objtool.h.

Signed-off-by: Michael Jeanson <mjeanson@efficios.com>
Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Change-Id: Ic2283161bebcbf1e33b72805eb4d2628f4ae3e89
---

diff --git a/include/wrapper/frame.h b/include/wrapper/frame.h
deleted file mode 100644
index 9c9c7d88..00000000
--- a/include/wrapper/frame.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/* SPDX-License-Identifier: (GPL-2.0-only or LGPL-2.1-only)
- *
- * wrapper/frame.h
- *
- * Copyright (C) 2016 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
- */
-
-#ifndef _LTTNG_WRAPPER_FRAME_H
-#define _LTTNG_WRAPPER_FRAME_H
-
-#include <linux/version.h>
-
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,6,0))
-
-#include <linux/frame.h>
-
-#define LTTNG_STACK_FRAME_NON_STANDARD(func) \
-	STACK_FRAME_NON_STANDARD(func)
-
-#else
-
-#define LTTNG_STACK_FRAME_NON_STANDARD(func)
-
-#endif
-
-#endif /* _LTTNG_WRAPPER_FRAME_H */
diff --git a/include/wrapper/objtool.h b/include/wrapper/objtool.h
new file mode 100644
index 00000000..3b997cae
--- /dev/null
+++ b/include/wrapper/objtool.h
@@ -0,0 +1,31 @@
+/* SPDX-License-Identifier: (GPL-2.0-only or LGPL-2.1-only)
+ *
+ * wrapper/objtool.h
+ *
+ * Copyright (C) 2016 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
+ */
+
+#ifndef _LTTNG_WRAPPER_OBJTOOL_H
+#define _LTTNG_WRAPPER_OBJTOOL_H
+
+#include <linux/version.h>
+
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5,10,0))
+#include <linux/objtool.h>
+#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(4,6,0))
+#include <linux/frame.h>
+#endif
+
+
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,6,0))
+
+#define LTTNG_STACK_FRAME_NON_STANDARD(func) \
+	STACK_FRAME_NON_STANDARD(func)
+
+#else
+
+#define LTTNG_STACK_FRAME_NON_STANDARD(func)
+
+#endif
+
+#endif /* _LTTNG_WRAPPER_OBJTOOL_H */
diff --git a/src/lttng-filter-interpreter.c b/src/lttng-filter-interpreter.c
index 337cd71f..09302c76 100644
--- a/src/lttng-filter-interpreter.c
+++ b/src/lttng-filter-interpreter.c
@@ -8,7 +8,7 @@
  */
 
 #include <wrapper/uaccess.h>
-#include <wrapper/frame.h>
+#include <wrapper/objtool.h>
 #include <wrapper/types.h>
 #include <linux/swab.h>