From patchwork Sun Jun 12 01:46:41 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John David Anglin X-Patchwork-Id: 872582 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter2.kernel.org (8.14.4/8.14.4) with ESMTP id p5C1ki9H009474 for ; Sun, 12 Jun 2011 01:46:44 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752739Ab1FLBqo (ORCPT ); Sat, 11 Jun 2011 21:46:44 -0400 Received: from hiauly1.hia.nrc.ca ([132.246.10.84]:2714 "EHLO hiauly1.hia.nrc.ca" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752286Ab1FLBqn (ORCPT ); Sat, 11 Jun 2011 21:46:43 -0400 Received: by hiauly1.hia.nrc.ca (Postfix, from userid 1000) id 0B6045369; Sat, 11 Jun 2011 21:46:41 -0400 (EDT) Date: Sat, 11 Jun 2011 21:46:41 -0400 From: John David Anglin To: Rolf Eike Beer Cc: John David Anglin , linux-parisc@vger.kernel.org, kyle@mcmartin.ca, deller@gmx.de, jejb@parisc-linux.org Subject: Re: [PATCH] parisc, don't claim cpu irqs more than once Message-ID: <20110612014640.GA19605@hiauly1.hia.nrc.ca> Reply-To: John David Anglin References: <20110611185524.GA1369@hiauly1.hia.nrc.ca> <1617203.1AoiWjTfrU@donald.sf-tec.de> <20110611205646.GA26431@hiauly1.hia.nrc.ca> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20110611205646.GA26431@hiauly1.hia.nrc.ca> Organization: nrc.ca User-Agent: Mutt/1.5.16 (2007-06-09) Sender: linux-parisc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-parisc@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter2.kernel.org [140.211.167.43]); Sun, 12 Jun 2011 01:46:44 +0000 (UTC) On Sat, 11 Jun 2011, John David Anglin wrote: > > Shouldn't this be bool then? Now that we have it. > > Yes but I would like to here with this approach is acceptable. Another > alternative might be a function init_IRQ_SMP that doesn't call claim_cpu_irqs. Looking at this a bit more, I believe this change is better. Signed-off-by: John David Anglin Cc: Kyle McMartin Cc: Helge Deller Cc: "James E.J. Bottomley" Dave diff --git a/arch/parisc/kernel/irq.c b/arch/parisc/kernel/irq.c index c0b1aff..0299d63 100644 --- a/arch/parisc/kernel/irq.c +++ b/arch/parisc/kernel/irq.c @@ -410,11 +410,13 @@ void __init init_IRQ(void) { local_irq_disable(); /* PARANOID - should already be disabled */ mtctl(~0UL, 23); /* EIRR : clear all pending external intr */ - claim_cpu_irqs(); #ifdef CONFIG_SMP - if (!cpu_eiem) + if (!cpu_eiem) { + claim_cpu_irqs(); cpu_eiem = EIEM_MASK(IPI_IRQ) | EIEM_MASK(TIMER_IRQ); + } #else + claim_cpu_irqs(); cpu_eiem = EIEM_MASK(TIMER_IRQ); #endif set_eiem(cpu_eiem); /* EIEM : enable all external intr */