From: Joe Jin Date: Tue, 14 Jun 2016 07:13:33 +0000 (+0800) Subject: Fix kabi issue for upstream commit ca369d51 X-Git-Tag: v4.1.12-92~103^2 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=d99dfed312ee8e3d6735baa5c1fe4744003f20eb;p=users%2Fjedix%2Flinux-maple.git Fix kabi issue for upstream commit ca369d51 Orabug: 23615929 When backport upstream commit ca369d51 'block/sd: Fix device-imposed transfer length limits' it broken kabi, this patch fix kabi issue. Signed-off-by: Joe Jin --- diff --git a/drivers/scsi/sd.h b/drivers/scsi/sd.h index 6932b6da9847..8943b7392355 100644 --- a/drivers/scsi/sd.h +++ b/drivers/scsi/sd.h @@ -101,7 +101,7 @@ struct scsi_disk { * allow extending the structure while preserving ABI. */ - UEK_KABI_RESERVED(1) + UEK_KABI_USE2(1, u32 opt_xfer_blocks, u32 unuse); UEK_KABI_RESERVED(2) }; #define to_scsi_disk(obj) container_of(obj,struct scsi_disk,dev) diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h index d78df14d857f..8448f38c3bae 100644 --- a/include/linux/blkdev.h +++ b/include/linux/blkdev.h @@ -313,7 +313,7 @@ struct queue_limits { * The following padding has been inserted before ABI freeze to * allow extending the structure while preserving ABI. */ - UEK_KABI_RESERVED(1) + UEK_KABI_USE2(1, unsigned int max_dev_sectors, unsigned int unuse) UEK_KABI_RESERVED(2) };