Merge tag 'pm+acpi-3.16-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafae...

[karo-tx-linux.git] / arch / s390 / mm / fault.c

diff --git a/arch/s390/mm/fault.c b/arch/s390/mm/fault.c
index 2f51a998a67e383b1ab50c0d08985109bd7e3e51..3f3b35403d0a4100bd0bd0bdee424f693ad93670 100644 (file)
--- a/arch/s390/mm/fault.c
+++ b/arch/s390/mm/fault.c
@@ -415,7 +415,7 @@ static inline int do_exception(struct pt_regs *regs, int access)
         * The instruction that caused the program check has
         * been nullified. Don't signal single step via SIGTRAP.
         */
-       clear_tsk_thread_flag(tsk, TIF_PER_TRAP);
+       clear_pt_regs_flag(regs, PIF_PER_TRAP);
 
        if (notify_page_fault(regs))
                return 0;