3 files changed, 26 insertions, 1 deletions

diff --git a/include/litmus/litmus_proc.h b/include/litmus/litmus_proc.h
index 6800e725d48c..0c5c07ea0ef5 100644
--- a/include/litmus/litmus_proc.h
+++ b/include/litmus/litmus_proc.h
@@ -23,3 +23,10 @@ void remove_plugin_proc_dir(struct sched_plugin* plugin);
  * -EFAULT. */
 int copy_and_chomp(char *kbuf, unsigned long ksize,
                    __user const char* ubuf, unsigned long ulength);
+
+
+#ifdef CONFIG_LITMUS_LOCKING
+struct proc_dir_entry* litmus_add_proc_lock(struct litmus_lock *l, read_proc_t func);
+void litmus_remove_proc_lock(struct litmus_lock* l);
+#endif
+
diff --git a/include/litmus/locking.h b/include/litmus/locking.h
index 4a5f198a0407..22f7372bf621 100644
--- a/include/litmus/locking.h
+++ b/include/litmus/locking.h
@@ -24,6 +24,11 @@ static inline struct task_struct* top_priority(struct binheap* handle) {
 void print_hp_waiters(struct binheap_node* n, int depth);
 #endif
 
+#define LOCK_NAME_LEN 16
+struct litmus_lock_proc_ops {
+        void (*add)(struct litmus_lock *l);
+        void (*remove)(struct litmus_lock *l);
+};
 
 /* Generic base struct for LITMUS^RT userspace semaphores.
  * This structure should be embedded in protocol-specific semaphores.
@@ -41,6 +46,10 @@ struct litmus_lock {
         struct lock_class_key key;
 //#endif
 #endif
+
+        struct litmus_lock_proc_ops *proc;
+        struct proc_dir_entry *proc_entry;
+        char name[LOCK_NAME_LEN];
 };
 
 #ifdef CONFIG_LITMUS_DGL_SUPPORT
@@ -131,12 +140,16 @@ struct litmus_lock_ops {
 /* DGL requires a big lock to implement nested inheritance */
 #define lock_global_irqsave(lock, flags)                raw_spin_lock_irqsave((lock), (flags))
 #define lock_global(lock)                                               raw_spin_lock((lock))
+#define trylock_global_irqsave(lock, flags)             raw_spin_trylock_irqsave((lock), (flags))
+#define trylock_global(lock)                                    raw_spin_trylock((lock))
 #define unlock_global_irqrestore(lock, flags)   raw_spin_unlock_irqrestore((lock), (flags))
 #define unlock_global(lock)                                             raw_spin_unlock((lock))
 
 /* fine-grain locking are no-ops with DGL support */
 #define lock_fine_irqsave(lock, flags)
 #define lock_fine(lock)
+#define trylock_fine_irqsave(lock, flags)
+#define trylock_fine(lock)
 #define unlock_fine_irqrestore(lock, flags)
 #define unlock_fine(lock)
 
@@ -145,11 +158,15 @@ struct litmus_lock_ops {
 /* global locking are no-ops without DGL support */
 #define lock_global_irqsave(lock, flags)
 #define lock_global(lock)
+#define trylock_global_irqsave(lock, flags)
+#define trylock_global(lock)
 #define unlock_global_irqrestore(lock, flags)
 #define unlock_global(lock)
 
 #define lock_fine_irqsave(lock, flags)                  raw_spin_lock_irqsave((lock), (flags))
 #define lock_fine(lock)                                                 raw_spin_lock((lock))
+#define trylock_fine_irqsave(lock, flags)               raw_spin_trylock_irqsave((lock), (flags))
+#define trylock_fine(lock)                                              raw_spin_trylock((lock))
 #define unlock_fine_irqrestore(lock, flags)             raw_spin_unlock_irqrestore((lock), (flags))
 #define unlock_fine(lock)                                               raw_spin_unlock((lock))
 
diff --git a/include/litmus/rsm_lock.h b/include/litmus/rsm_lock.h
index a15189683de4..f0d263322a69 100644
--- a/include/litmus/rsm_lock.h
+++ b/include/litmus/rsm_lock.h
@@ -51,4 +51,5 @@ void rsm_mutex_free(struct litmus_lock* l);
 struct litmus_lock* rsm_mutex_new(struct litmus_lock_ops*);
 
 
-#endif
\ No newline at end of file
+#endif
+