ANDROID: GKI: fix crc issue with commit ce1927b ("block: don't merge …

…across cgroup boundaries if blkcg is enabled") Commit ce1927b ("block: don't merge across cgroup boundaries if blkcg is enabled") added some new #include lines, which messes with the crc signatures of over 1400 different functions. Fix this up by marking this off with a __GENKSYMS__ entry. The abi has not changed, only the crc generation, and this change preserves it. Bug: 161946584 Fixes: ce1927b ("block: don't merge across cgroup boundaries if blkcg is enabled") Signed-off-by: Greg Kroah-Hartman <gregkh@google.com> Change-Id: Id4e79ea9f4edbf41b0ada4df964490ab336dd8f4
Forkworks · Apr 20, 2022 · 0038e1f · 0038e1f
1 parent 62fa339
commit 0038e1f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/block/blk-merge.c b/block/blk-merge.c
@@ -7,7 +7,9 @@
 #include <linux/bio.h>
 #include <linux/blkdev.h>
 #include <linux/scatterlist.h>
+#ifndef __GENKSYMS__
 #include <linux/blk-cgroup.h>
+#endif
 
 #include <trace/events/block.h>
 

diff --git a/include/linux/blk-cgroup.h b/include/linux/blk-cgroup.h
@@ -24,7 +24,9 @@
 #include <linux/atomic.h>
 #include <linux/kthread.h>
 #include <linux/fs.h>
+#ifndef __GENKSYMS__
 #include <linux/blk-mq.h>
+#endif
 
 /* percpu_counter batch for blkg_[rw]stats, per-cpu drift doesn't matter */
 #define BLKG_STAT_CPU_BATCH	(INT_MAX / 2)