From ebc9fb07d294cc27587d08866f0c0f2321bded54 Mon Sep 17 00:00:00 2001
From: Will McVicker <willmcvicker@google.com>
Date: Thu, 14 Jul 2022 17:08:07 -0700
Subject: [PATCH] ANDROID: random: fix CRC issues with the merge
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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>
---
 drivers/char/random.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/drivers/char/random.c b/drivers/char/random.c
index 550cf8894ee6..144134197ac3 100644
--- a/drivers/char/random.c
+++ b/drivers/char/random.c
@@ -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.