Merge branch 'mali-android' into stable-android-ux500-3.3-1

1 files changed, 11 insertions, 0 deletions

diff --git a/drivers/gpu/mali/mali400ko/driver/src/devicedrv/mali/linux/mali_osk_memory.c b/drivers/gpu/mali/mali400ko/driver/src/devicedrv/mali/linux/mali_osk_memory.c
index bf6679f7bac..7bb470f8828 100644
--- a/drivers/gpu/mali/mali400ko/driver/src/devicedrv/mali/linux/mali_osk_memory.c
+++ b/drivers/gpu/mali/mali400ko/driver/src/devicedrv/mali/linux/mali_osk_memory.c
@@ -15,6 +15,7 @@
 
 #include "mali_osk.h"
 #include <linux/slab.h>
+#include <linux/vmalloc.h>
 
 void inline *_mali_osk_calloc( u32 n, u32 size )
 {
@@ -31,6 +32,16 @@ void inline _mali_osk_free( void *ptr )
     kfree(ptr);
 }
 
+void inline *_mali_osk_valloc( u32 size )
+{
+    return vmalloc(size);
+}
+
+void inline _mali_osk_vfree( void *ptr )
+{
+    vfree(ptr);
+}
+
 void inline *_mali_osk_memcpy( void *dst, const void *src, u32	len )
 {
     return memcpy(dst, src, len);