From cf3a5bd57b277afdfb505fca3b1fc9b4497aa26d Mon Sep 17 00:00:00 2001 From: Dan Duval Date: Fri, 9 Dec 2016 10:29:57 -0500 Subject: [PATCH] fix kABI breakage caused by "block: generic request_queue reference counting" Orabug: 22913653 Commit 3ef28e83ab15799742e55fd13243a5f678b04242 ("block: generic request_queue reference counting") changed the name of an element of the request_queue structure, and in so doing, broke kABI. This patch uses __GENKSYMS__ to hide the 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 384b67059c83..b9710a2397ca 100644 --- a/include/linux/blkdev.h +++ b/include/linux/blkdev.h @@ -495,7 +495,11 @@ struct request_queue { #endif struct rcu_head rcu_head; wait_queue_head_t mq_freeze_wq; +#ifdef __GENKSYMS__ + struct percpu_ref mq_usage_counter; +#else struct percpu_ref q_usage_counter; +#endif struct list_head all_q_node; struct blk_mq_tag_set *tag_set; -- 2.50.1