From 9078c4bac5d78b321bc7d21a9be459c1ed1cac97 Mon Sep 17 00:00:00 2001 From: Mark Asselstine Date: Wed, 9 Jan 2019 15:19:58 -0500 Subject: linux-yocto: cleanup lxc.cfg kernel config fragment fixes: WARNING: linux-yocto-4.18.21+gitAUTOINC+9e348b6f9d_db2d813869-r0 do_kernel_configcheck: [kernel config]: This BSP sets config options that are not offered anywhere within this kernel: CONFIG_EXT3_FS_XATTR CONFIG_RESOURCE_COUNTERS CONFIG_CGROUP_MEM_RES_CTLR CONFIG_CLS_CGROUP CONFIG_NETPRIO_CGROUP CONFIG_DEVPTS_MULTIPLE_INSTANCES Configs were either dropped or renamed according to the updates made in the kernel, as capture below. CONFIG_RESOURCE_COUNTERS gone since kernel v3.19 via mainline commit 5b1efc027c0b51ca3e76f4e00c83358f8349f543. CONFIG_CGROUP_MEM_RES_CTLR renamed since kernel v3.6 via mainline commit c255a458055e459f65eb7b7f51dc5dbdd0caf1d8 CONFIG_CLS_CGROUP never existed AFAICT it should have always been CONFIG_NET_CLS_CGROUP CONFIG_NETPRIO_CGROUP renamed since kernel v3.14 via mainline commit 86f8515f9721fa171483f0fe0391968fbb949cc9 CONFIG_DEVPTS_MULTIPLE_INSTANCES removed since kernel v4.7 via mainline commit eedf265aa003b4781de24cfed40a655a664457e6 Signed-off-by: Mark Asselstine Signed-off-by: Bruce Ashfield --- recipes-kernel/linux/linux-yocto/lxc.cfg | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/recipes-kernel/linux/linux-yocto/lxc.cfg b/recipes-kernel/linux/linux-yocto/lxc.cfg index e5f1edca..9ff49f19 100644 --- a/recipes-kernel/linux/linux-yocto/lxc.cfg +++ b/recipes-kernel/linux/linux-yocto/lxc.cfg @@ -1,8 +1,7 @@ CONFIG_CGROUP_DEVICE=y CONFIG_CPUSETS=y CONFIG_PROC_PID_CPUSET=y -CONFIG_RESOURCE_COUNTERS=y -CONFIG_CGROUP_MEM_RES_CTLR=y +CONFIG_MEMCG=y CONFIG_CGROUP_SCHED=y CONFIG_FAIR_GROUP_SCHED=y CONFIG_RT_GROUP_SCHED=y @@ -14,11 +13,9 @@ CONFIG_USER_NS=y CONFIG_PID_NS=y CONFIG_NET_NS=y -CONFIG_CLS_CGROUP=m +CONFIG_NET_CLS_CGROUP=m CONFIG_BLK_CGROUP=y -CONFIG_NETPRIO_CGROUP=m - -CONFIG_DEVPTS_MULTIPLE_INSTANCES=y +CONFIG_CGROUP_NET_PRIO=m # Virtual drivers CONFIG_HVC_DRIVER=y -- cgit v1.2.3-54-g00ecf