From patchwork Sat Jun 6 21:54:28 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Helge Deller X-Patchwork-Id: 28465 X-Patchwork-Delegate: kyle@mcmartin.ca Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n56LsVo7012826 for ; Sat, 6 Jun 2009 21:54:31 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751535AbZFFVy2 (ORCPT ); Sat, 6 Jun 2009 17:54:28 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752442AbZFFVy2 (ORCPT ); Sat, 6 Jun 2009 17:54:28 -0400 Received: from mail.gmx.net ([213.165.64.20]:52939 "HELO mail.gmx.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with SMTP id S1751721AbZFFVy1 (ORCPT ); Sat, 6 Jun 2009 17:54:27 -0400 Received: (qmail invoked by alias); 06 Jun 2009 21:54:28 -0000 Received: from mnhm-590e0f04.pool.einsundeins.de (EHLO [192.168.178.60]) [89.14.15.4] by mail.gmx.net (mp026) with SMTP; 06 Jun 2009 23:54:28 +0200 X-Authenticated: #1045983 X-Provags-ID: V01U2FsdGVkX1813fQqgyk1sQ1U1OwElqxMnQv6UB7sQXWAlgrRUV MJjSPDNgl09jmt Message-ID: <4A2AE594.9050306@gmx.de> Date: Sat, 06 Jun 2009 23:54:28 +0200 From: Helge Deller User-Agent: Thunderbird 2.0.0.21 (X11/20090320) MIME-Version: 1.0 To: linux-parisc@vger.kernel.org, Kyle McMartin Subject: [PATCH] fix irq compile bugs in arch/parisc/kernel/irq.c X-Enigmail-Version: 0.95.7 X-Y-GMX-Trusted: 0 X-FuHaFi: 0.46 Sender: linux-parisc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-parisc@vger.kernel.org Fix miscompilation in arch/parisc/kernel/irq.c: /mnt/sda4/home/cvs/parisc/git-kernel/linus-linux-2.6/arch/parisc/kernel/irq.c:123: warning: passing arg 1 of `cpumask_setall' from incompatible pointer type /mnt/sda4/home/cvs/parisc/git-kernel/linus-linux-2.6/arch/parisc/kernel/irq.c:141: warning: passing arg 1 of `cpumask_copy' from incompatible pointer type /mnt/sda4/home/cvs/parisc/git-kernel/linus-linux-2.6/arch/parisc/kernel/irq.c:300: warning: passing arg 1 of `cpumask_copy' from incompatible pointer type /mnt/sda4/home/cvs/parisc/git-kernel/linus-linux-2.6/arch/parisc/kernel/irq.c:357: warning: passing arg 2 of `cpumask_copy' from incompatible pointer type Signed-off-by: Helge Deller --- To unsubscribe from this list: send the line "unsubscribe linux-parisc" 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/parisc/kernel/irq.c b/arch/parisc/kernel/irq.c index 4ea4229..570a335 100644 --- a/arch/parisc/kernel/irq.c +++ b/arch/parisc/kernel/irq.c @@ -120,7 +120,7 @@ int cpu_check_affinity(unsigned int irq, const struct cpumask *dest) if (CHECK_IRQ_PER_CPU(irq)) { /* Bad linux design decision. The mask has already * been set; we must reset it */ - cpumask_setall(&irq_desc[irq].affinity); + cpumask_setall(irq_desc[irq].affinity); return -EINVAL; } @@ -138,7 +138,7 @@ static void cpu_set_affinity_irq(unsigned int irq, const struct cpumask *dest) if (cpu_dest < 0) return; - cpumask_copy(&irq_desc[irq].affinity, dest); + cpumask_copy(irq_desc[irq].affinity, dest); } #endif @@ -297,7 +297,7 @@ int txn_alloc_irq(unsigned int bits_wide) unsigned long txn_affinity_addr(unsigned int irq, int cpu) { #ifdef CONFIG_SMP - cpumask_copy(&irq_desc[irq].affinity, cpumask_of(cpu)); + cpumask_copy(irq_desc[irq].affinity, cpumask_of(cpu)); #endif return per_cpu(cpu_data, cpu).txn_addr; @@ -354,7 +354,7 @@ void do_cpu_irq_mask(struct pt_regs *regs) irq = eirr_to_irq(eirr_val); #ifdef CONFIG_SMP - cpumask_copy(&dest, &irq_desc[irq].affinity); + cpumask_copy(&dest, irq_desc[irq].affinity); if (CHECK_IRQ_PER_CPU(irq_desc[irq].status) && !cpu_isset(smp_processor_id(), dest)) { int cpu = first_cpu(dest);