---

yaml --- r: 324106 b: refs/heads/master c: 66389e8 h: refs/heads/master v: v3
git-mirror · Sep 26, 2012 · cdbc496 · cdbc496
1 parent 9714d15
commit cdbc496
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git 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
@@ -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;