diff options
Diffstat (limited to 'drivers/media/video/samsung/mali/linux/mali_osk_specific.h')
| -rw-r--r--[-rwxr-xr-x] | drivers/media/video/samsung/mali/linux/mali_osk_specific.h | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/drivers/media/video/samsung/mali/linux/mali_osk_specific.h b/drivers/media/video/samsung/mali/linux/mali_osk_specific.h index 83ee906..157368b 100755..100644 --- a/drivers/media/video/samsung/mali/linux/mali_osk_specific.h +++ b/drivers/media/video/samsung/mali/linux/mali_osk_specific.h @@ -17,17 +17,15 @@ #ifndef __MALI_OSK_SPECIFIC_H__ #define __MALI_OSK_SPECIFIC_H__ -#ifdef __cplusplus -extern "C" -{ -#endif +#include <asm/uaccess.h> #define MALI_STATIC_INLINE static inline #define MALI_NON_STATIC_INLINE inline -#ifdef __cplusplus +MALI_STATIC_INLINE u32 _mali_osk_copy_from_user(void *to, void *from, u32 n) +{ + return (u32)copy_from_user(to, from, (unsigned long)n); } -#endif /** The list of events supported by the Mali DDK. */ typedef enum @@ -39,7 +37,7 @@ typedef enum ACTIVITY_FP0, ACTIVITY_FP1, ACTIVITY_FP2, - ACTIVITY_FP3, + ACTIVITY_FP3, /* L2 cache counters */ COUNTER_L2_C0, @@ -59,7 +57,7 @@ typedef enum COUNTER_FP3_C0, COUNTER_FP3_C1, - /* + /* * If more hardware counters are added, the _mali_osk_hw_counter_table * below should also be updated. */ |