summaryrefslogtreecommitdiff
path: root/packages/sys-kernel/linux-sources-redcore-lts/files/0016-unfuck-MuQSS-on-linux-4_14_15+.patch
blob: f7dc1d1cddb9e2839ab088b71f60bcff5e44b624 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
diff --git a/kernel/sched/MuQSS.c b/kernel/sched/MuQSS.c
index e84d700709ff6..b0be7fcfe41f9 100644
--- a/kernel/sched/MuQSS.c
+++ b/kernel/sched/MuQSS.c
@@ -55,6 +55,7 @@
 #include <linux/security.h>
 #include <linux/syscalls.h>
 #include <linux/tick.h>
+#include <linux/version.h>
 
 #include <asm/switch_to.h>
 #include <asm/tlb.h>
@@ -1959,7 +1960,11 @@ try_to_wake_up(struct task_struct *p, unsigned int state, int wake_flags)
 	p->state = TASK_WAKING;
 
 	if (p->in_iowait) {
+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 14, 15)
 		delayacct_blkio_end();
+#else
+		delayacct_blkio_end(p);
+#endif
 		atomic_dec(&task_rq(p)->nr_iowait);
 	}
 
@@ -1970,7 +1975,11 @@ try_to_wake_up(struct task_struct *p, unsigned int state, int wake_flags)
 #else /* CONFIG_SMP */
 
 	if (p->in_iowait) {
+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 14, 15)
 		delayacct_blkio_end();
+#else
+		delayacct_blkio_end(p);
+#endif
 		atomic_dec(&task_rq(p)->nr_iowait);
 	}
 
@@ -2022,7 +2031,11 @@ static void try_to_wake_up_local(struct task_struct *p)
 
 	if (!task_on_rq_queued(p)) {
 		if (p->in_iowait) {
+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 14, 15)
 			delayacct_blkio_end();
+#else
+			delayacct_blkio_end(p);
+#endif
 			atomic_dec(&rq->nr_iowait);
 		}
 		ttwu_activate(rq, p);