Merge branch 'wip-edf-wm' into wip-semi-part

This version of litmus2010 contains the implementation of three
semi-partitioned scheduling algorithms: EDF-fm, EDF-WM, and NPS-F.

Conflicts:
	include/litmus/rt_param.h
	litmus/Makefile

1 files changed, 5 insertions, 2 deletions

diff --git a/litmus/litmus.c b/litmus/litmus.c
index b1c627db694a..2f780222d8e8 100644
--- a/litmus/litmus.c
+++ b/litmus/litmus.c
@@ -115,10 +115,13 @@ asmlinkage long sys_set_rt_task_param(pid_t pid, struct rt_task __user * param)
                 goto out_unlock;
         }
         if (tp.budget_policy != NO_ENFORCEMENT &&
-                tp.budget_policy != QUANTUM_ENFORCEMENT)
+            tp.budget_policy != QUANTUM_ENFORCEMENT &&
+            tp.budget_policy != PRECISE_ENFORCEMENT)
         {
                 printk(KERN_INFO "litmus: real-time task %d rejected "
-                        "because unsupported budget enforcement policy specified\n", pid);
+                       "because unsupported budget enforcement policy "
+                       "specified (%d)\n",
+                       pid, tp.budget_policy);
                 goto out_unlock;
         }