ANDROID: vendor_hooks: Reduce pointless modversions CRC churn

When vendor hooks are added to a file that previously didn't have any vendor hooks, we end up indirectly including linux/tracepoint.h. This causes some data types that used to be opaque (forward declared) to the code to become visible to the code. Modversions correctly catches this change in visibility, but we don't really care about the data types made visible when linux/tracepoint.h is included. So, hide this from modversions in the central vendor_hooks.h file instead of having to fix this on a case by case basis. This change itself will cause a one time CRC breakage/churn because it's fixing the existing vendor hook headers, but should reduce unnecessary CRC churns in the future. To avoid future pointless CRC churn, vendor hook header files that include vendor_hooks.h should not include linux/tracepoint.h directly. Bug: 227513263 Bug: 226140073 Signed-off-by: Saravana Kannan <saravanak@google.com> Change-Id: Ia88e6af11dd94fe475c464eb30a6e5e1e24c938b
2026-03-25 12:00:22 +09:00 · 2022-03-30 14:58:30 -07:00
parent f33dc31c48
commit ac3d413511
67 changed files with 3 additions and 65 deletions
--- a/drivers/android/vendor_hooks.c
+++ b/drivers/android/vendor_hooks.c
@@ -8,6 +8,7 @@

 #define CREATE_TRACE_POINTS
 #include <trace/hooks/vendor_hooks.h>
+#include <linux/tracepoint.h>
 #include <trace/hooks/sched.h>
 #include <trace/hooks/cpu.h>
 #include <trace/hooks/fpsimd.h>
--- a/include/trace/hooks/avc.h
+++ b/include/trace/hooks/avc.h
@@ -5,7 +5,6 @@
 #define TRACE_INCLUDE_PATH trace/hooks
 #if !defined(_TRACE_HOOK_AVC_H) || defined(TRACE_HEADER_MULTI_READ)
 #define _TRACE_HOOK_AVC_H
