[PATCH][2.6.8-rc1] ppc32 open_pic.c cpumask_t conversion

From: Mikael Pettersson
Date: Mon Jul 12 2004 - 05:58:42 EST


Kernel 2.6.8-rc1 triggers a warning in ppc's open_pic.c:

arch/ppc/syslib/open_pic.c:103: warning: initialization from incompatible pointer type

This is due to incomplete conversion from ulong to cpumask_t.

Patch below. Given the u32 nature of physmask(), this should suffice.

Signed-off-by: Mikael Pettersson <mikpe@xxxxxxxxx>

--- linux-2.6.8-rc1/arch/ppc/syslib/open_pic.c.~1~ 2004-07-12 01:00:37.000000000 +0200
+++ linux-2.6.8-rc1/arch/ppc/syslib/open_pic.c 2004-07-12 11:47:20.948418000 +0200
@@ -89,7 +89,7 @@
*/
static void openpic_end_irq(unsigned int irq_nr);
static void openpic_ack_irq(unsigned int irq_nr);
-static void openpic_set_affinity(unsigned int irq_nr, unsigned long cpumask);
+static void openpic_set_affinity(unsigned int irq_nr, cpumask_t cpumask);

struct hw_interrupt_type open_pic = {
" OpenPIC ",
@@ -820,9 +820,9 @@
#endif
}

-static void openpic_set_affinity(unsigned int irq_nr, unsigned long cpumask)
+static void openpic_set_affinity(unsigned int irq_nr, cpumask_t cpumask)
{
- openpic_mapirq(irq_nr - open_pic_irq_offset, physmask(cpumask), 0);
+ openpic_mapirq(irq_nr - open_pic_irq_offset, physmask(cpus_addr(cpumask)[0]), 0);
}

#ifdef CONFIG_SMP
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/