From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1031694AbdAJMIq (ORCPT ); Tue, 10 Jan 2017 07:08:46 -0500 Received: from mout.kundenserver.de ([212.227.17.13]:51226 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1031456AbdAJMIo (ORCPT ); Tue, 10 Jan 2017 07:08:44 -0500 From: Arnd Bergmann To: "David S . Miller" Cc: netdev@vger.kernel.org, Alexei Starovoitov , Andy Lutomirski , Augusto Mecking Caringi , Arnd Bergmann , linux-kernel@vger.kernel.org Subject: [PATCH] cgroup: move CONFIG_SOCK_CGROUP_DATA to init/Kconfig Date: Tue, 10 Jan 2017 13:08:06 +0100 Message-Id: <20170110120825.2984218-1-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 X-Provags-ID: V03:K0:mY19F0P9X5yXEUqH3uWG+ZNIRX6/6AdQiGyPcqFC/ugqkzgEkh4 ji4Jyexc+ugbCHv3iFhta+c5Y7GF8sJG6wq5KYvR/mdDA6lbKYewnAUocOtnUUV5jU6aeLV ZcTk43IdKXk4QbkYIXMPwZCVrpdncQT1jlpMvNSuDyqi7ftGFhWEhDlebQWmtMzLDjsOLQ0 F81EfEDRMri5Imt9MgY8g== X-UI-Out-Filterresults: notjunk:1;V01:K0:4iJKTBtCgJo=:yUVg4nLW0WEwruupW+vsFD Pw4E47sw4UICpEjn0Ddj5LcHf4R8X4F8g66OC55tccB8mK7/lcZ2kU0uvOQUXmNm0Mwz5svCe +FN1DYkmrS1BhSr6r6N2jKqg/tu7vbjitD5keK525tP9QpYME/zKIbN2lhPg6cRSuTeXOwdI9 du0Ejh8CEHQ/Xsdg4tAQzeIAopWRJ3Il2k11dXZl1+ItjNdLr0NFugCx5r1Ag0FQ0avUtKZPY goxySOWK6tgboc0ZEA6ynVMzKXRe0lipBK+PJSIwrISqxXEMgVCQBK85bn/mTVjoX4Pzd1DMa OQpjcVkTHYfdmYS/4C1pfGGwOc+eMwGwQ4Ph7GRNkcdvPQRPXf/ir5EEfg1ktE8el2rJ+IIMC Zm0qycfkt41f9donrekC1lFPXv5Q3y57qmqDGe11roes8drD76y2szroTrLah1DGYXfFbkY3C qFrH+GOsrsNmZtnOqQO9Jd8YTprrxVw3yoliRbCHJsvCBNv+QhZXEBvyAQ15t6xNXRbjdRrfm PUt6oU0PMNE9duoiWUwfq4v3FO8AzEfc9EGHHNXH4mF6kT9SAWKA/yuoaY3qZNMjVWVuH5M2g V0JYuz6w9FKNTJ5yy962P707CXL0TiKycInqoI4PUjcDhTus5Gj8UJiHsp3jRnTg1OTPtGINt nG5JNhKI6jUqglWQijYhojDTYyn7mY0U0JqjW4rvyTmyLlO8KcFqvruT6uD+n7cKZtbA= Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org We now 'select SOCK_CGROUP_DATA' but Kconfig complains that this is not right when CONFIG_NET is disabled and there is no socket interface: warning: (CGROUP_BPF) selects SOCK_CGROUP_DATA which has unmet direct dependencies (NET) I don't know what the correct solution for this is, but simply removing the dependency on NET from SOCK_CGROUP_DATA by moving it out of the 'if NET' section avoids the warning and does not produce other build errors. Fixes: 483c4933ea09 ("cgroup: Fix CGROUP_BPF config") Signed-off-by: Arnd Bergmann --- There was an earlier patch by Augusto Mecking Caringi, which added a dependency, see https://lkml.org/lkml/2017/1/2/296. I could not figure out whether CGROUP_BPF is meaningful without CONFIG_NET, my version of the patch assumes that it is. Applying either my version Augusto's to v4.10-rc will kill the warning. --- init/Kconfig | 4 ++++ net/Kconfig | 4 ---- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/init/Kconfig b/init/Kconfig index 08c5c161f4ad..420d345db391 100644 --- a/init/Kconfig +++ b/init/Kconfig @@ -1174,6 +1174,10 @@ config CGROUP_DEBUG Say N. +config SOCK_CGROUP_DATA + bool + default n + endif # CGROUPS config CHECKPOINT_RESTORE diff --git a/net/Kconfig b/net/Kconfig index a1005007224c..a29bb4b41c50 100644 --- a/net/Kconfig +++ b/net/Kconfig @@ -258,10 +258,6 @@ config XPS config HWBM bool -config SOCK_CGROUP_DATA - bool - default n - config CGROUP_NET_PRIO bool "Network priority cgroup" depends on CGROUPS -- 2.9.0