um: Don't pollute kernel namespace with uapi

Don't include ptrace uapi stuff in arch headers, it will
pollute the kernel namespace and conflict with existing
stuff.
In this case it fixes clashes with common names like R8.

Signed-off-by: Richard Weinberger <richard@nod.at>

diff --cc arch/um/include/asm/ptrace-generic.h
Simple merge

diff --cc arch/um/kernel/ptrace.c
Simple merge

diff --cc arch/x86/um/ptrace_32.c
Simple merge

diff --cc arch/x86/um/ptrace_64.c
Simple merge

diff --cc arch/x86/um/tls_32.c
Simple merge

diff --cc arch/x86/um/tls_64.c
Simple merge