From: "Steven Rostedt (Google)" <rostedt@xxxxxxxxxxx> While user_events API is under development and has been marked for broken to not let the API become fixed, move the header file out of the uapi directory. This is to prevent it from being installed, then later changed, and then have an old distro user space update with a new kernel, where applications see the user_events being available, but the old header is in place, and then they get compiled incorrectly. Also, surround the include with CONFIG_COMPILE_TEST to the current location, but when the BROKEN tag is taken off, it will use the uapi directory, and fail to compile. This is a good way to remind us to move the header back. Link: https://lore.kernel.org/all/20220330155835.5e1f6669@xxxxxxxxxxxxxxxxxx Link: https://lkml.kernel.org/r/20220330201755.29319-1-mathieu.desnoyers@xxxxxxxxxxxx Suggested-by: Mathieu Desnoyers <mathieu.desnoyers@xxxxxxxxxxxx> Signed-off-by: Steven Rostedt (Google) <rostedt@xxxxxxxxxxx> --- include/{uapi => }/linux/user_events.h | 0 kernel/trace/trace_events_user.c | 5 +++++ 2 files changed, 5 insertions(+) rename include/{uapi => }/linux/user_events.h (100%) diff --git a/include/uapi/linux/user_events.h b/include/linux/user_events.h similarity index 100% rename from include/uapi/linux/user_events.h rename to include/linux/user_events.h diff --git a/kernel/trace/trace_events_user.c b/kernel/trace/trace_events_user.c index 846c27bc7aef..706e1686b5eb 100644 --- a/kernel/trace/trace_events_user.c +++ b/kernel/trace/trace_events_user.c @@ -18,7 +18,12 @@ #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.35.1
