Merge branch 'linus' into perf/core, to fix conflicts

[linux-2.6-microblaze.git] / tools / perf / util / thread.h

diff --git a/tools/perf/util/thread.h b/tools/perf/util/thread.h
index fdcea7c..40cfa36 100644 (file)
--- a/tools/perf/util/thread.h
+++ b/tools/perf/util/thread.h
@@ -10,6 +10,7 @@
 #include "symbol.h"
 #include <strlist.h>
 #include <intlist.h>
+#include "rwsem.h"
 
 struct thread_stack;
 struct unwind_libunwind_ops;
@@ -30,7 +31,9 @@ struct thread {
        int                     comm_len;
        bool                    dead; /* if set thread has exited */
        struct list_head        namespaces_list;
+       struct rw_semaphore     namespaces_lock;
        struct list_head        comm_list;
+       struct rw_semaphore     comm_lock;
        u64                     db_id;
 
        void                    *priv;