Skip to contentSkip to conversation

s390: Expose a constant for the number of words representing the CRs

PATCH In review Dan Smith 2 participants 7 messages Mar 5, 2009 – Mar 7, 2009

Subsystems (2)
lore
Share & tools
lore

Dan Smith

author
#0 lore raw

PATCH 1/1 s390: Expose a constant for the number of words representing the CRs

We need to use this value in the checkpoint/restart code and would like to have a constant instead of a magic '3'.

Changelog:
Mar 03:
. Picked up additional use of magic '3' in ptrace.h

---
 arch/s390/include/asm/ptrace.h   |    4 +++-
 arch/s390/kernel/compat_ptrace.h |    3 ++-
 2 files changed, 5 insertions(+), 2 deletions(-)
arch/s390/include/asm/ptrace.h +3 -1
index 8920025..f1b0516 100644
@@ -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
arch/s390/kernel/compat_ptrace.h +2 -1
index a2be3a9..123dd66 100644
@@ -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 {
Signature · 1 line
1.6.1
author
#1 lore raw

DS> We need to use this value in the checkpoint/restart code and would DS> like to have a constant instead of a magic '3'.

DS> Changelog:
DS> Mar 03:
DS> . Picked up additional use of magic '3' in ptrace.h

DS> Signed-off-by: Dan Smith <[email protected]>
DS> Cc: [email protected]
DS> ---

DS>  arch/s390/include/asm/ptrace.h   |    4 +++-
DS>  arch/s390/kernel/compat_ptrace.h |    3 ++-
DS>  2 files changed, 5 insertions(+), 2 deletions(-)

If there aren't any objections to this patch, can it get picked up?

Thanks!

Signature · 3 lines
Dan Smith
IBM Linux Technology Center
email: [email protected]
#2 lore raw
Quoted 1 line · On Thu, 05 Mar 2009 08:54:11 -0800 Dan Smith <[email protected]> wrote:

If there aren't any objections to this patch, can it get picked up?

Have you looked at git390 lately ?

Signature · 5 lines
-- 
blue skies,
   Martin.

"Reality continues to ruin my life." - Calvin.
author
#3 lore raw

MS> Have you looked at git390 lately ?

Yes. My patch still applies cleanly there. What am I missing?

Signature · 3 lines
Dan Smith
IBM Linux Technology Center
email: [email protected]
#4 lore raw
Quoted 3 lines · On Thu, 05 Mar 2009 12:01:11 -0800 Dan Smith <[email protected]> wrote:

MS> Have you looked at git390 lately ?

Yes. My patch still applies cleanly there. What am I missing?

You need to look at the correct branch:

http://git390.marist.edu/cgi-bin/gitweb.cgi?p=linux-2.6.git;a=shortlog;h=refs/heads/features

The feature branch which contains the patches for the next merge window contains your patch. I've added it a few weeks ago, but I might have forgotten to drop you a note that I did so.

Signature · 4 lines
blue skies,
   Martin.

"Reality continues to ruin my life." - Calvin.
author
#5 lore raw

MS> The feature branch which contains the patches for the next merge MS> window contains your patch. I've added it a few weeks ago, but I MS> might have forgotten to drop you a note that I did so.

Ah, yeah, I never heard anything :)

The patch I sent earlier to day has been updated to catch another use of the magic '3'. Can we replace the old with the new in that branch?

Thanks Martin!

Signature · 3 lines
Dan Smith
IBM Linux Technology Center
email: [email protected]
#6 lore raw
Quoted 8 lines · On Thu, 05 Mar 2009 13:15:47 -0800 Dan Smith <[email protected]> wrote:

MS> The feature branch which contains the patches for the next merge MS> window contains your patch. I've added it a few weeks ago, but I MS> might have forgotten to drop you a note that I did so.

Ah, yeah, I never heard anything :)

The patch I sent earlier to day has been updated to catch another use of the magic '3'. Can we replace the old with the new in that branch?

Sure, I've added the new one to my patch set.

Signature · 4 lines
blue skies,
   Martin.

"Reality continues to ruin my life." - Calvin.