From patchwork Thu Apr 23 01:31:43 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Ellerman X-Patchwork-Id: 26345 X-Patchwork-Delegate: benh@kernel.crashing.org Return-Path: X-Original-To: patchwork-incoming@bilbo.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from ozlabs.org (ozlabs.org [203.10.76.45]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client CN "mx.ozlabs.org", Issuer "CA Cert Signing Authority" (verified OK)) by bilbo.ozlabs.org (Postfix) with ESMTPS id C8865B7043 for ; Thu, 23 Apr 2009 11:35:50 +1000 (EST) Received: by ozlabs.org (Postfix) id 35AD2DEE03; Thu, 23 Apr 2009 11:33:06 +1000 (EST) Delivered-To: patchwork-incoming@ozlabs.org Received: from ozlabs.org (localhost [127.0.0.1]) by ozlabs.org (Postfix) with ESMTP id 342AEDEE02 for ; Thu, 23 Apr 2009 11:33:06 +1000 (EST) X-Original-To: linuxppc-dev@ozlabs.org Delivered-To: linuxppc-dev@ozlabs.org Received: by ozlabs.org (Postfix, from userid 1034) id 1787FDE1B9; Thu, 23 Apr 2009 11:31:43 +1000 (EST) To: Message-Id: In-Reply-To: References: From: Michael Ellerman Subject: [PATCH 4/6] powerpc: Remove fallback to __do_IRQ() Date: Thu, 23 Apr 2009 11:31:43 +1000 (EST) X-BeenThere: linuxppc-dev@ozlabs.org X-Mailman-Version: 2.1.11 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@ozlabs.org Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@ozlabs.org We should no longer have any irq code that needs __do_IRQ(), so remove the fallback to __do_IRQ(). Signed-off-by: Michael Ellerman --- arch/powerpc/kernel/irq.c | 7 +------ 1 files changed, 1 insertions(+), 6 deletions(-) diff --git a/arch/powerpc/kernel/irq.c b/arch/powerpc/kernel/irq.c index b8f09bd..7d46e5d 100644 --- a/arch/powerpc/kernel/irq.c +++ b/arch/powerpc/kernel/irq.c @@ -254,7 +254,6 @@ static inline void handle_one_irq(unsigned int irq) struct thread_info *curtp, *irqtp; unsigned long saved_sp_limit; struct irq_desc *desc; - void *handler; /* Switch to the irq stack to handle this */ curtp = current_thread_info(); @@ -269,10 +268,6 @@ static inline void handle_one_irq(unsigned int irq) desc = irq_desc + irq; saved_sp_limit = current->thread.ksp_limit; - handler = desc->handler; - if (handler == NULL) - handler = &__do_IRQ; - irqtp->task = curtp->task; irqtp->flags = 0; @@ -284,7 +279,7 @@ static inline void handle_one_irq(unsigned int irq) current->thread.ksp_limit = (unsigned long)irqtp + _ALIGN_UP(sizeof(struct thread_info), 16); - call_handle_irq(irq, desc, irqtp, handler); + call_handle_irq(irq, desc, irqtp, desc->handle_irq); current->thread.ksp_limit = saved_sp_limit; irqtp->task = NULL;