# HG changeset patch # User Pascal Bellard # Date 1380125087 0 # Node ID 66770652260538239edbd83272bc2d788c4269e6 # Parent b3adb464f82df434d67462760760414d551653ba linux: remove duplicate bootsect_start label diff -r b3adb464f82d -r 667706522605 linux/stuff/linux-header.u --- a/linux/stuff/linux-header.u Wed Sep 25 13:23:35 2013 +0000 +++ b/linux/stuff/linux-header.u Wed Sep 25 16:04:47 2013 +0000 @@ -58,7 +58,7 @@ +stacktop = 0x9E00 # in 0x8000 .. 0xA000 + decw %bp // Magic number: MZ + popw %dx -+ jmp start // Bytes on last page of file ++ jmp fdstart // Bytes on last page of file + .word (CODESZ+511)/512 // Pages in file + .word 0 // Relocations + .word 2 // Size of header in paragraphs @@ -78,7 +78,7 @@ + .word 0xA33F + .word stacktop +#endif -+start: ++fdstart: + pushw %dx +#endif @@ -98,7 +98,7 @@ +#define LOADSZ 0x8000 - movw $bugger_off_msg, %si -+bootsect_start: ++oldstart: + cld # assume nothing +stacktop = 0x9E00 # in 0x8000 .. 0xA000 +zeroed = 48+12 # gdt + zeroed registers