diff options
| author | Cyrill Gorcunov <gorcunov@gmail.com> | 2009-02-13 16:50:22 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-02-19 11:13:01 -0500 |
| commit | 2d4eeecb98ade6a736940d43311275b7d32dab21 (patch) | |
| tree | d8585762b176b6c499b74cbe2e71c1b5cccadf24 | |
| parent | 324bda9e47f53aebec1376ee89bba8128c8455e2 (diff) | |
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>
| -rw-r--r-- | arch/x86/boot/compressed/head_64.S | 6 |
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 @@ | |||
| 35 | 35 | ||
| 36 | .section ".text.head" | 36 | .section ".text.head" |
| 37 | .code32 | 37 | .code32 |
| 38 | .globl startup_32 | 38 | ENTRY(startup_32) |
| 39 | |||
| 40 | startup_32: | ||
| 41 | cld | 39 | cld |
| 42 | /* test KEEP_SEGMENTS flag to see if the bootloader is asking | 40 | /* test KEEP_SEGMENTS flag to see if the bootloader is asking |
| 43 | * us to not reload segments */ | 41 | * us to not reload segments */ |
| @@ -176,6 +174,7 @@ startup_32: | |||
| 176 | 174 | ||
| 177 | /* Jump from 32bit compatibility mode into 64bit mode. */ | 175 | /* Jump from 32bit compatibility mode into 64bit mode. */ |
| 178 | lret | 176 | lret |
| 177 | ENDPROC(startup_32) | ||
| 179 | 178 | ||
| 180 | no_longmode: | 179 | no_longmode: |
| 181 | /* This isn't an x86-64 CPU so hang */ | 180 | /* This isn't an x86-64 CPU so hang */ |
| @@ -295,7 +294,6 @@ relocated: | |||
| 295 | call decompress_kernel | 294 | call decompress_kernel |
| 296 | popq %rsi | 295 | popq %rsi |
| 297 | 296 | ||
| 298 | |||
| 299 | /* | 297 | /* |
| 300 | * Jump to the decompressed kernel. | 298 | * Jump to the decompressed kernel. |
| 301 | */ | 299 | */ |
