[XFS] merge xfs_arch.h userspace changes back