linux-kernel - [tip:x86/boot] x86/boot/doc: Fix grammar and typo in boot.txt

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <tip-c6039f4a00901259517b7c027007697105209968@git.kernel.org>
Date:	Fri, 26 Oct 2012 04:16:30 -0700
From:	tip-bot for Kees Cook <keescook@...omium.org>
To:	linux-tip-commits@...r.kernel.org
Cc:	linux-kernel@...r.kernel.org, hpa@...or.com, mingo@...nel.org,
	keescook@...omium.org, tglx@...utronix.de, rob@...dley.net
Subject: [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 <keescook@...omium.org>
AuthorDate: Thu, 25 Oct 2012 20:17:02 -0700
Committer:  Ingo Molnar <mingo@...nel.org>
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 <keescook@...omium.org>
Cc: Rob Landley <rob@...dley.net>
Link: http://lkml.kernel.org/r/20121026031702.GA23828@www.outflux.net
Signed-off-by: Ingo Molnar <mingo@...nel.org>
---
 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 9efceff..f15cb74 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.
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/