The patch titled
Subject: score, ptrace: remove unused macros
has been added to the -mm tree. Its filename is
score-ptrace-remove-the-macros-which-not-be-used-currently.patch
This patch should soon appear at
http://ozlabs.org/~akpm/mmots/broken-out/score-ptrace-remove-the-macros-which-not-be-used-currently.patch
and later at
http://ozlabs.org/~akpm/mmotm/broken-out/score-ptrace-remove-the-macros-which-not-be-used-currently.patch
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/SubmitChecklist when testing your code ***
The -mm tree is included into linux-next and is updated
there every 3-4 working days
------------------------------------------------------
From: Chen Gang <gang.chen.5i5j@xxxxxxxxx>
Subject: score, ptrace: remove unused macros
'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 <gang.chen.5i5j@xxxxxxxxx>
Signed-off-by: David Rientjes <rientjes@xxxxxxxxxx>
Cc: Lennox Wu <lennox.wu@xxxxxxxxx>
Cc: Guenter Roeck <linux@xxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
arch/score/include/uapi/asm/ptrace.h | 11 -----------
1 file changed, 11 deletions(-)
diff -puN arch/score/include/uapi/asm/ptrace.h~score-ptrace-remove-the-macros-which-not-be-used-currently arch/score/include/uapi/asm/ptrace.h
--- a/arch/score/include/uapi/asm/ptrace.h~score-ptrace-remove-the-macros-which-not-be-used-currently
+++ a/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 */
_
Patches currently in -mm which might be from gang.chen.5i5j@xxxxxxxxx are
score-ptrace-remove-the-macros-which-not-be-used-currently.patch
linux-next.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
