From 93d8bbeafbd449560d9b110a09ee033d5ac89987 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Tue, 19 Apr 2022 15:27:31 +0200 Subject: [PATCH] ANDROID: GKI: fix crc issue with commit 2e76c69c85f9 ("block: don't merge across cgroup boundaries if blkcg is enabled") Commit 2e76c69c85f9 ("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: 2e76c69c85f9 ("block: don't merge across cgroup boundaries if blkcg is enabled") Signed-off-by: Greg Kroah-Hartman Change-Id: Id4e79ea9f4edbf41b0ada4df964490ab336dd8f4 --- block/blk-merge.c | 2 ++ include/linux/blk-cgroup.h | 2 ++ 2 files changed, 4 insertions(+) diff --git a/block/blk-merge.c b/block/blk-merge.c index bbe66a9010bf..fbf5f61c8b9a 100644 --- a/block/blk-merge.c +++ b/block/blk-merge.c @@ -7,7 +7,9 @@ #include #include #include +#ifndef __GENKSYMS__ #include +#endif #include diff --git a/include/linux/blk-cgroup.h b/include/linux/blk-cgroup.h index bc5c04d711bb..e538b525b34f 100644 --- a/include/linux/blk-cgroup.h +++ b/include/linux/blk-cgroup.h @@ -24,7 +24,9 @@ #include #include #include +#ifndef __GENKSYMS__ #include +#endif /* percpu_counter batch for blkg_[rw]stats, per-cpu drift doesn't matter */ #define BLKG_STAT_CPU_BATCH (INT_MAX / 2)