CRIS: UAPI: fix ptrace.h

The exported ptrace.h header on CRIS references an "arch" directory
which does not exist.  Fix this by having the variants in the same
directory and including them conditionally, similar to other
architectures.

Signed-off-by: Rabin Vincent <rabin@rab.in>
Signed-off-by: Jesper Nilsson <jesper.nilsson@axis.com>

diff --cc arch/cris/arch-v32/kernel/signal.c
Simple merge

diff --cc arch/cris/include/arch-v32/arch/irqflags.h
Simple merge

diff --cc arch/cris/include/uapi/asm/Kbuild
Simple merge

diff --cc arch/cris/include/uapi/asm/ptrace.h
Simple merge

diff --cc arch/cris/include/uapi/asm/ptrace_v10.h
Simple merge

diff --cc arch/cris/include/uapi/asm/ptrace_v32.h
Simple merge