diff options
author | Kees Cook <keescook@chromium.org> | 2012-10-25 23:17:02 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2012-10-26 06:18:38 -0400 |
commit | c6039f4a00901259517b7c027007697105209968 (patch) | |
tree | 63e2b8a9b8dcb548552fd5c4bc28399aea1e9698 /Documentation | |
parent | 2ab3f29dddfb444c9fcc0a2f3a56ed4bdba41969 (diff) |
x86/boot/doc: Fix grammar and typo in boot.txt
Fixes some minor issues in the x86 boot documentation.
Signed-off-by: Kees Cook <keescook@chromium.org>
Cc: Rob Landley <rob@landley.net>
Link: http://lkml.kernel.org/r/20121026031702.GA23828@www.outflux.net
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'Documentation')
-rw-r--r-- | Documentation/x86/boot.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/x86/boot.txt b/Documentation/x86/boot.txt index 9efceff51bfb..f15cb74c4f78 100644 --- a/Documentation/x86/boot.txt +++ b/Documentation/x86/boot.txt | |||
@@ -1013,7 +1013,7 @@ boot_params as that of 16-bit boot protocol, the boot loader should | |||
1013 | also fill the additional fields of the struct boot_params as that | 1013 | also fill the additional fields of the struct boot_params as that |
1014 | described in zero-page.txt. | 1014 | described in zero-page.txt. |
1015 | 1015 | ||
1016 | After setupping the struct boot_params, the boot loader can load the | 1016 | After setting up the struct boot_params, the boot loader can load the |
1017 | 32/64-bit kernel in the same way as that of 16-bit boot protocol. | 1017 | 32/64-bit kernel in the same way as that of 16-bit boot protocol. |
1018 | 1018 | ||
1019 | In 32-bit boot protocol, the kernel is started by jumping to the | 1019 | In 32-bit boot protocol, the kernel is started by jumping to the |
@@ -1023,7 +1023,7 @@ In 32-bit boot protocol, the kernel is started by jumping to the | |||
1023 | At entry, the CPU must be in 32-bit protected mode with paging | 1023 | At entry, the CPU must be in 32-bit protected mode with paging |
1024 | disabled; a GDT must be loaded with the descriptors for selectors | 1024 | disabled; a GDT must be loaded with the descriptors for selectors |
1025 | __BOOT_CS(0x10) and __BOOT_DS(0x18); both descriptors must be 4G flat | 1025 | __BOOT_CS(0x10) and __BOOT_DS(0x18); both descriptors must be 4G flat |
1026 | segment; __BOOS_CS must have execute/read permission, and __BOOT_DS | 1026 | segment; __BOOT_CS must have execute/read permission, and __BOOT_DS |
1027 | must have read/write permission; CS must be __BOOT_CS and DS, ES, SS | 1027 | must have read/write permission; CS must be __BOOT_CS and DS, ES, SS |
1028 | must be __BOOT_DS; interrupt must be disabled; %esi must hold the base | 1028 | must be __BOOT_DS; interrupt must be disabled; %esi must hold the base |
1029 | address of the struct boot_params; %ebp, %edi and %ebx must be zero. | 1029 | address of the struct boot_params; %ebp, %edi and %ebx must be zero. |