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
Signed-off-by: Dan Smith <[email protected]>
Cc: [email protected]
---
arch/s390/include/asm/ptrace.h | 4 +++-
arch/s390/kernel/compat_ptrace.h | 3 ++-
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/arch/s390/include/asm/ptrace.h b/arch/s390/include/asm/ptrace.h
index 8920025..f1b0516 100644
--- a/arch/s390/include/asm/ptrace.h
+++ b/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/arch/s390/kernel/compat_ptrace.h b/arch/s390/kernel/compat_ptrace.h
index a2be3a9..123dd66 100644
--- a/arch/s390/kernel/compat_ptrace.h
+++ b/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 {
--
1.6.1
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!
--
Dan Smith
IBM Linux Technology Center
email: [email protected]
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 ?
--
--
blue skies,
Martin.
"Reality continues to ruin my life." - Calvin.
MS> Have you looked at git390 lately ?
Yes. My patch still applies cleanly there. What am I missing?
--
Dan Smith
IBM Linux Technology Center
email: [email protected]
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.
--
blue skies,
Martin.
"Reality continues to ruin my life." - Calvin.
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!
--
Dan Smith
IBM Linux Technology Center
email: [email protected]
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.
--
blue skies,
Martin.
"Reality continues to ruin my life." - Calvin.