de1a0ea811
When CONFIG_TRACEPOINTS or CONFIG_ANDROID_VENDOR_HOOKS is not set, there is a build error after commit01f2392e13("ANDROID: logbuf: Add new logbuf vendor hook to support pr_cont()"): kernel/printk/printk.c:1962:4: error: implicit declaration of function 'trace_android_vh_logbuf_pr_cont' [-Werror,-Wimplicit-function-declaration] trace_android_vh_logbuf_pr_cont(&r, text_len); ^ 1 error generated. Remove the #if directive so that this code always builds properly, which is possible after commitba75b92fef("ANDROID: simplify vendor hooks for non-GKI builds"). Change-Id: Icc7f55af1becab5a8833b0651402845559b6b56f Fixes:01f2392e13("ANDROID: logbuf: Add new logbuf vendor hook to support pr_cont()") Link: https://github.com/ClangBuiltLinux/continuous-integration2/runs/2948254099 Suggested-by: Todd Kjos <tkjos@google.com> Signed-off-by: Nathan Chancellor <nathan@kernel.org>
27 lines
689 B
C
27 lines
689 B
C
/* SPDX-License-Identifier: GPL-2.0 */
|
|
#undef TRACE_SYSTEM
|
|
#define TRACE_SYSTEM logbuf
|
|
|
|
#define TRACE_INCLUDE_PATH trace/hooks
|
|
|
|
#if !defined(_TRACE_HOOK_LOGBUF_H) || defined(TRACE_HEADER_MULTI_READ)
|
|
#define _TRACE_HOOK_LOGBUF_H
|
|
|
|
#include <linux/tracepoint.h>
|
|
#include <trace/hooks/vendor_hooks.h>
|
|
|
|
struct printk_ringbuffer;
|
|
struct printk_record;
|
|
|
|
DECLARE_HOOK(android_vh_logbuf,
|
|
TP_PROTO(struct printk_ringbuffer *rb, struct printk_record *r),
|
|
TP_ARGS(rb, r))
|
|
|
|
DECLARE_HOOK(android_vh_logbuf_pr_cont,
|
|
TP_PROTO(struct printk_record *r, size_t text_len),
|
|
TP_ARGS(r, text_len))
|
|
|
|
#endif /* _TRACE_HOOK_LOGBUF_H */
|
|
/* This part must be outside protection */
|
|
#include <trace/define_trace.h>
|