xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ANDROID: GKI: fix crc issue with commit ce1927b8cf ("block: don't merge across cgroup boundaries if blkcg is enabled")

Browse Source 
Commit ce1927b8cf ("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: ce1927b8cf ("block: don't merge across cgroup boundaries if blkcg is enabled")
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: Id4e79ea9f4edbf41b0ada4df964490ab336dd8f4
This commit is contained in:
Greg Kroah-Hartman
2022-04-19 15:27:31 +02:00
parent 62fa3399b4
commit 0038e1f40c
2 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
block/blk-merge.c
View File

@@ -7,7 +7,9 @@
#include <linux/bio.h> #include <linux/bio.h>
#include <linux/blkdev.h> #include <linux/blkdev.h>
#include <linux/scatterlist.h> #include <linux/scatterlist.h>
#ifndef __GENKSYMS__
#include <linux/blk-cgroup.h> #include <linux/blk-cgroup.h>
#endif
#include <trace/events/block.h> #include <trace/events/block.h>

2
include/linux/blk-cgroup.h
View File

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