1 files changed, 2 insertions, 1 deletions

diff --git a/arch/x86/mm/fault.c b/arch/x86/mm/fault.c
index f62777940dfb..60a0aa574dc6 100644
--- a/arch/x86/mm/fault.c
+++ b/arch/x86/mm/fault.c
@@ -554,6 +554,7 @@ static int is_f00f_bug(struct pt_regs *regs, unsigned long address)
                 nr = (address - idt_descr.address) >> 3;
 
                 if (nr == 6) {
+                        zap_rt_locks();
                         do_invalid_op(regs, 0);
                         return 1;
                 }
@@ -1035,7 +1036,7 @@ do_page_fault(struct pt_regs *regs, unsigned long error_code)
          * If we're in an interrupt, have no user context or are running
          * in an atomic region then we must not take the fault:
          */
-        if (unlikely(in_atomic() || !mm)) {
+        if (unlikely(in_atomic() || !mm || current->pagefault_disabled)) {
                 bad_area_nosemaphore(regs, error_code, address);
                 return;
         }