From mboxrd@z Thu Jan 1 00:00:00 1970 From: "Jan Beulich" Subject: [PATCH] x86: move early page fault code into .init.text Date: Thu, 16 Dec 2010 16:09:46 +0000 Message-ID: <4D0A47DA020000780002870D@vpn.id2.novell.com> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=__PartCCE086DA.0__=" Return-path: List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xensource.com Errors-To: xen-devel-bounces@lists.xensource.com To: "xen-devel@lists.xensource.com" List-Id: xen-devel@lists.xenproject.org This is a MIME message. If you are reading this text, you may want to consider changing to a mail reader or gateway that understands how to properly handle MIME multipart messages. --=__PartCCE086DA.0__= Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Content-Disposition: inline Signed-off-by: Jan Beulich --- a/xen/arch/x86/traps.c +++ b/xen/arch/x86/traps.c @@ -1320,7 +1320,7 @@ asmlinkage void do_page_fault(struct cpu * during early boot (an issue was seen once, but was most likely a = hardware=20 * 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; --- a/xen/arch/x86/x86_32/entry.S +++ b/xen/arch/x86/x86_32/entry.S @@ -544,6 +544,7 @@ ENTRY(spurious_interrupt_bug) pushl $TRAP_spurious_int<<16 jmp handle_exception =20 + .pushsection .init.text, "ax", @progbits ENTRY(early_page_fault) SAVE_ALL(1f,1f) 1: movl %esp,%eax @@ -551,6 +552,7 @@ ENTRY(early_page_fault) call do_early_page_fault addl $4,%esp jmp restore_all_xen + .popsection =20 handle_nmi_mce: #ifdef CONFIG_X86_SUPERVISOR_MODE_KERNEL --- a/xen/arch/x86/x86_64/entry.S +++ b/xen/arch/x86/x86_64/entry.S @@ -591,11 +594,13 @@ ENTRY(double_fault) call do_double_fault ud2 =20 + .pushsection .init.text, "ax", @progbits ENTRY(early_page_fault) SAVE_ALL movq %rsp,%rdi call do_early_page_fault jmp restore_all_xen + .popsection =20 handle_ist_exception: SAVE_ALL --=__PartCCE086DA.0__= Content-Type: text/plain; name="x86-early-page-fault-init.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="x86-early-page-fault-init.patch" Signed-off-by: Jan Beulich =0A=0A--- a/xen/arch/x86/tr= aps.c=0A+++ b/xen/arch/x86/traps.c=0A@@ -1320,7 +1320,7 @@ asmlinkage void = do_page_fault(struct cpu=0A * during early boot (an issue was seen once, = but was most likely a hardware =0A * problem).=0A */=0A-asmlinkage void = do_early_page_fault(struct cpu_user_regs *regs)=0A+asmlinkage void __init = do_early_page_fault(struct cpu_user_regs *regs)=0A {=0A static int = stuck;=0A static unsigned long prev_eip, prev_cr2;=0A--- a/xen/arch/x86= /x86_32/entry.S=0A+++ b/xen/arch/x86/x86_32/entry.S=0A@@ -544,6 +544,7 @@ = ENTRY(spurious_interrupt_bug)=0A pushl $TRAP_spurious_int<<16=0A = jmp handle_exception=0A =0A+ .pushsection .init.text, "ax", = @progbits=0A ENTRY(early_page_fault)=0A SAVE_ALL(1f,1f)=0A 1: = movl %esp,%eax=0A@@ -551,6 +552,7 @@ ENTRY(early_page_fault)=0A = call do_early_page_fault=0A addl $4,%esp=0A jmp = restore_all_xen=0A+ .popsection=0A =0A handle_nmi_mce:=0A #ifdef = CONFIG_X86_SUPERVISOR_MODE_KERNEL=0A--- a/xen/arch/x86/x86_64/entry.S=0A+++= b/xen/arch/x86/x86_64/entry.S=0A@@ -591,11 +594,13 @@ ENTRY(double_fault)= =0A call do_double_fault=0A ud2=0A =0A+ .pushsectio= n .init.text, "ax", @progbits=0A ENTRY(early_page_fault)=0A = SAVE_ALL=0A movq %rsp,%rdi=0A call do_early_page_fault=0A= jmp restore_all_xen=0A+ .popsection=0A =0A handle_ist_exc= eption:=0A SAVE_ALL=0A --=__PartCCE086DA.0__= Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-devel mailing list Xen-devel@lists.xensource.com http://lists.xensource.com/xen-devel --=__PartCCE086DA.0__=--