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-08 12:58:12 -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:

      ANDROID: vendor_hooks: Add vendor hooks for getting printk messages
      ANDROID: ABI: refresh with latest libabigail 94f5d4ae
      ANDROID: ABI: add already existing symbols of mali_gondul.ko to unisoc

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I1a9415ac9e453a6d4f5df19a215ab7dcc02856b8
This commit is contained in:
Greg Kroah-Hartman 2020-09-15 13:31:02 +02:00
commit aab1b68b41
5 changed files with 1235 additions and 3153 deletions
Download patch file Download diff file Expand all files Collapse all files

4369
android/abi_gki_aarch64.xml
View file

File diff suppressed because it is too large Load diff

10
android/abi_gki_aarch64_unisoc
View file

@ -2487,3 +2487,13 @@
# required by sprd_sip_svc.ko
__arm_smccc_smc
# required by mali_gondul.ko
bpf_trace_run5
ktime_get_raw
of_machine_is_compatible
_totalram_pages
trace_output_call
trace_print_array_seq
trace_print_flags_seq
vmf_insert_pfn_prot

1
drivers/android/vendor_hooks.c
View file

@ -55,3 +55,4 @@ EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_alter_rwsem_list_add);
EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_alter_futex_plist_add);
EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_is_fpsimd_save);
EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_ipi_stop);
EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_printk_store);

5
include/trace/hooks/debug.h
View file

@ -15,8 +15,13 @@ struct pt_regs;
DECLARE_HOOK(android_vh_ipi_stop,
TP_PROTO(struct pt_regs *regs),
TP_ARGS(regs))
DECLARE_HOOK(android_vh_printk_store,
TP_PROTO(int facility, int level),
TP_ARGS(facility, level))
#else
#define trace_android_vh_ipi_stop(regs)
#define trace_android_vh_printk_store(facility, level)
#endif
#endif /* _TRACE_HOOK_DEBUG_H */

3
kernel/printk/printk.c
View file

@ -55,6 +55,8 @@
#include <trace/events/initcall.h>
#define CREATE_TRACE_POINTS
#include <trace/events/printk.h>
#undef CREATE_TRACE_POINTS
#include <trace/hooks/debug.h>
#include "console_cmdline.h"
#include "braille.h"
@ -2007,6 +2009,7 @@ asmlinkage int vprintk_emit(int facility, int level,
pending_output = (curr_log_seq != log_next_seq);
logbuf_unlock_irqrestore(flags);
trace_android_vh_printk_store(facility, level);
/* If called from the scheduler, we can not call up(). */
if (!in_sched && pending_output) {
/*