---

yaml --- r: 211838 b: refs/heads/master c: 0c67b40 h: refs/heads/master v: v3
git-mirror · Sep 13, 2010 · cd97e21 · cd97e21
1 parent ebdb4f4
commit cd97e21
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cde8e88498c8de69271fcb6d4dd974979368fa67
+refs/heads/master: 0c67b40872326a5340cab51d79a192a5fbaeb484
diff --git a/trunk/kernel/perf_event.c b/trunk/kernel/perf_event.c
@@ -2150,7 +2150,9 @@ static void free_event(struct perf_event *event)
 	if (event->destroy)
 		event->destroy(event);
 
-	put_ctx(event->ctx);
+	if (event->ctx)
+		put_ctx(event->ctx);
+
 	call_rcu(&event->rcu_head, free_event_rcu);
 }