arch/score/include/uapi/asm/ptrace.h: Remove the macros which not be used currently

PATCH In review Chen Gang 4 participants 14 messages Jun 26, 2014 – Jul 22, 2014

lore

Share & tools

lore

Chen Gang

author

2014-06-26 12:24 UTC #0 lore raw

PATCH v3 1/1 arch/score/include/uapi/asm/ptrace.h: Remove the macros which not be used currently

'COUNTER' and other same kind macros are too common to use, and easy to get conflict with other modules.

At present, they are not used, so it is OK to simply remove them. And the related warning (allmodconfig with score):

CC [M] drivers/md/raid1.o
In file included from drivers/md/raid1.c:42:0:
drivers/md/bitmap.h:93:0: warning: "COUNTER" redefined
#define COUNTER(x) (((bitmap_counter_t) x) & COUNTER_MAX) ^
In file included from ./arch/score/include/asm/ptrace.h:4:0,

                   from include/linux/sched.h:31,
                   from include/linux/blkdev.h:4,
                   from drivers/md/raid1.c:36:

./arch/score/include/uapi/asm/ptrace.h:13:0: note: this is the location of the previous definition
#define COUNTER 38

Signed-off-by Chen Gang <[email protected]>

---
 arch/score/include/uapi/asm/ptrace.h | 11 -----------
 1 file changed, 11 deletions(-)

arch/score/include/uapi/asm/ptrace.h +0 ~~-11~~

index f59771a..5c5e794 100644
@@ -4,17 +4,6 @@
 #define PTRACE_GETREGS		12
 #define PTRACE_SETREGS		13
 
-#define PC		32
-#define CONDITION	33
-#define ECR		34
-#define EMA		35
-#define CEH		36
-#define CEL		37
-#define COUNTER		38
-#define LDCR		39
-#define STCR		40
-#define PSR		41
-
 #define SINGLESTEP16_INSN	0x7006
 #define SINGLESTEP32_INSN	0x840C8000
 #define BREAKPOINT16_INSN	0x7002		/* work on SPG300 */

Signature · 1 line

1.9.2.459.g68773ac

David Rientjes

Acked-by on v3 1/1

2014-06-26 21:56 UTC #1 lore raw

Quoted 15 lines · Chen Gang

'COUNTER' and other same kind macros are too common to use, and easy to get conflict with other modules.
At present, they are not used, so it is OK to simply remove them. And the related warning (allmodconfig with score):
CC [M] drivers/md/raid1.o
In file included from drivers/md/raid1.c:42:0:
drivers/md/bitmap.h:93:0: warning: "COUNTER" redefined
   #define COUNTER(x) (((bitmap_counter_t) x) & COUNTER_MAX)
   ^
  In file included from ./arch/score/include/asm/ptrace.h:4:0,
                   from include/linux/sched.h:31,
                   from include/linux/blkdev.h:4,
                   from drivers/md/raid1.c:36:

Quoted 5 lines

./arch/score/include/uapi/asm/ptrace.h:13:0: note: this is the location of the previous definition
#define COUNTER 38
Signed-off-by Chen Gang <[email protected]>

Acked-by David Rientjes <[email protected]>

Chen Gang

author

2014-06-26 23:29 UTC #2 lore raw

Quoted 21 lines · David Rientjes

Quoted 19 lines · Chen Gang
'COUNTER' and other same kind macros are too common to use, and easy to get conflict with other modules.
At present, they are not used, so it is OK to simply remove them. And the related warning (allmodconfig with score):
CC [M] drivers/md/raid1.o
In file included from drivers/md/raid1.c:42:0:
drivers/md/bitmap.h:93:0: warning: "COUNTER" redefined
   #define COUNTER(x) (((bitmap_counter_t) x) & COUNTER_MAX)
   ^
  In file included from ./arch/score/include/asm/ptrace.h:4:0,
                   from include/linux/sched.h:31,
                   from include/linux/blkdev.h:4,
                   from drivers/md/raid1.c:36:
./arch/score/include/uapi/asm/ptrace.h:13:0: note: this is the location of the previous definition
#define COUNTER 38

Quoted 4 lines

Quoted 1 line
Signed-off-by Chen Gang <[email protected]>
Acked-by David Rientjes <[email protected]>

OK, thanks. And also thank all of you for your discussions.

Thanks.

Signature · 3 lines

Chen Gang

Open, share, and attitude like air, water, and life which God blessed

Lennox Wu

Acked-by

2014-06-27 02:11 UTC #3 lore raw

