Richard Weinberger b5c04da022 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>

2013-09-07 10:57:11 +02:00

..

asm

missing user_stack_pointer() instances

2012-12-19 18:07:39 -05:00

os-Linux

um: prctl: Do not include linux/ptrace.h

2013-09-07 10:57:11 +02:00

shared/sysdep

sanitize rt_sigaction() situation a bit

2013-02-03 15:09:18 -05:00

vdso

coredump: remove VM_ALWAYSDUMP flag

2012-03-23 16:58:42 -07:00

bug.c

um: take arch/um/sys-x86 to arch/x86/um

2011-11-02 14:15:05 +01:00

bugs_32.c

um: get rid of pointless include "..." where include <...> will do

2012-10-09 22:28:45 +02:00

bugs_64.c

um: get rid of pointless include "..." where include <...> will do

2012-10-09 22:28:45 +02:00

checksum_32.S

x86, extable: Remove open-coded exception table entries in arch/x86/um/checksum_32.S

2012-04-20 13:51:39 -07:00

delay.c

um: merge delay_{32,64}.c

2011-11-02 14:15:37 +01:00

elfcore.c

um: take arch/um/sys-x86 to arch/x86/um

2011-11-02 14:15:05 +01:00

fault.c

um: don't compare a pointer to 0

2012-12-20 11:49:39 -08:00

Kconfig

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/signal

2013-02-23 18:50:11 -08:00

ksyms.c

um: take arch/um/sys-x86 to arch/x86/um

2011-11-02 14:15:05 +01:00

ldt.c

um: get rid of pointless include "..." where include <...> will do

2012-10-09 22:28:45 +02:00

Makefile

x86: switch to generic old sigaction

2013-02-03 18:16:27 -05:00

mem_32.c

coredump: remove VM_ALWAYSDUMP flag

2012-03-23 16:58:42 -07:00

mem_64.c

um: get rid of pointless include "..." where include <...> will do

2012-10-09 22:28:45 +02:00

ptrace_32.c

um: get rid of pointless include "..." where include <...> will do

2012-10-09 22:28:45 +02:00

ptrace_64.c

um: unify ptrace_user.h

2011-11-02 14:15:27 +01:00

ptrace_user.c

um: get rid of pointless include "..." where include <...> will do

2012-10-09 22:28:45 +02:00

setjmp_32.S

um: take arch/um/sys-x86 to arch/x86/um

2011-11-02 14:15:05 +01:00

setjmp_64.S

um: take arch/um/sys-x86 to arch/x86/um

2011-11-02 14:15:05 +01:00

signal.c

um: remove dead code

2013-07-19 11:35:32 +02:00

stub_32.S

um: get rid of pointless include "..." where include <...> will do

2012-10-09 22:28:45 +02:00

stub_64.S

um: get rid of pointless include "..." where include <...> will do

2012-10-09 22:28:45 +02:00

stub_segv.c

um: get rid of pointless include "..." where include <...> will do

2012-10-09 22:28:45 +02:00

sys_call_table_32.c

x86: get rid of pt_regs argument in vm86/vm86old

2013-02-03 18:16:24 -05:00

sys_call_table_64.c

introduce generic sys_sigaltstack(), switch x86 and um to it

2012-12-19 18:07:40 -05:00

syscalls_64.c

um: kill thread->forking

2012-09-27 18:04:55 +02:00

sysrq_32.c

um: move sysrq.h out of include/shared

2012-10-09 22:28:19 +02:00

sysrq_64.c

um: move sysrq.h out of include/shared

2012-10-09 22:28:19 +02:00

tls_32.c

make SYSCALL_DEFINE<n>-generated wrappers do asmlinkage_protect

2013-03-03 22:58:33 -05:00

tls_64.c

um: get rid of pointless include "..." where include <...> will do

2012-10-09 22:28:45 +02:00

user-offsets.c

x32: Add x32 system calls to syscall/syscall_64.tbl

2012-02-20 12:48:49 -08:00