diff --git a/drivers/android/vendor_hooks.c b/drivers/android/vendor_hooks.c index d4d7c4540d7f..d7424d8a828e 100644 --- a/drivers/android/vendor_hooks.c +++ b/drivers/android/vendor_hooks.c @@ -28,7 +28,6 @@ #include #include #include -#include #include #include #include @@ -116,7 +115,6 @@ EXPORT_TRACEPOINT_SYMBOL_GPL(android_rvh_iommu_setup_dma_ops); EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_iommu_iovad_alloc_iova); EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_iommu_iovad_free_iova); EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_ptype_head); -EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_timer_calc_index); EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_allow_domain_state); EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_cpuidle_psci_enter); EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_cpuidle_psci_exit); diff --git a/include/trace/hooks/timer.h b/include/trace/hooks/timer.h deleted file mode 100644 index 67ef865dad4a..000000000000 --- a/include/trace/hooks/timer.h +++ /dev/null @@ -1,18 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 */ -#undef TRACE_SYSTEM -#define TRACE_SYSTEM timer - -#define TRACE_INCLUDE_PATH trace/hooks - -#if !defined(_TRACE_HOOK_TIMER_H) || defined(TRACE_HEADER_MULTI_READ) -#define _TRACE_HOOK_TIMER_H - -#include - -DECLARE_HOOK(android_vh_timer_calc_index, - TP_PROTO(unsigned int lvl, unsigned long *expires), - TP_ARGS(lvl, expires)); - -#endif /* _TRACE_HOOK_TIMER_H */ -/* This part must be outside protection */ -#include diff --git a/kernel/time/timer.c b/kernel/time/timer.c index 204eaabfe3ee..9dd2a39cb3b0 100644 --- a/kernel/time/timer.c +++ b/kernel/time/timer.c @@ -55,8 +55,6 @@ #define CREATE_TRACE_POINTS #include -#undef CREATE_TRACE_POINTS -#include __visible u64 jiffies_64 __cacheline_aligned_in_smp = INITIAL_JIFFIES; @@ -505,7 +503,6 @@ static inline unsigned calc_index(unsigned long expires, unsigned lvl, * Round up with level granularity to prevent this. */ expires = (expires + LVL_GRAN(lvl)) >> LVL_SHIFT(lvl); - trace_android_vh_timer_calc_index(lvl, &expires); *bucket_expiry = expires << LVL_SHIFT(lvl); return LVL_OFFS(lvl) + (expires & LVL_MASK); }