commit 90e9f53662826db3cdd6d99bd394d727b05160c1
author Jeremy Fitzhardinge <jeremy@goop.org> Mon Mar 17 16:37:12 2008 -0700
committer Ingo Molnar <mingo@elte.hu> Thu Apr 24 23:57:31 2008 +0200
tree 5310e489d7fd62185706424a98df354e83e9a1a3
parent 9666e9d44b83755c53615fb89c0787b6846786a1

xen: make sure iret faults are trapped

Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

arch/x86/xen/xen-asm.S

diff --git a/arch/x86/xen/xen-asm.S b/arch/x86/xen/xen-asm.S
index fe161ed..99223cc 100644
--- a/arch/x86/xen/xen-asm.S
+++ b/arch/x86/xen/xen-asm.S
@@ -184,8 +184,12 @@
 	   region is OK. */
 	je xen_hypervisor_callback
 
-	iret
+1:	iret
 xen_iret_end_crit:
+.section __ex_table,"a"
+	.align 4
+	.long 1b,iret_exc
+.previous
 
 hyper_iret:
 	/* put this out of line since its very rarely used */