1 files changed, 13 insertions, 11 deletions

diff --git a/include/litmus.h b/include/litmus.h
index 632b9e1..2c48766 100644
--- a/include/litmus.h
+++ b/include/litmus.h
@@ -5,15 +5,15 @@
 extern "C" {
 #endif
 
+#include <sys/types.h>
+
 /* Include kernel header.
  * This is required for the rt_param
  * and control_page structures.
  */
-#include <litmus/rt_param.h>
-
-#include <sys/types.h>
+#include "litmus/rt_param.h"
 
-#include "cycles.h" /* for null_call() */
+#include "asm/cycles.h" /* for null_call() */
 
 typedef int pid_t;       /* PID of a task */
 
@@ -61,13 +61,9 @@ static inline int od_open(int fd, obj_type_t type, int obj_id)
         return od_openx(fd, type, obj_id, 0);
 }
 
-/* FMLP binary semaphore support */
-int fmlp_down(int od);
-int fmlp_up(int od);
-
-/* SRP binary semaphore support */
-int srp_down(int od);
-int srp_up(int od);
+/* real-time locking protocol support */
+int litmus_lock(int od);
+int litmus_unlock(int od);
 
 /* job control*/
 int get_job_no(unsigned int* job_no);
@@ -113,6 +109,12 @@ static inline lt_t ms2lt(unsigned long milliseconds)
         return __NS_PER_MS * milliseconds;
 }
 
+/* CPU time consumed so far in seconds */
+double cputime(void);
+
+/* wall-clock time in seconds */
+double wctime(void);
+
 /* semaphore allocation */
 
 static inline int open_fmlp_sem(int fd, int name)