arch/arm/mm/dma-mapping.c: fix mismerge