From patchwork Mon Aug 29 21:49:50 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 101904 Delivered-To: patch@linaro.org Received: by 10.140.29.52 with SMTP id a49csp1833555qga; Mon, 29 Aug 2016 14:50:28 -0700 (PDT) X-Received: by 10.66.221.229 with SMTP id qh5mr373558pac.66.1472507428250; Mon, 29 Aug 2016 14:50:28 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id t90si41134410pfa.50.2016.08.29.14.50.26; Mon, 29 Aug 2016 14:50: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 S1756943AbcH2VuP (ORCPT + 27 others); Mon, 29 Aug 2016 17:50:15 -0400 Received: from mout.kundenserver.de ([212.227.126.130]:52604 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756157AbcH2VuO (ORCPT ); Mon, 29 Aug 2016 17:50:14 -0400 Received: from wuerfel.lan. ([176.5.99.91]) by mrelayeu.kundenserver.de (mreue001) with ESMTPA (Nemesis) id 0MOG72-1bhnpR0zTQ-005YMv; Mon, 29 Aug 2016 23:49:57 +0200 From: Arnd Bergmann To: Andrew Morton Cc: kernel-build-reports@lists.linaro.org, linux-kernel@vger.kernel.org, Arnd Bergmann Subject: [PATCH 1/3] kconfig: tinyconfig: provide whole choice blocks to avoid warnings Date: Mon, 29 Aug 2016 23:49:50 +0200 Message-Id: <20160829214952.1334674-2-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20160829214952.1334674-1-arnd@arndb.de> References: <20160829214952.1334674-1-arnd@arndb.de> X-Provags-ID: V03:K0:5kl0elsuNEaoFWmHJ7/JMnPm6C80Grgc7jR3BzLWLVqvU/1ThgK aJuQrGSOas0vIDS8lPOau5uySdIK8T1jDdIuCj0XsttVDOiz27K0X/T5cQc8ZK/FzwZw6G8 7T7z9UmDaf/1c0K5eedSZNmN8a8WTX3Jf2X9czBg/YoTYCizTT9bGUSU2owfvbofF5KkK8x 7FQdRTtXPxXB1m/r7Y+fw== X-UI-Out-Filterresults: notjunk:1; V01:K0:puxJGtCrKGE=:EKbha9CvtZg+sP/3UIUUZC smVxIX/d2blrmejXqcZ5FQYhL+6V3rT2/yARcbhjBxJNfyGihO0H7J/BzIi2p+sKJSDiefImZ jJqn3FjW9rh5amfAgkidHlUDFAhYJYy7p5A1wLedQqxB3DzVuJNYJa4DjlHajuR5YL8JYzub5 S7cc7JQMAM/XSe63fPirWl2fZgL/JRsRav4F2pGUyD9/k+bws0CCFTbRuA9kD0SqCziYJnqYR RI7LH03B7I3cpMwAKbMV1QVmIdgfZV34O3RoNlkb+BbuhiHqiO1eDspwMaYpz5w1vWlUSvH7U /OdsilHMBdFPBm4lFOGaPMyB984eWRVLxQiSi2GTPe8q8SFwU/oBRcHROH7WmZFJY+qHP/NZR ucxQerR3RGhJwWweaAyKLkJmlOsRsuAkg6hpekGoLPr7hYyBVoegAYrscqpdXRJhVDpEeQDLB EcfLDFGlCc69njI2iSVC5AV9RWgr0CA9UCqZqMnxlgJLBbOvQ7ckoYQeE5XXZXNL9OgG0lDXM oG0dUyim9GWMavHYOYF4AZAw/feb97h7IfS2s4bPWJpGxbz10I3jbVwo4Tx4vbocf8fRutLhD pu7oNDZ/2XfhqSFwPPZb42Aa5SecmSGtomDqwQI6SVEf//gO8DMRPSzqjWLUHp6wNWrwt7Il/ vV3qBo/vhvxjYR8QXKLGKvPTt5/1Lb61EV0a5qLGFSRbNZDmB7NIC5ZCx60yXpEGbv98= 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 Reviewed-by: Masahiro Yamada Acked-by: Ingo Molnar --- This version incorporates feedback from Masahiro Yamada, and includes the x86 change that Josh mentioned --- 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 From patchwork Mon Aug 29 21:49:51 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 101902 Delivered-To: patch@linaro.org Received: by 10.140.29.52 with SMTP id a49csp1833746qga; Mon, 29 Aug 2016 14:51:02 -0700 (PDT) X-Received: by 10.66.145.73 with SMTP id ss9mr375745pab.82.1472507462828; Mon, 29 Aug 2016 14:51:02 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id v70si41155286pfa.220.2016.08.29.14.51.00; Mon, 29 Aug 2016 14:51:02 -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 S1756994AbcH2VuW (ORCPT + 27 others); Mon, 29 Aug 2016 17:50:22 -0400 Received: from mout.kundenserver.de ([212.227.126.133]:55986 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756944AbcH2VuU (ORCPT ); Mon, 29 Aug 2016 17:50:20 -0400 Received: from wuerfel.lan. ([176.5.99.91]) by mrelayeu.kundenserver.de (mreue001) with ESMTPA (Nemesis) id 0MMsGt-1bkolm3YFD-008aN4; Mon, 29 Aug 2016 23:49:58 +0200 From: Arnd Bergmann To: Andrew Morton Cc: kernel-build-reports@lists.linaro.org, linux-kernel@vger.kernel.org, Geert Uytterhoeven , Arnd Bergmann Subject: [PATCH 2/3] test/hash: Fix warning in two-dimensional array init Date: Mon, 29 Aug 2016 23:49:51 +0200 Message-Id: <20160829214952.1334674-3-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20160829214952.1334674-1-arnd@arndb.de> References: <20160829214952.1334674-1-arnd@arndb.de> X-Provags-ID: V03:K0:vRIttujQtxqRlCiRSwg9VoxmlMIzAEL7noog4Ni6z8Cw6ixsANs xi6ZRBicyIL0Qnmums9g3/P0MjqI1ROXuVy9DaEIhc5wiqDbgPKxQv9cf7hyA8ogJdplnUl X1iIPa1FFXR6KjPdEXu6pFE2eTO2T1m4hEngihdr8JiMxsn2DM3qbS0gTUIpQkfQGyROnsD uuKJy6u0JS0vCLPNNPHPQ== X-UI-Out-Filterresults: notjunk:1; V01:K0:8C7ml2XA/so=:bR2gkEyKqZMLJWJV6lCIKW 39ads1Jp5fB/yt4J0f5h8Jbqetr+/UsO2UFW7iQjsA4J6mCtZoxU44hMRzaIwJs76S38fjqLw cvk5zPB4Cl76U3t/xTAPuNtZ6imbWcmnc+8D4GrKD/+Ndhm1Oexu80GhIdCUXhF+x7kJW3krZ rV9dYLUkss9FuVeZ1bSmxdWLzhqfl6MF6CrItm+V9WNxTqqxlMLIRTAWPv2LlIGCRixZ01wws 3lPsiXMkVXxZc7Yk/ZINo2t5NJxYXmlHgdXZfng52DNwq3Q/poXqFJXuv2ER/22W9ZcFGy1nZ pJJt6MUpZLm03N1YXd6WXGlsw+VPkfWHS2+4FWAV6Q+P4XTXCkXKJRzmJi3ZrA7px/N86plKs jSsxtLCyOGgnsnDlSqqZZSLigK/cyLC3JeLcb4Co3Ja34XAFka69MsyshfXm3IZQeF2DWiQXh ZfikmjMeO3XoTtPiEoZHmt0H5bIh6Tglncuyk7oEVc9yFFZUdGn0RzZr3kscQW9NG/q/OfNqa LLrnUxfle1xXIJe8ReSw80Vjj3abrH22Yd9dODzE/g0nJIhblPMRO/QYhrDU6ueHIKiGnzvYa uperr0rGZZYuIUQ9tM/x+Hv2tRXXNhhQI2I+7Stjyb4XPUo8NcYPiGAgWI6Gu+IyLAu+kK8eB mbZHGcM48hQ6++4gLjU5W/11kxGQNHphuGeo2eu/1YhqKfLi1sPaDSVuHA4yRZEXNg0I= Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Geert Uytterhoeven lib/test_hash.c: In function 'test_hash_init': lib/test_hash.c:146:2: warning: missing braces around initializer [-Wmissing-braces] Fixes: 468a9428521e7d00 (": Add support for architecture-specific functions") Signed-off-by: Geert Uytterhoeven Acked-by: George Spelvin Signed-off-by: Arnd Bergmann --- lib/test_hash.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.9.0 diff --git a/lib/test_hash.c b/lib/test_hash.c index 66c5fc8351e8..81702ee4c41c 100644 --- a/lib/test_hash.c +++ b/lib/test_hash.c @@ -143,7 +143,7 @@ static int __init test_hash_init(void) { char buf[SIZE+1]; - u32 string_or = 0, hash_or[2][33] = { 0 }; + u32 string_or = 0, hash_or[2][33] = { { 0, } }; unsigned tests = 0; unsigned long long h64 = 0; int i, j; From patchwork Mon Aug 29 21:49:52 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 101903 Delivered-To: patch@linaro.org Received: by 10.140.29.52 with SMTP id a49csp1833576qga; Mon, 29 Aug 2016 14:50:30 -0700 (PDT) X-Received: by 10.98.63.1 with SMTP id m1mr401286pfa.14.1472507430324; Mon, 29 Aug 2016 14:50:30 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id t90si41134410pfa.50.2016.08.29.14.50.28; Mon, 29 Aug 2016 14:50:30 -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 S932356AbcH2VuX (ORCPT + 27 others); Mon, 29 Aug 2016 17:50:23 -0400 Received: from mout.kundenserver.de ([212.227.126.130]:60249 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756203AbcH2VuT (ORCPT ); Mon, 29 Aug 2016 17:50:19 -0400 Received: from wuerfel.lan. ([176.5.99.91]) by mrelayeu.kundenserver.de (mreue001) with ESMTPA (Nemesis) id 0LhoIM-1bIswm1uio-00n6a3; Mon, 29 Aug 2016 23:49:58 +0200 From: Arnd Bergmann To: Andrew Morton Cc: kernel-build-reports@lists.linaro.org, linux-kernel@vger.kernel.org, Geert Uytterhoeven , Arnd Bergmann Subject: [PATCH 3/3] test/hash: Fix warning in preprocessor symbol evaluation Date: Mon, 29 Aug 2016 23:49:52 +0200 Message-Id: <20160829214952.1334674-4-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20160829214952.1334674-1-arnd@arndb.de> References: <20160829214952.1334674-1-arnd@arndb.de> X-Provags-ID: V03:K0:MQNABdwl3r8OlsMY70ftGHwL1ITg57sPZoHmPn9Ttk+P/hP7Lqy PrJNlhz/l9boNpbyWjkJyITOhPfmBBYDHl1P7c3aU/MC/HmKMSkTmQtkC0EVa/V+bqKuQwV Ths9FhBLRIz4P9OvByuLNR0da9xRguOK1dylz3mh9kl4/UtshmXsY23LDiZkt1UkgKXvn3A bLfS7uc3lDO7O9N5yDYAw== X-UI-Out-Filterresults: notjunk:1; V01:K0:UyAp3Robwn0=:/YUYIm1PaGHH12X5jnuN5X 1WQQJagBGrFoYOemAzTdwf0GStscD/Ods7PZYBqP9OC1oKsR58s3Tgsll4fJqH/e0mDo6xdC9 862i5LbqS2PSWFKN8DgbMDuRfRx3ADjuF+DXqKFP0g6auyl9vN+riVYjnNDlERv2/krNZyk7C 0OVgdkVmmagnNqS1X6yHenMnapU6TlsjEoe0fRFa8zMmc2B65yeoVq8t86Bc7gl/3vGz8X74T VJoluvlocE4AVdPRaz4B6CZj7oj5rlA5QJvbL4AHl3OzJjPeq9dYUshDqN+l/gdmh5X5l5n0x OwpthvOShvu2aEaODVpnsFyZLE7UEDG47KEB/xiC9J9haHg8MjrebEkxaukmj/lPSFQN/an4I 6+qksTh8VVzamaJ36W6ZgVvcbYANQDOBrSasK/27DNwciMRRAdTTX97Q22Kk2UVSLIdXMADIf 8YRXehY1szu3dEEBG4caIoWLP0F855wXgcaBiTe5QWAEta5nxKvLS7vHLfFh5OEnV660NTAmk D3oEnXsMrDZvFzBIqNITxNnr6GSjC76JPV2HNa0kVL7jRNrQNEd8I94c0TF/zsAUjG5uJkglc GtFDC2juWv3RhK5mFBm/C/7JfFFgVB8c3lOVqrNz92fCZYYevcdtTTbQVzRHIUU60F+2uhmzi C5cFb0w/HaGDQ7VHeURNw+klGBt34EIt6bM6D7uevE/rouhHkNFasiJ9hIktRnRyoEF4= Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Geert Uytterhoeven Some versions of gcc don't like tests for the value of an undefined preprocessor symbol, even in the #else branch of an #ifndef: lib/test_hash.c:224:7: warning: "HAVE_ARCH__HASH_32" is not defined [-Wundef] #elif HAVE_ARCH__HASH_32 != 1 ^ lib/test_hash.c:229:7: warning: "HAVE_ARCH_HASH_32" is not defined [-Wundef] #elif HAVE_ARCH_HASH_32 != 1 ^ lib/test_hash.c:234:7: warning: "HAVE_ARCH_HASH_64" is not defined [-Wundef] #elif HAVE_ARCH_HASH_64 != 1 ^ Seen with gcc 4.9, not seen with 4.1.2. Change the logic to only check the value inside an #ifdef to fix this. Fixes: 468a9428521e7d00 (": Add support for architecture-specific functions") Signed-off-by: Geert Uytterhoeven Acked-by: George Spelvin Signed-off-by: Arnd Bergmann --- lib/test_hash.c | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) -- 2.9.0 diff --git a/lib/test_hash.c b/lib/test_hash.c index 81702ee4c41c..cac20c5fb304 100644 --- a/lib/test_hash.c +++ b/lib/test_hash.c @@ -219,21 +219,27 @@ test_hash_init(void) } /* Issue notices about skipped tests. */ -#ifndef HAVE_ARCH__HASH_32 - pr_info("__hash_32() has no arch implementation to test."); -#elif HAVE_ARCH__HASH_32 != 1 +#ifdef HAVE_ARCH__HASH_32 +#if HAVE_ARCH__HASH_32 != 1 pr_info("__hash_32() is arch-specific; not compared to generic."); #endif -#ifndef HAVE_ARCH_HASH_32 - pr_info("hash_32() has no arch implementation to test."); -#elif HAVE_ARCH_HASH_32 != 1 +#else + pr_info("__hash_32() has no arch implementation to test."); +#endif +#ifdef HAVE_ARCH_HASH_32 +#if HAVE_ARCH_HASH_32 != 1 pr_info("hash_32() is arch-specific; not compared to generic."); #endif -#ifndef HAVE_ARCH_HASH_64 - pr_info("hash_64() has no arch implementation to test."); -#elif HAVE_ARCH_HASH_64 != 1 +#else + pr_info("hash_32() has no arch implementation to test."); +#endif +#ifdef HAVE_ARCH_HASH_64 +#if HAVE_ARCH_HASH_64 != 1 pr_info("hash_64() is arch-specific; not compared to generic."); #endif +#else + pr_info("hash_64() has no arch implementation to test."); +#endif pr_notice("%u tests passed.", tests);