mirror of
git://git.yoctoproject.org/poky
synced 2026-10-01 06:15:14 +00:00
e876c23cd8
lttng-modules doesn't currently build against the lastest 5.10-rc versions. Upstream lttng does have fixes for the issues, but hasn't done a release that contains them yet. There are other patches on the 2.12.x branch, but I've skipped them for now as they aren't necessary for 5.10 builds, and can be picked up with the next full update. We also bump the dev-upstream hash to make them easier to pickup for those building from git. (From OE-Core rev: 6d1169d2c046d8fa6220ab04863672557aa42cf1) Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> (cherry picked from commit 47201e98bb293d59c5d41986d066fd7614b914fa) Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
89 lines
2.3 KiB
Diff
89 lines
2.3 KiB
Diff
From 37b9cb0e6cb92181b7a25583849a9d161a558982 Mon Sep 17 00:00:00 2001
|
|
From: Michael Jeanson <mjeanson@efficios.com>
|
|
Date: Mon, 26 Oct 2020 13:41:02 -0400
|
|
Subject: [PATCH 07/19] 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.
|
|
|
|
Upstream-Status: Backport
|
|
|
|
Signed-off-by: Michael Jeanson <mjeanson@efficios.com>
|
|
Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
|
|
Change-Id: Ic2283161bebcbf1e33b72805eb4d2628f4ae3e89
|
|
---
|
|
lttng-filter-interpreter.c | 2 +-
|
|
wrapper/{frame.h => objtool.h} | 19 ++++++++++++-------
|
|
2 files changed, 13 insertions(+), 8 deletions(-)
|
|
rename wrapper/{frame.h => objtool.h} (50%)
|
|
|
|
diff --git a/lttng-filter-interpreter.c b/lttng-filter-interpreter.c
|
|
index 21169f01..5d572437 100644
|
|
--- a/lttng-filter-interpreter.c
|
|
+++ b/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>
|
|
|
|
diff --git a/wrapper/frame.h b/wrapper/objtool.h
|
|
similarity index 50%
|
|
rename from wrapper/frame.h
|
|
rename to wrapper/objtool.h
|
|
index 6e6dc811..3b997cae 100644
|
|
--- a/wrapper/frame.h
|
|
+++ b/wrapper/objtool.h
|
|
@@ -1,18 +1,23 @@
|
|
-/* SPDX-License-Identifier: (GPL-2.0 or LGPL-2.1)
|
|
+/* SPDX-License-Identifier: (GPL-2.0-only or LGPL-2.1-only)
|
|
*
|
|
- * wrapper/frame.h
|
|
+ * wrapper/objtool.h
|
|
*
|
|
* Copyright (C) 2016 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
|
|
*/
|
|
|
|
-#ifndef _LTTNG_WRAPPER_FRAME_H
|
|
-#define _LTTNG_WRAPPER_FRAME_H
|
|
+#ifndef _LTTNG_WRAPPER_OBJTOOL_H
|
|
+#define _LTTNG_WRAPPER_OBJTOOL_H
|
|
|
|
#include <linux/version.h>
|
|
|
|
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,6,0))
|
|
-
|
|
+#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)
|
|
@@ -23,4 +28,4 @@
|
|
|
|
#endif
|
|
|
|
-#endif /* _LTTNG_WRAPPER_FRAME_H */
|
|
+#endif /* _LTTNG_WRAPPER_OBJTOOL_H */
|
|
--
|
|
2.19.1
|
|
|