1 files changed, 9 insertions, 0 deletions

diff --git a/arch/i386/kernel/process.c b/arch/i386/kernel/process.c
index cfae587bf7d2..05be77413351 100644
--- a/arch/i386/kernel/process.c
+++ b/arch/i386/kernel/process.c
@@ -670,6 +670,15 @@ struct task_struct fastcall * __switch_to(struct task_struct *prev_p, struct tas
         load_TLS(next, cpu);
 
         /*
+         * Restore IOPL if needed.  In normal use, the flags restore
+         * in the switch assembly will handle this.  But if the kernel
+         * is running virtualized at a non-zero CPL, the popf will
+         * not restore flags, so it must be done in a separate step.
+         */
+        if (get_kernel_rpl() && unlikely(prev->iopl != next->iopl))
+                set_iopl_mask(next->iopl);
+
+        /*
          * Now maybe handle debug registers and/or IO bitmaps
          */
         if (unlikely((task_thread_info(next_p)->flags & _TIF_WORK_CTXSW)