summaryrefslogtreecommitdiff
path: root/stand
diff options
context:
space:
mode:
authorBaptiste Daroussin <bapt@FreeBSD.org>2020-06-22 07:46:24 +0000
committerBaptiste Daroussin <bapt@FreeBSD.org>2020-06-22 07:46:24 +0000
commit5b990a9463bc31358684aa1f363ab131bd47c673 (patch)
treee84a69b7c270fecfced1cdbaa0793405dc57105f /stand
parentb158cfb3fcfd44bfb327ae1da5a696933ed4a02e (diff)
downloadsrc-test-5b990a9463bc31358684aa1f363ab131bd47c673.tar.gz
src-test-5b990a9463bc31358684aa1f363ab131bd47c673.zip
Revert r362466
Such change should not have happen without prior discussion and review. With hat: transitioning core
Notes
Notes: svn path=/head/; revision=362488
Diffstat (limited to 'stand')
-rw-r--r--stand/efi/include/efipart.h4
-rw-r--r--stand/i386/boot0/boot0.S4
2 files changed, 4 insertions, 4 deletions
diff --git a/stand/efi/include/efipart.h b/stand/efi/include/efipart.h
index 665144188eae3..ef1a8709d91b9 100644
--- a/stand/efi/include/efipart.h
+++ b/stand/efi/include/efipart.h
@@ -18,7 +18,7 @@ Module Name:
efipart.h
Abstract:
- Info about disk partitions and Main Boot Records
+ Info about disk partitions and Master Boot Records
@@ -62,7 +62,7 @@ typedef struct {
UINT8 Unknown[2];
MBR_PARTITION_RECORD Partition[MAX_MBR_PARTITIONS];
UINT16 Signature;
-} MAIN_BOOT_RECORD;
+} MASTER_BOOT_RECORD;
#pragma pack()
diff --git a/stand/i386/boot0/boot0.S b/stand/i386/boot0/boot0.S
index 7db1edd26e46d..708f0934c4277 100644
--- a/stand/i386/boot0/boot0.S
+++ b/stand/i386/boot0/boot0.S
@@ -53,7 +53,7 @@
/*
* BOOT BLOCK STRUCTURE
*
- * This code implements a Main Boot Record (MBR) for an Intel/PC disk.
+ * This code implements a Master Boot Record (MBR) for an Intel/PC disk.
* It is 512 bytes long and it is normally loaded by the BIOS (or another
* bootloader) at 0:0x7c00. This code depends on %cs:%ip being 0:0x7c00
*
@@ -68,7 +68,7 @@
* (called 'packet') or CHS mode, whether to force a drive number,
* and whether to write back the user's selection back to disk.
*
- * As in every Main Boot Record, the partition table is at 0x1be,
+ * As in every Master Boot Record, the partition table is at 0x1be,
* made of four 16-byte entries each containing:
*
* OFF SIZE DESCRIPTION