aboutsummaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorPeter Zijlstra <a.p.zijlstra@chello.nl>2010-11-20 00:53:51 +0100
committerIngo Molnar <mingo@elte.hu>2010-11-23 10:29:07 +0100
commit70caf8a6c13c2279b35f2ad6b644815533d6c476 (patch)
treeeae7e189473aa028eaced1a5a2b38bef4f2c9587 /kernel
parent28d0686cf7b14e30243096bd874d3f80591ed392 (diff)
downloadkernel_samsung_aries-70caf8a6c13c2279b35f2ad6b644815533d6c476.zip
kernel_samsung_aries-70caf8a6c13c2279b35f2ad6b644815533d6c476.tar.gz
kernel_samsung_aries-70caf8a6c13c2279b35f2ad6b644815533d6c476.tar.bz2
sched: Fix UP build breakage
The recent cgroup-scheduling rework caused a UP build problem. Cc: Paul Turner <pjt@google.com> Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl> LKML-Reference: <new-submission> Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'kernel')
-rw-r--r--kernel/sched_fair.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/sched_fair.c b/kernel/sched_fair.c
index 390ce30..82fd884 100644
--- a/kernel/sched_fair.c
+++ b/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);