Merge branch 'android11-5.4' into 'android11-5.4-lts

Sync up with android11-5.4 for the following commits:

42e516f6b2 ANDROID: ABI: update allowed list for galaxy
de198b0f2d ANDROID: GKI: update Vivo symbol list
c37c28d9aa ANDROID: adding __nocfi to cpuidle_enter_state
ebaebc32e5 ANDROID: ABI: update allowed list for galaxy
2ea974a00c ANDROID: workqueue: add vendor hook for wq lockup information
d240b6929c ANDROID: db845c_gki.fragment: Add missing qcom drivers required for cpufreq functionality
81e694dedc ANDROID: ABI: update allowed list for QCOM

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: Idbce7f9daa342e5ae3356193cfa2771054303838
This commit is contained in:
Greg Kroah-Hartman 2020-10-14 09:57:56 +02:00
commit 1dc6fc5d03
9 changed files with 1293 additions and 1009 deletions

View file

@ -0,0 +1,24 @@
/* SPDX-License-Identifier: GPL-2.0 */
#undef TRACE_SYSTEM
#define TRACE_SYSTEM wqlockup
#define TRACE_INCLUDE_PATH trace/hooks
#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
* mechanism for vendor modules to hook and extend functionality
*/
#if defined(CONFIG_TRACEPOINTS) && defined(CONFIG_ANDROID_VENDOR_HOOKS)
DECLARE_HOOK(android_vh_wq_lockup_pool,
TP_PROTO(int cpu, unsigned long pool_ts),
TP_ARGS(cpu, pool_ts));
#else
#define trace_android_vh_wq_lockup_pool(cpu, pool_ts)
#endif
#endif /* _TRACE_HOOK_WQLOCKUP_H */
/* This part must be outside protection */
#include <trace/define_trace.h>