diff options
| author | Geert Uytterhoeven <geert@linux-m68k.org> | 2012-07-17 15:47:57 -0700 | 
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-07-17 16:21:30 -0700 | 
| commit | 07f604ccfdff2afe8224aee9322080a7c4c2014c (patch) | |
| tree | beec07649cbafd16c26a42cd687f21035245d9cc | |
| parent | b45f9330b4e08ee4de5e2f5cae75200edb283a96 (diff) | |
| download | olio-linux-3.10-07f604ccfdff2afe8224aee9322080a7c4c2014c.tar.xz olio-linux-3.10-07f604ccfdff2afe8224aee9322080a7c4c2014c.zip  | |
m32r: remove duplicate definition of PTRACE_O_TRACESYSGOOD
Fix the m32r build warning:
  include/linux/ptrace.h:66:0: warning: "PTRACE_O_TRACESYSGOOD" redefined [enabled by default]
  arch/m32r/include/asm/ptrace.h:117:0: note: this is the location of the previous definition
We already have it in <linux/ptrace.h>, so remove it from <asm/ptrace.h>
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: Hirokazu Takata <takata@linux-m32r.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
| -rw-r--r-- | arch/m32r/include/asm/ptrace.h | 3 | 
1 files changed, 0 insertions, 3 deletions
diff --git a/arch/m32r/include/asm/ptrace.h b/arch/m32r/include/asm/ptrace.h index 527527584dd..4313aa62b51 100644 --- a/arch/m32r/include/asm/ptrace.h +++ b/arch/m32r/include/asm/ptrace.h @@ -113,9 +113,6 @@ struct pt_regs {  #define PTRACE_OLDSETOPTIONS	21 -/* options set using PTRACE_SETOPTIONS */ -#define PTRACE_O_TRACESYSGOOD	0x00000001 -  #ifdef __KERNEL__  #include <asm/m32r.h>		/* M32R_PSW_BSM, M32R_PSW_BPM */  |