From mboxrd@z Thu Jan 1 00:00:00 1970 From: Alexander Beregalov Subject: [PATCH next 2/2] PARISC: iosapic: fix build breakage Date: Fri, 20 Mar 2009 13:00:11 +0300 Message-ID: <20090320100011.GB26020@orion> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Return-path: Received: from mail-ew0-f165.google.com ([209.85.219.165]:54078 "EHLO mail-ew0-f165.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751080AbZCTKAS (ORCPT ); Fri, 20 Mar 2009 06:00:18 -0400 Content-Disposition: inline Sender: linux-next-owner@vger.kernel.org List-ID: To: kyle@mcmartin.ca, linux-parisc@vger.kernel.org, linux-next@vger.kernel.org drivers/parisc/iosapic.c:717: error: incompatible types in assignment irq_desc::affinity was changed from cpumask_t to cpumask_var_t in 7f7ace0cda (cpumask: update irq_desc to use cpumask_var_t) Signed-off-by: Alexander Beregalov --- drivers/parisc/iosapic.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/drivers/parisc/iosapic.c b/drivers/parisc/iosapic.c index 501aaf1..73348c4 100644 --- a/drivers/parisc/iosapic.c +++ b/drivers/parisc/iosapic.c @@ -714,7 +714,7 @@ static void iosapic_set_affinity_irq(unsigned int irq, if (dest_cpu < 0) return; - irq_desc[irq].affinity = cpumask_of_cpu(dest_cpu); + cpumask_copy(irq_desc[irq].affinity, cpumask_of(dest_cpu)); vi->txn_addr = txn_affinity_addr(irq, dest_cpu); spin_lock_irqsave(&iosapic_lock, flags);