ARM: dma-mapping: fix some CMA related mismerge