From 37b9cb0e6cb92181b7a25583849a9d161a558982 Mon Sep 17 00:00:00 2001 From: Michael Jeanson Date: Mon, 26 Oct 2020 13:41:02 -0400 Subject: [PATCH] fix: objtool: Rename frame.h -> objtool.h (v5.10) See upstream commit : commit 00089c048eb4a8250325efb32a2724fd0da68cce Author: Julien Thierry 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 Signed-off-by: Mathieu Desnoyers 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 -#include +#include #include #include 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 */ -#ifndef _LTTNG_WRAPPER_FRAME_H -#define _LTTNG_WRAPPER_FRAME_H +#ifndef _LTTNG_WRAPPER_OBJTOOL_H +#define _LTTNG_WRAPPER_OBJTOOL_H #include -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,6,0)) - +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5,10,0)) +#include +#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(4,6,0)) #include +#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.34.1