diff options
| author | Dan McDonald <danmcd@joyent.com> | 2020-12-02 10:19:05 -0500 |
|---|---|---|
| committer | Dan McDonald <danmcd@joyent.com> | 2020-12-02 10:19:06 -0500 |
| commit | d79b46fa6a6b38bd45268af896a043dde714b38a (patch) | |
| tree | 60bcbe653139d492d2bfcc23141f3c039457bf38 /usr/src/uts/common/sys | |
| parent | 99f76d09704e2a55d2d5fda310f907fdfbdf0684 (diff) | |
| parent | 7b4214534ccdf6f8aa6e566d7501aab328c72e84 (diff) | |
| download | illumos-joyent-release-20201203.tar.gz | |
[illumos-gate merge]release-20201203
commit 7b4214534ccdf6f8aa6e566d7501aab328c72e84
13324 struct dk_minfo_ext size differences trigger SSP in libfdisk
commit 63f9f2ff473e9cb7f455f032fe3d04a95ec4b537
13332 loader: iterate consoles to draw loader menu screen
Conflicts:
usr/src/boot/sys/boot/forth/support.4th
usr/src/boot/sys/boot/forth/Makefile.inc
Diffstat (limited to 'usr/src/uts/common/sys')
| -rw-r--r-- | usr/src/uts/common/sys/dkio.h | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/usr/src/uts/common/sys/dkio.h b/usr/src/uts/common/sys/dkio.h index 9d88731c5d..e66551fc6d 100644 --- a/usr/src/uts/common/sys/dkio.h +++ b/usr/src/uts/common/sys/dkio.h @@ -356,6 +356,23 @@ struct dk_minfo_ext { uint_t dki_pbsize; /* Physical blocksize of media */ }; +#ifdef _KERNEL + +/* + * The 32-bit version of the media info API did not end up with a consistent + * size in an ILP32 and LP64 interface. While the actual offsets of the members + * are the same, the resulting structure size is not. + */ +#pragma pack(4) +struct dk_minfo_ext32 { + uint_t dki_media_type; /* Media type or profile info */ + uint_t dki_lbsize; /* Logical blocksize of media */ + diskaddr_t dki_capacity; /* Capacity as # of dki_lbsize blks */ + uint_t dki_pbsize; /* Physical blocksize of media */ +}; +#pragma pack() +#endif + /* * Media types or profiles known */ |