diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-31 15:51:37 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-31 15:51:37 -0700 |
| commit | 8ddf83fed6c283dd941ca76ae715eb268ee8c04e (patch) | |
| tree | 309628fccc4ec213afd8ebd28181703050bb046a /arch/i386/boot | |
| parent | 0d6caa1795090bd22ede96b84daa4600b63eee37 (diff) | |
| parent | ff659d13ed91dd0b237064aba91a5259f827aeb3 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/hpa/linux-2.6-x86setup
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/hpa/linux-2.6-x86setup:
[x86 setup] EDD: Fix the computation of the MBR sector buffer
[x86 setup] Newline after setup signature failure message
x86 boot code comments typos
Diffstat (limited to 'arch/i386/boot')
| -rw-r--r-- | arch/i386/boot/code16gcc.h | 2 | ||||
| -rw-r--r-- | arch/i386/boot/edd.c | 5 | ||||
| -rw-r--r-- | arch/i386/boot/header.S | 4 | ||||
| -rw-r--r-- | arch/i386/boot/pm.c | 2 | ||||
| -rw-r--r-- | arch/i386/boot/video-bios.c | 2 |
5 files changed, 8 insertions, 7 deletions
diff --git a/arch/i386/boot/code16gcc.h b/arch/i386/boot/code16gcc.h index 3bd848093b9..d93e48010b6 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/edd.c b/arch/i386/boot/edd.c index 25a282494f4..77d92daf792 100644 --- a/arch/i386/boot/edd.c +++ b/arch/i386/boot/edd.c @@ -72,17 +72,18 @@ static u32 read_mbr_sig(u8 devno, struct edd_info *ei) u32 mbrsig; u32 buf_base, mbr_base; extern char _end[]; - static char mbr_buf[1024]; sector_size = ei->params.bytes_per_sector; if (!sector_size) sector_size = 512; /* Best available guess */ + /* Produce a naturally aligned buffer on the heap */ buf_base = (ds() << 4) + (u32)&_end; mbr_base = (buf_base+sector_size-1) & ~(sector_size-1); - mbrbuf_ptr = mbr_buf + (mbr_base-buf_base); + mbrbuf_ptr = _end + (mbr_base-buf_base); mbrbuf_end = mbrbuf_ptr + sector_size; + /* Make sure we actually have space on the heap... */ if (!(boot_params.hdr.loadflags & CAN_USE_HEAP)) return 0; if (mbrbuf_end > (char *)(size_t)boot_params.hdr.heap_end_ptr) diff --git a/arch/i386/boot/header.S b/arch/i386/boot/header.S index 6b9923fb6ea..7f4a2c53bd7 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 @@ -280,4 +280,4 @@ die: .section ".initdata", "a" setup_corrupt: .byte 7 - .string "No setup signature found..." + .string "No setup signature found...\n" diff --git a/arch/i386/boot/pm.c b/arch/i386/boot/pm.c index 1df025c7326..6be9ca811d1 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 afea46c500c..68e65d95cdf 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) |