Skip to contentSkip to conversation

sched: Fix UP build breakage

tip:sched/core tip-bot for Peter Zijlstra 1 participant 1 message Nov 23, 2010

lore
Share & tools
lore
#0 lore raw
Commit-ID:  70caf8a6c13c2279b35f2ad6b644815533d6c476
Gitweb:     http://git.kernel.org/tip/70caf8a6c13c2279b35f2ad6b644815533d6c476
Author:     Peter Zijlstra <[email protected]>
AuthorDate: Sat, 20 Nov 2010 00:53:51 +0100
Committer:  Ingo Molnar <[email protected]>
CommitDate: Tue, 23 Nov 2010 10:29:07 +0100

sched: Fix UP build breakage

The recent cgroup-scheduling rework caused a UP build problem.

LKML-Reference: <new-submission>

---
 kernel/sched_fair.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
kernel/sched_fair.c +1 -1
index 390ce30..82fd884 100644
@@ -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);