Acked-by Lennox Wu <[email protected]>

2014-06-27 7:28 GMT+08:00 Chen Gang <[email protected]>:

Quoted 36 lines · David Rientjes

Quoted 21 lines · Chen Gang
Quoted 20 lines
'COUNTER' and other same kind macros are too common to use, and easy to get conflict with other modules.
At present, they are not used, so it is OK to simply remove them. And the related warning (allmodconfig with score):
CC [M] drivers/md/raid1.o
In file included from drivers/md/raid1.c:42:0:
drivers/md/bitmap.h:93:0: warning: "COUNTER" redefined
   #define COUNTER(x) (((bitmap_counter_t) x) & COUNTER_MAX)
   ^
  In file included from ./arch/score/include/asm/ptrace.h:4:0,
                   from include/linux/sched.h:31,
                   from include/linux/blkdev.h:4,
                   from drivers/md/raid1.c:36:
./arch/score/include/uapi/asm/ptrace.h:13:0: note: this is the location of the previous definition
#define COUNTER 38
Quoted 4 lines
Quoted 1 line
Signed-off-by Chen Gang <[email protected]>
Acked-by David Rientjes <[email protected]>
OK, thanks. And also thank all of you for your discussions.
Thanks.
--
Chen Gang
Open, share, and attitude like air, water, and life which God blessed

Chen Gang

author

2014-06-27 02:47 UTC #4 lore raw

Quoted 2 lines · Lennox Wu

Acked-by Lennox Wu <[email protected]>

OK, thank, and excuse me, I am not quite familiar with the version merging of upstream kernel: "who will apply it, next, if it is past all reviewers' checking".

Thanks.

Signature · 3 lines

Chen Gang

Open, share, and attitude like air, water, and life which God blessed

Guenter Roeck

2014-06-27 03:25 UTC #5 lore raw

Quoted 8 lines · Chen Gang

Quoted 2 lines · Lennox Wu
Acked-by Lennox Wu <[email protected]>
OK, thank, and excuse me, I am not quite familiar with the version merging of upstream kernel: "who will apply it, next, if it is past all reviewers' checking".

Normal procedure would be for Lennox (as maintainer) to send a pull request to Linus.

Guenter

Chen Gang

author

2014-06-27 03:39 UTC #6 lore raw

Quoted 5 lines · Guenter Roeck

Quoted 4 lines · Chen Gang
Quoted 2 lines · Lennox Wu
Acked-by Lennox Wu <[email protected]>

Quoted 8 lines

Quoted 4 lines
OK, thank, and excuse me, I am not quite familiar with the version merging of upstream kernel: "who will apply it, next, if it is past all reviewers' checking".
Normal procedure would be for Lennox (as maintainer) to send a pull request to Linus.

OK, thank you for your information.

Thanks.

Signature · 3 lines

Chen Gang

Open, share, and attitude like air, water, and life which God blessed

David Rientjes

2014-07-17 01:49 UTC #7 lore raw

In reply to David Rientjes

Quoted 21 lines · David Rientjes

Quoted 19 lines · Chen Gang
'COUNTER' and other same kind macros are too common to use, and easy to get conflict with other modules.
At present, they are not used, so it is OK to simply remove them. And the related warning (allmodconfig with score):
CC [M] drivers/md/raid1.o
In file included from drivers/md/raid1.c:42:0:
drivers/md/bitmap.h:93:0: warning: "COUNTER" redefined
   #define COUNTER(x) (((bitmap_counter_t) x) & COUNTER_MAX)
   ^
  In file included from ./arch/score/include/asm/ptrace.h:4:0,
                   from include/linux/sched.h:31,
                   from include/linux/blkdev.h:4,
                   from drivers/md/raid1.c:36:
./arch/score/include/uapi/asm/ptrace.h:13:0: note: this is the location of the previous definition
#define COUNTER 38

Quoted 4 lines

Quoted 1 line
Signed-off-by Chen Gang <[email protected]>
Acked-by David Rientjes <[email protected]>

Lennox or Liqin, could you please queue this patch for 3.17?

Lennox Wu

2014-07-17 02:15 UTC #8 lore raw

Actually, I don't know the rule for merging patches. Some patches will be merge,and some will be miss. If the patch is missed, we will merge it into our git.

Best,
Lennox

2014-07-17 9:49 GMT+08:00 David Rientjes <[email protected]>:

Quoted 29 lines · David Rientjes

