From patchwork Fri Jan 28 00:21:15 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tony Lindgren X-Patchwork-Id: 513471 X-Patchwork-Delegate: tony@atomide.com Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p0S0KGFl024226 for ; Fri, 28 Jan 2011 00:21:25 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753420Ab1A1AVZ (ORCPT ); Thu, 27 Jan 2011 19:21:25 -0500 Received: from mho-02-ewr.mailhop.org ([204.13.248.72]:54576 "EHLO mho-02-ewr.mailhop.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752576Ab1A1AVY (ORCPT ); Thu, 27 Jan 2011 19:21:24 -0500 Received: from c-24-130-172-179.hsd1.ca.comcast.net ([24.130.172.179] helo=localhost.localdomain) by mho-02-ewr.mailhop.org with esmtpa (Exim 4.72) (envelope-from ) id 1Pic5c-000PT2-0R; Fri, 28 Jan 2011 00:21:24 +0000 Received: from Mutt by mutt-smtp-wrapper.pl 1.2 (www.zdo.com/articles/mutt-smtp-wrapper.shtml) X-Mail-Handler: MailHop Outbound by DynDNS X-Originating-IP: 24.130.172.179 X-Report-Abuse-To: abuse@dyndns.com (see http://www.dyndns.com/services/mailhop/outbound_abuse.html for abuse reporting information) X-MHO-User: U2FsdGVkX1+n0vRj592Goys1FV0BRP/B Date: Thu, 27 Jan 2011 16:21:15 -0800 From: Tony Lindgren To: Russell King - ARM Linux Cc: linux-omap@vger.kernel.org Subject: Re: Latest regressions Message-ID: <20110128002115.GO23412@atomide.com> References: <20110107115744.GL1198@n2100.arm.linux.org.uk> <20110107165626.GD880@atomide.com> <20110126085848.GB2698@n2100.arm.linux.org.uk> <20110126181215.GC23412@atomide.com> <20110127122245.GB26418@n2100.arm.linux.org.uk> <20110128001829.GN23412@atomide.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20110128001829.GN23412@atomide.com> User-Agent: Mutt/1.5.20 (2009-06-14) Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Fri, 28 Jan 2011 00:21:26 +0000 (UTC) --- a/arch/arm/mach-omap1/include/mach/entry-macro.S +++ b/arch/arm/mach-omap1/include/mach/entry-macro.S @@ -14,19 +14,6 @@ #include #include -/* - * We use __glue to avoid errors with multiple definitions of - * .globl omap_irq_flags as it's included from entry-armv.S but not - * from entry-common.S. - */ -#ifdef __glue - .pushsection .data - .globl omap_irq_flags -omap_irq_flags: - .word 0 - .popsection -#endif - .macro disable_fiq .endm --- a/arch/arm/mach-omap1/irq.c +++ b/arch/arm/mach-omap1/irq.c @@ -57,6 +57,7 @@ struct omap_irq_bank { unsigned long wake_enable; }; +void __iomem *omap_irq_flags; static unsigned int irq_bank_count; static struct omap_irq_bank *irq_banks; @@ -176,7 +177,6 @@ static struct irq_chip omap_irq_chip = { void __init omap_init_irq(void) { - extern unsigned int omap_irq_flags; int i, j; #if defined(CONFIG_ARCH_OMAP730) || defined(CONFIG_ARCH_OMAP850)