diff options
| author | Richard Weinberger <richard@nod.at> | 2013-08-23 13:37:49 +0200 |
|---|---|---|
| committer | Richard Weinberger <richard@nod.at> | 2013-09-07 10:57:11 +0200 |
| commit | b5c04da022e801ca04057e09de15f876fd203ef1 (patch) | |
| tree | 1147487050ed93bff62f842089e8fd91dc7e7994 /arch/x86/um | |
| parent | 250127216dd6635f5730752d7444bdec992aecb0 (diff) | |
| download | blackbird-op-linux-b5c04da022e801ca04057e09de15f876fd203ef1.tar.gz blackbird-op-linux-b5c04da022e801ca04057e09de15f876fd203ef1.zip | |
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>
Diffstat (limited to 'arch/x86/um')
| -rw-r--r-- | arch/x86/um/os-Linux/prctl.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/um/os-Linux/prctl.c b/arch/x86/um/os-Linux/prctl.c index 9d34eddb517f..96eb2bd28832 100644 --- a/arch/x86/um/os-Linux/prctl.c +++ b/arch/x86/um/os-Linux/prctl.c @@ -4,7 +4,7 @@ */ #include <sys/ptrace.h> -#include <linux/ptrace.h> +#include <asm/ptrace.h> int os_arch_prctl(int pid, int code, unsigned long *addr) { |
