aboutsummaryrefslogtreecommitdiffstats
path: root/arch/score/include
diff options
context:
space:
mode:
authorChen Gang <gang.chen.5i5j@gmail.com>2014-08-06 19:03:37 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2014-08-06 21:01:12 -0400
commit8cdea0602c0df194dc52af0bb47bd8791db681f7 (patch)
treeac89f01f98341c2fa5d3d2c417c71ef0ffe1a4e9 /arch/score/include
parent2502722ddedc4f0a110646134d7937287c904c68 (diff)
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@gmail.com> Signed-off-by: David Rientjes <rientjes@google.com> Cc: Lennox Wu <lennox.wu@gmail.com> Cc: Guenter Roeck <linux@roeck-us.net> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/score/include')
-rw-r--r--arch/score/include/uapi/asm/ptrace.h11
1 files changed, 0 insertions, 11 deletions
diff --git a/arch/score/include/uapi/asm/ptrace.h b/arch/score/include/uapi/asm/ptrace.h
index f59771a3f127..5c5e794058be 100644
--- a/arch/score/include/uapi/asm/ptrace.h
+++ b/arch/score/include/uapi/asm/ptrace.h
@@ -4,17 +4,6 @@
4#define PTRACE_GETREGS 12 4#define PTRACE_GETREGS 12
5#define PTRACE_SETREGS 13 5#define PTRACE_SETREGS 13
6 6
7#define PC 32
8#define CONDITION 33
9#define ECR 34
10#define EMA 35
11#define CEH 36
12#define CEL 37
13#define COUNTER 38
14#define LDCR 39
15#define STCR 40
16#define PSR 41
17
18#define SINGLESTEP16_INSN 0x7006 7#define SINGLESTEP16_INSN 0x7006
19#define SINGLESTEP32_INSN 0x840C8000 8#define SINGLESTEP32_INSN 0x840C8000
20#define BREAKPOINT16_INSN 0x7002 /* work on SPG300 */ 9#define BREAKPOINT16_INSN 0x7002 /* work on SPG300 */