anierin/msm-5.15
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ANDROID: random: fix CRC issues with the merge

Browse Source 
The upstream commit 9342656c01 ("random: remove unused tracepoints")
removed the random.h tracepoints which lead to CRC differences for the
following symbols:

    add_random_ready_callback()
    del_random_ready_callback()

If I add back #includes <linux/writeback.h> which is what was included
by the random.h tracepoint header, then the CRCs match the original CRC
values for those two functions above. This is necessary to retain GKI
compatibility.

Fixes: 9342656c013d ("random: remove unused tracepoints")
Change-Id: I52422404ec46273cc686d1930102e066cef05eb0
Signed-off-by: Will McVicker <willmcvicker@google.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
This commit is contained in:
Will McVicker
2022-07-14 17:08:07 -07:00
committed by Greg Kroah-Hartman
parent ca927bd22a
commit 89f568d282
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/char/random.c
View File

@@ -60,6 +60,10 @@
#include <asm/irq_regs.h>
#include <asm/io.h>
// GKI: Keep this header to retain the original CRC that previously used the
// random.h tracepoints.
#include <linux/writeback.h>
/*********************************************************************
*
* Initialization and readiness waiting.