Commit 347d6f40 authored Apr 19, 2022 by Greg Kroah-Hartman

ANDROID: GKI: fix crc issue with commit 3f91687e ("block: don't merge...

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

Commit 3f91687e ("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: 3f91687e ("block: don't merge across cgroup boundaries if blkcg is enabled")
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: Id4e79ea9f4edbf41b0ada4df964490ab336dd8f4

parent ebb848e7

block/blk-merge.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -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>

include/linux/blk-cgroup.h

+2 −0

Original line number	Diff line number	Diff line
		@@ -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)