From 9ad2609051110011b76ce4a6b27f0128af5f6122 Mon Sep 17 00:00:00 2001
From: Ingo Molnar <mingo@elte.hu>
Date: Thu, 2 Aug 2007 17:41:40 +0200
Subject: [PATCH] --- yaml --- r: 63583 b: refs/heads/master c:
 8179ca23d513717cc5e3dc81a1ffe01af0955468 h: refs/heads/master i:   63581:
 8bfabf97ad63c31ed0621145e6dcc2621baec5cd   63579:
 56424a422be85d29a43ee4a736d41584fdae8ca9   63575:
 263a94c3dce61e6af9fbaf373e7ff91f696c1be7   63567:
 7b49e2c695ac564b7b1a932eb4db15835eb0e493   63551:
 dc136b17c9a30aee1927f6afd747e479ed3d1377 v: v3

---
 [refs]                    |  2 +-
 trunk/kernel/sched_fair.c | 13 ++-----------
 2 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/[refs] b/[refs]
index 2cfc6e80caa8..7d4405737df7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c3c7011969274768818842b0a08ec45d88f45b4f
+refs/heads/master: 8179ca23d513717cc5e3dc81a1ffe01af0955468
diff --git a/trunk/kernel/sched_fair.c b/trunk/kernel/sched_fair.c
index 243da6cae71c..5bf7285ad02c 100644
--- a/trunk/kernel/sched_fair.c
+++ b/trunk/kernel/sched_fair.c
@@ -292,10 +292,7 @@ __update_curr(struct cfs_rq *cfs_rq, struct sched_entity *curr, u64 now)
 		return;
 
 	delta_exec = curr->delta_exec;
-#ifdef CONFIG_SCHEDSTATS
-	if (unlikely(delta_exec > curr->exec_max))
-		curr->exec_max = delta_exec;
-#endif
+	schedstat_set(curr->exec_max, max((u64)delta_exec, curr->exec_max));
 
 	curr->sum_exec_runtime += delta_exec;
 	cfs_rq->exec_clock += delta_exec;
@@ -425,13 +422,7 @@ __update_stats_wait_end(struct cfs_rq *cfs_rq, struct sched_entity *se, u64 now)
 {
 	unsigned long delta_fair = se->delta_fair_run;
 
-#ifdef CONFIG_SCHEDSTATS
-	{
-		s64 delta_wait = now - se->wait_start;
-		if (unlikely(delta_wait > se->wait_max))
-			se->wait_max = delta_wait;
-	}
-#endif
+	schedstat_set(se->wait_max, max(se->wait_max, now - se->wait_start));
 
 	if (unlikely(se->load.weight != NICE_0_LOAD))
 		delta_fair = calc_weighted(delta_fair, se->load.weight,