projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
mm/migrate: correct failure handling if !hugepage_migration_support()
[firefly-linux-kernel-4.4.55.git]
/
kernel
/
hrtimer.c
diff --git
a/kernel/hrtimer.c
b/kernel/hrtimer.c
index 383319bae3f7d0d9e8154a3bb99798a477ee676f..09094361dce523fec7def28599b17c34bee16bec 100644
(file)
--- a/
kernel/hrtimer.c
+++ b/
kernel/hrtimer.c
@@
-46,6
+46,7
@@
#include <linux/sched.h>
#include <linux/sched/sysctl.h>
#include <linux/sched/rt.h>
#include <linux/sched.h>
#include <linux/sched/sysctl.h>
#include <linux/sched/rt.h>
+#include <linux/sched/deadline.h>
#include <linux/timer.h>
#include <linux/freezer.h>
#include <linux/timer.h>
#include <linux/freezer.h>
@@
-1610,7
+1611,7
@@
long hrtimer_nanosleep(struct timespec *rqtp, struct timespec __user *rmtp,
unsigned long slack;
slack = current->timer_slack_ns;
unsigned long slack;
slack = current->timer_slack_ns;
- if (rt_task(current))
+ if (
dl_task(current) ||
rt_task(current))
slack = 0;
hrtimer_init_on_stack(&t.timer, clockid, mode);
slack = 0;
hrtimer_init_on_stack(&t.timer, clockid, mode);