aboutsummaryrefslogtreecommitdiffstats
path: root/Documentation/x86
diff options
context:
space:
mode:
Diffstat (limited to 'Documentation/x86')
-rw-r--r--Documentation/x86/boot.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/x86/boot.txt b/Documentation/x86/boot.txt
index 9a89e01d9bce..406d82d5d2bb 100644
--- a/Documentation/x86/boot.txt
+++ b/Documentation/x86/boot.txt
@@ -1014,7 +1014,7 @@ boot_params as that of 16-bit boot protocol, the boot loader should
1014also fill the additional fields of the struct boot_params as that 1014also fill the additional fields of the struct boot_params as that
1015described in zero-page.txt. 1015described in zero-page.txt.
1016 1016
1017After setupping the struct boot_params, the boot loader can load the 1017After setting up the struct boot_params, the boot loader can load the
101832/64-bit kernel in the same way as that of 16-bit boot protocol. 101832/64-bit kernel in the same way as that of 16-bit boot protocol.
1019 1019
1020In 32-bit boot protocol, the kernel is started by jumping to the 1020In 32-bit boot protocol, the kernel is started by jumping to the
@@ -1024,7 +1024,7 @@ In 32-bit boot protocol, the kernel is started by jumping to the
1024At entry, the CPU must be in 32-bit protected mode with paging 1024At entry, the CPU must be in 32-bit protected mode with paging
1025disabled; a GDT must be loaded with the descriptors for selectors 1025disabled; a GDT must be loaded with the descriptors for selectors
1026__BOOT_CS(0x10) and __BOOT_DS(0x18); both descriptors must be 4G flat 1026__BOOT_CS(0x10) and __BOOT_DS(0x18); both descriptors must be 4G flat
1027segment; __BOOS_CS must have execute/read permission, and __BOOT_DS 1027segment; __BOOT_CS must have execute/read permission, and __BOOT_DS
1028must have read/write permission; CS must be __BOOT_CS and DS, ES, SS 1028must have read/write permission; CS must be __BOOT_CS and DS, ES, SS
1029must be __BOOT_DS; interrupt must be disabled; %esi must hold the base 1029must be __BOOT_DS; interrupt must be disabled; %esi must hold the base
1030address of the struct boot_params; %ebp, %edi and %ebx must be zero. 1030address of the struct boot_params; %ebp, %edi and %ebx must be zero.