x86, doc: fix grammar and typo in boot.txt
PATCH 1/1 x86, doc: fix grammar and typo in boot.txt
Fixes some minor issues in the x86 boot documentation.
Signed-off-by Kees Cook <[email protected]>
--- Documentation/x86/boot.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
Documentation/x86/boot.txt +2 -2
@@ -1013,7 +1013,7 @@ boot_params as that of 16-bit boot protocol, the boot loader should also fill the additional fields of the struct boot_params as that described in zero-page.txt. -After setupping the struct boot_params, the boot loader can load the +After setting up the struct boot_params, the boot loader can load the 32/64-bit kernel in the same way as that of 16-bit boot protocol. 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 At entry, the CPU must be in 32-bit protected mode with paging disabled; a GDT must be loaded with the descriptors for selectors __BOOT_CS(0x10) and __BOOT_DS(0x18); both descriptors must be 4G flat -segment; __BOOS_CS must have execute/read permission, and __BOOT_DS +segment; __BOOT_CS must have execute/read permission, and __BOOT_DS must have read/write permission; CS must be __BOOT_CS and DS, ES, SS must be __BOOT_DS; interrupt must be disabled; %esi must hold the base address of the struct boot_params; %ebp, %edi and %ebx must be zero.
Signature · 6 lines
1.7.9.5 -- Kees Cook Chrome OS Security
[tip:x86/boot] x86/boot/doc: Fix grammar and typo in boot.txt
Commit-ID: c6039f4a00901259517b7c027007697105209968 Gitweb: http://git.kernel.org/tip/c6039f4a00901259517b7c027007697105209968 Author: Kees Cook <[email protected]> AuthorDate: Thu, 25 Oct 2012 20:17:02 -0700 Committer: Ingo Molnar <[email protected]> CommitDate: Fri, 26 Oct 2012 12:18:38 +0200
x86/boot/doc: Fix grammar and typo in boot.txt
Fixes some minor issues in the x86 boot documentation.
Signed-off-by Kees Cook <[email protected]>
Cc Rob Landley <[email protected]>
Signed-off-by Ingo Molnar <[email protected]>
--- Documentation/x86/boot.txt | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)
Documentation/x86/boot.txt +2 -2
@@ -1013,7 +1013,7 @@ boot_params as that of 16-bit boot protocol, the boot loader should also fill the additional fields of the struct boot_params as that described in zero-page.txt. -After setupping the struct boot_params, the boot loader can load the +After setting up the struct boot_params, the boot loader can load the 32/64-bit kernel in the same way as that of 16-bit boot protocol. 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 At entry, the CPU must be in 32-bit protected mode with paging disabled; a GDT must be loaded with the descriptors for selectors __BOOT_CS(0x10) and __BOOT_DS(0x18); both descriptors must be 4G flat -segment; __BOOS_CS must have execute/read permission, and __BOOT_DS +segment; __BOOT_CS must have execute/read permission, and __BOOT_DS must have read/write permission; CS must be __BOOT_CS and DS, ES, SS must be __BOOT_DS; interrupt must be disabled; %esi must hold the base address of the struct boot_params; %ebp, %edi and %ebx must be zero.