diff --git a/include/linux/blk_types.h b/include/linux/blk_types.h
index a0ec5ff216ff16a25725a18e7c9049a81507666e..b23db4257a24f5fd3e934056e96e24c56fad3c4e 100644
--- a/include/linux/blk_types.h
+++ b/include/linux/blk_types.h
@@ -234,9 +234,6 @@ struct bio {
 	 */
 	struct blkcg_gq		*bi_blkg;
 	struct bio_issue	bi_issue;
-#ifdef CONFIG_BLK_CGROUP_IOCOST
-	u64			bi_iocost_cost;
-#endif
 #endif
 
 #ifdef CONFIG_BLK_INLINE_ENCRYPTION
@@ -263,7 +260,11 @@ struct bio {
 
 	struct bio_set		*bi_pool;
 
+#ifdef CONFIG_BLK_CGROUP_IOCOST
+	KABI_USE(1, u64 bi_iocost_cost)
+#else
 	KABI_RESERVE(1)
+#endif
 	KABI_RESERVE(2)
 	KABI_RESERVE(3)
 	KABI_RESERVE(4)