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@xxxxxxxxxxxxxxxxxx
Link: https://lkml.kernel.org/r/20220330201755.29319-1-mathieu.desnoyers@xxxxxxxxxxxx
Link: https://lore.kernel.org/all/2059213643.196683.1648499088753.JavaMail.zimbra@xxxxxxxxxxxx/
Link: https://lore.kernel.org/all/1651771383.54437.1652370439159.JavaMail.zimbra@xxxxxxxxxxxx/
Signed-off-by: Beau Belgrave <beaub@xxxxxxxxxxxxxxxxxxx>
---
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 ccd6a5ade3e9..c9302f46a317 100644
--- a/kernel/trace/Kconfig
+++ b/kernel/trace/Kconfig
@@ -770,7 +770,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 2c0a6ec75548..fd8ea555437a 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
|