diff options
| author | Dan Williams <dan.j.williams@intel.com> | 2018-04-09 10:50:17 -0700 |
|---|---|---|
| committer | Dan Williams <dan.j.williams@intel.com> | 2018-04-09 10:50:17 -0700 |
| commit | e13e75b86ef2f88e3a47d672dd4c52a293efb95b (patch) | |
| tree | 2617aebd952d1aec09d323f6b2484b93f659e753 /include/linux/sched/deadline.h | |
| parent | 1ed41b5696ccc3ff40a1dee39fe14eff273faf82 (diff) | |
| parent | 976431b02c2ef92ae3f8b6a7d699fc554025e118 (diff) | |
Merge branch 'for-4.17/dax' into libnvdimm-for-nextlibnvdimm-for-4.17
Diffstat (limited to 'include/linux/sched/deadline.h')
| -rw-r--r-- | include/linux/sched/deadline.h | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/include/linux/sched/deadline.h b/include/linux/sched/deadline.h index a5bc8728ead7..0cb034331cbb 100644 --- a/include/linux/sched/deadline.h +++ b/include/linux/sched/deadline.h @@ -1,8 +1,4 @@ /* SPDX-License-Identifier: GPL-2.0 */ -#ifndef _LINUX_SCHED_DEADLINE_H -#define _LINUX_SCHED_DEADLINE_H - -#include <linux/sched.h> /* * SCHED_DEADLINE tasks has negative priorities, reflecting @@ -28,5 +24,3 @@ static inline bool dl_time_before(u64 a, u64 b) { return (s64)(a - b) < 0; } - -#endif /* _LINUX_SCHED_DEADLINE_H */ |