um: merge arch/um/os-Linux/sys-{i386,x86_64}