From 4a0deeccb3b51ec2c209ead8b28d01141d90a43c Mon Sep 17 00:00:00 2001 From: Todd Kjos Date: Thu, 2 Jun 2022 14:48:33 -0700 Subject: [PATCH] Revert "ANDROID: GKI: Add ANDROID_OEM_DATA in struct blk_mq_ctx" This reverts commit 7f6e518e432d8d4f6a4c0ad2135e097e5d83399d. Breaks KMI, should not have merged Change-Id: I23d7a9d9d9506a98c916c22a6e3b9fbe38b914c7 --- block/blk-mq.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/block/blk-mq.h b/block/blk-mq.h index f302e9cb40e4..7cdca23b6263 100644 --- a/block/blk-mq.h +++ b/block/blk-mq.h @@ -35,8 +35,6 @@ 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);