Messages in this thread Patch in this message | | | From | Beau Belgrave <> | Subject | [RFC PATCH 1/7] tracing/user_events: Remove BROKEN and restore user_events.h location | Date | Thu, 7 Jul 2022 14:58:22 -0700 |
| |
After having discussions and addressing the ABI issues user_events can be now marked as working and used by others.
As part of the BROKEN status, user_events.h was moved from its original uapi location to the kernel location. This needs to be moved back so it can be used by others.
Link: https://lore.kernel.org/all/20220330155835.5e1f6669@gandalf.local.home Link: https://lkml.kernel.org/r/20220330201755.29319-1-mathieu.desnoyers@efficios.com Link: https://lore.kernel.org/all/2059213643.196683.1648499088753.JavaMail.zimbra@efficios.com/ Link: https://lore.kernel.org/all/1651771383.54437.1652370439159.JavaMail.zimbra@efficios.com/
Signed-off-by: Beau Belgrave <beaub@linux.microsoft.com> --- include/{ => uapi}/linux/user_events.h | 0 kernel/trace/Kconfig | 1 - kernel/trace/trace_events_user.c | 5 ----- 3 files changed, 6 deletions(-) rename include/{ => uapi}/linux/user_events.h (100%)
diff --git a/include/linux/user_events.h b/include/uapi/linux/user_events.h similarity index 100% rename from include/linux/user_events.h rename to include/uapi/linux/user_events.h diff --git a/kernel/trace/Kconfig b/kernel/trace/Kconfig index 2c43e327a619..9bb54c0b3b2d 100644 --- a/kernel/trace/Kconfig +++ b/kernel/trace/Kconfig @@ -767,7 +767,6 @@ config USER_EVENTS bool "User trace events" select TRACING select DYNAMIC_EVENTS - depends on BROKEN || COMPILE_TEST # API needs to be straighten out help User trace events are user-defined trace events that can be used like an existing kernel trace event. User trace diff --git a/kernel/trace/trace_events_user.c b/kernel/trace/trace_events_user.c index 4afc41e321ac..7bff4c8b90f2 100644 --- a/kernel/trace/trace_events_user.c +++ b/kernel/trace/trace_events_user.c @@ -19,12 +19,7 @@ #include <linux/tracefs.h> #include <linux/types.h> #include <linux/uaccess.h> -/* Reminder to move to uapi when everything works */ -#ifdef CONFIG_COMPILE_TEST -#include <linux/user_events.h> -#else #include <uapi/linux/user_events.h> -#endif #include "trace.h" #include "trace_dynevent.h" -- 2.25.1
| |