fedora core 6 1.2949 + vserver 2.2.0

[linux-2.6.git] / arch / ia64 / hp / sim / hpsim_irq.c

diff --git a/arch/ia64/hp/sim/hpsim_irq.c b/arch/ia64/hp/sim/hpsim_irq.c
index 77dd130..c2f58ff 100644 (file)
--- a/arch/ia64/hp/sim/hpsim_irq.c
+++ b/arch/ia64/hp/sim/hpsim_irq.c
@@ -21,15 +21,20 @@ hpsim_irq_noop (unsigned int irq)
 {
 }
 
+static void
+hpsim_set_affinity_noop (unsigned int a, cpumask_t b)
+{
+}
+
 static struct hw_interrupt_type irq_type_hp_sim = {
-       .typename =     "hpsim",
+       .name =         "hpsim",
        .startup =      hpsim_irq_startup,
        .shutdown =     hpsim_irq_noop,
        .enable =       hpsim_irq_noop,
        .disable =      hpsim_irq_noop,
        .ack =          hpsim_irq_noop,
        .end =          hpsim_irq_noop,
-       .set_affinity = (void (*)(unsigned int, unsigned long)) hpsim_irq_noop,
+       .set_affinity = hpsim_set_affinity_noop,
 };
 
 void __init
@@ -39,8 +44,8 @@ hpsim_irq_init (void)
        int i;
 
        for (i = 0; i < NR_IRQS; ++i) {
-               idesc = irq_descp(i);
-               if (idesc->handler == &no_irq_type)
-                       idesc->handler = &irq_type_hp_sim;
+               idesc = irq_desc + i;
+               if (idesc->chip == &no_irq_type)
+                       idesc->chip = &irq_type_hp_sim;
        }
 }