'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(-)
diff --git a/arch/score/include/uapi/asm/ptrace.h b/arch/score/include/uapi/asm/ptrace.h
index f59771a..5c5e794 100644
--- a/arch/score/include/uapi/asm/ptrace.h
+++ b/arch/score/include/uapi/asm/ptrace.h
@@ -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 */
--
1.9.2.459.g68773ac
On Thu, 26 Jun 2014, Chen Gang wrote:
> '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]>
Acked-by: David Rientjes <[email protected]>
On 06/27/2014 05:56 AM, David Rientjes wrote:
> On Thu, 26 Jun 2014, Chen Gang wrote:
>
>> '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]>
>
> 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
Acked-by: Lennox Wu <[email protected]>
2014-06-27 7:28 GMT+08:00 Chen Gang <[email protected]>:
>
>
> On 06/27/2014 05:56 AM, David Rientjes wrote:
>> On Thu, 26 Jun 2014, Chen Gang wrote:
>>
>>> '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]>
>>
>> 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
On 06/27/2014 10:11 AM, Lennox Wu wrote:
> 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.
--
Chen Gang
Open, share, and attitude like air, water, and life which God blessed
On 06/26/2014 07:47 PM, Chen Gang wrote:
> On 06/27/2014 10:11 AM, Lennox Wu wrote:
>> 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
On 06/27/2014 11:25 AM, Guenter Roeck wrote:
> On 06/26/2014 07:47 PM, Chen Gang wrote:
>> On 06/27/2014 10:11 AM, Lennox Wu wrote:
>>> 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.
>
OK, thank you for your information.
Thanks.
--
Chen Gang
Open, share, and attitude like air, water, and life which God blessed
On Thu, 26 Jun 2014, David Rientjes wrote:
> On Thu, 26 Jun 2014, Chen Gang wrote:
>
> > '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]>
>
> Acked-by: David Rientjes <[email protected]>
>
Lennox or Liqin, could you please queue this patch for 3.17?
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]>:
> On Thu, 26 Jun 2014, David Rientjes wrote:
>
>> On Thu, 26 Jun 2014, Chen Gang wrote:
>>
>> > '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]>
>>
>> Acked-by: David Rientjes <[email protected]>
>>
>
> Lennox or Liqin, could you please queue this patch for 3.17?
On 07/16/2014 07:14 PM, Lennox Wu wrote:
> 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
> Best,
> Lennox
>
> 2014-07-17 9:49 GMT+08:00 David Rientjes <[email protected]>:
>> On Thu, 26 Jun 2014, David Rientjes wrote:
>>
>>> On Thu, 26 Jun 2014, Chen Gang wrote:
>>>
>>>> '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]>
>>>
>>> Acked-by: David Rientjes <[email protected]>
>>>
>>
>> Lennox or Liqin, could you please queue this patch for 3.17?
>
>
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]>:
> On 07/16/2014 07:14 PM, Lennox Wu wrote:
>>
>> 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
>
>
>> Best,
>> Lennox
>>
>> 2014-07-17 9:49 GMT+08:00 David Rientjes <[email protected]>:
>>>
>>> On Thu, 26 Jun 2014, David Rientjes wrote:
>>>
>>>> On Thu, 26 Jun 2014, Chen Gang wrote:
>>>>
>>>>> '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]>
>>>>
>>>>
>>>> Acked-by: David Rientjes <[email protected]>
>>>>
>>>
>>> Lennox or Liqin, could you please queue this patch for 3.17?
>>
>>
>>
>
On 07/17/2014 10:52 AM, Lennox Wu wrote:
> 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.
>
>
> 2014-07-17 10:30 GMT+08:00 Guenter Roeck <[email protected]>:
>> On 07/16/2014 07:14 PM, Lennox Wu wrote:
>>>
>>> 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
>>
>>
>>> Best,
>>> Lennox
>>>
>>> 2014-07-17 9:49 GMT+08:00 David Rientjes <[email protected]>:
>>>>
>>>> On Thu, 26 Jun 2014, David Rientjes wrote:
>>>>
>>>>> On Thu, 26 Jun 2014, Chen Gang wrote:
>>>>>
>>>>>> '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]>
>>>>>
>>>>>
>>>>> Acked-by: David Rientjes <[email protected]>
>>>>>
>>>>
>>>> Lennox or Liqin, could you please queue this patch for 3.17?
>>>
>>>
>>>
>>
--
Chen Gang
Open, share, and attitude like air, water, and life which God blessed
On Thu, 17 Jul 2014, Lennox Wu wrote:
> 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?
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):
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]>
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(-)
diff --git a/arch/score/include/uapi/asm/ptrace.h b/arch/score/include/uapi/asm/ptrace.h
--- a/arch/score/include/uapi/asm/ptrace.h
+++ b/arch/score/include/uapi/asm/ptrace.h
@@ -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 */