summaryrefslogtreecommitdiffstats
path: root/arch/x86/realmode
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@linux.intel.com>2012-05-08 21:22:35 +0300
committerH. Peter Anvin <hpa@linux.intel.com>2012-05-08 11:48:03 -0700
commit056a43a6d3ab903a798d8ee4435ad67d6fccc3e6 (patch)
treee7af15979dd52981873a676351ed45307bfe4a6e /arch/x86/realmode
parentf7436a9da902922a48cccc208099763b87d6171f (diff)
downloadlinux-056a43a6d3ab903a798d8ee4435ad67d6fccc3e6.tar.bz2
x86, realmode: Remove indirect jumps in trampoline_64.S
Remove indirect jumps in trampoline_64.S which are no longer necessary: the realmode code can relocate the absolute jumps correctly from the start. Signed-off-by: H. Peter Anvin <hpa@linux.intel.com> Link: http://lkml.kernel.org/r/1336501366-28617-13-git-send-email-jarkko.sakkinen@intel.com
Diffstat (limited to 'arch/x86/realmode')
-rw-r--r--arch/x86/realmode/rm/trampoline_64.S15
1 files changed, 2 insertions, 13 deletions
diff --git a/arch/x86/realmode/rm/trampoline_64.S b/arch/x86/realmode/rm/trampoline_64.S
index 66c58cf15503..77b72b45d705 100644
--- a/arch/x86/realmode/rm/trampoline_64.S
+++ b/arch/x86/realmode/rm/trampoline_64.S
@@ -73,7 +73,7 @@ ENTRY(trampoline_data)
lmsw %ax # into protected mode
# flush prefetch and jump to startup_32
- ljmpl *(startup_32_vector)
+ ljmpl $__KERNEL32_CS, $pa_startup_32
no_longmode:
hlt
@@ -113,7 +113,7 @@ ENTRY(startup_32)
* EFER.LMA = 1). Now we want to jump in 64bit mode, to do that we use
* the new gdt/idt that has __KERNEL_CS with CS.L = 1.
*/
- ljmpl *(pa_startup_64_vector)
+ ljmpl $__KERNEL_CS, $pa_startup_64
.section ".text64","ax"
.code64
@@ -144,17 +144,6 @@ tgdt:
.quad 0x00cf93000000ffff # __KERNEL_DS
tgdt_end:
- .balign 4
-startup_32_vector:
- .long pa_startup_32
- .word __KERNEL32_CS, 0
-
- .balign 4
- .globl startup_64_vector
-startup_64_vector:
- .long pa_startup_64
- .word __KERNEL_CS, 0
-
.data
.balign 4
GLOBAL(trampoline_status)