diff --git a/drivers/android/vendor_hooks.c b/drivers/android/vendor_hooks.c index 295527a249f8..eac1682a6107 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/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 4f164b7626df..154884d76ad5 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/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/gic.h b/include/trace/hooks/gic.h index e9d9fce0ee77..4ac8c4930aa8 100644 --- a/include/trace/hooks/gic.h +++ b/include/trace/hooks/gic.h @@ -9,7 +9,6 @@ #include -#include #include DECLARE_HOOK(android_vh_gic_resume, 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/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/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 22dcee0d90a1..55e3d8f480f7 100644 --- a/include/trace/hooks/mm.h +++ b/include/trace/hooks/mm.h @@ -9,7 +9,6 @@ #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 b4c1dd38e735..381649bf67e8 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/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 44599c9cd9a2..2598490b1449 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/sched.h b/include/trace/hooks/sched.h index 33ed33bfe33f..69b994cc60a3 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/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/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/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 0e815b872f7f..83116f7d3654 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