diff options
| author | Kees Cook <keescook@chromium.org> | 2012-10-25 20:17:02 -0700 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2012-10-26 12:18:38 +0200 |
| commit | c6039f4a00901259517b7c027007697105209968 (patch) | |
| tree | 63e2b8a9b8dcb548552fd5c4bc28399aea1e9698 /Documentation/x86 | |
| parent | 2ab3f29dddfb444c9fcc0a2f3a56ed4bdba41969 (diff) | |
| download | linux-c6039f4a00901259517b7c027007697105209968.tar.gz linux-c6039f4a00901259517b7c027007697105209968.tar.bz2 linux-c6039f4a00901259517b7c027007697105209968.zip | |
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/x86')
| -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 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. |