diff options
| author | Steven Rostedt (Google) <rostedt@goodmis.org> | 2022-04-01 21:39:03 +0300 |
|---|---|---|
| committer | Steven Rostedt (Google) <rostedt@goodmis.org> | 2022-04-02 15:40:10 +0300 |
| commit | 5cfff569cab8bf544bab62c911c5d6efd5af5e05 (patch) | |
| tree | a9b5f4d16b7c91c461d6c4b0039c12e6f04f7471 | |
| parent | 18bfee3216fa6f28d55ebf88d824a539d2bec3c7 (diff) | |
| download | linux-5cfff569cab8bf544bab62c911c5d6efd5af5e05.tar.xz | |
tracing: Move user_events.h temporarily out of include/uapi
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@gandalf.local.home
Link: https://lkml.kernel.org/r/20220330201755.29319-1-mathieu.desnoyers@efficios.com
Link: https://lkml.kernel.org/r/20220401143903.188384f3@gandalf.local.home
Suggested-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Signed-off-by: Steven Rostedt (Google) <rostedt@goodmis.org>
| -rw-r--r-- | include/linux/user_events.h (renamed from include/uapi/linux/user_events.h) | 0 | ||||
| -rw-r--r-- | kernel/trace/trace_events_user.c | 5 |
2 files changed, 5 insertions, 0 deletions
diff --git a/include/uapi/linux/user_events.h b/include/linux/user_events.h index 736e05603463..736e05603463 100644 --- a/include/uapi/linux/user_events.h +++ b/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" |