From patchwork Fri May 5 19:47:30 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 98717 Delivered-To: patch@linaro.org Received: by 10.140.96.100 with SMTP id j91csp293317qge; Fri, 5 May 2017 12:49:54 -0700 (PDT) X-Received: by 10.84.205.70 with SMTP id o6mr67229231plh.63.1494013794711; Fri, 05 May 2017 12:49:54 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 1si2689373pgp.198.2017.05.05.12.49.54; Fri, 05 May 2017 12:49:54 -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 S1756070AbdEETtl (ORCPT + 25 others); Fri, 5 May 2017 15:49:41 -0400 Received: from mout.kundenserver.de ([212.227.126.130]:55919 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755319AbdEETth (ORCPT ); Fri, 5 May 2017 15:49:37 -0400 Received: from wuerfel.lan ([78.42.17.5]) by mrelayeu.kundenserver.de (mreue002 [212.227.15.129]) with ESMTPA (Nemesis) id 0MdTH9-1dP52w2jVT-00IRos; Fri, 05 May 2017 21:48:33 +0200 From: Arnd Bergmann To: Ben Hutchings Cc: stable@vger.kernel.org, Ingo Molnar , "H. Peter Anvin" , Thomas Gleixner , linux-kernel@vger.kernel.org, Arnd Bergmann Subject: [PATCH 3.16-stable 72/87] x86/boot: Add CONFIG_PARAVIRT_SPINLOCKS quirk to arch/x86/boot/compressed/misc.h Date: Fri, 5 May 2017 21:47:30 +0200 Message-Id: <20170505194745.3627137-73-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20170505194745.3627137-1-arnd@arndb.de> References: <20170505194745.3627137-1-arnd@arndb.de> MIME-Version: 1.0 X-Provags-ID: V03:K0:noyEIF0LTGRl4vc8QGfal8/0YZqvoOKbCIoCFf0nHjXbC1zcrY1 hnNKiWfTMKW+rv5TogIvxB8WOEoaLN8epi3TaOzi5RPrP2/Eo4U4Wf1NesbVDKRHIi+aL4d Ac19nJggylEfZ+1Q0jnHiSL45dZk2sYpzPJbgyv1xm679yO6vmbK2hQXayoWk06gyMnMMk2 jSBWTT1vP6i6WiX9WzDLg== X-UI-Out-Filterresults: notjunk:1; V01:K0:yiyA5AEsj1I=:kUlAOVM+4SCdZ74Q4mSsMv lQ0+YXO/ujKGM2LK2oXa9mlC7gF7MoT7pfHAay5dlsR7ZgT7n9woq9euEfBNaM9ZZpvqv8kok hC2Fil6rrcuj/Xdb7ZZiL1J/CTq7R1Z+cuLMfb2MEesjm+uYYgfkg0qcOGdKHpDfDFn7psNX4 iViLhVs4pa83QWh6VoyzeMs0tRHhhK+VXNbJwsQ9o2mvlqIis+cu8NRIUxIJZWK3hrw9hAclB sTn2c89WyfUxQFvd/0kzmW1YNx/J8nYcwYkVfZsGOsMPK54hKIHVDRVDI+fIG56rASq8wEgb8 A/EIrU6nwQI2yXAJ4Xgegnuors1Q2fQnNRTgEnqZ3JGT+3FRVQy+QxATbbo7Av5YmQ8zVrcq/ 9wQURcDGbwLhectXpDqWhpr6WZb5wrsudghnfdHhzW3C9Q+tKxZENWMT/5zeXhkHnF4Q4VIMz G27ba6Knvj0UNPuSuBI7iJHmdEKIFMq9Nn5lYd5t+VhscI0M3As0hIWCTZPJr4JHITRBH2AWQ sdx/S3AuGkYMpx+5FCfNLUaE7Q/wovpxTGEQzVPKGu24Il8GVYcHOCXpdfkIRypqaTrZJy7sz JR21yvWOClZdEBNt2GoZ4XxPYQLNrsyOY83xUL49N6dMVOCh9F+uBT5114UV0GkkVHLVbjCpW RVIuYRsc0NA7syyFO5nOU4wtW23Cc3jHMeKM4SLI0dSYJkeKZWpZvg8tPKpSwk6lLWoCadXix 0fnEjm2fv23M1aue Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Ingo Molnar Commit 927392d73a97d8d235bb65400e2e3c7f0bec2b6f upstream. Linus reported the following new warning on x86 allmodconfig with GCC 5.1: > ./arch/x86/include/asm/spinlock.h: In function ‘arch_spin_lock’: > ./arch/x86/include/asm/spinlock.h:119:3: warning: implicit declaration > of function ‘__ticket_lock_spinning’ [-Wimplicit-function-declaration] > __ticket_lock_spinning(lock, inc.tail); > ^ This warning triggers because of these hacks in misc.h: /* * we have to be careful, because no indirections are allowed here, and * paravirt_ops is a kind of one. As it will only run in baremetal anyway, * we just keep it from happening */ #undef CONFIG_PARAVIRT #undef CONFIG_KASAN But these hacks were not updated when CONFIG_PARAVIRT_SPINLOCKS was added, and eventually (with the introduction of queued paravirt spinlocks in recent kernels) this created an invalid Kconfig combination and broke the build. So add a CONFIG_PARAVIRT_SPINLOCKS #undef line as well. Also remove the _ASM_X86_DESC_H quirk: that undocumented quirk was originally added ages ago, in: 099e1377269a ("x86: use ELF format in compressed images.") and I went back to that kernel (and fixed up the main Makefile which didn't build anymore) and checked what failure it avoided: it avoided an include file dependencies related build failure related to our old x86-platforms code. That old code is long gone, the header dependencies got cleaned up, and the build does not fail anymore with the totality of asm/desc.h included - so remove the quirk. Reported-by: Linus Torvalds Cc: "H. Peter Anvin" Cc: Thomas Gleixner Cc: linux-kernel@vger.kernel.org Signed-off-by: Ingo Molnar Signed-off-by: Arnd Bergmann --- arch/x86/boot/compressed/misc.h | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) -- 2.9.0 diff --git a/arch/x86/boot/compressed/misc.h b/arch/x86/boot/compressed/misc.h index 24e3e569a13c..124312be129b 100644 --- a/arch/x86/boot/compressed/misc.h +++ b/arch/x86/boot/compressed/misc.h @@ -2,14 +2,13 @@ #define BOOT_COMPRESSED_MISC_H /* - * we have to be careful, because no indirections are allowed here, and - * paravirt_ops is a kind of one. As it will only run in baremetal anyway, - * we just keep it from happening + * Special hack: we have to be careful, because no indirections are allowed here, + * and paravirt_ops is a kind of one. As it will only run in baremetal anyway, + * we just keep it from happening. (This list needs to be extended when new + * paravirt and debugging variants are added.) */ #undef CONFIG_PARAVIRT -#ifdef CONFIG_X86_32 -#define _ASM_X86_DESC_H 1 -#endif +#undef CONFIG_PARAVIRT_SPINLOCKS #include #include