Rather than blindly re-enabling interrupts in die(), save their state upon entry and then restore that state. From: Jan Beulich (actual patch attached)