mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-28 18:51:56 -04:00
Merge android11-5.4.61+ (45adb81) into msm-5.4
* refs/heads/tmp-45adb81 ANDROID: ABI: refresh with latest libabigail 94f5d4ae ANDROID: vendor_hooks: Add vendor hooks for getting printk messages ANDROID: ABI: add already existing symbols of mali_gondul.ko to unisoc Revert "ANDROID: vendor_hooks: Add vendor hooks for key combination" ANDROID: Setting up GS before calling __restore_processor_state. FROMGIT: binder: print warnings when detecting oneway spamming. ANDROID: Address flaky behaviour in genksyms affecting CRC stability. Revert "Revert "BACKPORT: net: core: use listified Rx for GRO_NORMAL in napi_gro_receive()"" ANDROID: ABI: update allowed list for QCOM Change-Id: I540875bd86481c7f9288913943493b7535833d8d Signed-off-by: Blagovest Kolenichev <[email protected]>
This commit is contained in:
commit
3e334f26d5
16 changed files with 3542 additions and 6386 deletions
|
|
@ -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) {
|
||||
/*
|
||||
|
|
|
|||
Loading…
Reference in a new issue