projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge commit 'v3.15' into next
[firefly-linux-kernel-4.4.55.git]
/
arch
/
s390
/
kernel
/
ptrace.c
diff --git
a/arch/s390/kernel/ptrace.c
b/arch/s390/kernel/ptrace.c
index 4ac8fafec95fa87d0b680c6222ac3c9e9f06700a..1c82619eb4f768343f8a9c20f8f30a00ba7370fd 100644
(file)
--- a/
arch/s390/kernel/ptrace.c
+++ b/
arch/s390/kernel/ptrace.c
@@
-64,7
+64,7
@@
void update_cr_regs(struct task_struct *task)
if (task->thread.per_flags & PER_FLAG_NO_TE)
cr_new &= ~(1UL << 55);
if (cr_new != cr)
- __ctl_load(cr, 0, 0);
+ __ctl_load(cr
_new
, 0, 0);
/* Set or clear transaction execution TDC bits 62 and 63. */
__ctl_store(cr, 2, 2);
cr_new = cr & ~3UL;