2 files changed, 12 insertions, 10 deletions

diff --git a/src/kernel_iface.c b/src/kernel_iface.c
index 6286810..bd47d5c 100644
--- a/src/kernel_iface.c
+++ b/src/kernel_iface.c
@@ -43,6 +43,8 @@ int init_kernel_iface(void)
         int err = 0;
         long page_size = sysconf(_SC_PAGESIZE);
 
+        BUILD_BUG_ON(sizeof(union np_flag) != sizeof(uint32_t));
+
         err = map_file(LITMUS_CTRL_DEVICE, (void**) &ctrl_page, CTRL_PAGES * page_size);
         if (err) {
                 fprintf(stderr, "%s: cannot open LITMUS^RT control page (%m)\n",
@@ -55,7 +57,7 @@ int init_kernel_iface(void)
 void enter_np(void)
 {
         if (likely(ctrl_page != NULL) || init_kernel_iface() == 0)
-                ctrl_page->np_flag++;
+                ctrl_page->sched.np.flag++;
         else
                 fprintf(stderr, "enter_np: control page not mapped!\n");
 }
@@ -63,10 +65,12 @@ void enter_np(void)
 
 void exit_np(void)
 {
-        if (likely(ctrl_page != NULL) && --ctrl_page->np_flag == 0) {
+        if (likely(ctrl_page != NULL) &&
+            ctrl_page->sched.np.flag &&
+            !(--ctrl_page->sched.np.flag)) {
                 /* became preemptive, let's check for delayed preemptions */
                 __sync_synchronize();
-                if (ctrl_page->delayed_preemption)
+                if (ctrl_page->sched.np.preempt)
                         sched_yield();
         }
 }
@@ -78,6 +82,11 @@ void request_resource(int resource, int replicas)
         }
 }
 
+int requested_to_preempt(void)
+{
+        return (likely(ctrl_page != NULL) && ctrl_page->sched.np.preempt);
+}
+
 /* init and return a ptr to the control page for
  * preemption and migration overhead analysis
  *
diff --git a/src/syscalls.c b/src/syscalls.c
index ef1ea17..c68f15b 100644
--- a/src/syscalls.c
+++ b/src/syscalls.c
@@ -8,8 +8,6 @@
 /* for syscall() */
 #include <unistd.h>
 
-//#include <sys/types.h>
-
 #include "litmus.h"
 
 /*      Syscall stub for setting RT mode and scheduling options */
@@ -88,8 +86,3 @@ int null_call(cycles_t *timestamp)
 {
         return syscall(__NR_null_call, timestamp);
 }
-
-int set_rt_task_mc_param(pid_t pid, struct mc_task *param)
-{
-        return syscall(__NR_set_rt_task_mc_param, pid, param);
-}