-#include <linux/tracepoint.h>
 #include <trace/hooks/vendor_hooks.h>
 /*
 * Following tracepoints are not exported in tracefs and provide a
--- a/include/trace/hooks/binder.h
+++ b/include/trace/hooks/binder.h
@@ -5,7 +5,6 @@
 #define TRACE_INCLUDE_PATH trace/hooks
 #if !defined(_TRACE_HOOK_BINDER_H) || defined(TRACE_HEADER_MULTI_READ)
 #define _TRACE_HOOK_BINDER_H
-#include <linux/tracepoint.h>
 #include <trace/hooks/vendor_hooks.h>
 /*
 * Following tracepoints are not exported in tracefs and provide a
--- a/include/trace/hooks/block.h
+++ b/include/trace/hooks/block.h
@@ -7,7 +7,6 @@
 #if !defined(_TRACE_HOOK_BLOCK_H) || defined(TRACE_HEADER_MULTI_READ)
 #define _TRACE_HOOK_BLOCK_H

-#include <linux/tracepoint.h>
 #include <trace/hooks/vendor_hooks.h>

 struct blk_mq_tag_set;
--- a/include/trace/hooks/bug.h
+++ b/include/trace/hooks/bug.h
@@ -5,7 +5,6 @@

 #if !defined(_TRACE_HOOK_BUG_H) || defined(TRACE_HEADER_MULTI_READ)
 #define _TRACE_HOOK_BUG_H
-#include <linux/tracepoint.h>
 #include <trace/hooks/vendor_hooks.h>
 /*
 * Following tracepoints are not exported in tracefs and provide a
--- a/include/trace/hooks/cgroup.h
+++ b/include/trace/hooks/cgroup.h
@@ -5,7 +5,6 @@
 #define TRACE_INCLUDE_PATH trace/hooks
 #if !defined(_TRACE_HOOK_CGROUP_H) || defined(TRACE_HEADER_MULTI_READ)
 #define _TRACE_HOOK_CGROUP_H
-#include <linux/tracepoint.h>
 #include <trace/hooks/vendor_hooks.h>

 struct task_struct;
--- a/include/trace/hooks/cpu.h
+++ b/include/trace/hooks/cpu.h
@@ -4,7 +4,6 @@
 #define TRACE_INCLUDE_PATH trace/hooks
 #if !defined(_TRACE_HOOK_CPU_H) || defined(TRACE_HEADER_MULTI_READ)
 #define _TRACE_HOOK_CPU_H
-#include <linux/tracepoint.h>
 #include <trace/hooks/vendor_hooks.h>
 /*
 * Following tracepoints are not exported in tracefs and provide a
--- a/include/trace/hooks/cpufreq.h
+++ b/include/trace/hooks/cpufreq.h
@@ -8,7 +8,6 @@
 #define _TRACE_HOOK_CPUFREQ_H

 #include <linux/cpufreq.h>
-#include <linux/tracepoint.h>
 #include <trace/hooks/vendor_hooks.h>

 DECLARE_HOOK(android_vh_show_max_freq,
--- a/include/trace/hooks/cpuidle.h
+++ b/include/trace/hooks/cpuidle.h
@@ -7,7 +7,6 @@
 #if !defined(_TRACE_HOOK_CPUIDLE_H) || defined(TRACE_HEADER_MULTI_READ)
 #define _TRACE_HOOK_CPUIDLE_H

-#include <linux/tracepoint.h>
 #include <trace/hooks/vendor_hooks.h>

 struct cpuidle_device;
--- a/include/trace/hooks/cpuidle_psci.h
+++ b/include/trace/hooks/cpuidle_psci.h
@@ -4,7 +4,6 @@
 #define TRACE_INCLUDE_PATH trace/hooks
 #if !defined(_TRACE_HOOK_CPUIDLE_PSCI_H) || defined(TRACE_HEADER_MULTI_READ)
 #define _TRACE_HOOK_CPUIDLE_PSCI_H
-#include <linux/tracepoint.h>
 #include <trace/hooks/vendor_hooks.h>
 /*
 * Following tracepoints are not exported in tracefs and provide a
--- a/include/trace/hooks/creds.h
+++ b/include/trace/hooks/creds.h
@@ -5,7 +5,6 @@
 #define TRACE_INCLUDE_PATH trace/hooks
 #if !defined(_TRACE_HOOK_CREDS_H) || defined(TRACE_HEADER_MULTI_READ)
 #define _TRACE_HOOK_CREDS_H
-#include <linux/tracepoint.h>
 #include <trace/hooks/vendor_hooks.h>
 /*
 * Following tracepoints are not exported in tracefs and provide a
--- a/include/trace/hooks/debug.h
+++ b/include/trace/hooks/debug.h
@@ -7,7 +7,6 @@
 #if !defined(_TRACE_HOOK_DEBUG_H) || defined(TRACE_HEADER_MULTI_READ)
 #define _TRACE_HOOK_DEBUG_H

-#include <linux/tracepoint.h>
 #include <trace/hooks/vendor_hooks.h>

 #if defined(CONFIG_TRACEPOINTS) && defined(CONFIG_ANDROID_VENDOR_HOOKS)
--- a/include/trace/hooks/dtask.h
+++ b/include/trace/hooks/dtask.h
@@ -5,7 +5,6 @@

 #if !defined(_TRACE_HOOK_DTASK_H) || defined(TRACE_HEADER_MULTI_READ)
 #define _TRACE_HOOK_DTASK_H
-#include <linux/tracepoint.h>
 #include <trace/hooks/vendor_hooks.h>
 /*
 * Following tracepoints are not exported in tracefs and provide a
--- a/include/trace/hooks/epoch.h
+++ b/include/trace/hooks/epoch.h
@@ -7,7 +7,6 @@
 #if !defined(_TRACE_HOOK_EPOCH_H) || defined(TRACE_HEADER_MULTI_READ)
 #define _TRACE_HOOK_EPOCH_H

-#include <linux/tracepoint.h>
 #include <trace/hooks/vendor_hooks.h>

 DECLARE_HOOK(android_vh_show_suspend_epoch_val,
--- a/include/trace/hooks/fault.h
+++ b/include/trace/hooks/fault.h
@@ -5,7 +5,6 @@

 #if !defined(_TRACE_HOOK_FAULT_H) || defined(TRACE_HEADER_MULTI_READ)
 #define _TRACE_HOOK_FAULT_H
-#include <linux/tracepoint.h>
 #include <trace/hooks/vendor_hooks.h>
 /*
 * Following tracepoints are not exported in tracefs and provide a
--- a/include/trace/hooks/fips140.h
+++ b/include/trace/hooks/fips140.h
@@ -5,7 +5,6 @@

 #if !defined(_TRACE_HOOK_FIPS140_H) || defined(TRACE_HEADER_MULTI_READ)
 #define _TRACE_HOOK_FIPS140_H
-#include <linux/tracepoint.h>
 #include <trace/hooks/vendor_hooks.h>

 struct crypto_aes_ctx;
--- a/include/trace/hooks/fpsimd.h
+++ b/include/trace/hooks/fpsimd.h
@@ -7,7 +7,6 @@
 #if !defined(_TRACE_HOOK_FPSIMD_H) || defined(TRACE_HEADER_MULTI_READ)
 #define _TRACE_HOOK_FPSIMD_H

-#include <linux/tracepoint.h>
 #include <trace/hooks/vendor_hooks.h>

 struct task_struct;
--- a/include/trace/hooks/fs.h
+++ b/include/trace/hooks/fs.h
@@ -8,7 +8,6 @@
 #if !defined(_TRACE_HOOK_FS_H) || defined(TRACE_HEADER_MULTI_READ)
 #define _TRACE_HOOK_FS_H

-#include <linux/tracepoint.h>
 #include <trace/hooks/vendor_hooks.h>
 DECLARE_HOOK(android_vh_ep_create_wakeup_source,
 	TP_PROTO(char *name, int len),
--- a/include/trace/hooks/ftrace_dump.h
+++ b/include/trace/hooks/ftrace_dump.h
@@ -10,7 +10,6 @@
 #include <linux/trace_seq.h>
 #include <linux/trace_events.h>

-#include <linux/tracepoint.h>
 #include <trace/hooks/vendor_hooks.h>

 DECLARE_HOOK(android_vh_ftrace_oops_enter,
--- a/include/trace/hooks/futex.h
+++ b/include/trace/hooks/futex.h
@@ -5,7 +5,6 @@
 #define TRACE_INCLUDE_PATH trace/hooks
 #if !defined(_TRACE_HOOK_FUTEX_H) || defined(TRACE_HEADER_MULTI_READ)
 #define _TRACE_HOOK_FUTEX_H
-#include <linux/tracepoint.h>
 #include <trace/hooks/vendor_hooks.h>
 #include <linux/plist.h>
 /*
--- a/include/trace/hooks/gic.h
+++ b/include/trace/hooks/gic.h
@@ -8,7 +8,6 @@
 #define _TRACE_HOOK_GIC_H


-#include <linux/tracepoint.h>
 #include <trace/hooks/vendor_hooks.h>
 struct gic_chip_data;

--- a/include/trace/hooks/gic_v3.h
+++ b/include/trace/hooks/gic_v3.h
@@ -4,7 +4,6 @@
 #define TRACE_INCLUDE_PATH trace/hooks
 #if !defined(_TRACE_HOOK_GIC_V3_H) || defined(TRACE_HEADER_MULTI_READ)
 #define _TRACE_HOOK_GIC_V3_H
-#include <linux/tracepoint.h>
 #include <trace/hooks/vendor_hooks.h>
 /*
 * Following tracepoints are not exported in tracefs and provide a
--- a/include/trace/hooks/gpiolib.h
+++ b/include/trace/hooks/gpiolib.h
@@ -7,7 +7,6 @@
 #if !defined(_TRACE_HOOK_GPIOLIB_H) || defined(TRACE_HEADER_MULTI_READ)
 #define _TRACE_HOOK_GPIOLIB_H

-#include <linux/tracepoint.h>
 #include <trace/hooks/vendor_hooks.h>
 #include "../drivers/gpio/gpiolib.h"

--- a/include/trace/hooks/gup.h
+++ b/include/trace/hooks/gup.h
@@ -5,7 +5,6 @@
 #define TRACE_INCLUDE_PATH trace/hooks
 #if !defined(_TRACE_HOOK_GUP_H) || defined(TRACE_HEADER_MULTI_READ)
 #define _TRACE_HOOK_GUP_H
-#include <linux/tracepoint.h>
 #include <trace/hooks/vendor_hooks.h>

 struct page;
--- a/include/trace/hooks/hung_task.h
+++ b/include/trace/hooks/hung_task.h
@@ -7,7 +7,6 @@
 #if !defined(_TRACE_HOOK_HUNG_TASK_H) || defined(TRACE_HEADER_MULTI_READ)
 #define _TRACE_HOOK_HUNG_TASK_H

-#include <linux/tracepoint.h>
 #include <trace/hooks/vendor_hooks.h>

 DECLARE_HOOK(android_vh_check_uninterruptible_tasks,
--- a/include/trace/hooks/i2c.h
+++ b/include/trace/hooks/i2c.h
@@ -7,7 +7,6 @@
 #if !defined(_TRACE_HOOK_I2C_H) || defined(TRACE_HEADER_MULTI_READ)
 #define _TRACE_HOOK_I2C_H

-#include <linux/tracepoint.h>
 #include <trace/hooks/vendor_hooks.h>

 DECLARE_HOOK(android_vh_of_i2c_get_board_info,
--- a/include/trace/hooks/iommu.h
+++ b/include/trace/hooks/iommu.h
@@ -9,7 +9,6 @@

 #include <linux/types.h>

-#include <linux/tracepoint.h>
 #include <trace/hooks/vendor_hooks.h>

 #if defined(CONFIG_TRACEPOINTS) && defined(CONFIG_ANDROID_VENDOR_HOOKS)
--- a/include/trace/hooks/ipv6.h
+++ b/include/trace/hooks/ipv6.h
@@ -5,7 +5,6 @@

 #if !defined(_TRACE_HOOK_IPV6_H) || defined(TRACE_HEADER_MULTI_READ)
 #define _TRACE_HOOK_IPV6_H
-#include <linux/tracepoint.h>
 #include <trace/hooks/vendor_hooks.h>
 /*
 * Following tracepoints are not exported in tracefs and provide a
--- a/include/trace/hooks/logbuf.h
+++ b/include/trace/hooks/logbuf.h
@@ -7,7 +7,6 @@
 #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;
--- a/include/trace/hooks/memory.h
+++ b/include/trace/hooks/memory.h
@@ -5,7 +5,6 @@
 #define TRACE_INCLUDE_PATH trace/hooks
 #if !defined(_TRACE_HOOK_MEMORY_H) || defined(TRACE_HEADER_MULTI_READ)
 #define _TRACE_HOOK_MEMORY_H
-#include <linux/tracepoint.h>
 #include <trace/hooks/vendor_hooks.h>
 /*
 * Following tracepoints are not exported in tracefs and provide a
--- a/include/trace/hooks/mm.h
+++ b/include/trace/hooks/mm.h
@@ -11,7 +11,6 @@

 #include <linux/mm.h>
 #include <linux/oom.h>
-#include <linux/tracepoint.h>
 #include <trace/hooks/vendor_hooks.h>

 struct cma;
--- a/include/trace/hooks/mmc_core.h
+++ b/include/trace/hooks/mmc_core.h
@@ -7,7 +7,6 @@
 #if !defined(_TRACE_HOOK_MMC_CORE_H) || defined(TRACE_HEADER_MULTI_READ)
 #define _TRACE_HOOK_MMC_CORE_H

-#include <linux/tracepoint.h>
 #include <trace/hooks/vendor_hooks.h>

 struct mmc_host;
--- a/include/trace/hooks/module.h
+++ b/include/trace/hooks/module.h
@@ -5,7 +5,6 @@
 #define TRACE_INCLUDE_PATH trace/hooks
 #if !defined(_TRACE_HOOK_MODULE_H) || defined(TRACE_HEADER_MULTI_READ)
 #define _TRACE_HOOK_MODULE_H
-#include <linux/tracepoint.h>
 #include <trace/hooks/vendor_hooks.h>
 /*
 * Following tracepoints are not exported in tracefs and provide a
--- a/include/trace/hooks/mpam.h
+++ b/include/trace/hooks/mpam.h
@@ -5,7 +5,6 @@
 #define TRACE_INCLUDE_PATH trace/hooks
 #if !defined(_TRACE_HOOK_MPAM_H) || defined(TRACE_HEADER_MULTI_READ)
 #define _TRACE_HOOK_MPAM_H
-#include <linux/tracepoint.h>
 #include <trace/hooks/vendor_hooks.h>
 /*
 * Following tracepoints are not exported in tracefs and provide a
--- a/include/trace/hooks/net.h
+++ b/include/trace/hooks/net.h
@@ -6,7 +6,6 @@

 #if !defined(_TRACE_HOOK_NET_VH_H) || defined(TRACE_HEADER_MULTI_READ)
 #define _TRACE_HOOK_NET_VH_H
-#include <linux/tracepoint.h>
 #include <trace/hooks/vendor_hooks.h>

 struct packet_type;
--- a/include/trace/hooks/pm_domain.h
+++ b/include/trace/hooks/pm_domain.h
@@ -8,7 +8,6 @@
 #if !defined(_TRACE_HOOK_PM_DOMAIN_H) || defined(TRACE_HEADER_MULTI_READ)
 #define _TRACE_HOOK_PM_DOMAIN_H

-#include <linux/tracepoint.h>
 #include <trace/hooks/vendor_hooks.h>

 struct generic_pm_domain;
--- a/include/trace/hooks/power.h
+++ b/include/trace/hooks/power.h
@@ -5,7 +5,6 @@

 #if !defined(_TRACE_HOOK_POWER_H) || defined(TRACE_HEADER_MULTI_READ)
 #define _TRACE_HOOK_POWER_H
-#include <linux/tracepoint.h>
 #include <trace/hooks/vendor_hooks.h>
 /*
 * Following tracepoints are not exported in tracefs and provide a
--- a/include/trace/hooks/preemptirq.h
+++ b/include/trace/hooks/preemptirq.h
@@ -8,7 +8,6 @@
 #if !defined(_TRACE_HOOK_PREEMPTIRQ_H) || defined(TRACE_HEADER_MULTI_READ)
 #define _TRACE_HOOK_PREEMPTIRQ_H

-#include <linux/tracepoint.h>
 #include <trace/hooks/vendor_hooks.h>

 DECLARE_RESTRICTED_HOOK(android_rvh_preempt_disable,
--- a/include/trace/hooks/printk.h
+++ b/include/trace/hooks/printk.h
@@ -7,7 +7,6 @@
 #if !defined(_TRACE_HOOK_PRINTK_H) || defined(TRACE_HEADER_MULTI_READ)
 #define _TRACE_HOOK_PRINTK_H

-#include <linux/tracepoint.h>
 #include <trace/hooks/vendor_hooks.h>

 DECLARE_HOOK(android_vh_printk_hotplug,
--- a/include/trace/hooks/psi.h
+++ b/include/trace/hooks/psi.h
@@ -7,7 +7,6 @@
 #if !defined(_TRACE_HOOK_PSI_H) || defined(TRACE_HEADER_MULTI_READ)
 #define _TRACE_HOOK_PSI_H

-#include <linux/tracepoint.h>
 #include <trace/hooks/vendor_hooks.h>

 #if defined(CONFIG_TRACEPOINTS) && defined(CONFIG_ANDROID_VENDOR_HOOKS)
--- a/include/trace/hooks/remoteproc.h
+++ b/include/trace/hooks/remoteproc.h
@@ -7,7 +7,6 @@
 #if !defined(_TRACE_HOOK_RPROC_H) || defined(TRACE_HEADER_MULTI_READ)
 #define _TRACE_HOOK_RPROC_H

-#include <linux/tracepoint.h>
 #include <trace/hooks/vendor_hooks.h>

 struct rproc;
--- a/include/trace/hooks/rwsem.h
+++ b/include/trace/hooks/rwsem.h
@@ -4,7 +4,6 @@
 #define TRACE_INCLUDE_PATH trace/hooks
 #if !defined(_TRACE_HOOK_RWSEM_H) || defined(TRACE_HEADER_MULTI_READ)
 #define _TRACE_HOOK_RWSEM_H
-#include <linux/tracepoint.h>
 #include <trace/hooks/vendor_hooks.h>
 /*
 * Following tracepoints are not exported in tracefs and provide a
--- a/include/trace/hooks/sched.h
+++ b/include/trace/hooks/sched.h
@@ -4,7 +4,6 @@
 #define TRACE_INCLUDE_PATH trace/hooks
 #if !defined(_TRACE_HOOK_SCHED_H) || defined(TRACE_HEADER_MULTI_READ)
 #define _TRACE_HOOK_SCHED_H
-#include <linux/tracepoint.h>
 #include <trace/hooks/vendor_hooks.h>
 /*
 * Following tracepoints are not exported in tracefs and provide a
--- a/include/trace/hooks/scmi.h
+++ b/include/trace/hooks/scmi.h
@@ -7,7 +7,6 @@
 #if !defined(_TRACE_HOOK_SCMI_H) || defined(TRACE_HEADER_MULTI_READ)
 #define _TRACE_HOOK_SCMI_H

-#include <linux/tracepoint.h>
 #include <trace/hooks/vendor_hooks.h>

 DECLARE_HOOK(android_vh_scmi_timeout_sync,
--- a/include/trace/hooks/selinux.h
+++ b/include/trace/hooks/selinux.h
@@ -5,7 +5,6 @@
 #define TRACE_INCLUDE_PATH trace/hooks
 #if !defined(_TRACE_HOOK_SELINUX_H) || defined(TRACE_HEADER_MULTI_READ)
 #define _TRACE_HOOK_SELINUX_H
-#include <linux/tracepoint.h>
 #include <trace/hooks/vendor_hooks.h>
 /*
 * Following tracepoints are not exported in tracefs and provide a
--- a/include/trace/hooks/shmem_fs.h
+++ b/include/trace/hooks/shmem_fs.h
@@ -5,7 +5,6 @@
 #define TRACE_INCLUDE_PATH trace/hooks
 #if !defined(_TRACE_HOOK_SHMEM_FS_H) || defined(TRACE_HEADER_MULTI_READ)
 #define _TRACE_HOOK_SHMEM_FS_H
-#include <linux/tracepoint.h>
 #include <trace/hooks/vendor_hooks.h>

 struct page;
--- a/include/trace/hooks/signal.h
+++ b/include/trace/hooks/signal.h
@@ -5,7 +5,6 @@
 #define TRACE_INCLUDE_PATH trace/hooks
 #if !defined(_TRACE_HOOK_SIGNAL_H) || defined(TRACE_HEADER_MULTI_READ)
 #define _TRACE_HOOK_SIGNAL_H
-#include <linux/tracepoint.h>
 #include <trace/hooks/vendor_hooks.h>

 struct task_struct;
--- a/include/trace/hooks/snd_compr.h
+++ b/include/trace/hooks/snd_compr.h
@@ -8,7 +8,6 @@
 #if !defined(_TRACE_HOOK_SND_COMPR_H) || defined(TRACE_HEADER_MULTI_READ)
 #define _TRACE_HOOK_SND_COMPR_H

-#include <linux/tracepoint.h>
 #include <trace/hooks/vendor_hooks.h>
 /*
 * Following tracepoints are not exported in tracefs and provide a
--- a/include/trace/hooks/softlockup.h
+++ b/include/trace/hooks/softlockup.h
@@ -5,7 +5,6 @@

 #if !defined(_TRACE_HOOK_SOFTLOCKUP_H) || defined(TRACE_HEADER_MULTI_READ)
 #define _TRACE_HOOK_SOFTLOCKUP_H
-#include <linux/tracepoint.h>
 #include <trace/hooks/vendor_hooks.h>
 /*
 * Following tracepoints are not exported in tracefs and provide a
--- a/include/trace/hooks/sound.h
+++ b/include/trace/hooks/sound.h
@@ -5,7 +5,6 @@
 #define TRACE_INCLUDE_PATH trace/hooks
 #if !defined(_TRACE_HOOK_SOUND_H) || defined(TRACE_HEADER_MULTI_READ)
 #define _TRACE_HOOK_SOUND_H
-#include <linux/tracepoint.h>
 #include <trace/hooks/vendor_hooks.h>
 #include <linux/usb.h>

--- a/include/trace/hooks/sys.h
+++ b/include/trace/hooks/sys.h
@@ -5,7 +5,6 @@
 #define TRACE_INCLUDE_PATH trace/hooks
 #if !defined(_TRACE_HOOK_SYS_H) || defined(TRACE_HEADER_MULTI_READ)
 #define _TRACE_HOOK_SYS_H
-#include <linux/tracepoint.h>
 #include <trace/hooks/vendor_hooks.h>

 struct task_struct;
--- a/include/trace/hooks/syscall_check.h
+++ b/include/trace/hooks/syscall_check.h
@@ -5,7 +5,6 @@
 #define TRACE_INCLUDE_PATH trace/hooks
 #if !defined(_TRACE_HOOK_SYSCALL_CHECK_H) || defined(TRACE_HEADER_MULTI_READ)
 #define _TRACE_HOOK_SYSCALL_CHECK_H
-#include <linux/tracepoint.h>
 #include <trace/hooks/vendor_hooks.h>
 /*
 * Following tracepoints are not exported in tracefs and provide a
--- a/include/trace/hooks/sysrqcrash.h
+++ b/include/trace/hooks/sysrqcrash.h
@@ -5,7 +5,6 @@

 #if !defined(_TRACE_HOOK_SYSRQCRASH_H) || defined(TRACE_HEADER_MULTI_READ)
 #define _TRACE_HOOK_SYSRQCRASH_H
-#include <linux/tracepoint.h>
 #include <trace/hooks/vendor_hooks.h>
 /*
 * Following tracepoints are not exported in tracefs and provide a
--- a/include/trace/hooks/thermal.h
+++ b/include/trace/hooks/thermal.h
@@ -7,7 +7,6 @@
 #if !defined(_TRACE_HOOK_THERMAL_H) || defined(TRACE_HEADER_MULTI_READ)
 #define _TRACE_HOOK_THERMAL_H

-#include <linux/tracepoint.h>
 #include <trace/hooks/vendor_hooks.h>
 #include <linux/cpufreq.h>

--- a/include/trace/hooks/timer.h
+++ b/include/trace/hooks/timer.h
@@ -7,7 +7,6 @@
 #if !defined(_TRACE_HOOK_TIMER_H) || defined(TRACE_HEADER_MULTI_READ)
 #define _TRACE_HOOK_TIMER_H

-#include <linux/tracepoint.h>
 #include <trace/hooks/vendor_hooks.h>

 DECLARE_HOOK(android_vh_timer_calc_index,
--- a/include/trace/hooks/topology.h
+++ b/include/trace/hooks/topology.h
@@ -7,7 +7,6 @@
 #if !defined(_TRACE_HOOK_TOPOLOGY_H) || defined(TRACE_HEADER_MULTI_READ)
 #define _TRACE_HOOK_TOPOLOGY_H

-#include <linux/tracepoint.h>
 #include <trace/hooks/vendor_hooks.h>
 #include <linux/cpumask.h>

--- a/include/trace/hooks/traps.h
+++ b/include/trace/hooks/traps.h
@@ -5,7 +5,6 @@

 #if !defined(_TRACE_HOOK_TRAPS_H) || defined(TRACE_HEADER_MULTI_READ)
 #define _TRACE_HOOK_TRAPS_H
-#include <linux/tracepoint.h>
 #include <trace/hooks/vendor_hooks.h>
 /*
 * Following tracepoints are not exported in tracefs and provide a
--- a/include/trace/hooks/typec.h
+++ b/include/trace/hooks/typec.h
@@ -4,7 +4,6 @@
 #define TRACE_INCLUDE_PATH trace/hooks
 #if !defined(_TRACE_HOOK_TYPEC_H) || defined(TRACE_HEADER_MULTI_READ)
 #define _TRACE_HOOK_TYPEC_H
-#include <linux/tracepoint.h>
 #include <linux/usb/pd.h>
 #include <trace/hooks/vendor_hooks.h>
 /*
--- a/include/trace/hooks/ufshcd.h
+++ b/include/trace/hooks/ufshcd.h
@@ -4,7 +4,6 @@
 #define TRACE_INCLUDE_PATH trace/hooks
 #if !defined(_TRACE_HOOK_UFSHCD_H) || defined(TRACE_HEADER_MULTI_READ)
 #define _TRACE_HOOK_UFSHCD_H
-#include <linux/tracepoint.h>
 #include <trace/hooks/vendor_hooks.h>
 /*
 * Following tracepoints are not exported in tracefs and provide a
--- a/include/trace/hooks/usb.h
+++ b/include/trace/hooks/usb.h
@@ -5,7 +5,6 @@
 #define TRACE_INCLUDE_PATH trace/hooks
 #if !defined(_TRACE_HOOK_USB_H) || defined(TRACE_HEADER_MULTI_READ)
 #define _TRACE_HOOK_USB_H
-#include <linux/tracepoint.h>
 #include <linux/usb.h>
 #include <trace/hooks/vendor_hooks.h>
 /*
--- a/include/trace/hooks/user.h
+++ b/include/trace/hooks/user.h
@@ -5,7 +5,6 @@
 #define TRACE_INCLUDE_PATH trace/hooks
 #if !defined(_TRACE_HOOK_USER_H) || defined(TRACE_HEADER_MULTI_READ)
 #define _TRACE_HOOK_USER_H
-#include <linux/tracepoint.h>
 #include <trace/hooks/vendor_hooks.h>

 struct user_struct;
--- a/include/trace/hooks/v4l2core.h
+++ b/include/trace/hooks/v4l2core.h
@@ -7,7 +7,6 @@
 #if !defined(_TRACE_HOOK_V4L2CORE_H) || defined(TRACE_HEADER_MULTI_READ)
 #define _TRACE_HOOK_V4L2_CORE_H

-#include <linux/tracepoint.h>
 #include <trace/hooks/vendor_hooks.h>

 struct v4l2_format;
--- a/include/trace/hooks/v4l2mc.h
+++ b/include/trace/hooks/v4l2mc.h
@@ -7,7 +7,6 @@
 #if !defined(_TRACE_HOOK_V4L2MC_H) || defined(TRACE_HEADER_MULTI_READ)
 #define _TRACE_HOOK_V4L2MC_H

-#include <linux/tracepoint.h>
 #include <trace/hooks/vendor_hooks.h>

 struct media_link;
--- a/include/trace/hooks/vendor_hooks.h
+++ b/include/trace/hooks/vendor_hooks.h
@@ -7,7 +7,9 @@
 *  will override the DECLARE_RESTRICTED_HOOK and break the second include.
 */

