From fe75b4b840c072f018d65b68e104e3c39216c9eb Mon Sep 17 00:00:00 2001
From: Ingo Molnar <mingo@elte.hu>
Date: Tue, 28 Aug 2007 12:53:24 +0200
Subject: [PATCH] --- yaml --- r: 64655 b: refs/heads/master c:
 b77d69db9f4ba03b2ed17e383c2d73ca89f5ab14 h: refs/heads/master i:   64653:
 f6b1d0eb882dc102993de5608a26814f171fac5b   64651:
 808941cf8d215681c59dacb14ce4ceb0338eaa9c   64647:
 7f7e69b2bae971a736ec15679af2117ddb76c3bf   64639:
 5ce0438dad4ddfcb09a5dbcd88b58556127d9bc7 v: v3

---
 [refs]                    | 2 +-
 trunk/kernel/sched_fair.c | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 21bc12bb5300..dc1bbbd56341 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7109c4429af3640f79a638f177fc5d05b9807149
+refs/heads/master: b77d69db9f4ba03b2ed17e383c2d73ca89f5ab14
diff --git a/trunk/kernel/sched_fair.c b/trunk/kernel/sched_fair.c
index 9f06094e5275..0c718857176f 100644
--- a/trunk/kernel/sched_fair.c
+++ b/trunk/kernel/sched_fair.c
@@ -489,6 +489,9 @@ update_stats_wait_end(struct cfs_rq *cfs_rq, struct sched_entity *se)
 {
 	unsigned long delta_fair;
 
+	if (unlikely(!se->wait_start_fair))
+		return;
+
 	delta_fair = (unsigned long)min((u64)(2*sysctl_sched_runtime_limit),
 			(u64)(cfs_rq->fair_clock - se->wait_start_fair));