From 10868aafdb37454fe670afa261d8252de0e322e7 Mon Sep 17 00:00:00 2001
From: Peter Zijlstra <a.p.zijlstra@chello.nl>
Date: Sat, 20 Nov 2010 00:53:51 +0100
Subject: [PATCH] --- yaml --- r: 223997 b: refs/heads/master c:
 70caf8a6c13c2279b35f2ad6b644815533d6c476 h: refs/heads/master i:   223995:
 cd03ad3016ebe2e37419e2fb238cfc4df9c76462 v: v3

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

diff --git a/[refs] b/[refs]
index d23465e5a942..d29905adc88a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 28d0686cf7b14e30243096bd874d3f80591ed392
+refs/heads/master: 70caf8a6c13c2279b35f2ad6b644815533d6c476
diff --git a/trunk/kernel/sched_fair.c b/trunk/kernel/sched_fair.c
index 390ce30ff2d0..82fd884b4e33 100644
--- a/trunk/kernel/sched_fair.c
+++ b/trunk/kernel/sched_fair.c
@@ -562,7 +562,7 @@ __update_curr(struct cfs_rq *cfs_rq, struct sched_entity *curr,
 	curr->vruntime += delta_exec_weighted;
 	update_min_vruntime(cfs_rq);
 
-#ifdef CONFIG_FAIR_GROUP_SCHED
+#if defined CONFIG_SMP && defined CONFIG_FAIR_GROUP_SCHED
 	cfs_rq->load_unacc_exec_time += delta_exec;
 	if (cfs_rq->load_unacc_exec_time > sysctl_sched_shares_window) {
 		update_cfs_load(cfs_rq, 0);