From patchwork Mon Nov 23 03:44:19 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Pitre X-Patchwork-Id: 7677531 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 5D253BF90C for ; Mon, 23 Nov 2015 03:46:38 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 7D9C4206AC for ; Mon, 23 Nov 2015 03:46:37 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id A597F2038F for ; Mon, 23 Nov 2015 03:46:36 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1a0i3a-0007fw-CB; Mon, 23 Nov 2015 03:44:46 +0000 Received: from mail-qk0-x22d.google.com ([2607:f8b0:400d:c09::22d]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1a0i3W-0007bt-TZ for linux-arm-kernel@lists.infradead.org; Mon, 23 Nov 2015 03:44:43 +0000 Received: by qkfo3 with SMTP id o3so54067971qkf.1 for ; Sun, 22 Nov 2015 19:44:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro-org.20150623.gappssmtp.com; s=20150623; h=date:from:to:cc:subject:message-id:user-agent:mime-version :content-type; bh=y7JBC8pbJJW1qiEi5mXg/CfzV6FnONisw0DITMxjBWg=; b=bZ9kxiO98Vy21Mc8j3MCdNm73/Qda75m+KdX4YRlksmsPdKEfBz/06HvU4y4/+eB07 EzuHp3qbEGQjG7XqXcpuBNzv7KrcUtL0TpgKtOgIbRyPvzojfZ54U8YlZK7+6ZES38TU uvmJ4Rpvxm5IUWFKzqtsbReQANNY21y5ZX/WIbyR8FPRZQDprDdA/4eNkOsWgV2Sbrd2 /zoDDQHplgMDhKgQMR9vwT0NHLRPVK8Pg+adKNTm0jZqTokyUwGogAjfmpkHpnA0xEWM MbYwEMaO34MUbWWdmqHdulzM4y7vpGFJ1NbfgYmhnFun4V3HU8RES67vIq/vh8o5LhL8 hWYA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:date:from:to:cc:subject:message-id:user-agent :mime-version:content-type; bh=y7JBC8pbJJW1qiEi5mXg/CfzV6FnONisw0DITMxjBWg=; b=QNnk+zSYjRE7v0NwiSUpxACt7hR7xJkA/vEbNZyMAgYx4AdscefDsJitYynC9lPR2z FzmM/zCEKGGhgT4uwAZSQt3oWGwvvB3P7x/GvlXQ4d4XzsnDFV2POhIe6RPbSTk/lVhO KZbp+9C2dtGrseOs86XGLBXZ11e5SZObH2Ibj51PxvchuPUrpy1KKqCTG8a4a41v8Ca9 VTT1pMAvyI2gPNBWr03PjueKKf19PRgCSxHylzvTeoiX2Z4VV1EMvOXr1ChtRjtE1287 mJ7SFHTeItiuj3e2JqD+gwiWt5iNYX/UIy1JMlMwShOtNQeZmJstmY9jj4zZyUU6eatR U7+Q== X-Gm-Message-State: ALoCoQlrjW91gSm7geVYiUyZ2QXg69KpGEwBGSpnOuO8EKd7Hn1lw5VmOGwW6aN9O0rJpUCova66 X-Received: by 10.140.242.77 with SMTP id n74mr13449069qhc.37.1448250261540; Sun, 22 Nov 2015 19:44:21 -0800 (PST) Received: from xanadu.home (modemcable065.157-23-96.mc.videotron.ca. [96.23.157.65]) by smtp.gmail.com with ESMTPSA id s105sm2569780qge.40.2015.11.22.19.44.20 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 22 Nov 2015 19:44:20 -0800 (PST) Date: Sun, 22 Nov 2015 22:44:19 -0500 (EST) From: Nicolas Pitre To: Jason Cooper , Andrew Lunn , Gregory Clement Subject: [PATCH] ARM: mach-orion5x: fix legacy get_irqnr_and_base Message-ID: User-Agent: Alpine 2.20 (LFD 67 2015-01-07) MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20151122_194443_038100_8CCCFFD2 X-CRM114-Status: UNSURE ( 8.57 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -2.6 (--) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-arm-kernel@lists.infradead.org Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.7 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Commit 5be9fc23cd ("ARM: orion5x: fix legacy orion5x IRQ numbers") shifted IRQ numbers by one but didn't update the get_irqnr_and_base macro accordingly. This macro is involved when CONFIG_MULTI_IRQ_HANDLER is not defined. Signed-off-by: Nicolas Pitre diff --git a/arch/arm/mach-orion5x/include/mach/entry-macro.S b/arch/arm/mach-orion5x/include/mach/entry-macro.S index 79eb502a1e..73919a36b5 100644 --- a/arch/arm/mach-orion5x/include/mach/entry-macro.S +++ b/arch/arm/mach-orion5x/include/mach/entry-macro.S @@ -21,5 +21,5 @@ @ find cause bits that are unmasked ands \irqstat, \irqstat, \tmp @ clear Z flag if any clzne \irqnr, \irqstat @ calc irqnr - rsbne \irqnr, \irqnr, #31 + rsbne \irqnr, \irqnr, #32 .endm