A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-11 15:11:48 -04:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source 
Sync up with android11-5.4 for the following commits:

a2114d2456 ANDROID: Update KMI_GENERATION after KMI change
9bb683349b ANDROID: GKI: update the .xml file with the October 15 ABI breakages
b7d30a3293 ANDROID: GKI: fs.h: add Android ABI padding to struct file
3b300ff4c5 ANDROID: vendor_hooks: Add a vendor data to file struct
e89b05984d ANDROID: vendor_hooks: Extend the vendor data array in task_struct
7ee8b58cc1 ANDROID: GKI: add fields required to enable CONFIG_TRANSPARENT_HUGEPAGE
0ce2100bcf ANDROID: Drop abi_gki_aarch64_workarounds
f0c4a768cf UPSTREAM: ehci-hcd: Move include to keep CRC stable
5427f8b72f ANDROID: GKI: update xiaomi symbol list
ecb88922f5 ANDROID: GKI: update Vivo symbol list
32b2423372 ANDROID: sysrq: add vendor hook for sysrq crash information

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: Ia8ac3109c49a4866904c4419a17e2379156a8f77
This commit is contained in:
Greg Kroah-Hartman 2020-10-16 08:08:04 +02:00
commit cb547a4e01
24 changed files with 4351 additions and 5008 deletions
Download patch file Download diff file Expand all files Collapse all files

24
include/trace/hooks/sysrqcrash.h Normal file
View file

@ -0,0 +1,24 @@
/* SPDX-License-Identifier: GPL-2.0 */
#undef TRACE_SYSTEM
#define TRACE_SYSTEM sysrqcrash
#define TRACE_INCLUDE_PATH trace/hooks
#if !defined(_TRACE_HOOK_SYSRQCRASH_H) || defined(TRACE_HEADER_MULTI_READ)
#define _TRACE_HOOK_SYSRQCRASH_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_sysrq_crash,
TP_PROTO(void *data),
TP_ARGS(data));
#else
#define trace_android_vh_sysrq_crash(data)
#endif
#endif /* _TRACE_HOOK_SYSRQCRASH_H */
/* This part must be outside protection */
#include <trace/define_trace.h>