Quoted 22 lines · Chen Gang
Quoted 20 lines
'COUNTER' and other same kind macros are too common to use, and easy to get conflict with other modules.
At present, they are not used, so it is OK to simply remove them. And the related warning (allmodconfig with score):
CC [M] drivers/md/raid1.o
In file included from drivers/md/raid1.c:42:0:
drivers/md/bitmap.h:93:0: warning: "COUNTER" redefined
   #define COUNTER(x) (((bitmap_counter_t) x) & COUNTER_MAX)
   ^
  In file included from ./arch/score/include/asm/ptrace.h:4:0,
                   from include/linux/sched.h:31,
                   from include/linux/blkdev.h:4,
                   from drivers/md/raid1.c:36:
./arch/score/include/uapi/asm/ptrace.h:13:0: note: this is the location of the previous definition
#define COUNTER 38
Quoted 4 lines
Quoted 1 line
Signed-off-by Chen Gang <[email protected]>
Acked-by David Rientjes <[email protected]>
Lennox or Liqin, could you please queue this patch for 3.17?

Guenter Roeck

2014-07-17 02:30 UTC #9 lore raw

Quoted 4 lines · Lennox Wu

Actually, I don't know the rule for merging patches. Some patches will be merge,and some will be miss. If the patch is missed, we will merge it into our git.

Unless I am missing something, this patch is in arch/score, so the expectation would be for you to pick it up and send it to Linus.

Guenter

Quoted 35 lines

Best,
Lennox
2014-07-17 9:49 GMT+08:00 David Rientjes <[email protected]>:
Quoted 29 lines · David Rientjes
Quoted 22 lines · Chen Gang
Quoted 20 lines
'COUNTER' and other same kind macros are too common to use, and easy to get conflict with other modules.
At present, they are not used, so it is OK to simply remove them. And the related warning (allmodconfig with score):
CC [M] drivers/md/raid1.o
In file included from drivers/md/raid1.c:42:0:
   drivers/md/bitmap.h:93:0: warning: "COUNTER" redefined
    #define COUNTER(x) (((bitmap_counter_t) x) & COUNTER_MAX)
    ^
   In file included from ./arch/score/include/asm/ptrace.h:4:0,
                    from include/linux/sched.h:31,
                    from include/linux/blkdev.h:4,
                    from drivers/md/raid1.c:36:
   ./arch/score/include/uapi/asm/ptrace.h:13:0: note: this is the location of the previous definition
    #define COUNTER  38
Quoted 4 lines
Quoted 1 line
Signed-off-by Chen Gang <[email protected]>
Acked-by David Rientjes <[email protected]>
Lennox or Liqin, could you please queue this patch for 3.17?

Lennox Wu

2014-07-17 02:52 UTC #10 lore raw

Yes, you might miss something. Some patches were merged once I acknowledged them,and some were missed.
So I am not sure the rule, if someone will merge these patches once them are acknowledged, it is redundant that I issue a PULL request again.

2014-07-17 10:30 GMT+08:00 Guenter Roeck <[email protected]>:

Quoted 53 lines · Lennox Wu

Quoted 5 lines
Actually, I don't know the rule for merging patches. Some patches will be merge,and some will be miss. If the patch is missed, we will merge it into our git.
Unless I am missing something, this patch is in arch/score, so the expectation would be for you to pick it up and send it to Linus.
Guenter
Quoted 40 lines
Best,
Lennox
2014-07-17 9:49 GMT+08:00 David Rientjes <[email protected]>:
Quoted 33 lines · David Rientjes
Quoted 24 lines · Chen Gang
Quoted 22 lines
'COUNTER' and other same kind macros are too common to use, and easy to get conflict with other modules.
At present, they are not used, so it is OK to simply remove them. And the
related warning (allmodconfig with score):
CC [M] drivers/md/raid1.o
In file included from drivers/md/raid1.c:42:0:
drivers/md/bitmap.h:93:0: warning: "COUNTER" redefined
    #define COUNTER(x) (((bitmap_counter_t) x) & COUNTER_MAX)
    ^
   In file included from ./arch/score/include/asm/ptrace.h:4:0,
                    from include/linux/sched.h:31,
                    from include/linux/blkdev.h:4,
                    from drivers/md/raid1.c:36:
   ./arch/score/include/uapi/asm/ptrace.h:13:0: note: this is the
location of the previous definition
    #define COUNTER  38
Quoted 5 lines
Quoted 1 line
Signed-off-by Chen Gang <[email protected]>
Acked-by David Rientjes <[email protected]>
Lennox or Liqin, could you please queue this patch for 3.17?

Chen Gang

author

