um: merge HOST_... of registers common on i386 and amd64

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Richard Weinberger <richard@nod.at>

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/shared/sysdep/ptrace_32.h
Simple merge

diff --cc arch/x86/um/shared/sysdep/ptrace_64.h
Simple merge

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

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

diff --cc arch/x86/um/user-offsets.c
Simple merge