shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-06 10:58:48 +09:00
Code Issues Packages Projects Releases Wiki Activity

Revert "ANDROID: timer: Add vendor hook for timer calc index"

Browse Source 
This reverts commit 1855071010.

This causes merge conflicts with 5.19-rc1 and should not be needed
anymore.  Revert it for now and if it really is needed it can be added
back to a device-specific branch.

Bug: 178758017
Cc: Huang Yiwei <hyiwei@codeaurora.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: Id0bc0d42ae311f0af52a323fea5e58ed1b7e0bd7
This commit is contained in:
Greg Kroah-Hartman
2022-06-04 13:05:11 +02:00
parent bf3b3ff13c
commit ab2ca64e06
3 changed files with 0 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/android/vendor_hooks.c
View File

@@ -28,7 +28,6 @@
#include <trace/hooks/sys.h>
#include <trace/hooks/iommu.h>
#include <trace/hooks/net.h>
#include <trace/hooks/timer.h>
#include <trace/hooks/pm_domain.h>
#include <trace/hooks/cpuidle_psci.h>
#include <trace/hooks/vmscan.h>
@@ -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);

18
include/trace/hooks/timer.h
View File

@@ -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 <trace/hooks/vendor_hooks.h>
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 <trace/define_trace.h>

3
kernel/time/timer.c
View File

@@ -55,8 +55,6 @@
#define CREATE_TRACE_POINTS
#include <trace/events/timer.h>
#undef CREATE_TRACE_POINTS
#include <trace/hooks/timer.h>
__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);
}