Skip to content

Commit

Permalink
x86: pmjump - use GLOBAL,ENDPROC macros
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Cyrill Gorcunov authored and Ingo Molnar committed Feb 19, 2009
1 parent 2f79555 commit 324bda9
Showing 1 changed file with 5 additions and 11 deletions.
16 changes: 5 additions & 11 deletions arch/x86/boot/pmjump.S
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -78,5 +73,4 @@ in_pm32:
lldt %cx

jmpl *%eax # Jump to the 32-bit entrypoint

.size in_pm32, .-in_pm32
ENDPROC(in_pm32)

0 comments on commit 324bda9

Please sign in to comment.