Skip to content

Commit

Permalink
ANDROID: Fix kernelci build-break in printk.c
Browse files Browse the repository at this point in the history
commit 0820d8e ("ANDROID: logbuf: Add new logbuf vendor hook to support pr_cont()")
added a vendor hook, but broke kernelci builds with
!CONFIG_ANDROID_VENDOR_HOOKS.

The fix is to remove the old "#if defined(CONFIG_ANDROID_VENDOR_HOOKS)"
guard that is now obsolete.

Fixes: 0820d8e ("ANDROID: logbuf: Add new logbuf vendor hook to support pr_cont()")
Signed-off-by: Todd Kjos <tkjos@google.com>
Change-Id: I60932d17f3d5019e25d0d767e8a88ded877267de
  • Loading branch information
toddkjos committed Nov 24, 2021
1 parent 611e67f commit dde568a
Showing 1 changed file with 0 additions and 4 deletions.
4 changes: 0 additions & 4 deletions include/trace/hooks/logbuf.h
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
#include <linux/tracepoint.h>
#include <trace/hooks/vendor_hooks.h>

#if defined(CONFIG_TRACEPOINTS) && defined(CONFIG_ANDROID_VENDOR_HOOKS)
struct printk_ringbuffer;
struct printk_record;

Expand All @@ -21,9 +20,6 @@ DECLARE_HOOK(android_vh_logbuf,
DECLARE_HOOK(android_vh_logbuf_pr_cont,
TP_PROTO(struct printk_record *r, size_t text_len),
TP_ARGS(r, text_len))
#else
#define trace_android_vh_logbuf(rb, r)
#endif

#endif /* _TRACE_HOOK_LOGBUF_H */
/* This part must be outside protection */
Expand Down

0 comments on commit dde568a

Please sign in to comment.