diff options
| author | Richard Braun <rbraun@sceen.net> | 2013-04-05 01:00:26 +0200 |
|---|---|---|
| committer | Richard Braun <rbraun@sceen.net> | 2013-04-05 01:02:47 +0200 |
| commit | e8dfbc47c11df34d6157dfa067b58cc3d691bf5d (patch) | |
| tree | 95da8a9876b2933bb1289fbc184eb98fdb0421b2 | |
| parent | 1229592da62bd1e48ca460b5843444dc203708da (diff) | |
x86/boot: minor 32/64-bit assembly code sharing
| -rw-r--r-- | arch/x86/machine/boot_asm.S | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/arch/x86/machine/boot_asm.S b/arch/x86/machine/boot_asm.S index f0c1b04f..730307e1 100644 --- a/arch/x86/machine/boot_asm.S +++ b/arch/x86/machine/boot_asm.S @@ -86,7 +86,6 @@ ASM_ENTRY(_start) #ifdef __LP64__ movq %rax, %cr3 movq $(boot_stacks + BOOT_STACK_SIZE), %rsp - xorq %rbp, %rbp #else /* __LP64__ */ movl %eax, %cr3 movl %cr0, %eax @@ -96,9 +95,9 @@ ASM_ENTRY(_start) 1: movl $(boot_stacks + BOOT_STACK_SIZE), %esp - xorl %ebp, %ebp #endif /* __LP64__ */ + xorl %ebp, %ebp call boot_main /* Never reached */ @@ -245,12 +244,11 @@ ASM_ENTRY(boot_ap_start32) #ifdef __LP64__ addq $boot_stacks, %rsp - xorq %rbp, %rbp #else /* __LP64__ */ addl $boot_stacks, %esp - xorl %ebp, %ebp #endif /* __LP64__ */ + xorl %ebp, %ebp call boot_ap_main /* Never reached */ |