gpu: mali-t6xx: Fix build errorstracking-member-build-g3d-1

Signed-off-by: Tushar Behera <tushar.behera@linaro.org>

3 files changed, 13 insertions, 5 deletions

diff --git a/drivers/gpu/arm/t6xx/kbase/osk/src/linux/include/osk/mali_osk_arch_credentials.h b/drivers/gpu/arm/t6xx/kbase/osk/src/linux/include/osk/mali_osk_arch_credentials.h
index 3581558f22b..403c78a8c7b 100644
--- a/drivers/gpu/arm/t6xx/kbase/osk/src/linux/include/osk/mali_osk_arch_credentials.h
+++ b/drivers/gpu/arm/t6xx/kbase/osk/src/linux/include/osk/mali_osk_arch_credentials.h
@@ -25,6 +25,7 @@
 #endif
 
 #include <linux/cred.h>
+#include <linux/sched/rt.h>
 
 OSK_STATIC_INLINE mali_bool osk_is_privileged(void)
 {
diff --git a/drivers/gpu/arm/t6xx/kbase/src/linux/config/tpip/mali_kbase_config_exynos5.c b/drivers/gpu/arm/t6xx/kbase/src/linux/config/tpip/mali_kbase_config_exynos5.c
index 75585fdee97..bdc7e23a8a2 100644
--- a/drivers/gpu/arm/t6xx/kbase/src/linux/config/tpip/mali_kbase_config_exynos5.c
+++ b/drivers/gpu/arm/t6xx/kbase/src/linux/config/tpip/mali_kbase_config_exynos5.c
@@ -31,7 +31,6 @@
 #include <linux/fb.h>
 #include <linux/clk.h>
 #include <mach/regs-clock.h>
-#include <mach/pmu.h>
 #include <mach/regs-pmu.h>
 #include <asm/delay.h>
 #include <mach/map.h>
@@ -1627,8 +1626,8 @@ void kbase_platform_dvfs_term(void)
 
 	mali_dvfs_wq = NULL;
 }
-#endif /* CONFIG_T6XX_DVFS */
 
+#endif /* CONFIG_T6XX_DVFS */
 
 int kbase_platform_dvfs_event(struct kbase_device *kbdev)
 {
@@ -1873,6 +1872,8 @@ static void kbase_platform_dvfs_set_vol(unsigned int vol)
 	return;
 }
 
+
+#ifdef CONFIG_T6XX_DVFS
 int kbase_platform_dvfs_get_level(int freq)
 {
 	int i;
@@ -1882,6 +1883,12 @@ int kbase_platform_dvfs_get_level(int freq)
 	}
 	return -1;
 }
+#else
+int kbase_platform_dvfs_get_level(int freq)
+{
+	return -1;
+}
+#endif
 
 #if defined CONFIG_T6XX_DVFS || defined CONFIG_T6XX_DEBUG_SYS
 void kbase_platform_dvfs_set_level(kbase_device *kbdev, int level)
diff --git a/drivers/gpu/arm/t6xx/kbase/src/linux/mali_kbase_mem_linux.c b/drivers/gpu/arm/t6xx/kbase/src/linux/mali_kbase_mem_linux.c
index 3b9b96f65a0..7d5320387bf 100644
--- a/drivers/gpu/arm/t6xx/kbase/src/linux/mali_kbase_mem_linux.c
+++ b/drivers/gpu/arm/t6xx/kbase/src/linux/mali_kbase_mem_linux.c
@@ -148,7 +148,7 @@ static int kbase_cpu_mmap(struct kbase_va_region *reg, struct vm_area_struct *vm
 	/*
 	 * VM_DONTCOPY - don't make this mapping available in fork'ed processes
 	 * VM_DONTEXPAND - disable mremap on this region
-	 * VM_RESERVED & VM_IO - disables paging
+	 * VM_IO - disables paging
 	 * VM_MIXEDMAP - Support mixing struct page*s and raw pfns.
 	 *               This is needed to support using the dedicated and
 	 *               the OS based memory backends together.
@@ -157,7 +157,7 @@ static int kbase_cpu_mmap(struct kbase_va_region *reg, struct vm_area_struct *vm
 	 * This will need updating to propagate coherency flags
 	 * See MIDBASE-1057
 	 */
-	vma->vm_flags |= VM_DONTCOPY | VM_DONTEXPAND | VM_RESERVED | VM_IO | VM_MIXEDMAP;
+	vma->vm_flags |= VM_DONTCOPY | VM_DONTEXPAND | VM_IO | VM_MIXEDMAP;
 	vma->vm_ops = &kbase_vm_ops;
 	vma->vm_private_data = reg;
 
@@ -753,7 +753,7 @@ static int kbase_tracking_page_setup(struct kbase_context * kctx, struct vm_area
 
 	/* no real access */
 	vma->vm_flags &= ~(VM_READ | VM_WRITE | VM_EXEC);
-	vma->vm_flags |= VM_DONTCOPY | VM_DONTEXPAND | VM_RESERVED | VM_IO;
+	vma->vm_flags |= VM_DONTCOPY | VM_DONTEXPAND | VM_IO;
 	vma->vm_ops = &kbase_vm_special_ops;
 	vma->vm_private_data = kctx;