---

yaml --- r: 182403 b: refs/heads/master c: 339ce1a h: refs/heads/master i: 182401: dc89309 182399: c01428d v: v3
git-mirror · Jan 28, 2010 · 9bbf8da · 9bbf8da
1 parent c972295
commit 9bbf8da
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 10 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 408f0d18ba6b9bb447f807f621b2c9663c5cf638
+refs/heads/master: 339ce1a4dc2ca26444c4f65c31b71a5056f3bb0b
diff --git a/trunk/arch/powerpc/kernel/perf_callchain.c b/trunk/arch/powerpc/kernel/perf_callchain.c
@@ -495,9 +495,6 @@ struct perf_callchain_entry *perf_callchain(struct pt_regs *regs)
 
 	entry->nr = 0;
 
-	if (current->pid == 0)		/* idle task? */
-		return entry;
-
 	if (!user_mode(regs)) {
 		perf_callchain_kernel(regs, entry);
 		if (current->mm)

diff --git a/trunk/arch/sh/kernel/perf_callchain.c b/trunk/arch/sh/kernel/perf_callchain.c
@@ -68,9 +68,6 @@ perf_do_callchain(struct pt_regs *regs, struct perf_callchain_entry *entry)
 
 	is_user = user_mode(regs);
 
-	if (!current || current->pid == 0)
-		return;
-
 	if (is_user && current->state != TASK_RUNNING)
 		return;
 

diff --git a/trunk/arch/x86/kernel/cpu/perf_event.c b/trunk/arch/x86/kernel/cpu/perf_event.c
@@ -2425,9 +2425,6 @@ perf_do_callchain(struct pt_regs *regs, struct perf_callchain_entry *entry)
 
 	is_user = user_mode(regs);
 
-	if (!current || current->pid == 0)
-		return;
-
 	if (is_user && current->state != TASK_RUNNING)
 		return;
-Original file line number
+Diff line change
@@ Expand Up @@
     	is_user = user_mode(regs);
-    	if (!current || current->pid == 0)
-    		return;
     	if (is_user && current->state != TASK_RUNNING)
     		return;
@@ Expand Down @@