Skip to content

Commit 5cfff56

Browse files
committed
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/[email protected] Link: https://lkml.kernel.org/r/[email protected] Link: https://lkml.kernel.org/r/[email protected] Suggested-by: Mathieu Desnoyers <[email protected]> Signed-off-by: Steven Rostedt (Google) <[email protected]>
1 parent 18bfee3 commit 5cfff56

File tree

2 files changed

+5
-0
lines changed

2 files changed

+5
-0
lines changed
File renamed without changes.

kernel/trace/trace_events_user.c

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,12 @@
1818
#include <linux/tracefs.h>
1919
#include <linux/types.h>
2020
#include <linux/uaccess.h>
21+
/* Reminder to move to uapi when everything works */
22+
#ifdef CONFIG_COMPILE_TEST
23+
#include <linux/user_events.h>
24+
#else
2125
#include <uapi/linux/user_events.h>
26+
#endif
2227
#include "trace.h"
2328
#include "trace_dynevent.h"
2429

0 commit comments

Comments
 (0)