lisa/android_kernel_xiaomi_sm8350
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Commit 3f91687e6e ("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.

Fixes: 3f91687e6e ("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 ebb848e772
commit 347d6f40b8
2 changed files with 4 additions and 0 deletions
Show Stats 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/blkdev.h>
#include <linux/scatterlist.h>
#ifndef __GENKSYMS__
#include <linux/blk-cgroup.h>
#endif
#include <trace/events/block.h>

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

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