2014-07-17 09:08 UTC #11 lore raw

Quoted 6 lines · Lennox Wu

Yes, you might miss something. Some patches were merged once I acknowledged them,and some were missed.
So I am not sure the rule, if someone will merge these patches once them are acknowledged, it is redundant that I issue a PULL request again.

I guess, we need consult another version merging members (e.g Stephen Rothwell), they may provide more useful suggestions or ideas.

For me, if the patch is mainly under "arch/*/*", it need be applied by related architecture members. And these architecture related patches can be merged into linux-next tree firstly, then to upstream main line.

Thanks.

Quoted 56 lines

2014-07-17 10:30 GMT+08:00 Guenter Roeck <[email protected]>:
Quoted 53 lines · Lennox Wu
Quoted 5 lines
Actually, I don't know the rule for merging patches. Some patches will be merge,and some will be miss. If the patch is missed, we will merge it into our git.
Unless I am missing something, this patch is in arch/score, so the expectation would be for you to pick it up and send it to Linus.
Guenter
Quoted 40 lines
Best,
Lennox
2014-07-17 9:49 GMT+08:00 David Rientjes <[email protected]>:
Quoted 33 lines · David Rientjes
Quoted 24 lines · Chen Gang
Quoted 22 lines
'COUNTER' and other same kind macros are too common to use, and easy to get conflict with other modules.
At present, they are not used, so it is OK to simply remove them. And the
related warning (allmodconfig with score):
CC [M] drivers/md/raid1.o
In file included from drivers/md/raid1.c:42:0:
drivers/md/bitmap.h:93:0: warning: "COUNTER" redefined
    #define COUNTER(x) (((bitmap_counter_t) x) & COUNTER_MAX)
    ^
   In file included from ./arch/score/include/asm/ptrace.h:4:0,
                    from include/linux/sched.h:31,
                    from include/linux/blkdev.h:4,
                    from drivers/md/raid1.c:36:
   ./arch/score/include/uapi/asm/ptrace.h:13:0: note: this is the
location of the previous definition
    #define COUNTER  38
Quoted 5 lines
Quoted 1 line
Signed-off-by Chen Gang <[email protected]>
Acked-by David Rientjes <[email protected]>
Lennox or Liqin, could you please queue this patch for 3.17?

Signature · 3 lines

Chen Gang

Open, share, and attitude like air, water, and life which God blessed

David Rientjes

2014-07-17 21:39 UTC #12 lore raw

In reply to Lennox Wu

Quoted 6 lines · Lennox Wu

Yes, you might miss something. Some patches were merged once I acknowledged them,and some were missed.
So I am not sure the rule, if someone will merge these patches once them are acknowledged, it is redundant that I issue a PULL request again.

You and Liqin Chen are the listed maintainers for this architecture and you do not list a git tree, nobody else is a maintainer for score. Who are you expecting to pick up patches to your architecture? As maintainer, you need to ensure that patches arrive at Linus's tree in one way or another, so what is your mechanism for doing so?

David Rientjes

2014-07-22 00:45 UTC #13 lore raw

PATCH 1/1 score, ptrace: Remove the macros which not be used currently

From: Chen Gang <[email protected]>

'COUNTER' and other same kind macros are too common to use, and easy to get conflict with other modules.

At present, they are not used, so it is OK to simply remove them. And the related warning (allmodconfig with score):

                   from include/linux/sched.h:31,
                   from include/linux/blkdev.h:4,
                   from drivers/md/raid1.c:36:

./arch/score/include/uapi/asm/ptrace.h:13:0: note: this is the location of the previous definition
#define COUNTER 38

Signed-off-by Chen Gang <[email protected]>

Signed-off-by David Rientjes <[email protected]>

---
Andrew, since the maintainers of score are non-responsive, could you please pick this up?

 arch/score/include/uapi/asm/ptrace.h | 11 -----------
 1 file changed, 11 deletions(-)

arch/score/include/uapi/asm/ptrace.h +0 ~~-11~~

@@ -4,17 +4,6 @@
 #define PTRACE_GETREGS		12
 #define PTRACE_SETREGS		13
 
-#define PC		32
-#define CONDITION	33
-#define ECR		34
-#define EMA		35
-#define CEH		36
-#define CEL		37
-#define COUNTER		38
-#define LDCR		39
-#define STCR		40
-#define PSR		41
-
 #define SINGLESTEP16_INSN	0x7006
 #define SINGLESTEP32_INSN	0x840C8000
 #define BREAKPOINT16_INSN	0x7002		/* work on SPG300 */