From 9953f89f35b15bdd3da346163d4d194837346f34 Mon Sep 17 00:00:00 2001
From: Dan Smith <danms@us.ibm.com>
Date: Thu, 26 Mar 2009 15:24:40 +0100
Subject: [PATCH] --- yaml --- r: 135643 b: refs/heads/master c:
 eaf1b6fbca8d9be87bef2eafaa3f40bffe26ce04 h: refs/heads/master i:   135641:
 dd5b78154c78da78441f0f530d51c0c91a9a30bb   135639:
 3be6f248337da85068154de1130c684d857e331d v: v3

---
 [refs]                                 | 2 +-
 trunk/arch/s390/include/asm/ptrace.h   | 4 +++-
 trunk/arch/s390/kernel/compat_ptrace.h | 3 ++-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 354adcd3dafd..d361fc1a6322 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1fbc9f46a024535d95c3d5f136901decd86b109e
+refs/heads/master: eaf1b6fbca8d9be87bef2eafaa3f40bffe26ce04
diff --git a/trunk/arch/s390/include/asm/ptrace.h b/trunk/arch/s390/include/asm/ptrace.h
index 8920025c3c02..f1b051630c50 100644
--- a/trunk/arch/s390/include/asm/ptrace.h
+++ b/trunk/arch/s390/include/asm/ptrace.h
@@ -172,6 +172,8 @@
 #define NUM_CRS		16
 #define NUM_ACRS	16
 
+#define NUM_CR_WORDS	3
+
 #define FPR_SIZE	8
 #define FPC_SIZE	4
 #define FPC_PAD_SIZE	4 /* gcc insists on aligning the fpregs */
@@ -334,7 +336,7 @@ struct pt_regs
  */
 typedef struct
 {
-	unsigned long cr[3];
+	unsigned long cr[NUM_CR_WORDS];
 } per_cr_words;
 
 #define PER_EM_MASK 0xE8000000UL
diff --git a/trunk/arch/s390/kernel/compat_ptrace.h b/trunk/arch/s390/kernel/compat_ptrace.h
index a2be3a978d5c..123dd660d7fb 100644
--- a/trunk/arch/s390/kernel/compat_ptrace.h
+++ b/trunk/arch/s390/kernel/compat_ptrace.h
@@ -1,10 +1,11 @@
 #ifndef _PTRACE32_H
 #define _PTRACE32_H
 
+#include <asm/ptrace.h>    /* needed for NUM_CR_WORDS */
 #include "compat_linux.h"  /* needed for psw_compat_t */
 
 typedef struct {
-	__u32 cr[3];
+	__u32 cr[NUM_CR_WORDS];
 } per_cr_words32;
 
 typedef struct {