From patchwork Thu May 4 21:33:04 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 98585 Delivered-To: patch@linaro.org Received: by 10.140.89.200 with SMTP id v66csp822892qgd; Thu, 4 May 2017 14:33:31 -0700 (PDT) X-Received: by 10.99.2.84 with SMTP id 81mr46885024pgc.17.1493933611250; Thu, 04 May 2017 14:33:31 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 1si3145399pgi.120.2017.05.04.14.33.30; Thu, 04 May 2017 14:33:31 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of stable-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 stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751580AbdEDVda (ORCPT + 6 others); Thu, 4 May 2017 17:33:30 -0400 Received: from mout.kundenserver.de ([212.227.17.24]:50561 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752275AbdEDVd3 (ORCPT ); Thu, 4 May 2017 17:33:29 -0400 Received: from wuerfel.lan ([78.42.17.5]) by mrelayeu.kundenserver.de (mreue104 [212.227.15.145]) with ESMTPA (Nemesis) id 0MbgsX-1dOsjF4Asf-00J3aK; Thu, 04 May 2017 23:33:13 +0200 From: Arnd Bergmann To: gregkh@linuxfoundation.org Cc: stable@vger.kernel.org, Arnd Bergmann , Lars-Peter Clausen Subject: [PATCH 1/3] [3.18-stable] MIPS: jz4740: fix build error in irq.h Date: Thu, 4 May 2017 23:33:04 +0200 Message-Id: <20170504213306.645281-2-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20170504213306.645281-1-arnd@arndb.de> References: <20170504213306.645281-1-arnd@arndb.de> X-Provags-ID: V03:K0:kaooEIYli47E3qt396AaIv6wJ3eGuep25QOOXzNR/hMVFFZKqY8 +FKuu2dXX35rPq/WQr0dDifRRxL6/JS+tYNtfKRwWM7perMs7rwXQ8B16AH0RY+Q5DjwZ55 upIDiogbw3j3Gc++SfV7NTn/Byu4xtomQ4xSiVQzWzAA6aaz1pjAgStiyaMYadGgTr01hjH gGUxf1WZXOsG+WYdBR7zg== X-UI-Out-Filterresults: notjunk:1; V01:K0:Dhs90VTIdl0=:dKCtrdbPPIINr2yH0kEuhh Jne5GyM3nMz+9TCQTV0+l9KDJ2p84wAwpwj9L+9Sg8rCT+W1G1/p4YGpvhnRyFz5XKFvwvAxi HKeXmVpZvLnv0TGhrqgUAHDk16oPWo4gceNmOr+7U8jkZ4IBZbTIofOsG92XLwMW+KOTHJkFD ft33rr2ygltx8xjvovdgbRL4fcuXVYQD6WDLN+HsBbwWPlJXHfmAHpE8gqnH3ZICfIw9W6dWM gr4QQzEu+kHIUgBo3H1BfLeIB4gOWDrHyl9Ctk7f0G1bfIzyDp/O8lX06fOgslkBtToj16zC2 13C+4qHzBfu17xSjsnSt/QFQk3Vv5ZJje17iCFmIEgWBKH5+ceAW/4JL5pIsmkgIeAbM/qV8z Z3wI41nsAjv8kTaa10tjAZuWCLBxfA4d802dDGIhTJmf8lAPydO0Jx0spXVjmh6OMINFN/Km+ 3lCqKfAaj6mCbfjjTMD2Txd9tfIvJv9NBkUGyID5QPbWLQDv0WCllBULBdKf/1lfYzDIDrHXd tPpXCC1wVnf/G0u+mHHEeWvBKCVjA6W2L5zCz/PrR1WKoHXJ72aNy8XFpcD0k9d1yww5O6wub cHCfGx0u9M70gPY2w9mPJgFKP6zertFAH4m8UP9L+gMrjnLtMdbaumqbk/9jiJjg5KcsK4uV9 8yocCvfBi6fCz1FYoL1+UPXgV7P9zYn+VlmbRorcJyiNQbU7kg678rj8l7SqqBs+kxwY= Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org kernelci found build error on the 3.18 stable tree that don't show up in later versions: arch/mips/jz4740/irq.h:21:38: error: 'struct irq_data' declared inside parameter list will not be visible outside of this definition or declaration [-Werror] arch/mips/jz4740/irq.h:20:39: error: 'struct irq_data' declared inside parameter list will not be visible outside of this definition or declaration [-Werror] include/linux/irqdesc.h:92:33: error: 'NR_IRQS' undeclared here (not in a function) arch/mips/jz4740/irq.c:91:41: error: 'JZ4740_IRQ_BASE' undeclared (first use in this function) arch/mips/jz4740/irq.c:68:6: error: conflicting types for 'jz4740_irq_resume' arch/mips/jz4740/irq.c:62:6: error: conflicting types for 'jz4740_irq_suspend' arch/mips/jz4740/irq.c:49:39: error: 'JZ4740_IRQ_BASE' undeclared (first use in this function) arch/mips/jz4740/gpio.c:47:32: error: initializer element is not constant arch/mips/jz4740/gpio.c:46:32: error: initializer element is not constant arch/mips/jz4740/gpio.c:45:32: error: initializer element is not constant arch/mips/jz4740/gpio.c:44:32: error: initializer element is not constant arch/mips/jz4740/gpio.c:447:22: error: assignment from incompatible pointer type [-Werror=incompatible-pointer-types] arch/mips/jz4740/gpio.c:446:23: error: assignment from incompatible pointer type [-Werror=incompatible-pointer-types] arch/mips/jz4740/gpio.c:427:14: error: implicit declaration of function 'JZ4740_IRQ_INTC_GPIO' [-Werror=implicit-function-declaration] arch/mips/jz4740/gpio.c:269:9: error: implicit declaration of function 'JZ4740_IRQ_GPIO' [-Werror=implicit-function-declaration] The problem seems to be caused by commit 83bc76920080 ("MIPS: JZ4740: Use generic irq chip") from linux-3.2, but only showed up in a defconfig build when qi_lb60_defconfig was added in linux-3.13 and that configuration never successfully built. The code has changed in a number of ways before 4.4, which builds fine. While I did not bisect the problem to a specific change, I found a simple fix by including the obviously missing header. Cc: Lars-Peter Clausen Signed-off-by: Arnd Bergmann --- arch/mips/jz4740/irq.h | 2 ++ 1 file changed, 2 insertions(+) -- 2.9.0 diff --git a/arch/mips/jz4740/irq.h b/arch/mips/jz4740/irq.h index 0f48720b5b63..486db78808cc 100644 --- a/arch/mips/jz4740/irq.h +++ b/arch/mips/jz4740/irq.h @@ -16,7 +16,9 @@ #define __MIPS_JZ4740_IRQ_H__ #include +#include +struct irq_data; extern void jz4740_irq_suspend(struct irq_data *data); extern void jz4740_irq_resume(struct irq_data *data);