CONFIG_VE selected CGROUP_PERF unconditionally, but CGROUP_PERF
depends on PERF_EVENTS which is not available on UML.  Make the
select conditional on PERF_EVENTS.

Also add missing selects for CONFIG_NET, CONFIG_CGROUP_SCHED,
CONFIG_CGROUP_CPUACCT, CONFIG_MEMCG, CONFIG_MEMCG_V1,
CONFIG_POSIX_MQUEUE, and CONFIG_SCHEDSTATS.  VZ code depends on all
of these, but they were only implicitly satisfied by the x86
defconfig.  Making them explicit is required for building on UML
where the defaults differ.

Signed-off-by: Eva Kurchatova <[email protected]>

https://virtuozzo.atlassian.net/browse/VSTOR-134732
Feature: fix kunit
---
 kernel/Kconfig.openvz | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/kernel/Kconfig.openvz b/kernel/Kconfig.openvz
index 9164db1f2acc..7494048425a5 100644
--- a/kernel/Kconfig.openvz
+++ b/kernel/Kconfig.openvz
@@ -14,12 +14,19 @@ config VE
        select PID_NS
        select IPC_NS
        select UTS_NS
+       select NET
        select NET_NS
        select USER_NS
        select CGROUPS
+       select CGROUP_SCHED
+       select CGROUP_CPUACCT
+       select MEMCG
+       select MEMCG_V1
        select CGROUP_DEVICE
        select CGROUP_FREEZER
-       select CGROUP_PERF
+       select CGROUP_PERF if PERF_EVENTS
+       select POSIX_MQUEUE
+       select SCHEDSTATS
        help
          This option adds support of virtual Linux running on the original box
          with fully supported virtual network driver, tty subsystem and
-- 
2.54.0

_______________________________________________
Devel mailing list
[email protected]
https://lists.openvz.org/mailman/listinfo/devel

Reply via email to