diff options
| author | Cyrill Gorcunov <gorcunov@gmail.com> | 2009-02-14 00:50:21 +0300 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-02-19 17:13:00 +0100 |
| commit | 324bda9e47f53aebec1376ee89bba8128c8455e2 (patch) | |
| tree | 6dbc3906e281295de79f34522ab00ddb906aa12b /arch/x86/boot | |
| parent | 2f7955509710fd378a1ac96e19d29d5a0e3301fd (diff) | |
| download | op-kernel-dev-324bda9e47f53aebec1376ee89bba8128c8455e2.zip op-kernel-dev-324bda9e47f53aebec1376ee89bba8128c8455e2.tar.gz | |
x86: pmjump - use GLOBAL,ENDPROC macros
Impact: cleanup
We are in setup stage so we use GLOBAL
instead of ENTRY and do not increase 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/pmjump.S | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/arch/x86/boot/pmjump.S b/arch/x86/boot/pmjump.S index 141b6e2..019c17a 100644 --- a/arch/x86/boot/pmjump.S +++ b/arch/x86/boot/pmjump.S @@ -15,18 +15,15 @@ #include <asm/boot.h> #include <asm/processor-flags.h> #include <asm/segment.h> +#include <linux/linkage.h> .text - - .globl protected_mode_jump - .type protected_mode_jump, @function - .code16 /* * void protected_mode_jump(u32 entrypoint, u32 bootparams); */ -protected_mode_jump: +GLOBAL(protected_mode_jump) movl %edx, %esi # Pointer to boot_params table xorl %ebx, %ebx @@ -47,12 +44,10 @@ protected_mode_jump: .byte 0x66, 0xea # ljmpl opcode 2: .long in_pm32 # offset .word __BOOT_CS # segment - - .size protected_mode_jump, .-protected_mode_jump +ENDPROC(protected_mode_jump) .code32 - .type in_pm32, @function -in_pm32: +GLOBAL(in_pm32) # Set up data segments for flat 32-bit mode movl %ecx, %ds movl %ecx, %es @@ -78,5 +73,4 @@ in_pm32: lldt %cx jmpl *%eax # Jump to the 32-bit entrypoint - - .size in_pm32, .-in_pm32 +ENDPROC(in_pm32) |
