diff options
Diffstat (limited to 'drivers/media/video/samsung/mali/linux/mali_osk_specific.h')
| -rw-r--r-- | drivers/media/video/samsung/mali/linux/mali_osk_specific.h | 14 |
1 files changed, 8 insertions, 6 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 157368b..83ee906 100644 --- a/drivers/media/video/samsung/mali/linux/mali_osk_specific.h +++ b/drivers/media/video/samsung/mali/linux/mali_osk_specific.h @@ -17,15 +17,17 @@ #ifndef __MALI_OSK_SPECIFIC_H__ #define __MALI_OSK_SPECIFIC_H__ -#include <asm/uaccess.h> +#ifdef __cplusplus +extern "C" +{ +#endif #define MALI_STATIC_INLINE static inline #define MALI_NON_STATIC_INLINE inline -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); +#ifdef __cplusplus } +#endif /** The list of events supported by the Mali DDK. */ typedef enum @@ -37,7 +39,7 @@ typedef enum ACTIVITY_FP0, ACTIVITY_FP1, ACTIVITY_FP2, - ACTIVITY_FP3, + ACTIVITY_FP3, /* L2 cache counters */ COUNTER_L2_C0, @@ -57,7 +59,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. */ |