|
@@ -791,22 +791,22 @@ static void lguest_flush_tlb_kernel(void)
|
|
|
* simple as setting a bit. We don't actually "ack" interrupts as such, we
|
|
|
* just mask and unmask them. I wonder if we should be cleverer?
|
|
|
*/
|
|
|
-static void disable_lguest_irq(unsigned int irq)
|
|
|
+static void disable_lguest_irq(struct irq_data *data)
|
|
|
{
|
|
|
- set_bit(irq, lguest_data.blocked_interrupts);
|
|
|
+ set_bit(data->irq, lguest_data.blocked_interrupts);
|
|
|
}
|
|
|
|
|
|
-static void enable_lguest_irq(unsigned int irq)
|
|
|
+static void enable_lguest_irq(struct irq_data *data)
|
|
|
{
|
|
|
- clear_bit(irq, lguest_data.blocked_interrupts);
|
|
|
+ clear_bit(data->irq, lguest_data.blocked_interrupts);
|
|
|
}
|
|
|
|
|
|
/* This structure describes the lguest IRQ controller. */
|
|
|
static struct irq_chip lguest_irq_controller = {
|
|
|
.name = "lguest",
|
|
|
- .mask = disable_lguest_irq,
|
|
|
- .mask_ack = disable_lguest_irq,
|
|
|
- .unmask = enable_lguest_irq,
|
|
|
+ .irq_mask = disable_lguest_irq,
|
|
|
+ .irq_mask_ack = disable_lguest_irq,
|
|
|
+ .irq_unmask = enable_lguest_irq,
|
|
|
};
|
|
|
|
|
|
/*
|