bitkeeper revision 1.891.1.14 (40a323c0nvrlljcyaqYaEcR8VMyfOQ)

Forcibly reenable interrupts during exit-to-guest epilogue code in Xen.

diff --git a/xen/arch/i386/entry.S b/xen/arch/i386/entry.S
index 1fd1d9ebb0c2f9434d2201e5bc86cb1621a4d776..b522f4f7543cc63e545284ca548ab9338f60426b 100644 (file)
--- 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