shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-05 10:31:46 +09:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
This reverts commit 93d8bbeafb.

It is no longer needed as we are able to update the abi at this point in
time.

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I965b9e7225127b5b0e58082e05d80bcebdb1e547
This commit is contained in:
Greg Kroah-Hartman
2022-04-20 12:33:23 +02:00
committed by Todd Kjos
parent 6bfa0e0bc8
commit 574f2b7533
2 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
block/blk-merge.c
View File

@@ -7,9 +7,7 @@
#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

@@ -24,9 +24,7 @@
#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)