diff options
Diffstat (limited to 'arch/ia64/kernel')
-rw-r--r-- | arch/ia64/kernel/iosapic.c | 6 | ||||
-rw-r--r-- | arch/ia64/kernel/irq.c | 2 | ||||
-rw-r--r-- | arch/ia64/kernel/irq_ia64.c | 2 | ||||
-rw-r--r-- | arch/ia64/kernel/mca.c | 2 | ||||
-rw-r--r-- | arch/ia64/kernel/smpboot.c | 2 |
5 files changed, 7 insertions, 7 deletions
diff --git a/arch/ia64/kernel/iosapic.c b/arch/ia64/kernel/iosapic.c index 0900be60fc3a..a56f554207a5 100644 --- a/arch/ia64/kernel/iosapic.c +++ b/arch/ia64/kernel/iosapic.c | |||
@@ -451,7 +451,7 @@ iosapic_startup_edge_irq (unsigned int irq) | |||
451 | static void | 451 | static void |
452 | iosapic_ack_edge_irq (unsigned int irq) | 452 | iosapic_ack_edge_irq (unsigned int irq) |
453 | { | 453 | { |
454 | irq_desc_t *idesc = irq_desc + irq; | 454 | struct irq_desc *idesc = irq_desc + irq; |
455 | 455 | ||
456 | irq_complete_move(irq); | 456 | irq_complete_move(irq); |
457 | move_native_irq(irq); | 457 | move_native_irq(irq); |
@@ -600,7 +600,7 @@ static int | |||
600 | register_intr (unsigned int gsi, int irq, unsigned char delivery, | 600 | register_intr (unsigned int gsi, int irq, unsigned char delivery, |
601 | unsigned long polarity, unsigned long trigger) | 601 | unsigned long polarity, unsigned long trigger) |
602 | { | 602 | { |
603 | irq_desc_t *idesc; | 603 | struct irq_desc *idesc; |
604 | struct hw_interrupt_type *irq_type; | 604 | struct hw_interrupt_type *irq_type; |
605 | int index; | 605 | int index; |
606 | struct iosapic_rte_info *rte; | 606 | struct iosapic_rte_info *rte; |
@@ -828,7 +828,7 @@ iosapic_unregister_intr (unsigned int gsi) | |||
828 | { | 828 | { |
829 | unsigned long flags; | 829 | unsigned long flags; |
830 | int irq, index; | 830 | int irq, index; |
831 | irq_desc_t *idesc; | 831 | struct irq_desc *idesc; |
832 | u32 low32; | 832 | u32 low32; |
833 | unsigned long trigger, polarity; | 833 | unsigned long trigger, polarity; |
834 | unsigned int dest; | 834 | unsigned int dest; |
diff --git a/arch/ia64/kernel/irq.c b/arch/ia64/kernel/irq.c index 7429752ef5ad..7d8951229e7c 100644 --- a/arch/ia64/kernel/irq.c +++ b/arch/ia64/kernel/irq.c | |||
@@ -130,7 +130,7 @@ unsigned int vectors_in_migration[NR_IRQS]; | |||
130 | */ | 130 | */ |
131 | static void migrate_irqs(void) | 131 | static void migrate_irqs(void) |
132 | { | 132 | { |
133 | irq_desc_t *desc; | 133 | struct irq_desc *desc; |
134 | int irq, new_cpu; | 134 | int irq, new_cpu; |
135 | 135 | ||
136 | for (irq=0; irq < NR_IRQS; irq++) { | 136 | for (irq=0; irq < NR_IRQS; irq++) { |
diff --git a/arch/ia64/kernel/irq_ia64.c b/arch/ia64/kernel/irq_ia64.c index b448197728be..dd9d7b54f1a1 100644 --- a/arch/ia64/kernel/irq_ia64.c +++ b/arch/ia64/kernel/irq_ia64.c | |||
@@ -630,7 +630,7 @@ static struct irqaction tlb_irqaction = { | |||
630 | void | 630 | void |
631 | ia64_native_register_percpu_irq (ia64_vector vec, struct irqaction *action) | 631 | ia64_native_register_percpu_irq (ia64_vector vec, struct irqaction *action) |
632 | { | 632 | { |
633 | irq_desc_t *desc; | 633 | struct irq_desc *desc; |
634 | unsigned int irq; | 634 | unsigned int irq; |
635 | 635 | ||
636 | irq = vec; | 636 | irq = vec; |
diff --git a/arch/ia64/kernel/mca.c b/arch/ia64/kernel/mca.c index 8f33a8840422..1cce4ceb48ac 100644 --- a/arch/ia64/kernel/mca.c +++ b/arch/ia64/kernel/mca.c | |||
@@ -2093,7 +2093,7 @@ ia64_mca_late_init(void) | |||
2093 | cpe_poll_timer.function = ia64_mca_cpe_poll; | 2093 | cpe_poll_timer.function = ia64_mca_cpe_poll; |
2094 | 2094 | ||
2095 | { | 2095 | { |
2096 | irq_desc_t *desc; | 2096 | struct irq_desc *desc; |
2097 | unsigned int irq; | 2097 | unsigned int irq; |
2098 | 2098 | ||
2099 | if (cpe_vector >= 0) { | 2099 | if (cpe_vector >= 0) { |
diff --git a/arch/ia64/kernel/smpboot.c b/arch/ia64/kernel/smpboot.c index 7700e23034bb..2a70af473b36 100644 --- a/arch/ia64/kernel/smpboot.c +++ b/arch/ia64/kernel/smpboot.c | |||
@@ -678,7 +678,7 @@ extern void fixup_irqs(void); | |||
678 | int migrate_platform_irqs(unsigned int cpu) | 678 | int migrate_platform_irqs(unsigned int cpu) |
679 | { | 679 | { |
680 | int new_cpei_cpu; | 680 | int new_cpei_cpu; |
681 | irq_desc_t *desc = NULL; | 681 | struct irq_desc *desc = NULL; |
682 | const struct cpumask *mask; | 682 | const struct cpumask *mask; |
683 | int retval = 0; | 683 | int retval = 0; |
684 | 684 | ||