diff --git a/drivers/gpu/arm/midgard.txxx/mali_kbase_device.c b/drivers/gpu/arm/midgard.txxx/mali_kbase_device.c
index 717795b7f817..3ade31a85604 100644
--- a/drivers/gpu/arm/midgard.txxx/mali_kbase_device.c
+++ b/drivers/gpu/arm/midgard.txxx/mali_kbase_device.c
@@ -27,6 +27,7 @@
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/of_platform.h>
+#include <linux/ktime.h>
 
 #include <mali_kbase.h>
 #include <mali_kbase_defs.h>
@@ -443,7 +444,7 @@ void kbasep_trace_add(struct kbase_device *kbdev, enum kbase_trace_code code, vo
 	trace_msg->thread_id = task_pid_nr(current);
 	trace_msg->cpu = task_cpu(current);
 
-	getnstimeofday(&trace_msg->timestamp);
+	ktime_get_real_ts64(&trace_msg->timestamp);
 
 	trace_msg->code = code;
 	trace_msg->ctx = ctx;
diff --git a/drivers/gpu/arm/midgard.txxx/tests/kutf/kutf_suite.c b/drivers/gpu/arm/midgard.txxx/tests/kutf/kutf_suite.c
index 4968f24301db..40106f2af0df 100644
--- a/drivers/gpu/arm/midgard.txxx/tests/kutf/kutf_suite.c
+++ b/drivers/gpu/arm/midgard.txxx/tests/kutf/kutf_suite.c
@@ -687,19 +687,19 @@ void kutf_add_test_with_filters_and_data(
 	}
 
 	test_func->filters = filters;
-	tmp = debugfs_create_x32("filters", S_IROTH, test_func->dir,
+	debugfs_create_x32("filters", S_IROTH, test_func->dir,
 				 &test_func->filters);
 	if (!tmp) {
 		pr_err("Failed to create debugfs file \"filters\" when adding test %s\n", name);
-		goto fail_file;
+	//	goto fail_file;
 	}
 
 	test_func->test_id = id;
-	tmp = debugfs_create_u32("test_id", S_IROTH, test_func->dir,
+	debugfs_create_u32("test_id", S_IROTH, test_func->dir,
 				 &test_func->test_id);
 	if (!tmp) {
 		pr_err("Failed to create debugfs file \"test_id\" when adding test %s\n", name);
-		goto fail_file;
+	//	goto fail_file;
 	}
 
 	for (i = 0; i < suite->fixture_variants; i++) {