aboutsummaryrefslogtreecommitdiffstats
path: root/arch/i386
diff options
context:
space:
mode:
authorRandy Dunlap <randy.dunlap@oracle.com>2007-07-26 13:10:35 -0400
committerH. Peter Anvin <hpa@zytor.com>2007-07-31 16:18:05 -0400
commit8218d029c58b89837a24b4e1362c33d0ba7450b5 (patch)
treec455ebfe8bcd0431fd30540fe55485b27339d0ac /arch/i386
parent6a302358d87fedaf7bda12b8e909265ebf1ce674 (diff)
x86 boot code comments typos
Fix comments typos in new x86 boot code. Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com> Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Diffstat (limited to 'arch/i386')
-rw-r--r--arch/i386/boot/code16gcc.h2
-rw-r--r--arch/i386/boot/header.S2
-rw-r--r--arch/i386/boot/pm.c2
-rw-r--r--arch/i386/boot/video-bios.c2
4 files changed, 4 insertions, 4 deletions
diff --git a/arch/i386/boot/code16gcc.h b/arch/i386/boot/code16gcc.h
index 3bd848093b9d..d93e48010b61 100644
--- a/arch/i386/boot/code16gcc.h
+++ b/arch/i386/boot/code16gcc.h
@@ -2,7 +2,7 @@
2 * code16gcc.h 2 * code16gcc.h
3 * 3 *
4 * This file is -include'd when compiling 16-bit C code. 4 * This file is -include'd when compiling 16-bit C code.
5 * Note: this asm() needs to be emitted before gcc omits any code. 5 * Note: this asm() needs to be emitted before gcc emits any code.
6 * Depending on gcc version, this requires -fno-unit-at-a-time or 6 * Depending on gcc version, this requires -fno-unit-at-a-time or
7 * -fno-toplevel-reorder. 7 * -fno-toplevel-reorder.
8 * 8 *
diff --git a/arch/i386/boot/header.S b/arch/i386/boot/header.S
index 6b9923fb6eae..32ce54a03d23 100644
--- a/arch/i386/boot/header.S
+++ b/arch/i386/boot/header.S
@@ -225,7 +225,7 @@ start_of_setup:
225 int $0x13 225 int $0x13
226#endif 226#endif
227 227
228# We will have entired with %cs = %ds+0x20, normalize %cs so 228# We will have entered with %cs = %ds+0x20, normalize %cs so
229# it is on par with the other segments. 229# it is on par with the other segments.
230 pushw %ds 230 pushw %ds
231 pushw $setup2 231 pushw $setup2
diff --git a/arch/i386/boot/pm.c b/arch/i386/boot/pm.c
index 1df025c73261..6be9ca811d17 100644
--- a/arch/i386/boot/pm.c
+++ b/arch/i386/boot/pm.c
@@ -80,7 +80,7 @@ static void move_kernel_around(void)
80 */ 80 */
81static void mask_all_interrupts(void) 81static void mask_all_interrupts(void)
82{ 82{
83 outb(0xff, 0xa1); /* Mask all interrupts on the seconday PIC */ 83 outb(0xff, 0xa1); /* Mask all interrupts on the secondary PIC */
84 io_delay(); 84 io_delay();
85 outb(0xfb, 0x21); /* Mask all but cascade on the primary PIC */ 85 outb(0xfb, 0x21); /* Mask all but cascade on the primary PIC */
86 io_delay(); 86 io_delay();
diff --git a/arch/i386/boot/video-bios.c b/arch/i386/boot/video-bios.c
index afea46c500cc..68e65d95cdfd 100644
--- a/arch/i386/boot/video-bios.c
+++ b/arch/i386/boot/video-bios.c
@@ -44,7 +44,7 @@ static int set_bios_mode(u8 mode)
44 : "+a" (ax) 44 : "+a" (ax)
45 : : "ebx", "ecx", "edx", "esi", "edi"); 45 : : "ebx", "ecx", "edx", "esi", "edi");
46 46
47 do_restore = 1; /* Assume video contents was lost */ 47 do_restore = 1; /* Assume video contents were lost */
48 new_mode = ax & 0x7f; /* Not all BIOSes are clean with the top bit */ 48 new_mode = ax & 0x7f; /* Not all BIOSes are clean with the top bit */
49 49
50 if (new_mode == mode) 50 if (new_mode == mode)