From 9bbf8dacee9a952561e365d18e217f53154c587c Mon Sep 17 00:00:00 2001
From: Anton Blanchard <anton@samba.org>
Date: Mon, 18 Jan 2010 16:47:07 +1100
Subject: [PATCH] --- yaml --- r: 182403 b: refs/heads/master c:
 339ce1a4dc2ca26444c4f65c31b71a5056f3bb0b h: refs/heads/master i:   182401:
 dc89309645e8787670f15bdfc96879a2ce6d04bb   182399:
 c01428dffdb69ffd3584cc653409c6275fcb2173 v: v3

---
 [refs]                                     | 2 +-
 trunk/arch/powerpc/kernel/perf_callchain.c | 3 ---
 trunk/arch/sh/kernel/perf_callchain.c      | 3 ---
 trunk/arch/x86/kernel/cpu/perf_event.c     | 3 ---
 4 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/[refs] b/[refs]
index 5d2e01339788..11199c832d93 100644
--- 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
index a3c11cac3d71..95ad9dad298e 100644
--- 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
index 24ea837eac5b..a9dd3abde28e 100644
--- 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
index b1bb8c550526..ed1998b28a7c 100644
--- 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;