Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Chen Gang and committed by
Linus Torvalds
8cdea060 2502722d

-11
-11
arch/score/include/uapi/asm/ptrace.h
··· 4 4 #define PTRACE_GETREGS 12 5 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 7 #define SINGLESTEP16_INSN 0x7006 19 8 #define SINGLESTEP32_INSN 0x840C8000 20 9 #define BREAKPOINT16_INSN 0x7002 /* work on SPG300 */