diff options
| author | kaf24@scramble.cl.cam.ac.uk <kaf24@scramble.cl.cam.ac.uk> | 2004-05-13 07:29:04 +0000 |
|---|---|---|
| committer | kaf24@scramble.cl.cam.ac.uk <kaf24@scramble.cl.cam.ac.uk> | 2004-05-13 07:29:04 +0000 |
| commit | dd77060a9f8a7c799b431b1c405454d008a243ad (patch) | |
| tree | 4d7f8fb211e79b74c0962bff64f298037593da38 /xen | |
| parent | 577256743338ab1d65574b77f626f252860f3f88 (diff) | |
| download | xen-dd77060a9f8a7c799b431b1c405454d008a243ad.tar.gz xen-dd77060a9f8a7c799b431b1c405454d008a243ad.tar.bz2 xen-dd77060a9f8a7c799b431b1c405454d008a243ad.zip | |
bitkeeper revision 1.891.1.14 (40a323c0nvrlljcyaqYaEcR8VMyfOQ)
Forcibly reenable interrupts during exit-to-guest epilogue code in Xen.
Diffstat (limited to 'xen')
| -rw-r--r-- | xen/arch/i386/entry.S | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/xen/arch/i386/entry.S b/xen/arch/i386/entry.S index 1fd1d9ebb0..b522f4f754 100644 --- a/xen/arch/i386/entry.S +++ b/xen/arch/i386/entry.S @@ -245,6 +245,10 @@ restore_all_guest: movsl movsl movsl + # Third, reenable interrupts. They will definitely be reenabled by IRET + # in any case. They could be disabled here if we are returning from an + # interrupt. We need interrupts enabled if we take a fault. + sti # Finally, restore guest registers -- faults will cause failsafe popl %ebx popl %ecx |