A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-11 15:11:48 -04:00
Code Issues Projects Releases Packages Wiki Activity

ANDROID: GKI: genksyms fixup for efed9a3337e3 ("kyber: fix out of bounds access when * preempted")

Browse source 
Commit efed9a3337e3 ("kyber: fix out of bounds access when * preempted")
is in the 5.4.120 release, which causes a CRC issue for genksyms.  Work
around this by just papering over the difference when the crc checker
parses the files.

Bug: 161946584
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: Ib1371d0319797cf9e56110ecb8ef4116870ee777
This commit is contained in:
Greg Kroah-Hartman 2021-05-20 10:53:53 +02:00
commit 33da8c5b3a
1 changed files with 12 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

12
include/linux/elevator.h
View file

@ -35,7 +35,19 @@ struct elevator_mq_ops {
void (*depth_updated)(struct blk_mq_hw_ctx *);
bool (*allow_merge)(struct request_queue *, struct request *, struct bio *);
/*
* CRC "preservation" hack
*
* This is due to efed9a3337e3 ("kyber: fix out of bounds access when * preempted")
* showing up in 5.4.120. It does not actually change anything relevant, but
* the CRC check goes crazy because of it, so paper over it by keeping the old
* signature for when we do the check.
*/
#ifdef __GENKSYMS__
bool (*bio_merge)(struct blk_mq_hw_ctx *, struct bio *, unsigned int);
#else
bool (*bio_merge)(struct request_queue *, struct bio *, unsigned int);
#endif
int (*request_merge)(struct request_queue *q, struct request **, struct bio *);
void (*request_merged)(struct request_queue *, struct request *, enum elv_merge);
void (*requests_merged)(struct request_queue *, struct request *, struct request *);