summaryrefslogtreecommitdiffstats
path: root/arch/x86/boot
diff options
context:
space:
mode:
authorCyrill Gorcunov <gorcunov@gmail.com>2009-02-13 22:50:22 +0100
committerIngo Molnar <mingo@elte.hu>2009-02-19 17:13:01 +0100
commit2d4eeecb98ade6a736940d43311275b7d32dab21 (patch)
treed8585762b176b6c499b74cbe2e71c1b5cccadf24 /arch/x86/boot
parentx86: pmjump - use GLOBAL,ENDPROC macros (diff)
downloadlinux-2d4eeecb98ade6a736940d43311275b7d32dab21.tar.xz
linux-2d4eeecb98ade6a736940d43311275b7d32dab21.zip
x86: compressed head_64 - use ENTRY,ENDPROC macros
Impact: clenaup Linker script will put startup_32 at predefined address so using ENTRY will not bloat the code size. Signed-off-by: Cyrill Gorcunov <gorcunov@openvz.org> Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/boot')
-rw-r--r--arch/x86/boot/compressed/head_64.S6
1 files changed, 2 insertions, 4 deletions
diff --git a/arch/x86/boot/compressed/head_64.S b/arch/x86/boot/compressed/head_64.S
index 1d5dff4123e1..ba9229ba7f0d 100644
--- a/arch/x86/boot/compressed/head_64.S
+++ b/arch/x86/boot/compressed/head_64.S
@@ -35,9 +35,7 @@
.section ".text.head"
.code32
- .globl startup_32
-
-startup_32:
+ENTRY(startup_32)
cld
/* test KEEP_SEGMENTS flag to see if the bootloader is asking
* us to not reload segments */
@@ -176,6 +174,7 @@ startup_32:
/* Jump from 32bit compatibility mode into 64bit mode. */
lret
+ENDPROC(startup_32)
no_longmode:
/* This isn't an x86-64 CPU so hang */
@@ -295,7 +294,6 @@ relocated:
call decompress_kernel
popq %rsi
-
/*
* Jump to the decompressed kernel.
*/