diff --git a/[refs] b/[refs] index 69d1617c1995..53e48bc30d94 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c6c2d7a084d14a8a701be84872aa1b77d2945f46 +refs/heads/master: afe0bc63ae5fdc642a6181e1b514434f901e39ba diff --git a/trunk/arch/x86/boot/compressed/vmlinux_32.lds b/trunk/arch/x86/boot/compressed/vmlinux_32.lds index cc4854f6c6c1..d98ab69a1276 100644 --- a/trunk/arch/x86/boot/compressed/vmlinux_32.lds +++ b/trunk/arch/x86/boot/compressed/vmlinux_32.lds @@ -3,10 +3,10 @@ OUTPUT_ARCH(i386) ENTRY(startup_32) SECTIONS { - /* Be careful parts of head.S assume startup_32 is at - * address 0. + /* Be careful parts of head_32.S assume startup_32 is at + * address 0. */ - . = 0 ; + . = 0; .text.head : { _head = . ; *(.text.head) diff --git a/trunk/arch/x86/boot/compressed/vmlinux_64.lds b/trunk/arch/x86/boot/compressed/vmlinux_64.lds index 94c13e557fb4..8d63b3a22ce4 100644 --- a/trunk/arch/x86/boot/compressed/vmlinux_64.lds +++ b/trunk/arch/x86/boot/compressed/vmlinux_64.lds @@ -3,8 +3,8 @@ OUTPUT_ARCH(i386:x86-64) ENTRY(startup_64) SECTIONS { - /* Be careful parts of head.S assume startup_32 is at - * address 0. + /* Be careful parts of head_64.S assume startup_64 is at + * address 0. */ . = 0; .text : {