From ac0d5696940a3339e2f560142261e8a8e6d11177 Mon Sep 17 00:00:00 2001
From: Julio Montes <julio.montes@intel.com>
Date: Wed, 26 Feb 2020 22:02:17 +0000
Subject: [PATCH] kernel: enable BPF to support libcontainer's cgroups V2
 implementation

libcontainer's cgroups V2 implementation requires BPF to run a BPF
program in the container

fixes #955

Signed-off-by: Julio Montes <julio.montes@intel.com>
---
 kernel/configs/fragments/common/cgroup.conf | 4 ++++
 kernel/kata_config_version                  | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/kernel/configs/fragments/common/cgroup.conf b/kernel/configs/fragments/common/cgroup.conf
index 1daffb2e20..429983a5f8 100644
--- a/kernel/configs/fragments/common/cgroup.conf
+++ b/kernel/configs/fragments/common/cgroup.conf
@@ -20,3 +20,7 @@ CONFIG_SOCK_CGROUP_DATA=y
 CONFIG_SWAP=y
 CONFIG_MEMCG_SWAP=y
 CONFIG_MEMCG_SWAP_ENABLED=y
+
+# Needed for cgroups v2
+CONFIG_BPF_SYSCALL=y
+CONFIG_CGROUP_BPF=y
diff --git a/kernel/kata_config_version b/kernel/kata_config_version
index 69a893aa31..3fdcd7c44c 100644
--- a/kernel/kata_config_version
+++ b/kernel/kata_config_version
@@ -1 +1 @@
-66
+67