Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751499AbdFHMkB (ORCPT ); Thu, 8 Jun 2017 08:40:01 -0400 Received: from mail-pg0-f51.google.com ([74.125.83.51]:35010 "EHLO mail-pg0-f51.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751502AbdFHMj7 (ORCPT ); Thu, 8 Jun 2017 08:39:59 -0400 From: Amit Pundir To: Andrew Morton , Rob Herring , Greg KH , John Stultz Cc: lkml , Android Kernel Team , Chenbo Feng Subject: [PATCH v2 7/8] config: android-base: add CGROUP_BPF Date: Thu, 8 Jun 2017 18:09:15 +0530 Message-Id: <1496925556-19417-8-git-send-email-amit.pundir@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1496925556-19417-1-git-send-email-amit.pundir@linaro.org> References: <1496925556-19417-1-git-send-email-amit.pundir@linaro.org> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 870 Lines: 28 From: Chenbo Feng Add CONFIG_CGROUP_BPF as a default configuration in android base config since it is used to replace XT_QTAGUID in future. Reviewed-at: https://android-review.googlesource.com/#/c/400374/ Signed-off-by: Chenbo Feng [AmitP: cherry-picked this change from Android common kernel] Signed-off-by: Amit Pundir --- kernel/configs/android-base.config | 1 + 1 file changed, 1 insertion(+) diff --git a/kernel/configs/android-base.config b/kernel/configs/android-base.config index 62cb392fc34b..cdde5af6b332 100644 --- a/kernel/configs/android-base.config +++ b/kernel/configs/android-base.config @@ -14,6 +14,7 @@ CONFIG_ASHMEM=y CONFIG_AUDIT=y CONFIG_BLK_DEV_INITRD=y CONFIG_CGROUPS=y +CONFIG_CGROUP_BPF=y CONFIG_CGROUP_CPUACCT=y CONFIG_CGROUP_DEBUG=y CONFIG_CGROUP_FREEZER=y -- 2.7.4