From cdbc4968169ee8492b260741862c9621a695c531 Mon Sep 17 00:00:00 2001 From: Heiko Carstens Date: Fri, 14 Sep 2012 12:59:47 +0200 Subject: [PATCH] --- yaml --- r: 324106 b: refs/heads/master c: 66389e8583af71f8e01fab7c8e704a6b393663b9 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/s390/kernel/ptrace.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index bfbc3173c99b..266d9152b47d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1a0f24878eb5ca56dff5f20b9f0e716947dc0394 +refs/heads/master: 66389e8583af71f8e01fab7c8e704a6b393663b9 diff --git a/trunk/arch/s390/kernel/ptrace.c b/trunk/arch/s390/kernel/ptrace.c index b817cc5e49ae..a314c57f4e94 100644 --- a/trunk/arch/s390/kernel/ptrace.c +++ b/trunk/arch/s390/kernel/ptrace.c @@ -53,6 +53,7 @@ void update_per_regs(struct task_struct *task) struct thread_struct *thread = &task->thread; struct per_regs old, new; +#ifdef CONFIG_64BIT /* Take care of the enable/disable of transactional execution. */ if (MACHINE_HAS_TE) { unsigned long cr0, cr0_new; @@ -67,7 +68,7 @@ void update_per_regs(struct task_struct *task) if (cr0 != cr0_new) __ctl_load(cr0_new, 0, 0); } - +#endif /* Copy user specified PER registers */ new.control = thread->per_user.control; new.start = thread->per_user.start;