+#ifndef __GENKSYMS__
 #include <linux/tracepoint.h>
+#endif

 #if defined(CONFIG_TRACEPOINTS) && defined(CONFIG_ANDROID_VENDOR_HOOKS)

--- a/include/trace/hooks/vmscan.h
+++ b/include/trace/hooks/vmscan.h
@@ -7,7 +7,6 @@
 #if !defined(_TRACE_HOOK_VMSCAN_H) || defined(TRACE_HEADER_MULTI_READ)
 #define _TRACE_HOOK_VMSCAN_H

-#include <linux/tracepoint.h>
 #include <trace/hooks/vendor_hooks.h>

 DECLARE_HOOK(android_vh_tune_scan_type,
--- a/include/trace/hooks/workqueue.h
+++ b/include/trace/hooks/workqueue.h
@@ -5,7 +5,6 @@

 #if !defined(_TRACE_HOOK_WORKQUEUE_H) || defined(TRACE_HEADER_MULTI_READ)
 #define _TRACE_HOOK_WORKQUEUE_H
-#include <linux/tracepoint.h>
 #include <trace/hooks/vendor_hooks.h>
 /*
 * Following tracepoints are not exported in tracefs and provide a
--- a/include/trace/hooks/wqlockup.h
+++ b/include/trace/hooks/wqlockup.h
@@ -5,7 +5,6 @@

 #if !defined(_TRACE_HOOK_WQLOCKUP_H) || defined(TRACE_HEADER_MULTI_READ)
 #define _TRACE_HOOK_WQLOCKUP_H
-#include <linux/tracepoint.h>
 #include <trace/hooks/vendor_hooks.h>
 /*
 * Following tracepoints are not exported in tracefs and provide a