Merge branch 'wip-gpu-rtas12' into wip-slave-threads

Conflicts:
	include/litmus/unistd_32.h
	include/litmus/unistd_64.h
	litmus/litmus.c

1 files changed, 6 insertions, 1 deletions

diff --git a/kernel/lockdep.c b/kernel/lockdep.c
index 298c9276dfdb..2bdcdc3691e5 100644
--- a/kernel/lockdep.c
+++ b/kernel/lockdep.c
@@ -542,7 +542,7 @@ static void print_lock(struct held_lock *hlock)
         print_ip_sym(hlock->acquire_ip);
 }
 
-static void lockdep_print_held_locks(struct task_struct *curr)
+void lockdep_print_held_locks(struct task_struct *curr)
 {
         int i, depth = curr->lockdep_depth;
 
@@ -558,6 +558,7 @@ static void lockdep_print_held_locks(struct task_struct *curr)
                 print_lock(curr->held_locks + i);
         }
 }
+EXPORT_SYMBOL(lockdep_print_held_locks);
 
 static void print_kernel_version(void)
 {
@@ -583,6 +584,10 @@ static int static_obj(void *obj)
                       end   = (unsigned long) &_end,
                       addr  = (unsigned long) obj;
 
+        // GLENN
+        return 1;
+
+
         /*
          * static variable?
          */