54bc0aa219
ANDROID_VENDOR_HOOKS has implicit dependencies on the subsystems which
it hooks into whenever it directly uses an "internal" header for that
system. For instance, drivers/scsi/ufs/ufshcd.h doesn't compile unless
CONFIG_SCSI_UFSHCD is enabled:
In file included from drivers/android/vendor_hooks.c:41:
In file included from include/trace/hooks/ufshcd.h:21:
include/../drivers/scsi/ufs/ufshcd.h:675:38: error: field has incomplete type 'struct devfreq_simple_ondemand_data'
struct devfreq_simple_ondemand_data ondemand_data;
^
include/../drivers/scsi/ufs/ufshcd.h:675:9: note: forward declaration of 'struct devfreq_simple_ondemand_data'
struct devfreq_simple_ondemand_data ondemand_data;
To avoid these implicit dependencies, guard any "internal" header
includes with the respective CONFIG_ options when applicable. If the
CONFIG_ option is not enabled, then the forward-declared structs are
used. This is acceptable because those hooks would not have been called
anyway since the underlying subsytem wasn't enabled.
Fixes: commit 1590a0e8e1 ("ANDROID: GKI: include more type definitions in vendor hooks")
Bug: 240404657
Change-Id: I43d19136fdb1b534e80630067f5db92c379adc67
Signed-off-by: Elliot Berman <quic_eberman@quicinc.com>
(cherry picked from commit 573c7f061d)
32 lines
878 B
C
32 lines
878 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>
|
|
|
|
#if defined(__GENKSYMS__) || !IS_ENABLED(CONFIG_PRINTK)
|
|
struct printk_record;
|
|
struct printk_ringbuffer;
|
|
#else
|
|
/* struct printk_record, struct printk_ringbuffer */
|
|
#include <../kernel/printk/printk_ringbuffer.h>
|
|
#endif /* __GENKSYMS__ */
|
|
|
|
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>
|