context_tracking: Restore correct previous context state on exception exit

[deliverable/linux.git] / arch / x86 / mm / fault.c

diff --git a/arch/x86/mm/fault.c b/arch/x86/mm/fault.c
index f946e6ce331556b3c3f482ec846d046de0fccd64..fa8c02de0d259ad7b1e5f869627cc442733b9738 100644 (file)
--- a/arch/x86/mm/fault.c
+++ b/arch/x86/mm/fault.c
@@ -1222,7 +1222,9 @@ good_area:
 dotraplinkage void __kprobes
 do_page_fault(struct pt_regs *regs, unsigned long error_code)
 {
-       exception_enter(regs);
+       enum ctx_state prev_state;
+
+       prev_state = exception_enter();
        __do_page_fault(regs, error_code);
-       exception_exit(regs);
+       exception_exit(prev_state);
 }