mirror of
https://github.com/Fishwaldo/build.git
synced 2025-03-23 15:21:39 +00:00
61 lines
2 KiB
Diff
61 lines
2 KiB
Diff
From ee8623e8e56fa7e07f39da97f6f1a48ae25328d2 Mon Sep 17 00:00:00 2001
|
|
From: Myy <myy@miouyouyou.fr>
|
|
Date: Sun, 12 Mar 2017 21:18:20 +0000
|
|
Subject: [PATCH] Few modifications after v4.11 headers and signatures changes
|
|
|
|
This patch is due to the following main kernel changes :
|
|
|
|
* 11bac80004499ea59f361ef2a5516c84b6eab675
|
|
mm, fs: reduce fault, page_mkwrite, and pfn_mkwrite to take only vmf
|
|
|
|
* 68e21be2916b359fd8afb536c1911dc014cfd03e
|
|
sched/headers: Move task->mm handling methods to <linux/sched/mm.h>
|
|
|
|
* f3ac60671954c8d413532627b1be13a76f394c49
|
|
sched/headers: Move task-stack related APIs from <linux/sched.h> to
|
|
<linux/sched/task_stack.h>
|
|
|
|
Signed-off-by: Myy <myy@miouyouyou.fr>
|
|
---
|
|
drivers/gpu/arm/midgard/mali_kbase.h | 4 ++++
|
|
drivers/gpu/arm/midgard/mali_kbase_mem_linux.c | 7 ++++++-
|
|
2 files changed, 10 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/drivers/gpu/arm/midgard/mali_kbase.h b/drivers/gpu/arm/midgard/mali_kbase.h
|
|
index b5a771f..c4946fe 100644
|
|
--- a/drivers/gpu/arm/midgard/mali_kbase.h
|
|
+++ b/drivers/gpu/arm/midgard/mali_kbase.h
|
|
@@ -35,6 +35,10 @@
|
|
#include <linux/mutex.h>
|
|
#include <linux/rwsem.h>
|
|
#include <linux/sched.h>
|
|
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 11, 0)
|
|
+#include <linux/sched/task_stack.h>
|
|
+#include <linux/sched/mm.h>
|
|
+#endif
|
|
#include <linux/slab.h>
|
|
#include <linux/spinlock.h>
|
|
#include <linux/vmalloc.h>
|
|
diff --git a/drivers/gpu/arm/midgard/mali_kbase_mem_linux.c b/drivers/gpu/arm/midgard/mali_kbase_mem_linux.c
|
|
index b5b138b..3cc6229 100644
|
|
--- a/drivers/gpu/arm/midgard/mali_kbase_mem_linux.c
|
|
+++ b/drivers/gpu/arm/midgard/mali_kbase_mem_linux.c
|
|
@@ -1710,9 +1710,14 @@ static void kbase_cpu_vm_close(struct vm_area_struct *vma)
|
|
|
|
KBASE_EXPORT_TEST_API(kbase_cpu_vm_close);
|
|
|
|
-
|
|
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0))
|
|
static int kbase_cpu_vm_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
|
|
{
|
|
+#else
|
|
+static int kbase_cpu_vm_fault(struct vm_fault *vmf)
|
|
+{
|
|
+ struct vm_area_struct *vma = vmf->vma;
|
|
+#endif
|
|
struct kbase_cpu_mapping *map = vma->vm_private_data;
|
|
pgoff_t rel_pgoff;
|
|
size_t i;
|
|
--
|
|
2.10.2
|
|
|