4 files changed, 45 insertions, 3 deletions

diff --git a/include/litmus/fdso.h b/include/litmus/fdso.h
index b0e62a9098bd..4c67c87d0e1b 100644
--- a/include/litmus/fdso.h
+++ b/include/litmus/fdso.h
@@ -19,8 +19,9 @@ typedef enum  {
 
         FMLP_SEM        = 0,
         SRP_SEM         = 1,
+        OMLP_SEM        = 2,    
 
-        MAX_OBJ_TYPE    = 1
+        MAX_OBJ_TYPE    = 2
 } obj_type_t;
 
 struct inode_obj_id {
@@ -64,6 +65,7 @@ static inline void* od_lookup(int od, obj_type_t type)
 
 #define lookup_fmlp_sem(od)((struct fmlp_semaphore*)  od_lookup(od, FMLP_SEM))
 #define lookup_srp_sem(od) ((struct srp_semaphore*) od_lookup(od, SRP_SEM))
+#define lookup_omlp_sem(od)((struct omlp_semaphore*) od_lookup(od, OMLP_SEM))
 #define lookup_ics(od)     ((struct ics*)           od_lookup(od, ICS_ID))
 
 
diff --git a/include/litmus/sched_plugin.h b/include/litmus/sched_plugin.h
index 071e809564b2..186e99c6bb88 100644
--- a/include/litmus/sched_plugin.h
+++ b/include/litmus/sched_plugin.h
@@ -41,6 +41,25 @@ static inline struct fmlp_semaphore* to_fmlp(struct pi_semaphore* sem) {
 }
 #endif
 
+#ifdef CONFIG_OMLP
+struct omlp_semaphore {
+        /* NOTE: first part of struct matchs fmlp_semaphore, so
+         * omlp_struct can be cast to fmlp_struct
+         */
+        struct pi_semaphore pi; /* must always be first. */
+
+        /* current lock holder */
+        struct task_struct *holder;
+
+        /* PQ - just a single list since we only support G-EDF for now */
+        struct list_head pq_task_list;
+};
+
+static inline struct omlp_semaphore* to_omlp(struct pi_semaphore* sem) {
+        return (struct omlp_semaphore*)sem;
+}
+#endif
+
 /************************ setup/tear down ********************/
 
 typedef long (*activate_plugin_t) (void);
@@ -149,6 +168,13 @@ struct sched_plugin {
         return_priority_t       fmlp_return_priority;
         pi_block_t          fmlp_pi_block;
 #endif
+
+#ifdef CONFIG_OMLP
+        unsigned int            omlp_active;
+        inherit_priority_t      omlp_inherit_priority;
+        return_priority_t       omlp_return_priority;
+        pi_block_t                      omlp_pi_block;
+#endif
 } __attribute__ ((__aligned__(SMP_CACHE_BYTES)));
 
 
@@ -177,6 +203,14 @@ static inline int fmlp_active(void)
         return 0;
 #endif
 }
+static inline int omlp_active(void)
+{
+#ifdef CONFIG_OMLP
+        return litmus->omlp_active;
+#else
+        return 0;
+#endif
+}
 
 extern struct sched_plugin linux_sched_plugin;
 
diff --git a/include/litmus/unistd_32.h b/include/litmus/unistd_32.h
index dbddc6523f8e..3c55c8331e1b 100644
--- a/include/litmus/unistd_32.h
+++ b/include/litmus/unistd_32.h
@@ -19,5 +19,7 @@
 #define __NR_wait_for_ts_release __LSC(11)
 #define __NR_release_ts         __LSC(12)
 #define __NR_null_call          __LSC(13)
+#define __NR_omlp_down          __LSC(14)
+#define __NR_omlp_up            __LSC(15)
 
-#define NR_litmus_syscalls 14
+#define NR_litmus_syscalls 16
diff --git a/include/litmus/unistd_64.h b/include/litmus/unistd_64.h
index f0618e75348d..dd4b6c928b2c 100644
--- a/include/litmus/unistd_64.h
+++ b/include/litmus/unistd_64.h
@@ -33,5 +33,9 @@ __SYSCALL(__NR_wait_for_ts_release, sys_wait_for_ts_release)
 __SYSCALL(__NR_release_ts, sys_release_ts)
 #define __NR_null_call                          __LSC(13)
 __SYSCALL(__NR_null_call, sys_null_call)
+#define __NR_omlp_down                          __LSC(14)
+__SYSCALL(__NR_omlp_down, sys_omlp_down)
+#define __NR_omlp_up                            __LSC(15)
+__SYSCALL(__NR_omlp_up, sys_omlp_up)
 
-#define NR_litmus_syscalls 14
+#define NR_litmus_syscalls 16