linux58-tkg: Merge b17b53430b

Fixes 994fcbee93
This commit is contained in:
Tk-Glitch 2020-09-06 21:28:34 +02:00
parent a59c00ab6f
commit f89af1cbb4
2 changed files with 23 additions and 2 deletions

View File

@ -45,7 +45,7 @@ else
fi
pkgname=("${pkgbase}" "${pkgbase}-headers")
pkgver="${_basekernel}"."${_sub}"
pkgrel=11
pkgrel=12
pkgdesc='Linux-tkg'
arch=('x86_64') # no i686 in here
url="http://www.kernel.org/"
@ -95,7 +95,7 @@ sha256sums=('e7f75186aa0642114af8f19d99559937300ca27acaf7451b36d4f9b0f85cf1f5'
'cd225e86d72eaf6c31ef3d7b20df397f4cc44ddd04389850691292cdf292b204'
'9fad4a40449e09522899955762c8928ae17f4cdaa16e01239fd12592e9d58177'
'965a517a283f265a012545fbb5cc9e516efc9f6166d2aa1baf7293a32a1086b7'
'15add9c484fc32843060293d2dab69f5ac4627063483ec9f31c0a7b966be7e92'
'548c5f7ab1a72a97abd4c1c6420e10b2f1e6442176f5f10526254b15024aaca6'
'49262ce4a8089fa70275aad742fc914baa28d9c384f710c9a62f64796d13e104'
'98311deeb474b39e821cd1e64198793d5c4d797155b3b8bbcb1938b7f11e8d74')

View File

@ -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