linux58-tkg: Merge b17b53430b

Fixes 994fcbee93
2020-09-06 21:28:34 +02:00
parent a59c00ab6f
commit f89af1cbb4
2 changed files with 23 additions and 2 deletions
--- a/linux58-tkg/linux58-tkg-patches/0009-prjc_v5.8-r2.patch
+++ b/linux58-tkg/linux58-tkg-patches/0009-prjc_v5.8-r2.patch
@@ -8549,3 +8549,24 @@ index b5e3496cf803..65f60c77bc50 100644
 	};
 	struct wakeup_test_data *x = data;
 
+diff --git a/include/linux/sched/deadline.h b/include/linux/sched/deadline.h
+index 45f0b0f3616c934a3bfa43d0f2ba998c6f006dba..179d77c8360ebdd795a5bb9d2b046232403907a1 100644
+--- a/include/linux/sched/deadline.h
+++ b/include/linux/sched/deadline.h
+@@ -2,13 +2,13 @@
+ 
+ #ifdef CONFIG_SCHED_ALT
+ 
+-#ifdef CONFIG_SCHED_BMQ
+-#define __tsk_deadline(p)	(0UL)
+-
+ static inline int dl_task(struct task_struct *p)
+ {
+ 	return 0;
+ }
+
+#ifdef CONFIG_SCHED_BMQ
+#define __tsk_deadline(p)	(0UL)
+ #endif
+ 
+ #ifdef CONFIG_SCHED_PDS