From 98b13348ba2dfcd03ac104ee466335ed858fd5cd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maciej=20=C5=BBenczykowski?= <maze@google.com>
Date: Tue, 8 Oct 2019 10:05:25 -0700
Subject: [PATCH] ANDROID: cuttlefish_defconfig: Enable BPF_JIT and
 BPF_JIT_ALWAYS_ON
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Generated via:
  echo 'CONFIG_BPF_JIT=y' >> arch/x86/configs/x86_64_cuttlefish_defconfig
  echo 'CONFIG_BPF_JIT_ALWAYS_ON=y' >> arch/x86/configs/x86_64_cuttlefish_defconfig

  make ARCH=x86_64 x86_64_cuttlefish_defconfig
  make ARCH=x86_64 savedefconfig
  mv defconfig arch/x86/configs/x86_64_cuttlefish_defconfig

  echo 'CONFIG_BPF_JIT=y' >> arch/arm64/configs/cuttlefish_defconfig
  echo 'CONFIG_BPF_JIT_ALWAYS_ON=y' >> arch/arm64/configs/cuttlefish_defconfig

  make ARCH=arm64 cuttlefish_defconfig
  make ARCH=arm64 savedefconfig
  mv defconfig arch/arm64/configs/cuttlefish_defconfig

Bug: 140377409
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I08c44f691ac62c77fb6fbacd7c533a7111d7a9f8
---
 arch/arm64/configs/cuttlefish_defconfig      | 2 ++
 arch/x86/configs/x86_64_cuttlefish_defconfig | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/arch/arm64/configs/cuttlefish_defconfig b/arch/arm64/configs/cuttlefish_defconfig
index 943f52cc3170..713be1192676 100644
--- a/arch/arm64/configs/cuttlefish_defconfig
+++ b/arch/arm64/configs/cuttlefish_defconfig
@@ -30,6 +30,7 @@ CONFIG_SGETMASK_SYSCALL=y
 # CONFIG_FHANDLE is not set
 CONFIG_KALLSYMS_ALL=y
 CONFIG_BPF_SYSCALL=y
+CONFIG_BPF_JIT_ALWAYS_ON=y
 # CONFIG_RSEQ is not set
 CONFIG_EMBEDDED=y
 # CONFIG_VM_EVENT_COUNTERS is not set
@@ -191,6 +192,7 @@ CONFIG_NET_EMATCH_U32=y
 CONFIG_NET_CLS_ACT=y
 CONFIG_VSOCKETS=y
 CONFIG_VIRTIO_VSOCKETS=y
+CONFIG_BPF_JIT=y
 CONFIG_CFG80211=y
 # CONFIG_CFG80211_DEFAULT_PS is not set
 # CONFIG_CFG80211_CRDA_SUPPORT is not set
diff --git a/arch/x86/configs/x86_64_cuttlefish_defconfig b/arch/x86/configs/x86_64_cuttlefish_defconfig
index cc01102ad77a..4a5a9e76d89c 100644
--- a/arch/x86/configs/x86_64_cuttlefish_defconfig
+++ b/arch/x86/configs/x86_64_cuttlefish_defconfig
@@ -30,6 +30,7 @@ CONFIG_BLK_DEV_INITRD=y
 # CONFIG_PCSPKR_PLATFORM is not set
 CONFIG_KALLSYMS_ALL=y
 CONFIG_BPF_SYSCALL=y
+CONFIG_BPF_JIT_ALWAYS_ON=y
 CONFIG_EMBEDDED=y
 # CONFIG_COMPAT_BRK is not set
 CONFIG_PROFILING=y
@@ -203,6 +204,7 @@ CONFIG_NET_EMATCH_U32=y
 CONFIG_NET_CLS_ACT=y
 CONFIG_VSOCKETS=y
 CONFIG_VIRTIO_VSOCKETS=y
+CONFIG_BPF_JIT=y
 CONFIG_CFG80211=y
 CONFIG_MAC80211=y
 CONFIG_RFKILL=y