| Andrew Geissler | c723b72 | 2021-01-08 16:14:09 -0600 | [diff] [blame] | 1 | From 37b9cb0e6cb92181b7a25583849a9d161a558982 Mon Sep 17 00:00:00 2001 |
| 2 | From: Michael Jeanson <mjeanson@efficios.com> |
| 3 | Date: Mon, 26 Oct 2020 13:41:02 -0400 |
| 4 | Subject: [PATCH 07/19] fix: objtool: Rename frame.h -> objtool.h (v5.10) |
| 5 | |
| 6 | See upstream commit : |
| 7 | |
| 8 | commit 00089c048eb4a8250325efb32a2724fd0da68cce |
| 9 | Author: Julien Thierry <jthierry@redhat.com> |
| 10 | Date: Fri Sep 4 16:30:25 2020 +0100 |
| 11 | |
| 12 | objtool: Rename frame.h -> objtool.h |
| 13 | |
| 14 | Header frame.h is getting more code annotations to help objtool analyze |
| 15 | object files. |
| 16 | |
| 17 | Rename the file to objtool.h. |
| 18 | |
| 19 | Upstream-Status: Backport |
| 20 | |
| 21 | Signed-off-by: Michael Jeanson <mjeanson@efficios.com> |
| 22 | Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com> |
| 23 | Change-Id: Ic2283161bebcbf1e33b72805eb4d2628f4ae3e89 |
| 24 | --- |
| 25 | lttng-filter-interpreter.c | 2 +- |
| 26 | wrapper/{frame.h => objtool.h} | 19 ++++++++++++------- |
| 27 | 2 files changed, 13 insertions(+), 8 deletions(-) |
| 28 | rename wrapper/{frame.h => objtool.h} (50%) |
| 29 | |
| 30 | diff --git a/lttng-filter-interpreter.c b/lttng-filter-interpreter.c |
| 31 | index 21169f01..5d572437 100644 |
| 32 | --- a/lttng-filter-interpreter.c |
| 33 | +++ b/lttng-filter-interpreter.c |
| 34 | @@ -8,7 +8,7 @@ |
| 35 | */ |
| 36 | |
| 37 | #include <wrapper/uaccess.h> |
| 38 | -#include <wrapper/frame.h> |
| 39 | +#include <wrapper/objtool.h> |
| 40 | #include <wrapper/types.h> |
| 41 | #include <linux/swab.h> |
| 42 | |
| 43 | diff --git a/wrapper/frame.h b/wrapper/objtool.h |
| 44 | similarity index 50% |
| 45 | rename from wrapper/frame.h |
| 46 | rename to wrapper/objtool.h |
| 47 | index 6e6dc811..3b997cae 100644 |
| 48 | --- a/wrapper/frame.h |
| 49 | +++ b/wrapper/objtool.h |
| 50 | @@ -1,18 +1,23 @@ |
| 51 | -/* SPDX-License-Identifier: (GPL-2.0 or LGPL-2.1) |
| 52 | +/* SPDX-License-Identifier: (GPL-2.0-only or LGPL-2.1-only) |
| 53 | * |
| 54 | - * wrapper/frame.h |
| 55 | + * wrapper/objtool.h |
| 56 | * |
| 57 | * Copyright (C) 2016 Mathieu Desnoyers <mathieu.desnoyers@efficios.com> |
| 58 | */ |
| 59 | |
| 60 | -#ifndef _LTTNG_WRAPPER_FRAME_H |
| 61 | -#define _LTTNG_WRAPPER_FRAME_H |
| 62 | +#ifndef _LTTNG_WRAPPER_OBJTOOL_H |
| 63 | +#define _LTTNG_WRAPPER_OBJTOOL_H |
| 64 | |
| 65 | #include <linux/version.h> |
| 66 | |
| 67 | -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,6,0)) |
| 68 | - |
| 69 | +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5,10,0)) |
| 70 | +#include <linux/objtool.h> |
| 71 | +#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(4,6,0)) |
| 72 | #include <linux/frame.h> |
| 73 | +#endif |
| 74 | + |
| 75 | + |
| 76 | +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,6,0)) |
| 77 | |
| 78 | #define LTTNG_STACK_FRAME_NON_STANDARD(func) \ |
| 79 | STACK_FRAME_NON_STANDARD(func) |
| 80 | @@ -23,4 +28,4 @@ |
| 81 | |
| 82 | #endif |
| 83 | |
| 84 | -#endif /* _LTTNG_WRAPPER_FRAME_H */ |
| 85 | +#endif /* _LTTNG_WRAPPER_OBJTOOL_H */ |
| 86 | -- |
| 87 | 2.19.1 |
| 88 | |