]> git.baikalelectronics.ru Git - kernel.git/commit
um: prctl: Do not include linux/ptrace.h
authorRichard Weinberger <richard@nod.at>
Fri, 23 Aug 2013 11:37:49 +0000 (13:37 +0200)
committerRichard Weinberger <richard@nod.at>
Sat, 7 Sep 2013 08:57:11 +0000 (10:57 +0200)
commita3ad497bf067b5db0938eeb2018faca89cb6c4f3
tree1147487050ed93bff62f842089e8fd91dc7e7994
parent21626489b091f63ed5a2b79995ef78fbb89a125a
um: prctl: Do not include linux/ptrace.h

On recent toolchains we hit:
In file included from arch/x86/um/os-Linux/prctl.c:7:0:
/usr/include/linux/ptrace.h:58:8: error: redefinition of ‘struct
ptrace_peeksiginfo_args’ struct ptrace_peeksiginfo_args {
        ^
In file included from arch/x86/um/os-Linux/prctl.c:6:0:
/usr/include/sys/ptrace.h:191:8: note: originally defined here
 struct ptrace_peeksiginfo_args
        ^
make[2]: *** [arch/x86/um/os-Linux/prctl.o] Error 1
make[1]: *** [arch/x86/um/os-Linux] Error 2
make: *** [arch/x86/um] Error 2

The solution is not to include linux/ptrace.h and obtain
the arch specific ptrace command from asm/ptrace.h.

Reported-and-tested-by: David Oberhollenzer <david.oberhollenzer@tele2.at>
Signed-off-by: Richard Weinberger <richard@nod.at>
arch/x86/um/os-Linux/prctl.c