From patchwork Wed Aug 10 21:54:07 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 101956 Delivered-To: patch@linaro.org Received: by 10.140.29.52 with SMTP id a49csp609810qga; Wed, 10 Aug 2016 14:57:29 -0700 (PDT) X-Received: by 10.66.142.105 with SMTP id rv9mr10849544pab.33.1470866248944; Wed, 10 Aug 2016 14:57:28 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id g63si50421756pfg.227.2016.08.10.14.57.28; Wed, 10 Aug 2016 14:57:28 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932675AbcHJV50 (ORCPT + 27 others); Wed, 10 Aug 2016 17:57:26 -0400 Received: from mout.kundenserver.de ([212.227.126.131]:58326 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932179AbcHJV5Y (ORCPT ); Wed, 10 Aug 2016 17:57:24 -0400 Received: from wuerfel.lan. ([78.42.132.4]) by mrelayeu.kundenserver.de (mreue005) with ESMTPA (Nemesis) id 0M1kNy-1bDBw63AiI-00tjaF; Wed, 10 Aug 2016 23:55:24 +0200 From: Arnd Bergmann To: x86@kernel.org Cc: Arnd Bergmann , Masahiro Yamada , Andrew Morton , Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" , Josh Triplett , linux-kernel@vger.kernel.org Subject: [PATCH 1/9] kconfig: tinyconfig: provide whole choice blocks to avoid warnings Date: Wed, 10 Aug 2016 23:54:07 +0200 Message-Id: <20160810215424.1926658-2-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20160810215424.1926658-1-arnd@arndb.de> References: <20160810215424.1926658-1-arnd@arndb.de> X-Provags-ID: V03:K0:8Spd8dYz/ICS6bziN60suyKMT7a2CpV+f6h6cEw7NYL49TD/7fL UXkIKcwmUaDVC3Twv51gH87u4ACnuQlr7WVkT/tbXnvTpn3FZsH5sH2cSb9JOYSY+vCBLtN 95ampd5GdFDCHewjMFAepBtAeVRB3brtlq8hRCsLz0MPZguWz4tskqJYErCzPivdDboHPyv CQqmntSqYeC4Y6jFGj+gw== X-UI-Out-Filterresults: notjunk:1; V01:K0:0kX33EVh38A=:2LOkMCqCRpIB2btl6aRi2B 19mX7dqvlJvw68wsmuflDz41sOkEzAkWynmfWzZOHw7PrNH+eHBFGVWr5qw+5JjkZu3qWGjiN CUYidbQ/3XAWDzv7EdpFCB80SKaHt7Rshr0omKke9L/Aqoee1bDxY+ypWt87dlFBF+Zw6A3DQ /QYs8awseMkcOLOvuL9YZdw1PhZ66zo2SWowZANJ5v/ZIYAaQbrOmcnj6q7m0Qz64xGcG8srd gXOeUyEuMlI8/nsWBL3oY2qtyy6QcOqHi7SjdmGt+XtW9aK4cDdRFLYd7UZuOdyHWG2VQ16ol CGSHOIcvDgpYNOKRzRjoBEV9NngIHemkA41okF3RV+7Psu2WxX/lvTUQjRWYwfdUoIK3H9EXk 0Hvwn99d8U5y1A2R6NMp1mV4z9FHW5UG0oKApBXsID4PZ4QccMzai613WNepJwwmltnSrhTK+ keer4Gwf+W7NfpO3sb6pFHuQjGKxKYNc+RuNX6Q5UplSs92ajm1GBdH8rlCKHpkcSXauPwxwN RuSrY8c3H+TkKnu7PhQYH82z14Us1WTUNFsmeO6ApCtYZe66n5pBHK3+kWxoXleeSff5Y1twN eNWO6fCExBtp5j4imVjmH+e3u8Tu7AuwF8RTVYJEj2QCorsje2xoxoyozfpSmQGRKvcqkoNyK 7Rj+HqKBd6GxtTz/WAPDbp1AQW2TsSxYcIG9aXTY5AQdADWMP7UqXS0EF8w/4ObfFsjM= Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Using "make tinyconfig" produces a couple of annoying warnings that show up for build test machines all the time: .config:966:warning: override: NOHIGHMEM changes choice state .config:965:warning: override: SLOB changes choice state .config:963:warning: override: KERNEL_XZ changes choice state .config:962:warning: override: CC_OPTIMIZE_FOR_SIZE changes choice state .config:933:warning: override: SLOB changes choice state .config:930:warning: override: CC_OPTIMIZE_FOR_SIZE changes choice state .config:870:warning: override: SLOB changes choice state .config:868:warning: override: KERNEL_XZ changes choice state .config:867:warning: override: CC_OPTIMIZE_FOR_SIZE changes choice state I've made a previous attempt at fixing them and we discussed a number of alternatives. I tried changing the Makefile to use "merge_config.sh -n $(fragment-list)" but couldn't get that to work properly. This is yet another approach, based on the observation that we do want to see a warning for conflicting 'choice' options, and that we can simply make them non-conflicting by listing all other options as disabled. This is a trivial patch that we can apply independent of plans for other changes. Signed-off-by: Arnd Bergmann Link: https://storage.kernelci.org/mainline/v4.7-rc6/x86-tinyconfig/build.log https://patchwork.kernel.org/patch/9212749/ Reviewed-by: Josh Triplett Cc: Masahiro Yamada Cc: Andrew Morton --- This version incorporates feedback from Masahiro Yamada, and includes the x86 change that Josh mentioned Unlike the other patches in this series, this is not a recent regression, but it is the only non-regression warning fix I'm aware of that we currently need for a clean build on all configurations tested by https://kernelci.org/. --- arch/x86/configs/tiny.config | 2 ++ kernel/configs/tiny.config | 8 ++++++++ 2 files changed, 10 insertions(+) -- 2.9.0 diff --git a/arch/x86/configs/tiny.config b/arch/x86/configs/tiny.config index 4e2ecfa23c15..4b429df40d7a 100644 --- a/arch/x86/configs/tiny.config +++ b/arch/x86/configs/tiny.config @@ -1 +1,3 @@ CONFIG_NOHIGHMEM=y +# CONFIG_HIGHMEM4G is not set +# CONFIG_HIGHMEM64G is not set diff --git a/kernel/configs/tiny.config b/kernel/configs/tiny.config index c2de56ab0fce..7fa0c4ae6394 100644 --- a/kernel/configs/tiny.config +++ b/kernel/configs/tiny.config @@ -1,4 +1,12 @@ +# CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE is not set CONFIG_CC_OPTIMIZE_FOR_SIZE=y +# CONFIG_KERNEL_GZIP is not set +# CONFIG_KERNEL_BZIP2 is not set +# CONFIG_KERNEL_LZMA is not set CONFIG_KERNEL_XZ=y +# CONFIG_KERNEL_LZO is not set +# CONFIG_KERNEL_LZ4 is not set CONFIG_OPTIMIZE_INLINING=y +# CONFIG_SLAB is not set +# CONFIG_SLUB is not set CONFIG_SLOB=y