From ea2bf02397fb8c2b0ab452eb7f4185e7555261ac Mon Sep 17 00:00:00 2001
From: "David S. Miller" <davem@davemloft.net>
Date: Fri, 6 Jan 2006 15:36:48 -0800
Subject: [PATCH] --- yaml --- r: 16717 b: refs/heads/master c:
 0aec63e67c69545ca757a73a66f5dcf05fa484bf h: refs/heads/master i:   16715:
 52de5fe67e317840313fd3ec3abb10e22eada2e7 v: v3

---
 [refs]                          |  2 +-
 trunk/kernel/posix-cpu-timers.c | 13 +------------
 2 files changed, 2 insertions(+), 13 deletions(-)

diff --git a/[refs] b/[refs]
index 2e1df77524ff..28aa0c2889d1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0feb9bfcfa3f9bf67a4a1e3f2608700ad73f92ed
+refs/heads/master: 0aec63e67c69545ca757a73a66f5dcf05fa484bf
diff --git a/trunk/kernel/posix-cpu-timers.c b/trunk/kernel/posix-cpu-timers.c
index cae4f5728997..4c68edff900b 100644
--- a/trunk/kernel/posix-cpu-timers.c
+++ b/trunk/kernel/posix-cpu-timers.c
@@ -238,18 +238,7 @@ static int cpu_clock_sample_group_locked(unsigned int clock_idx,
 		while ((t = next_thread(t)) != p) {
 			cpu->sched += t->sched_time;
 		}
-		if (p->tgid == current->tgid) {
-			/*
-			 * We're sampling ourselves, so include the
-			 * cycles not yet banked.  We still omit
-			 * other threads running on other CPUs,
-			 * so the total can always be behind as
-			 * much as max(nthreads-1,ncpus) * (NSEC_PER_SEC/HZ).
-			 */
-			cpu->sched += current_sched_time(current);
-		} else {
-			cpu->sched += p->sched_time;
-		}
+		cpu->sched += sched_ns(p);
 		break;
 	}
 	return 0;