Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 90e9f536 authored by Jeremy Fitzhardinge's avatar Jeremy Fitzhardinge Committed by Ingo Molnar
Browse files

xen: make sure iret faults are trapped

parent 9666e9d4
Loading
Loading
Loading
Loading
+1 −1
Original line number Original line Diff line number Diff line
@@ -409,7 +409,7 @@ restore_nocheck_notrace:
irq_return:
irq_return:
	INTERRUPT_RETURN
	INTERRUPT_RETURN
.section .fixup,"ax"
.section .fixup,"ax"
iret_exc:
ENTRY(iret_exc)
	pushl $0			# no error code
	pushl $0			# no error code
	pushl $do_iret_error
	pushl $do_iret_error
	jmp error_code
	jmp error_code
+5 −1
Original line number Original line Diff line number Diff line
@@ -184,8 +184,12 @@ iret_restore_end:
	   region is OK. */
	   region is OK. */
	je xen_hypervisor_callback
	je xen_hypervisor_callback


	iret
1:	iret
xen_iret_end_crit:
xen_iret_end_crit:
.section __ex_table,"a"
	.align 4
	.long 1b,iret_exc
.previous


hyper_iret:
hyper_iret:
	/* put this out of line since its very rarely used */
	/* put this out of line since its very rarely used */