[Devel] [PATCH RHEL7 COMMIT] Revert "sched/fair: Fix ENQUEUE_WAKEUP false appearance in enqueue_task_fair()"

[Konstantin Khorenko]

The commit is pushed to "branch-rh7-3.10.0-514.16.1.vz7.30.x-ovz" and will appear at https://src.openvz.org/scm/ovz/vzkernel.git
after rh7-3.10.0-514.16.1.vz7.30.1
------>
commit 5055eaf8964e0390c29d400dd9d69684dc01af10
Author: Konstantin Khorenko <khorenko at virtuozzo.com>
Date:   Mon Apr 17 20:16:12 2017 +0400

    Revert "sched/fair: Fix ENQUEUE_WAKEUP false appearance in enqueue_task_fair()"
    
    This reverts commit 5c55133e47d0fc6cca3ccc26e7067593025ca129.
    
    It came from mainstream and it's need for correct placing
    parent cfs_rq on a task wakeup. Must not touch that, because
    it introduces imbalance.
    
    https://jira.sw.ru/browse/PSBM-64576
    
    Signed-off-by: Kirill Tkhai <ktkhai at virtuozzo.com>
---
 kernel/sched/fair.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c
index 6de2bc3..35562e2 100644
--- a/kernel/sched/fair.c
+++ b/kernel/sched/fair.c
@@ -4291,7 +4291,7 @@ enqueue_task_fair(struct rq *rq, struct task_struct *p, int flags)
 		if (boost)
 			boost = enqueue_boosted_entity(cfs_rq, se);
 
-		flags &= ~ENQUEUE_BOOST;
+		flags = ENQUEUE_WAKEUP;
 	}
 
 	for_each_sched_entity(se) {