From 5479e5879caff7935e9ee99904d74f0849c3d682 Mon Sep 17 00:00:00 2001 From: Dan Duval Date: Sun, 4 Dec 2016 12:49:05 -0500 Subject: [PATCH] fix kABI breakage caused by "block: use an atomic_t for mq_freeze_depth" Orabug: 22913653 The aforementioned commit changed the type of "mq_freeze_depth" from "int" to "atomic_t", thereby breaking kABI. The types are the same size, and third-party module code should not be fiddling with this field's value. This commit adds the usual "__GENKSYMS__" armor to hide the type change from the kABI checker. Signed-off-by: Dan Duval --- include/linux/blkdev.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h index f85197afe2570..7cd97608442ba 100644 --- a/include/linux/blkdev.h +++ b/include/linux/blkdev.h @@ -477,7 +477,11 @@ struct request_queue { struct mutex sysfs_lock; int bypass_depth; +#ifdef __GENKSYMS__ + int mq_freeze_depth; +#else atomic_t mq_freeze_depth; +#endif #if defined(CONFIG_BLK_DEV_BSG) bsg_job_fn *bsg_job_fn; -- 2.50.1