# HG changeset patch
# User Keir Fraser <keir@xxxxxxx>
# Date 1292524650 0
# Node ID 669c2f83b86c0c06ab20006488c67fb7237fcdef
# Parent 8dc27840025c966cb57aaa1d56e61c69d5178189
x86: move early page fault code into .init.text
Signed-off-by: Jan Beulich <jbeulich@xxxxxxxxxx>
---
xen/arch/x86/traps.c | 2 +-
xen/arch/x86/x86_32/entry.S | 2 ++
xen/arch/x86/x86_64/entry.S | 2 ++
3 files changed, 5 insertions(+), 1 deletion(-)
diff -r 8dc27840025c -r 669c2f83b86c xen/arch/x86/traps.c
--- a/xen/arch/x86/traps.c Thu Dec 16 18:37:20 2010 +0000
+++ b/xen/arch/x86/traps.c Thu Dec 16 18:37:30 2010 +0000
@@ -1317,7 +1317,7 @@ asmlinkage void do_page_fault(struct cpu
* during early boot (an issue was seen once, but was most likely a hardware
* problem).
*/
-asmlinkage void do_early_page_fault(struct cpu_user_regs *regs)
+asmlinkage void __init do_early_page_fault(struct cpu_user_regs *regs)
{
static int stuck;
static unsigned long prev_eip, prev_cr2;
diff -r 8dc27840025c -r 669c2f83b86c xen/arch/x86/x86_32/entry.S
--- a/xen/arch/x86/x86_32/entry.S Thu Dec 16 18:37:20 2010 +0000
+++ b/xen/arch/x86/x86_32/entry.S Thu Dec 16 18:37:30 2010 +0000
@@ -549,6 +549,7 @@ ENTRY(spurious_interrupt_bug)
pushl $TRAP_spurious_int<<16
jmp handle_exception
+ .pushsection .init.text, "ax", @progbits
ENTRY(early_page_fault)
SAVE_ALL(1f,1f)
1: movl %esp,%eax
@@ -556,6 +557,7 @@ 1: movl %esp,%eax
call do_early_page_fault
addl $4,%esp
jmp restore_all_xen
+ .popsection
handle_nmi_mce:
#ifdef CONFIG_X86_SUPERVISOR_MODE_KERNEL
diff -r 8dc27840025c -r 669c2f83b86c xen/arch/x86/x86_64/entry.S
--- a/xen/arch/x86/x86_64/entry.S Thu Dec 16 18:37:20 2010 +0000
+++ b/xen/arch/x86/x86_64/entry.S Thu Dec 16 18:37:30 2010 +0000
@@ -591,11 +591,13 @@ ENTRY(double_fault)
call do_double_fault
ud2
+ .pushsection .init.text, "ax", @progbits
ENTRY(early_page_fault)
SAVE_ALL
movq %rsp,%rdi
call do_early_page_fault
jmp restore_all_xen
+ .popsection
handle_ist_exception:
SAVE_ALL
_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog
|
Home