From patchwork Wed Jul 4 07:42:55 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 1154731 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by patchwork1.kernel.org (Postfix) with ESMTP id 5F9C13FE4F for ; Wed, 4 Jul 2012 07:47:41 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1SmKF5-0003CI-RZ; Wed, 04 Jul 2012 07:43:19 +0000 Received: from moutng.kundenserver.de ([212.227.17.8]) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1SmKEw-0003AH-IJ for linux-arm-kernel@lists.infradead.org; Wed, 04 Jul 2012 07:43:12 +0000 Received: from klappe2.localnet (HSI-KBW-149-172-5-253.hsi13.kabel-badenwuerttemberg.de [149.172.5.253]) by mrelayeu.kundenserver.de (node=mreu2) with ESMTP (Nemesis) id 0MVqHM-1SJcFv0whc-00X8s3; Wed, 04 Jul 2012 09:42:59 +0200 From: Arnd Bergmann To: linux-arm-kernel@lists.infradead.org Subject: Re: [GIT PULL] at91: first batch of cleanup for 3.6 Date: Wed, 4 Jul 2012 07:42:55 +0000 User-Agent: KMail/1.12.2 (Linux/3.5.0-rc1+; KDE/4.3.2; x86_64; ; ) References: <4FF19B6D.3010704@atmel.com> <201207022058.34442.arnd@arndb.de> In-Reply-To: <201207022058.34442.arnd@arndb.de> MIME-Version: 1.0 Message-Id: <201207040742.56200.arnd@arndb.de> X-Provags-ID: V02:K0:UsH/rekRtQ8iw9n7T7oxBUxrvFoVgCfuKzLH3T4EJ+p VcuLTFByJcbfAqLglftsS/1O30D/xSRDVQQIi4rrmRo14WwiJ1 YN19ZvPZhTrF2A9mae4qcsvbImOkgvz+vl0fEzbQaBozOLw6x4 zrjfgTfAiBRNzKosSZaOKPQKkH3XMgQRGEx4hZmSHy1y/Ha5Pz tcGsQBUBB6u2tEzuJQWeuix1LLI6EN79teqm0FTJhvqEdLbYgx 0QSKIza/ONfCzaBszhdmr07kalK+TsvDwMcZTYa1IN1fKfesVk v32227mcbX0vph0P0y0mvmfkzjkNO6c+JgDS8tEhOorHrE+4NN dCsaWD33jL10iTCTC1pA= X-Spam-Note: CRM114 invocation failed X-Spam-Score: -1.9 (-) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-1.9 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [212.227.17.8 listed in list.dnswl.org] -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: Paul Bolle , Nicolas Ferre , Linux Kernel list , Ludovic Desroches , Olof Johansson , Jean-Christophe PLAGNIOL-VILLARD X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org On Monday 02 July 2012, Arnd Bergmann wrote: > On Monday 02 July 2012, Nicolas Ferre wrote: > > The following changes since commit > > 6887a4131da3adaab011613776d865f4bcfb5678: > > > > Linux 3.5-rc5 (2012-06-30 16:08:57 -0700) > > > > are available in the git repository at: > > > > git://github.com/at91linux/linux-at91.git tags/at91-for-next-cleanup > > Pulled into next/cleanup Unfortunately, I got a bunch of new builf errors and warnings: 8<---- ARM: at91: fix new build errors MULTI_IRQ_HANDLER and SPARSE_IRQ are now required everywhere because mach/irqs.h and mach/entry-macros.S are gone but the symbols are only selected for AT91SAM9, not for the NOMMU parts. A few files now need to include linux/io.h directly, which used to be included through other headers that have changed. The new at91_aic_irq_priorities variable is only used with CONFIG_OF enabled and should not be visible otherwise. Signed-off-by: Arnd Bergmann Acked-by: Nicolas Ferre --- Please check these patches for correctness, and try to be more careful to avoid such problems in the future. I found these just building the defconfig files, not even invoking my randconfig scripts. Arnd diff --git a/arch/arm/mach-at91/Kconfig b/arch/arm/mach-at91/Kconfig index 7d0c40a..c8050b1 100644 --- a/arch/arm/mach-at91/Kconfig +++ b/arch/arm/mach-at91/Kconfig @@ -37,6 +37,8 @@ config SOC_AT91SAM9 config SOC_AT91RM9200 bool "AT91RM9200" select CPU_ARM920T + select MULTI_IRQ_HANDLER + select SPARSE_IRQ select GENERIC_CLOCKEVENTS select HAVE_AT91_DBGU0 @@ -142,6 +144,8 @@ config ARCH_AT91SAM9G45 config ARCH_AT91X40 bool "AT91x40" depends on !MMU + select MULTI_IRQ_HANDLER + select SPARSE_IRQ select ARCH_USES_GETTIMEOFFSET endchoice diff --git a/arch/arm/mach-at91/at91x40.c b/arch/arm/mach-at91/at91x40.c index 4c0f5fd..46090e6 100644 --- a/arch/arm/mach-at91/at91x40.c +++ b/arch/arm/mach-at91/at91x40.c @@ -13,6 +13,7 @@ #include #include #include +#include #include #include #include diff --git a/arch/arm/mach-at91/irq.c b/arch/arm/mach-at91/irq.c index c5eaaa0..1e02c0e 100644 --- a/arch/arm/mach-at91/irq.c +++ b/arch/arm/mach-at91/irq.c @@ -49,7 +49,6 @@ static struct irq_domain *at91_aic_domain; static struct device_node *at91_aic_np; static unsigned int n_irqs = NR_AIC_IRQS; static unsigned long at91_aic_caps = 0; -static unsigned int *at91_aic_irq_priorities; /* AIC5 introduces a Source Select Register */ #define AT91_AIC_CAP_AIC5 (1 << 0) @@ -359,6 +358,8 @@ static void __init __maybe_unused at91_aic5_hw_init(unsigned int spu_vector) } #if defined(CONFIG_OF) +static unsigned int *at91_aic_irq_priorities; + static int at91_aic_irq_map(struct irq_domain *h, unsigned int virq, irq_hw_number_t hw) { diff --git a/drivers/rtc/rtc-at91rm9200.c b/drivers/rtc/rtc-at91rm9200.c index dc474bc..fca9790 100644 --- a/drivers/rtc/rtc-at91rm9200.c +++ b/drivers/rtc/rtc-at91rm9200.c @@ -27,6 +27,7 @@ #include #include #include +#include #include