diff options
| author | Randy Dunlap <randy.dunlap@oracle.com> | 2007-07-26 19:10:35 +0200 |
|---|---|---|
| committer | H. Peter Anvin <hpa@zytor.com> | 2007-07-31 22:18:05 +0200 |
| commit | 8218d029c58b89837a24b4e1362c33d0ba7450b5 (patch) | |
| tree | c455ebfe8bcd0431fd30540fe55485b27339d0ac /arch/i386/boot | |
| parent | Merge master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6.23 (diff) | |
| download | linux-8218d029c58b89837a24b4e1362c33d0ba7450b5.tar.xz linux-8218d029c58b89837a24b4e1362c33d0ba7450b5.zip | |
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/boot')
| -rw-r--r-- | arch/i386/boot/code16gcc.h | 2 | ||||
| -rw-r--r-- | arch/i386/boot/header.S | 2 | ||||
| -rw-r--r-- | arch/i386/boot/pm.c | 2 | ||||
| -rw-r--r-- | arch/i386/boot/video-bios.c | 2 |
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 @@ * code16gcc.h * * This file is -include'd when compiling 16-bit C code. - * Note: this asm() needs to be emitted before gcc omits any code. + * Note: this asm() needs to be emitted before gcc emits any code. * Depending on gcc version, this requires -fno-unit-at-a-time or * -fno-toplevel-reorder. * 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: int $0x13 #endif -# We will have entired with %cs = %ds+0x20, normalize %cs so +# We will have entered with %cs = %ds+0x20, normalize %cs so # it is on par with the other segments. pushw %ds 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) */ static void mask_all_interrupts(void) { - outb(0xff, 0xa1); /* Mask all interrupts on the seconday PIC */ + outb(0xff, 0xa1); /* Mask all interrupts on the secondary PIC */ io_delay(); outb(0xfb, 0x21); /* Mask all but cascade on the primary PIC */ 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) : "+a" (ax) : : "ebx", "ecx", "edx", "esi", "edi"); - do_restore = 1; /* Assume video contents was lost */ + do_restore = 1; /* Assume video contents were lost */ new_mode = ax & 0x7f; /* Not all BIOSes are clean with the top bit */ if (new_mode == mode) |