summaryrefslogtreecommitdiffstats
path: root/sys/boot/pc98/boot2
diff options
context:
space:
mode:
authorjhb <jhb@FreeBSD.org>2007-10-24 04:03:25 +0000
committerjhb <jhb@FreeBSD.org>2007-10-24 04:03:25 +0000
commit67997e41d53c8ad1c2b5042fbb90c1324c017ac4 (patch)
treefdf38b4daaca0d3bae26f2cebbfb7bbbf5eb115e /sys/boot/pc98/boot2
parent9bc0f4c6a443721979818bca4ed522cc2dcb24f3 (diff)
downloadFreeBSD-src-67997e41d53c8ad1c2b5042fbb90c1324c017ac4.zip
FreeBSD-src-67997e41d53c8ad1c2b5042fbb90c1324c017ac4.tar.gz
Slightly cleanup the 'bootdev' concept on x86 by changing the various
macros to treat the 'slice' field as a real part of the bootdev instead of as hack that spans two other fields (adaptor (sic) and controller) that are not used in any modern FreeBSD boot code. MFC after: 1 week
Diffstat (limited to 'sys/boot/pc98/boot2')
-rw-r--r--sys/boot/pc98/boot2/boot.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sys/boot/pc98/boot2/boot.c b/sys/boot/pc98/boot2/boot.c
index f350b91..4bdfbef 100644
--- a/sys/boot/pc98/boot2/boot.c
+++ b/sys/boot/pc98/boot2/boot.c
@@ -294,7 +294,7 @@ loadprog(void)
* For backwards compatibility, use the previously-unused adaptor
* and controller bitfields to hold the slice number.
*/
- bootdev = MAKEBOOTDEV(maj, (slice >> 4), slice & 0xf, unit, part);
+ bootdev = MAKEBOOTDEV(maj, slice, unit, part);
bootinfo.bi_version = BOOTINFO_VERSION;
bootinfo.bi_kernelname = (u_int32_t)(name + ouraddr);
OpenPOWER on IntegriCloud