From 574f2b7533efffedee6cf5901c60cf2127fda5ef Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Wed, 20 Apr 2022 12:33:23 +0200 Subject: [PATCH] Revert "ANDROID: GKI: fix crc issue with commit 2e76c69c85f9 ("block: don't merge across cgroup boundaries if blkcg is enabled")" This reverts commit 93d8bbeafbd449560d9b110a09ee033d5ac89987. It is no longer needed as we are able to update the abi at this point in time. Signed-off-by: Greg Kroah-Hartman Change-Id: I965b9e7225127b5b0e58082e05d80bcebdb1e547 --- block/blk-merge.c | 2 -- include/linux/blk-cgroup.h | 2 -- 2 files changed, 4 deletions(-) diff --git a/block/blk-merge.c b/block/blk-merge.c index fbf5f61c8b9a..bbe66a9010bf 100644 --- a/block/blk-merge.c +++ b/block/blk-merge.c @@ -7,9 +7,7 @@ #include #include #include -#ifndef __GENKSYMS__ #include -#endif #include diff --git a/include/linux/blk-cgroup.h b/include/linux/blk-cgroup.h index e538b525b34f..bc5c04d711bb 100644 --- a/include/linux/blk-cgroup.h +++ b/include/linux/blk-cgroup.h @@ -24,9 +24,7 @@ #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)