Merge "arm: dma-mapping: set the proper bitmap size"