diff options
| author | Ingo Molnar <mingo@kernel.org> | 2017-03-23 07:35:15 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2017-03-23 07:35:15 +0100 |
| commit | 4ccb6aea4b3eb97c94575d1ed4bf10744169f082 (patch) | |
| tree | a2ca8bc8b567608bd4067593b752f78c895d713b /kernel/time/hrtimer.c | |
| parent | f25d384755191690b1196776d319cb6a4e899f28 (diff) | |
| parent | 093b995e3b55a0ae0670226ddfcb05bfbf0099ae (diff) | |
Merge branch 'linus' into x86/asm, to refresh the topic tree with fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'kernel/time/hrtimer.c')
| -rw-r--r-- | kernel/time/hrtimer.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/kernel/time/hrtimer.c b/kernel/time/hrtimer.c index 8e11d8d9f419..ec08f527d7ee 100644 --- a/kernel/time/hrtimer.c +++ b/kernel/time/hrtimer.c @@ -43,10 +43,12 @@ #include <linux/seq_file.h> #include <linux/err.h> #include <linux/debugobjects.h> -#include <linux/sched.h> +#include <linux/sched/signal.h> #include <linux/sched/sysctl.h> #include <linux/sched/rt.h> #include <linux/sched/deadline.h> +#include <linux/sched/nohz.h> +#include <linux/sched/debug.h> #include <linux/timer.h> #include <linux/freezer.h> |