From: Imre Deak Date: Fri, 4 Nov 2011 12:27:53 +0000 (+0200) Subject: gfx: pvr: change map/export_devmem to map/export_devmem_2 X-Git-Tag: 2.1b_release~523 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=a1156f850ce1204210739f8038aa996142e7b0b6;p=kernel%2Fkernel-mfld-blackbay.git gfx: pvr: change map/export_devmem to map/export_devmem_2 Signed-off-by: Imre Deak Signed-off-by: Pauli Nieminen Signed-off-by: Kirill A. Shutemov --- diff --git a/drivers/staging/mrst/pvr/services4/srvkm/env/linux/pvr_bridge_k.c b/drivers/staging/mrst/pvr/services4/srvkm/env/linux/pvr_bridge_k.c index f7a41f6..68f1377 100644 --- a/drivers/staging/mrst/pvr/services4/srvkm/env/linux/pvr_bridge_k.c +++ b/drivers/staging/mrst/pvr/services4/srvkm/env/linux/pvr_bridge_k.c @@ -207,7 +207,7 @@ static int secure_fd_export_prepare(int cmd, void *param_in, void *sec_meminfo) return 0; switch (cmd) { - case PVRSRV_BRIDGE_EXPORT_DEVICEMEM: + case PVRSRV_BRIDGE_EXPORT_DEVICEMEM_2: if (sec_meminfo) { pr_err("pvr: %s: can only export one MemInfo " "per file descriptor", __func__); @@ -215,7 +215,7 @@ static int secure_fd_export_prepare(int cmd, void *param_in, void *sec_meminfo) } break; - case PVRSRV_BRIDGE_MAP_DEV_MEMORY: + case PVRSRV_BRIDGE_MAP_DEV_MEMORY_2: { PVRSRV_BRIDGE_IN_MAP_DEV_MEMORY *map_devmem_in = param_in; @@ -248,7 +248,7 @@ static void secure_fd_export_finish(int cmd, void *param_out, if (!support_secure_fd_export()) return; - if (cmd != PVRSRV_BRIDGE_EXPORT_DEVICEMEM) + if (cmd != PVRSRV_BRIDGE_EXPORT_DEVICEMEM_2) return; *sec_mem_info = map_devmem_out->hMemInfo;