---

yaml --- r: 191201 b: refs/heads/master c: 8dc5810 h: refs/heads/master i: 191199: ac7e5f7 v: v3
git-mirror · Apr 14, 2010 · f2fc10e · f2fc10e
1 parent fddb973
commit f2fc10e
Show file tree

Hide file tree

Showing 12 changed files with 316 additions and 282 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f92128193094c288bc315db1694fafeaeb7ee1d0
+refs/heads/master: 8dc58101f2c838355d44402aa77646649d10dbec
diff --git a/trunk/include/linux/perf_event.h b/trunk/include/linux/perf_event.h
@@ -589,14 +589,6 @@ enum perf_group_flag {
 	PERF_GROUP_SOFTWARE = 0x1,
 };
 
-#define SWEVENT_HLIST_BITS	8
-#define SWEVENT_HLIST_SIZE	(1 << SWEVENT_HLIST_BITS)
-
-struct swevent_hlist {
-	struct hlist_head	heads[SWEVENT_HLIST_SIZE];
-	struct rcu_head		rcu_head;
-};
-
 /**
  * struct perf_event - performance event kernel representation:
  */
@@ -605,7 +597,6 @@ struct perf_event {
 	struct list_head		group_entry;
 	struct list_head		event_entry;
 	struct list_head		sibling_list;
-	struct hlist_node		hlist_entry;
 	int				nr_siblings;
 	int				group_flags;
 	struct perf_event		*group_leader;
@@ -753,9 +744,6 @@ struct perf_cpu_context {
 	int				active_oncpu;
 	int				max_pertask;
 	int				exclusive;
-	struct swevent_hlist		*swevent_hlist;
-	struct mutex			hlist_mutex;
-	int				hlist_refcount;
 
 	/*
 	 * Recursion avoidance: