Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp

Conflicts:
	litmus/sched_cedf.c

1 files changed, 12 insertions, 6 deletions

diff --git a/include/litmus/rt_param.h b/include/litmus/rt_param.h
index 5de422c742f6..d6d799174160 100644
--- a/include/litmus/rt_param.h
+++ b/include/litmus/rt_param.h
@@ -30,7 +30,7 @@ typedef enum {
 typedef enum {
         NO_ENFORCEMENT,      /* job may overrun unhindered */
         QUANTUM_ENFORCEMENT, /* budgets are only checked on quantum boundaries */
-        PRECISE_ENFORCEMENT  /* NOT IMPLEMENTED - enforced with hrtimers */
+        PRECISE_ENFORCEMENT  /* budgets are enforced with hrtimers */
 } budget_policy_t;
 
 struct rt_task {
@@ -42,6 +42,16 @@ struct rt_task {
         budget_policy_t budget_policy; /* ignored by pfair */
 };
 
+union np_flag {
+        uint32_t raw;
+        struct {
+                /* Is the task currently in a non-preemptive section? */
+                uint32_t flag:31;
+                /* Should the task call into the scheduler? */
+                uint32_t preempt:1;
+        } np;
+};
+
 /* The definition of the data that is shared between the kernel and real-time
  * tasks via a shared page (see litmus/ctrldev.c).
  *
@@ -57,11 +67,7 @@ struct rt_task {
  * determining preemption/migration overheads).
  */
 struct control_page {
-        /* Is the task currently in a non-preemptive section? */
-        int np_flag;
-        /* Should the task call into the kernel when it leaves
-         * its non-preemptive section? */
-        int delayed_preemption;
+        volatile union np_flag sched;
 
         /* to be extended */
 };