diff options
| author | Jeremy Fitzhardinge <jeremy@goop.org> | 2008-03-17 16:37:12 -0700 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-04-24 23:57:31 +0200 |
| commit | 90e9f53662826db3cdd6d99bd394d727b05160c1 (patch) | |
| tree | 5310e489d7fd62185706424a98df354e83e9a1a3 /arch/x86/xen/xen-asm.S | |
| parent | 9666e9d44b83755c53615fb89c0787b6846786a1 (diff) | |
| download | linux-90e9f53662826db3cdd6d99bd394d727b05160c1.tar.bz2 | |
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>
Diffstat (limited to 'arch/x86/xen/xen-asm.S')
| -rw-r--r-- | arch/x86/xen/xen-asm.S | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/arch/x86/xen/xen-asm.S b/arch/x86/xen/xen-asm.S index fe161ed4b01e..99223cc323be 100644 --- a/arch/x86/xen/xen-asm.S +++ b/arch/x86/xen/xen-asm.S @@ -184,8 +184,12 @@ iret_restore_end: 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 */ |