diff options
-rw-r--r-- | core/Makefile | 2 | ||||
-rw-r--r-- | core/ldlinux.asm | 2 | ||||
-rw-r--r-- | core/localboot.inc | 4 | ||||
-rw-r--r-- | core/pxelinux.asm | 2 | ||||
-rw-r--r-- | core/runkernel.inc | 2 | ||||
-rw-r--r-- | core/syslinux.ld | 4 | ||||
-rw-r--r-- | doc/SubmittingPatches.txt | 6 | ||||
-rw-r--r-- | doc/gpt.txt | 6 | ||||
-rw-r--r-- | doc/memdisk.txt | 2 | ||||
-rwxr-xr-x | memdisk/fdgeo.pl | 1 | ||||
-rw-r--r-- | memdisk/memcpy.S | 2 | ||||
-rw-r--r-- | memdisk/memset.S | 2 | ||||
-rw-r--r-- | memdisk/setup.c | 2 |
13 files changed, 16 insertions, 21 deletions
diff --git a/core/Makefile b/core/Makefile index 3e58696b..983a3417 100644 --- a/core/Makefile +++ b/core/Makefile @@ -34,7 +34,7 @@ OBJCOPY = objcopy OBJDUMP = objdump OPTFLAGS = -g -Os -march=i386 -falign-functions=0 -falign-jumps=0 -falign-loops=0 -fomit-frame-pointer -INCLUDES = +INCLUDES = CFLAGS = $(M32) -mregparm=3 -DREGPARM=3 -W -Wall -msoft-float $(OPTFLAGS) $(INCLUDES) NASM = nasm diff --git a/core/ldlinux.asm b/core/ldlinux.asm index cb045c83..54dc8fac 100644 --- a/core/ldlinux.asm +++ b/core/ldlinux.asm @@ -1072,7 +1072,7 @@ search_dos_dir: .not_us: popa jmp .nomatch - + .short_entry: test byte [gs:si+11],8 ; Ignore volume labels jnz .nomatch diff --git a/core/localboot.inc b/core/localboot.inc index b6b31deb..ae54737a 100644 --- a/core/localboot.inc +++ b/core/localboot.inc @@ -1,5 +1,5 @@ ; ----------------------------------------------------------------------- -; +; ; Copyright 1999-2008 H. Peter Anvin - All Rights Reserved ; ; This program is free software; you can redistribute it and/or modify @@ -51,7 +51,7 @@ local_boot: jnc .ok dec bp jnz .again - jmp kaboom ; Failure... + jmp kaboom ; Failure... .ok: pop dx cli ; Abandon hope, ye who enter here diff --git a/core/pxelinux.asm b/core/pxelinux.asm index 9e2d2fb3..2c81ec54 100644 --- a/core/pxelinux.asm +++ b/core/pxelinux.asm @@ -1724,7 +1724,7 @@ PXEEntry equ pxenv.jump+1 section .bss alignb 2 PXEStatus resb 2 - + section .text ; diff --git a/core/runkernel.inc b/core/runkernel.inc index abd23782..7ddc7632 100644 --- a/core/runkernel.inc +++ b/core/runkernel.inc @@ -553,7 +553,7 @@ parse_load_initrd: ; Input: InitRD - set to the mangled name of the initrd ; EDI - location to load ; Output: EDI - location for next initrd -; InitRDEnd - updated +; InitRDEnd - updated ; loadinitrd: push ds diff --git a/core/syslinux.ld b/core/syslinux.ld index 66ea5e53..28ef44e9 100644 --- a/core/syslinux.ld +++ b/core/syslinux.ld @@ -13,7 +13,7 @@ SECTIONS { /* "Early" sections (before the load) */ . = 0x0800; - + .earlybss : { __earlybss_start = .; *(.earlybss) @@ -81,7 +81,7 @@ SECTIONS *(.data) __data_end = .; } - __data_len = __data_end - __data_start; + __data_len = __data_end - __data_start; __data_dwords = (__data_len + 3) >> 2; . = ALIGN(4); diff --git a/doc/SubmittingPatches.txt b/doc/SubmittingPatches.txt index 51b78616..d8c6be35 100644 --- a/doc/SubmittingPatches.txt +++ b/doc/SubmittingPatches.txt @@ -160,9 +160,9 @@ Do not send more than 15 patches at once to the vger mailing lists!!! Linus Torvalds is the final arbiter of all changes accepted into the -Linux kernel. His e-mail address is <torvalds@linux-foundation.org>. +Linux kernel. His e-mail address is <torvalds@linux-foundation.org>. He gets a lot of e-mail, so typically you should do your best to -avoid- -sending him e-mail. +sending him e-mail. Patches which are bug fixes, are "obvious" changes, or similarly require little discussion should be sent or CC'd to Linus. Patches @@ -338,7 +338,7 @@ using your real name (sorry, no pseudonyms or anonymous contributions.) Some people also put extra tags at the end. They'll just be ignored for now, but you can do this to mark internal company procedures or just -point out some special detail about the sign-off. +point out some special detail about the sign-off. 13) When to use Acked-by: diff --git a/doc/gpt.txt b/doc/gpt.txt index 42a4da18..14c1ee8e 100644 --- a/doc/gpt.txt +++ b/doc/gpt.txt @@ -61,7 +61,7 @@ The PMBR boot code loads the first sector of the bootable partition, and passes in DL=<disk number>, ES:DI=<pointer to $PnP>, sets EAX to 0x54504721 ("!GPT") and points DS:SI to a structure of the following form: - + Offset Size Contents --------------------------------------------------------- 0 1 0x80 (this is a bootable partition) @@ -86,7 +86,3 @@ also informs the OS that the GPT partition information is present. Currently, this is compatible with Syslinux as long as the Syslinux partition is < 2 TB; this probably will be improved in a future version. - - - - diff --git a/doc/memdisk.txt b/doc/memdisk.txt index 808a9476..304de52b 100644 --- a/doc/memdisk.txt +++ b/doc/memdisk.txt @@ -32,7 +32,7 @@ b) If the disk image is less than 4,194,304 bytes (4096K, 4 MB) it is assumed to be a floppy image and MEMDISK will try to guess its geometry based on the size of the file. MEMDISK recognizes all the standard floppy sizes as well as common extended formats: - + 163,840 bytes (160K) c=40 h=1 s=8 5.25" SSSD 184,320 bytes (180K) c=40 h=1 s=9 5.25" SSSD 327,680 bytes (320K) c=40 h=2 s=8 5.25" DSDD diff --git a/memdisk/fdgeo.pl b/memdisk/fdgeo.pl index 47d19afa..eafef761 100755 --- a/memdisk/fdgeo.pl +++ b/memdisk/fdgeo.pl @@ -51,4 +51,3 @@ if ($ok) { } else { print "No valid geometry found (MEMDISK will fake it)\n"; } - diff --git a/memdisk/memcpy.S b/memdisk/memcpy.S index 5f2c4ec7..6b986a0d 100644 --- a/memdisk/memcpy.S +++ b/memdisk/memcpy.S @@ -80,7 +80,7 @@ memcpy: popl %eax /* Return value */ popl %edi popl %esi -1: +1: ret .size memcpy, .-memcpy diff --git a/memdisk/memset.S b/memdisk/memset.S index 4b2583c3..e641415d 100644 --- a/memdisk/memset.S +++ b/memdisk/memset.S @@ -47,7 +47,7 @@ memset: movzwl %dx,%eax shll $16,%edx orl %edx,%eax - + /* Initial alignment */ movl %edi,%edx shrl $1,%edx diff --git a/memdisk/setup.c b/memdisk/setup.c index 4d38598a..ba02582f 100644 --- a/memdisk/setup.c +++ b/memdisk/setup.c @@ -434,7 +434,7 @@ const struct geometry *get_disk_image_geometry(uint32_t where, uint32_t size) } c++; track += h; - } + } if (ok) { hd_geometry.driveno = 0; hd_geometry.c = c; |