35 lines
966 B
Diff
35 lines
966 B
Diff
|
From 47c1fc7609ad25b54896c8715eff0e05b45d9956 Mon Sep 17 00:00:00 2001
|
||
|
|
From: wang_yue111 <648774160@qq.com>
|
||
|
|
Date: Wed, 11 Nov 2020 14:13:19 +0800
|
||
|
|
Subject: [PATCH] fix vm_fault_t conflict error
|
||
|
|
|
||
|
|
---
|
||
|
|
kae_driver/uacce/uacce.c | 3 +++
|
||
|
|
1 file changed, 3 insertions(+)
|
||
|
|
|
||
|
|
diff --git a/kae_driver/uacce/uacce.c b/KAEdriver-1.3.9/kae_driver/uacce/uacce.c
|
||
|
|
index 0ce0702..f897456 100644
|
||
|
|
--- a/kae_driver/uacce/uacce.c
|
||
|
|
+++ b/kae_driver/uacce/uacce.c
|
||
|
|
@@ -14,6 +14,7 @@
|
||
|
|
#include "../include_linux/uacce.h"
|
||
|
|
#include <linux/wait.h>
|
||
|
|
#include <linux/eventpoll.h>
|
||
|
|
+#include <linux/version.h>
|
||
|
|
|
||
|
|
static struct class *uacce_class;
|
||
|
|
static DEFINE_IDR(uacce_idr);
|
||
|
|
@@ -31,7 +32,9 @@ static DECLARE_RWSEM(uacce_qs_lock);
|
||
|
|
static const struct file_operations uacce_fops;
|
||
|
|
static void uacce_put_queue(struct uacce_queue *q);
|
||
|
|
|
||
|
|
+#if LINUX_VERSION_CODE < KERNEL_VERSION(5,1,0)
|
||
|
|
typedef int vm_fault_t;
|
||
|
|
+#endif
|
||
|
|
typedef unsigned int __poll_t;
|
||
|
|
|
||
|
|
/* match with enum uacce_qfrt */
|
||
|
|
--
|
||
|
|
2.23.0
|
||
|
|
|