From 02a7ee2f6e5b1920eae7443b05a1955319f6147a Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Fri, 1 May 2020 16:44:20 +0200 Subject: [PATCH] ANDROID: GKI: scsi.h: add Android ABI padding to a structure Try to mitigate potential future driver core api changes by adding a padding to struct scsi_disk. Based on a change made to the RHEL/CENTOS 8 kernel. Bug: 151154716 Signed-off-by: Greg Kroah-Hartman Change-Id: I1191c786cb341df43a40fa1a82789759b0f431cf --- drivers/scsi/sd.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/scsi/sd.h b/drivers/scsi/sd.h index 50fff0bf8c8e..048cf39647e5 100644 --- a/drivers/scsi/sd.h +++ b/drivers/scsi/sd.h @@ -116,6 +116,9 @@ struct scsi_disk { unsigned urswrz : 1; unsigned security : 1; unsigned ignore_medium_access_errors : 1; + + ANDROID_KABI_RESERVE(1); + ANDROID_KABI_RESERVE(2); }; #define to_scsi_disk(obj) container_of(obj,struct scsi_disk,dev)