exynos4: squash opensource libUMP
commit f40eeecbe44ee3ca5f4406e8881f6ffe1507d87c
Author: Dheeraj CVR <cvr.dheeraj@gmail.com>
Date: Sun Dec 14 16:41:30 2014 +0530
exynos4: libUMP: fix headers for newer mali driver
Change-Id: Ia81fa1949d04d809b4c5045269a70d7bab758f4a
commit 8c3792c590c0591647ab5ab59ff74d11e5f8afdd
Author: Dheeraj CVR <cvr.dheeraj@gmail.com>
Date: Sun Dec 14 16:38:51 2014 +0530
exynos4: libUMP: use relative include paths
Change-Id: If46c68512d0404df0d46734531a6160eb18b7ce5
commit feb6f2c45d4f87655a2f391114946933a128e60c
Author: Javi Ferrer <javi.f.o@gmail.com>
Date: Fri Nov 21 04:05:51 2014 +0530
exynos4: open source libUMP
- Deleted unneeded include ion.h
- Correct libsecion build
- Correct gralloc build and bring back ump_ref_drv_ion_import
Change-Id: I1da602ec77d78e5056ea0c37f328c6c1b0e60e00
diff --git a/exynos4/hal/libsecion/libsecion.cpp b/exynos4/hal/libsecion/libsecion.cpp
index 614c6e1..b1cad23 100644
--- a/exynos4/hal/libsecion/libsecion.cpp
+++ b/exynos4/hal/libsecion/libsecion.cpp
@@ -124,11 +124,11 @@
return munmap(addr, len);
}
-int ion_msync(ion_client client, ion_buffer buffer, enum ION_MSYNC_FLAGS flags, size_t size, off_t offset)
+int ion_msync(ion_client client, ion_buffer buffer, long flags, size_t size, off_t offset)
{
struct ion_msync_data arg_cdata;
arg_cdata.size = size;
- arg_cdata.dir = flags;
+ arg_cdata.dir = (ION_MSYNC_FLAGS) flags;
arg_cdata.fd = buffer;
arg_cdata.offset = offset;