The commit is pushed to "branch-rh7-3.10.0-123.1.2-ovz" and will appear at
https://src.openvz.org/scm/ovz/vzkernel.git
after rh7-3.10.0-123.1.2.vz7.4.10
------>
commit 0237fbfd0a0acc3b75cafce1050e392c0463a67b
Author: Kir Kolyshkin <k...@openvz.org>
Date: Thu May 7 20:28:10 2015 +0400
ve/sched: put move_task_groups() under CONFIG_CFS_CPULIMIT
This was found while tring to compile the kernel with a stock
config (i.e. no CONFIG_BEANCOUNTERS, CONFIG_VE etc.) and
boot it on IBM Power8.
=============================================================
Function move_task_groups() is not defined if CONFIG_CFS_CPULIMIT
is not set, so compiler complains.
This is a fix to commit 51fd1aec7.
Signed-off-by: Kir Kolyshkin <k...@openvz.org>
---
kernel/sched/fair.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c
index bfb4c28..ec866ed 100644
--- a/kernel/sched/fair.c
+++ b/kernel/sched/fair.c
@@ -6947,6 +6947,7 @@ more_balance:
double_rq_unlock(env.dst_rq, busiest);
local_irq_restore(flags);
+#ifdef CONFIG_CFS_CPULIMIT
if (!ld_moved && (env.flags & LBF_ALL_PINNED)) {
env.loop = 0;
local_irq_save(flags);
@@ -6955,6 +6956,7 @@ more_balance:
double_rq_unlock(env.dst_rq, busiest);
local_irq_restore(flags);
}
+#endif
/*
* some other cpu did the load balance for us.
_______________________________________________
Devel mailing list
Devel@openvz.org
https://lists.openvz.org/mailman/listinfo/devel
