Fix after cherry-pick
delete 	pr_debug("\n in %s domain: %d, Partition: %d\n",__func__, domain, partition);
FIX 3
ion: Port heap mask change to ion

Heap mask field passes as argument at allocation time to specify ion
heap.

Change-Id: I6951da81b11bfcb0e006d2539c1707aabbb12db6
Signed-off-by: Hanumant Singh <hanumant@codeaurora.org>
Signed-off-by: Mitchel Humpherys <mitchelh@codeaurora.org>

Conflicts:
	drivers/media/dvb/mpq/demux/mpq_dmx_plugin_common.c
	drivers/media/video/msm_vidc/msm_smem.c
	drivers/media/video/vcap_vp.c
	drivers/video/msm/mdss/mdss_fb.c
ion: remove obsolete ion flags

The symbols CACHED and UNCACHED have been replaced by ION_FLAG_CACHED
upstream. This removes them from the kernel.

Change-Id: I90c33c293f56792131fc6bd490fe041b5798ac20
Signed-off-by: Mitchel Humpherys <mitchelh@codeaurora.org>

Conflicts:
	drivers/media/video/msm/mercury/msm_mercury_platform.c
	drivers/media/video/msm/msm_mctl_buf.c
	drivers/media/video/msm/msm_mem.c
	drivers/media/video/msm/msm_vfe_stats_buf.c
	drivers/media/video/msm_vidc/msm_smem.c
	drivers/media/video/videobuf2-msm-mem.c
ion: change ion kernel map function to not take flags argument

Buffer flags are going to be specified at allocation time rather than
map time. This removes the flags argument from the ion kernel map
function.

Change-Id: Ib983ecd0dcd7befb36287ae7037c71d4ca475f90
Signed-off-by: Mitchel Humpherys <mitchelh@codeaurora.org>

Conflicts:
	drivers/media/video/msm_vidc/msm_smem.c
	drivers/media/video/vcap_vp.c
	drivers/video/msm/mdss/mdss_fb.c
	drivers/video/msm/mdss/mdss_mdp_wb.c