diff options
Diffstat (limited to 'meta-xilinx-core/recipes-graphics/mali/kernel-module-mali/0018-Change-return-type-to-vm_fault_t-for-fault-handler.patch')
-rw-r--r-- | meta-xilinx-core/recipes-graphics/mali/kernel-module-mali/0018-Change-return-type-to-vm_fault_t-for-fault-handler.patch | 32 |
1 files changed, 32 insertions, 0 deletions
diff --git a/meta-xilinx-core/recipes-graphics/mali/kernel-module-mali/0018-Change-return-type-to-vm_fault_t-for-fault-handler.patch b/meta-xilinx-core/recipes-graphics/mali/kernel-module-mali/0018-Change-return-type-to-vm_fault_t-for-fault-handler.patch new file mode 100644 index 00000000..9797db62 --- /dev/null +++ b/meta-xilinx-core/recipes-graphics/mali/kernel-module-mali/0018-Change-return-type-to-vm_fault_t-for-fault-handler.patch | |||
@@ -0,0 +1,32 @@ | |||
1 | From ad5c569f0cc40698699fc2f2c1db3ceb9f8b8f35 Mon Sep 17 00:00:00 2001 | ||
2 | From: Madhurkiran Harikrishnan <madhurkiran.harikrishnan@xilinx.com> | ||
3 | Date: Tue, 25 Feb 2020 11:36:01 -0800 | ||
4 | Subject: [LINUX][rel-v2020.1][PATCH v1 3/3] Change return type to vm_fault_t | ||
5 | for fault handler | ||
6 | |||
7 | From kernel 4.17 onwards the return type of fault handler for | ||
8 | vm_operations is of type 'vm_fault_t'. | ||
9 | |||
10 | Signed-off-by: Madhurkiran Harikrishnan <madhurkiran.harikrishnan@xilinx.com> | ||
11 | --- | ||
12 | driver/src/devicedrv/mali/linux/mali_memory.c | 4 +++- | ||
13 | 1 file changed, 3 insertions(+), 1 deletion(-) | ||
14 | |||
15 | diff --git a/driver/src/devicedrv/mali/linux/mali_memory.c b/driver/src/devicedrv/mali/linux/mali_memory.c | ||
16 | index c0f0982..2b2b209 100644 | ||
17 | --- linux/mali_memory.c | ||
18 | +++ b/linux/mali_memory.c | ||
19 | @@ -70,7 +70,9 @@ static void mali_mem_vma_close(struct vm_area_struct *vma) | ||
20 | } | ||
21 | } | ||
22 | |||
23 | -#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 11, 0) | ||
24 | +#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 17, 0) | ||
25 | +static vm_fault_t mali_mem_vma_fault(struct vm_fault *vmf) | ||
26 | +#elif LINUX_VERSION_CODE >= KERNEL_VERSION(4, 11, 0) | ||
27 | static int mali_mem_vma_fault(struct vm_fault *vmf) | ||
28 | #else | ||
29 | static int mali_mem_vma_fault(struct vm_area_struct *vma, struct vm_fault *vmf) | ||
30 | -- | ||
31 | 2.7.4 | ||
32 | |||