From patchwork Wed Dec 8 01:48:29 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tony Lindgren X-Patchwork-Id: 388152 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 oB81nIei018554 for ; Wed, 8 Dec 2010 01:49:18 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932495Ab0LHBsi (ORCPT ); Tue, 7 Dec 2010 20:48:38 -0500 Received: from mho-02-ewr.mailhop.org ([204.13.248.72]:54427 "EHLO mho-02-ewr.mailhop.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932165Ab0LHBsf (ORCPT ); Tue, 7 Dec 2010 20:48:35 -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.68) (envelope-from ) id 1PQ990-000BEe-C6; Wed, 08 Dec 2010 01:48:34 +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: U2FsdGVkX18EfCVyfJIqRY5I/kIALZw0 Date: Tue, 7 Dec 2010 17:48:29 -0800 From: Tony Lindgren To: Nicolas Pitre Cc: linux-arm-kernel@lists.infradead.org, linux-omap@vger.kernel.org Subject: [PATCH 2/3] omap1: Use get_irqnr_preamble Message-ID: <20101208014829.GL17435@atomide.com> References: <20101204001435.28853.29616.stgit@baageli.muru.com> <20101204180541.GH17222@atomide.com> <20101205031002.GP17222@atomide.com> <20101208014548.GJ17435@atomide.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20101208014548.GJ17435@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.3 (demeter1.kernel.org [140.211.167.41]); Wed, 08 Dec 2010 01:49:19 +0000 (UTC) diff --git a/arch/arm/mach-omap1/include/mach/entry-macro.S b/arch/arm/mach-omap1/include/mach/entry-macro.S index c9be6d4..584bf7b 100644 --- a/arch/arm/mach-omap1/include/mach/entry-macro.S +++ b/arch/arm/mach-omap1/include/mach/entry-macro.S @@ -31,13 +31,13 @@ omap_irq_flags: .endm .macro get_irqnr_preamble, base, tmp + ldr \base, =OMAP1_IO_ADDRESS(OMAP_IH1_BASE) .endm .macro arch_ret_to_user, tmp1, tmp2 .endm .macro get_irqnr_and_base, irqnr, irqstat, base, tmp - ldr \base, =OMAP1_IO_ADDRESS(OMAP_IH1_BASE) ldr \irqnr, [\base, #IRQ_ITR_REG_OFFSET] ldr \tmp, [\base, #IRQ_MIR_REG_OFFSET] mov \irqstat, #0xffffffff