Mercurial > illumos > illumos-gate
changeset 4661:44ad046d354c
6510526 Solaris grub, fdisk and Windows vista bootloader will not go together. (fix cstyle/lint)
| author | mg147109 |
|---|---|
| date | Sun, 15 Jul 2007 12:29:45 -0700 |
| parents | a454b7c72f51 |
| children | 9c48274ded8b |
| files | usr/src/uts/common/sys/dktp/fdisk.h |
| diffstat | 1 files changed, 6 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/usr/src/uts/common/sys/dktp/fdisk.h Sat Jul 14 19:40:41 2007 -0700 +++ b/usr/src/uts/common/sys/dktp/fdisk.h Sun Jul 15 12:29:45 2007 -0700 @@ -127,13 +127,16 @@ * structure to hold master boot block in physical sector 0 of the disk. * Note that partitions stuff can't be directly included in the structure * because of lameo '386 compiler alignment design. + * Alignment issues also force us to have 2 16bit entities for a single + * 32bit win_volserno. It is not used anywhere anyway. */ struct mboot { /* master boot block */ - char bootinst[BOOTSZ]; - uint32_t win_volserno; + char bootinst[BOOTSZ]; + uint16_t win_volserno_lo; + uint16_t win_volserno_hi; uint16_t reserved; - char parts[FD_NUMPART * sizeof (struct ipart)]; + char parts[FD_NUMPART * sizeof (struct ipart)]; ushort_t signature; };