Merge tag 'soc-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

[~andy/linux] / arch / s390 / kernel / ptrace.c

diff --git a/arch/s390/kernel/ptrace.c b/arch/s390/kernel/ptrace.c
index e9fadb04e3c61e0b71b6eb238a12941359edba0d..9556905bd3ce42c046052a54aa32ed5b07d9d559 100644 (file)
--- a/arch/s390/kernel/ptrace.c
+++ b/arch/s390/kernel/ptrace.c
@@ -60,11 +60,11 @@ void update_cr_regs(struct task_struct *task)
 
                __ctl_store(cr, 0, 2);
                cr_new[1] = cr[1];
-               /* Set or clear transaction execution TXC/PIFO bits 8 and 9. */
+               /* Set or clear transaction execution TXC bit 8. */
                if (task->thread.per_flags & PER_FLAG_NO_TE)
-                       cr_new[0] = cr[0] & ~(3UL << 54);
+                       cr_new[0] = cr[0] & ~(1UL << 55);
                else
-                       cr_new[0] = cr[0] | (3UL << 54);
+                       cr_new[0] = cr[0] | (1UL << 55);
                /* Set or clear transaction execution TDC bits 62 and 63. */
                cr_new[2] = cr[2] & ~3UL;
                if (task->thread.per_flags & PER_FLAG_TE_ABORT_RAND) {
@@ -1299,7 +1299,7 @@ int regs_query_register_offset(const char *name)
 
        if (!name || *name != 'r')
                return -EINVAL;
-       if (strict_strtoul(name + 1, 10, &offset))
+       if (kstrtoul(name + 1, 10, &offset))
                return -EINVAL;
        if (offset >= NUM_GPRS)
                return -EINVAL;