diff options
| author | Glenn Elliott <gelliott@cs.unc.edu> | 2014-02-19 15:46:34 -0500 |
|---|---|---|
| committer | Glenn Elliott <gelliott@cs.unc.edu> | 2014-02-19 15:46:34 -0500 |
| commit | 933e053de1efaa3d754899cc03ff1f3eebdc432e (patch) | |
| tree | 6c57cf1dbdede346495fb3d6ab51ce40499c57a2 | |
| parent | c973f7f4766dd9194e4c7a52e971e29b224b9720 (diff) | |
| parent | 0568a30a1f1895590a35d3487cce7efeaa142989 (diff) | |
Merge branch 'wip-ecrts14-pgm' of ssh://rtsrv.cs.unc.edu/home/litmus/litmus-rt into wip-ecrts14-pgmwip-ecrts14-pgmecrts14-pgm-finalecrts-pgm-final
Conflicts:
litmus/sched_cfl_split.c
| -rw-r--r-- | litmus/sched_gsn_edf.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/litmus/sched_gsn_edf.c b/litmus/sched_gsn_edf.c index b6973e20cf97..207f4b65bcbc 100644 --- a/litmus/sched_gsn_edf.c +++ b/litmus/sched_gsn_edf.c | |||
| @@ -35,6 +35,10 @@ | |||
| 35 | #include <litmus/pgm.h> | 35 | #include <litmus/pgm.h> |
| 36 | #endif | 36 | #endif |
| 37 | 37 | ||
| 38 | #ifdef CONFIG_SCHED_PGM | ||
| 39 | #include <litmus/pgm.h> | ||
| 40 | #endif | ||
| 41 | |||
| 38 | #include <linux/module.h> | 42 | #include <linux/module.h> |
| 39 | 43 | ||
| 40 | /* Overview of GSN-EDF operations. | 44 | /* Overview of GSN-EDF operations. |