提交 187a8a73 编写于 作者: Y Yinghai Lu 提交者: H. Peter Anvin

x86, boot: Move verify_cpu.S and no_longmode down

We need to move some code to 32bit section in following patch:

   x86, boot: Move lldt/ltr out of 64bit code section

but that will push startup_64 down from 0x200.

According to hpa, we can not change startup_64 position and that
is an ABI.

We could move function verify_cpu and no_longmode down, because
verify_cpu is used via function call and no_longmode will not
return, then we don't need to add extra code for jumping back.
Signed-off-by: NYinghai Lu <yinghai@kernel.org>
Link: http://lkml.kernel.org/r/1359058816-7615-20-git-send-email-yinghai@kernel.org
Cc: Matt Fleming <matt.fleming@intel.com>
Signed-off-by: NH. Peter Anvin <hpa@linux.intel.com>
上级 3db07e70
...@@ -176,14 +176,6 @@ ENTRY(startup_32) ...@@ -176,14 +176,6 @@ ENTRY(startup_32)
lret lret
ENDPROC(startup_32) ENDPROC(startup_32)
no_longmode:
/* This isn't an x86-64 CPU so hang */
1:
hlt
jmp 1b
#include "../../kernel/verify_cpu.S"
/* /*
* Be careful here startup_64 needs to be at a predictable * Be careful here startup_64 needs to be at a predictable
* address so I can export it in an ELF header. Bootloaders * address so I can export it in an ELF header. Bootloaders
...@@ -349,6 +341,15 @@ relocated: ...@@ -349,6 +341,15 @@ relocated:
*/ */
jmp *%rbp jmp *%rbp
.code32
no_longmode:
/* This isn't an x86-64 CPU so hang */
1:
hlt
jmp 1b
#include "../../kernel/verify_cpu.S"
.data .data
gdt: gdt:
.word gdt_end - gdt .word gdt_end - gdt
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册