From 0a673759df6cfc27271a0fffc8c52b7e61ded8b7 Mon Sep 17 00:00:00 2001
From: Todd Kjos <tkjos@google.com>
Date: Thu, 2 Jun 2022 15:50:40 -0700
Subject: [PATCH] Revert "Revert "ANDROID: GKI: Add ANDROID_OEM_DATA in struct
 blk_mq_ctx""

This reverts commit 443c11e0b16bb99f9f59e563184c86d9e7f10974.

Reinstate patch for June 17 KMI update

Bug: 233781098
Change-Id: I47ebbc6a1cecc363b97e35c10a5e44d7221caa01
---
 block/blk-mq.h | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/block/blk-mq.h b/block/blk-mq.h
index 7cdca23b6263..f302e9cb40e4 100644
--- a/block/blk-mq.h
+++ b/block/blk-mq.h
@@ -35,6 +35,8 @@ struct blk_mq_ctx {
 	struct request_queue	*queue;
 	struct blk_mq_ctxs      *ctxs;
 	struct kobject		kobj;
+
+	ANDROID_OEM_DATA_ARRAY(1, 2);
 } ____cacheline_aligned_in_smp;
 
 void blk_mq_exit_queue(struct request_queue *q);