From bd041b5977cf46d8a63930cb9eabed56cf679197 Mon Sep 17 00:00:00 2001
From: Greg Kroah-Hartman <gregkh@google.com>
Date: Tue, 5 Sep 2023 15:15:44 +0000
Subject: [PATCH] ANDROID: GKI: Fix block/genhd.c exports from having their CRC
 changed

Commit aa07e56c6a9c ("block: fix blktrace debugfs entries leakage")
added a new #include line, which ends up dragging in more structures
which changes the CRC abi for all functions exported in bloc/genhd.c

Fix this up by only including that file if the CRC checker is not being
run at the moment, preserving the CRC properly

Bug: 161946584
Fixes: aa07e56c6a9c ("block: fix blktrace debugfs entries leakage")
Change-Id: I46aa843c28f36c9ac1d83fc28e80b25ba757ff4c
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
---
 block/genhd.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/block/genhd.c b/block/genhd.c
index afab646d12c8..0c00489b9731 100644
--- a/block/genhd.c
+++ b/block/genhd.c
@@ -25,7 +25,9 @@
 #include <linux/pm_runtime.h>
 #include <linux/badblocks.h>
 #include <linux/part_stat.h>
+#ifndef __GENKSYMS__
 #include <linux/blktrace_api.h>
+#endif
 
 #include "blk-throttle.h"
 #include "blk.h"