[RHEL7,COMMIT] ve/cgroup: fixup for " ve/cgroup: do not link a CT cpu

Submitted by Vasily Averin on July 6, 2020, 7:11 a.m.

Details

Message ID 202007060711.0667B60k015135@vvs.co7.work.ct
State New
Series "ve/cgroup: fixup for " ve/cgroup: do not link a CT cpu cgroup twice into ve_root_list""
Headers show

Commit Message

Vasily Averin July 6, 2020, 7:11 a.m.
The commit is pushed to "branch-rh7-3.10.0-1127.10.1.vz7.162.x-ovz" and will appear at https://src.openvz.org/scm/ovz/vzkernel.git
after rh7-3.10.0-1127.10.1.vz7.162.8
------>
commit d579cdb5496c9244ab28c11c769a8e39596fd6da
Author: Vasily Averin <vvs@virtuozzo.com>
Date:   Mon Jul 6 10:11:05 2020 +0300

    ve/cgroup: fixup for " ve/cgroup: do not link a CT cpu
    
    load_ve_lock was defined twice due to mistake during rebase to RHEL7.7
    
    https://jira.sw.ru/browse/PSBM-105237
    Signed-off-by: Vasily Averin <vvs@virtuozzo.com>
---
 kernel/sched/core.c | 1 -
 1 file changed, 1 deletion(-)

Patch hide | download patch | download mbox

diff --git a/kernel/sched/core.c b/kernel/sched/core.c
index 3fe0d62cc51c..fdb0e8cff60d 100644
--- a/kernel/sched/core.c
+++ b/kernel/sched/core.c
@@ -2955,7 +2955,6 @@  static DEFINE_SPINLOCK(load_ve_lock);
 
 void calc_load_ve(void)
 {
-	static DEFINE_SPINLOCK(load_ve_lock);
 	unsigned long nr_unint, nr_active;
 	struct task_group *tg;
 	int i;