From 0ef21e1c1ae5cbde091fc7bbbc5ebc5962d9bb13 Mon Sep 17 00:00:00 2001 From: Saravana Kannan Date: Wed, 30 Mar 2022 14:58:30 -0700 Subject: [PATCH] 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 Change-Id: Ia88e6af11dd94fe475c464eb30a6e5e1e24c938b --- drivers/android/vendor_hooks.c | 1 + include/trace/hooks/avc.h | 1 - include/trace/hooks/binder.h | 1 - include/trace/hooks/bug.h | 1 - include/trace/hooks/cgroup.h | 1 - include/trace/hooks/cpufreq.h | 1 - include/trace/hooks/cpuidle.h | 1 - include/trace/hooks/cpuidle_psci.h | 1 - include/trace/hooks/creds.h | 1 - include/trace/hooks/debug.h | 1 - include/trace/hooks/dtask.h | 1 - include/trace/hooks/epoch.h | 1 - include/trace/hooks/fault.h | 1 - include/trace/hooks/fips140.h | 1 - include/trace/hooks/fpsimd.h | 1 - include/trace/hooks/ftrace_dump.h | 1 - include/trace/hooks/futex.h | 1 - include/trace/hooks/gic.h | 1 - include/trace/hooks/gic_v3.h | 1 - include/trace/hooks/hung_task.h | 1 - include/trace/hooks/iommu.h | 1 - include/trace/hooks/logbuf.h | 1 - include/trace/hooks/memory.h | 1 - include/trace/hooks/mm.h | 1 - include/trace/hooks/module.h | 1 - include/trace/hooks/mpam.h | 1 - include/trace/hooks/net.h | 1 - include/trace/hooks/pm_domain.h | 1 - include/trace/hooks/power.h | 1 - include/trace/hooks/preemptirq.h | 1 - include/trace/hooks/printk.h | 1 - include/trace/hooks/remoteproc.h | 1 - include/trace/hooks/rwsem.h | 1 - include/trace/hooks/sched.h | 1 - include/trace/hooks/selinux.h | 1 - include/trace/hooks/softlockup.h | 1 - include/trace/hooks/sys.h | 1 - include/trace/hooks/syscall_check.h | 1 - include/trace/hooks/sysrqcrash.h | 1 - include/trace/hooks/thermal.h | 1 - include/trace/hooks/timekeeping.h | 1 - include/trace/hooks/timer.h | 1 - include/trace/hooks/topology.h | 1 - include/trace/hooks/traps.h | 1 - include/trace/hooks/ufshcd.h | 1 - include/trace/hooks/vendor_hooks.h | 2 ++ include/trace/hooks/vmscan.h | 1 - include/trace/hooks/wqlockup.h | 1 - 48 files changed, 3 insertions(+), 46 deletions(-) diff --git a/drivers/android/vendor_hooks.c b/drivers/android/vendor_hooks.c index 57886c84a772..5b5a6ccdb865 100644 --- a/drivers/android/vendor_hooks.c +++ b/drivers/android/vendor_hooks.c @@ -8,6 +8,7 @@ #define CREATE_TRACE_POINTS #include +#include #include #include #include diff --git a/include/trace/hooks/avc.h b/include/trace/hooks/avc.h index 1ac5fa3cc08f..5100dde72c9d 100644 --- 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 #include /* * Following tracepoints are not exported in tracefs and provide a diff --git a/include/trace/hooks/binder.h b/include/trace/hooks/binder.h index f52f1be5dfd6..4cb0d78ea2ff 100644 --- 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 #include /* * Following tracepoints are not exported in tracefs and provide a diff --git a/include/trace/hooks/bug.h b/include/trace/hooks/bug.h index ddb1b9d595ad..bbae73fd14c4 100644 --- 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 #include DECLARE_RESTRICTED_HOOK(android_rvh_report_bug, diff --git a/include/trace/hooks/cgroup.h b/include/trace/hooks/cgroup.h index 1c22b84fb8b1..95d271f1638c 100644 --- 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 #include struct task_struct; diff --git a/include/trace/hooks/cpufreq.h b/include/trace/hooks/cpufreq.h index b7c5586442ef..1b29b6f24913 100644 --- a/include/trace/hooks/cpufreq.h +++ b/include/trace/hooks/cpufreq.h @@ -8,7 +8,6 @@ #define _TRACE_HOOK_CPUFREQ_H #include -#include #include DECLARE_RESTRICTED_HOOK(android_rvh_show_max_freq, diff --git a/include/trace/hooks/cpuidle.h b/include/trace/hooks/cpuidle.h index ef1cd61e71e0..b1ee27ed6707 100644 --- 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 #include struct cpuidle_device; diff --git a/include/trace/hooks/cpuidle_psci.h b/include/trace/hooks/cpuidle_psci.h index 94b01eba0b4e..eef0032c0879 100644 --- 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 #include /* * Following tracepoints are not exported in tracefs and provide a diff --git a/include/trace/hooks/creds.h b/include/trace/hooks/creds.h index 3bf62aac7b7e..69a68081f2a3 100644 --- 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 #include /* * Following tracepoints are not exported in tracefs and provide a diff --git a/include/trace/hooks/debug.h b/include/trace/hooks/debug.h index ac006d7fdd0a..90d81041a48b 100644 --- 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 #include #if defined(CONFIG_TRACEPOINTS) && defined(CONFIG_ANDROID_VENDOR_HOOKS) diff --git a/include/trace/hooks/dtask.h b/include/trace/hooks/dtask.h index 29ce503c44f0..6f005d49b4e2 100644 --- 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 #include /* * Following tracepoints are not exported in tracefs and provide a diff --git a/include/trace/hooks/epoch.h b/include/trace/hooks/epoch.h index 13dd9a6d7849..ccee2d8cd429 100644 --- 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 #include DECLARE_HOOK(android_vh_show_suspend_epoch_val, diff --git a/include/trace/hooks/fault.h b/include/trace/hooks/fault.h index 4051397c573f..75ecc8808961 100644 --- 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 #include struct pt_regs; diff --git a/include/trace/hooks/fips140.h b/include/trace/hooks/fips140.h index 3aebf6168791..fd4a42c013c7 100644 --- 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 #include struct crypto_aes_ctx; diff --git a/include/trace/hooks/fpsimd.h b/include/trace/hooks/fpsimd.h index 3c107f8c1dac..10337180a7be 100644 --- 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 #include struct task_struct; diff --git a/include/trace/hooks/ftrace_dump.h b/include/trace/hooks/ftrace_dump.h index ce33479cb17b..be5345ebe3d4 100644 --- a/include/trace/hooks/ftrace_dump.h +++ b/include/trace/hooks/ftrace_dump.h @@ -10,7 +10,6 @@ #include #include -#include #include #if defined(CONFIG_TRACEPOINTS) && defined(CONFIG_ANDROID_VENDOR_HOOKS) diff --git a/include/trace/hooks/futex.h b/include/trace/hooks/futex.h index 9330f034a2ae..b3c8aca6345b 100644 --- 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 #include #include /* diff --git a/include/trace/hooks/gic.h b/include/trace/hooks/gic.h index 4e40b12177be..2a12bf941b60 100644 --- a/include/trace/hooks/gic.h +++ b/include/trace/hooks/gic.h @@ -7,7 +7,6 @@ #if !defined(_TRACE_HOOK_GIC_H) || defined(TRACE_HEADER_MULTI_READ) #define _TRACE_HOOK_GIC_H -#include #include struct gic_chip_data; struct irq_data; diff --git a/include/trace/hooks/gic_v3.h b/include/trace/hooks/gic_v3.h index 964fa80a4979..f1ddbb19ea65 100644 --- 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 #include /* * Following tracepoints are not exported in tracefs and provide a diff --git a/include/trace/hooks/hung_task.h b/include/trace/hooks/hung_task.h index b355828df349..1559d3ed774f 100644 --- 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 #include DECLARE_HOOK(android_vh_check_uninterruptible_tasks, diff --git a/include/trace/hooks/iommu.h b/include/trace/hooks/iommu.h index 082d8e7df897..f615320e44d6 100644 --- a/include/trace/hooks/iommu.h +++ b/include/trace/hooks/iommu.h @@ -9,7 +9,6 @@ #include -#include #include DECLARE_RESTRICTED_HOOK(android_rvh_iommu_setup_dma_ops, diff --git a/include/trace/hooks/logbuf.h b/include/trace/hooks/logbuf.h index f73ad597fc64..72c34f7fbad0 100644 --- 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 #include struct printk_ringbuffer; diff --git a/include/trace/hooks/memory.h b/include/trace/hooks/memory.h index f59a26e090bf..d7dbfdeacd4d 100644 --- 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 #include /* * Following tracepoints are not exported in tracefs and provide a diff --git a/include/trace/hooks/mm.h b/include/trace/hooks/mm.h index 36bafc54e4bb..9bd5b1414b99 100644 --- a/include/trace/hooks/mm.h +++ b/include/trace/hooks/mm.h @@ -11,7 +11,6 @@ #include #include -#include #include DECLARE_RESTRICTED_HOOK(android_rvh_set_skip_swapcache_flags, diff --git a/include/trace/hooks/module.h b/include/trace/hooks/module.h index 281cb0d37c12..78b49869ca65 100644 --- 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 #include /* * Following tracepoints are not exported in tracefs and provide a diff --git a/include/trace/hooks/mpam.h b/include/trace/hooks/mpam.h index 7d28bc8834f0..50f5a68fdae2 100644 --- 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 #include /* * Following tracepoints are not exported in tracefs and provide a diff --git a/include/trace/hooks/net.h b/include/trace/hooks/net.h index 31e0f21373e8..acbb456d184b 100644 --- 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 #include struct packet_type; diff --git a/include/trace/hooks/pm_domain.h b/include/trace/hooks/pm_domain.h index 659117e7e5b4..2a530d13eac0 100644 --- 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 #include struct generic_pm_domain; diff --git a/include/trace/hooks/power.h b/include/trace/hooks/power.h index 3804cc8086f8..fad46611a570 100644 --- 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 #include struct task_struct; diff --git a/include/trace/hooks/preemptirq.h b/include/trace/hooks/preemptirq.h index 7a5d64833fdf..52308c882acb 100644 --- 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 #include DECLARE_RESTRICTED_HOOK(android_rvh_preempt_disable, diff --git a/include/trace/hooks/printk.h b/include/trace/hooks/printk.h index da99776df6f6..b3e9598386c7 100644 --- 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 #include DECLARE_HOOK(android_vh_printk_hotplug, diff --git a/include/trace/hooks/remoteproc.h b/include/trace/hooks/remoteproc.h index 722e2917003c..bcd73a9792cf 100644 --- a/include/trace/hooks/remoteproc.h +++ b/include/trace/hooks/remoteproc.h @@ -9,7 +9,6 @@ struct rproc; -#include #include struct rproc; diff --git a/include/trace/hooks/rwsem.h b/include/trace/hooks/rwsem.h index 7c7a1f786369..e868d5ba398e 100644 --- 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 #include /* * Following tracepoints are not exported in tracefs and provide a diff --git a/include/trace/hooks/sched.h b/include/trace/hooks/sched.h index f8d05602cc8a..4091e2698b67 100644 --- 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 #include /* * Following tracepoints are not exported in tracefs and provide a diff --git a/include/trace/hooks/selinux.h b/include/trace/hooks/selinux.h index fb0e8a50635f..0b65631b5dde 100644 --- 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 #include /* * Following tracepoints are not exported in tracefs and provide a diff --git a/include/trace/hooks/softlockup.h b/include/trace/hooks/softlockup.h index e329fe6ec198..eb2855379d98 100644 --- 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 #include struct pt_regs; diff --git a/include/trace/hooks/sys.h b/include/trace/hooks/sys.h index 9e5d7a5cb2cf..e2d5d6d4fc14 100644 --- 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 #include struct task_struct; diff --git a/include/trace/hooks/syscall_check.h b/include/trace/hooks/syscall_check.h index d39802aa4a1e..56d8267297ca 100644 --- 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 #include /* * Following tracepoints are not exported in tracefs and provide a diff --git a/include/trace/hooks/sysrqcrash.h b/include/trace/hooks/sysrqcrash.h index e109d21be499..92e7bc7ca9c3 100644 --- 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 #include /* * Following tracepoints are not exported in tracefs and provide a diff --git a/include/trace/hooks/thermal.h b/include/trace/hooks/thermal.h index 9112f9453d62..59741a88af48 100644 --- 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 #include #include diff --git a/include/trace/hooks/timekeeping.h b/include/trace/hooks/timekeeping.h index 7aeed3918c7f..56c20963cc84 100644 --- a/include/trace/hooks/timekeeping.h +++ b/include/trace/hooks/timekeeping.h @@ -7,7 +7,6 @@ #if !defined(_TRACE_HOOK_TIMEKEEPING_H) || defined(TRACE_HEADER_MULTI_READ) #define _TRACE_HOOK_TIMEKEEPING_H -#include #include struct timekeeper; diff --git a/include/trace/hooks/timer.h b/include/trace/hooks/timer.h index 174d958e4c31..67ef865dad4a 100644 --- 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 #include DECLARE_HOOK(android_vh_timer_calc_index, diff --git a/include/trace/hooks/topology.h b/include/trace/hooks/topology.h index 521e07e58f04..9c7e8c54a85b 100644 --- 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 #include #include diff --git a/include/trace/hooks/traps.h b/include/trace/hooks/traps.h index 168618daafea..775a2ec00665 100644 --- 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 #include struct pt_regs; diff --git a/include/trace/hooks/ufshcd.h b/include/trace/hooks/ufshcd.h index fb470846e99b..bf4ba522e665 100644 --- 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 #include /* * Following tracepoints are not exported in tracefs and provide a diff --git a/include/trace/hooks/vendor_hooks.h b/include/trace/hooks/vendor_hooks.h index 0efbc4616473..48ee67aaee9f 100644 --- 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 +#endif #if defined(CONFIG_TRACEPOINTS) && defined(CONFIG_ANDROID_VENDOR_HOOKS) diff --git a/include/trace/hooks/vmscan.h b/include/trace/hooks/vmscan.h index f77873285bb8..6cba5fd70e8a 100644 --- 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 #include DECLARE_RESTRICTED_HOOK(android_rvh_set_balance_anon_file_reclaim, diff --git a/include/trace/hooks/wqlockup.h b/include/trace/hooks/wqlockup.h index 3cb33cd7847f..92e01ab0ad0e 100644 --- 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 #include /* * Following tracepoints are not exported in tracefs and provide a