From patchwork Tue Jan 26 12:12:53 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: David Miller X-Patchwork-Id: 43691 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 6F20FB7CC2 for ; Tue, 26 Jan 2010 23:12:45 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751884Ab0AZMMn (ORCPT ); Tue, 26 Jan 2010 07:12:43 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751525Ab0AZMMn (ORCPT ); Tue, 26 Jan 2010 07:12:43 -0500 Received: from 74-93-104-97-Washington.hfc.comcastbusiness.net ([74.93.104.97]:37858 "EHLO sunset.davemloft.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750754Ab0AZMMm convert rfc822-to-8bit (ORCPT ); Tue, 26 Jan 2010 07:12:42 -0500 Received: from localhost (localhost [127.0.0.1]) by sunset.davemloft.net (Postfix) with ESMTP id 375ED24C10E; Tue, 26 Jan 2010 04:12:53 -0800 (PST) Date: Tue, 26 Jan 2010 04:12:53 -0800 (PST) Message-Id: <20100126.041253.189819572.davem@davemloft.net> To: a.beregalov@gmail.com Cc: torvalds@linux-foundation.org, akpm@linux-foundation.org, sparclinux@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [GIT]: Sparc From: David Miller In-Reply-To: References: <20100125.165644.197238824.davem@davemloft.net> X-Mailer: Mew version 6.3 on Emacs 23.1 / Mule 6.0 (HANACHIRUSATO) Mime-Version: 1.0 Sender: sparclinux-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: sparclinux@vger.kernel.org From: Alexander Beregalov Date: Tue, 26 Jan 2010 12:23:06 +0300 > Hi David > >> 7) IRQ ->set_affinity() using wrong cpu mask, thanks to Ben H. for >>   noticing. >>      sparc64: Fix IRQ ->set_affinity() methods. > > This commit breaks UP build Sorry, I'll fix this, thanks for the report. sparc64: Fix UP build. Can't reference irq_desc[].affinity when !SMP. Reported-by: Alexander Beregalov Signed-off-by: David S. Miller --- To unsubscribe from this list: send the line "unsubscribe sparclinux" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/arch/sparc/kernel/irq_64.c b/arch/sparc/kernel/irq_64.c index f2179cc..e1cbdb9 100644 --- a/arch/sparc/kernel/irq_64.c +++ b/arch/sparc/kernel/irq_64.c @@ -268,10 +268,8 @@ static int irq_choose_cpu(unsigned int virt_irq, const struct cpumask *affinity) return cpuid; } #else -static int irq_choose_cpu(unsigned int virt_irq, const struct cpumask *affinity) -{ - return real_hard_smp_processor_id(); -} +#define irq_choose_cpu(virt_irq, affinity) \ + real_hard_smp_processor_id() #endif static void sun4u_irq_enable(unsigned int virt_irq)