x86: unify arch/x86/boot/compressed/vmlinux_*.lds
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 26 Apr 2009 17:12:47 +0000 (10:12 -0700)
committerIngo Molnar <mingo@elte.hu>
Mon, 27 Apr 2009 04:35:24 +0000 (06:35 +0200)
commit51b26ada79b605ed709ddcedbb6012e8f8e0ebed
treeb6b9a353cf32db8debe602b9bf23625bc26388a0
parent0a3ec21fcd311b26ab0f249d62960e127bc20ca8
x86: unify arch/x86/boot/compressed/vmlinux_*.lds

Look at the:

diff -u arch/x86/boot/compressed/vmlinux_*.lds

output and realize that they're basially exactly the same except for
trivial naming differences, and the fact that the 64-bit version has a
"pgtable" thing.

So unify them.

There's some trivial cleanup there (make the output format a Kconfig thing
rather than doing #ifdef's for it, and unify both 32-bit and 64-bit BSS
end to "_ebss", where 32-bit used to use the traditional "_end"), but
other than that it's really very mindless and straigt conversion.

For example, I think we should aim to remove "startup_32" vs "startup_64",
and just call it "startup", and get rid of one more difference. I didn't
do that.

Also, notice the comment in the unified vmlinux.lds.S talks about
"head_64" and "startup_32" which is an odd and incorrect mix, but that was
actually what the old 64-bit only lds file had, so the confusion isn't
new, and now that mixing is arguably more accurate thanks to the
vmlinux.lds.S file being shared between the two cases ;)

[ Impact: cleanup, unification ]

Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Acked-by: Sam Ravnborg <sam@ravnborg.org>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
arch/x86/Kconfig
arch/x86/boot/compressed/Makefile
arch/x86/boot/compressed/head_32.S
arch/x86/boot/compressed/vmlinux.lds.S [moved from arch/x86/boot/compressed/vmlinux_64.lds with 78% similarity]
arch/x86/boot/compressed/vmlinux_32.lds [deleted file]