diff options
-rw-r--r-- | include/linux/interrupt.h | 3 | ||||
-rw-r--r-- | kernel/irq/irqdesc.c | 2 | ||||
-rw-r--r-- | kernel/softirq.c | 5 |
3 files changed, 0 insertions, 10 deletions
diff --git a/include/linux/interrupt.h b/include/linux/interrupt.h index a0384a4d1e6f..19988983aeac 100644 --- a/include/linux/interrupt.h +++ b/include/linux/interrupt.h | |||
@@ -641,11 +641,8 @@ static inline void init_irq_proc(void) | |||
641 | struct seq_file; | 641 | struct seq_file; |
642 | int show_interrupts(struct seq_file *p, void *v); | 642 | int show_interrupts(struct seq_file *p, void *v); |
643 | 643 | ||
644 | struct irq_desc; | ||
645 | |||
646 | extern int early_irq_init(void); | 644 | extern int early_irq_init(void); |
647 | extern int arch_probe_nr_irqs(void); | 645 | extern int arch_probe_nr_irqs(void); |
648 | extern int arch_early_irq_init(void); | 646 | extern int arch_early_irq_init(void); |
649 | extern int arch_init_chip_data(struct irq_desc *desc, int node); | ||
650 | 647 | ||
651 | #endif | 648 | #endif |
diff --git a/kernel/irq/irqdesc.c b/kernel/irq/irqdesc.c index a1fbd1d347af..6c71f8ea5d7d 100644 --- a/kernel/irq/irqdesc.c +++ b/kernel/irq/irqdesc.c | |||
@@ -197,8 +197,6 @@ static int alloc_descs(unsigned int start, unsigned int cnt, int node) | |||
197 | desc = alloc_desc(start + i, node); | 197 | desc = alloc_desc(start + i, node); |
198 | if (!desc) | 198 | if (!desc) |
199 | goto err; | 199 | goto err; |
200 | /* temporary until I fixed x86 madness */ | ||
201 | arch_init_chip_data(desc, node); | ||
202 | raw_spin_lock_irqsave(&sparse_irq_lock, flags); | 200 | raw_spin_lock_irqsave(&sparse_irq_lock, flags); |
203 | irq_insert_desc(start + i, desc); | 201 | irq_insert_desc(start + i, desc); |
204 | raw_spin_unlock_irqrestore(&sparse_irq_lock, flags); | 202 | raw_spin_unlock_irqrestore(&sparse_irq_lock, flags); |
diff --git a/kernel/softirq.c b/kernel/softirq.c index 14a7b80b2cce..d19b1c9aa7c5 100644 --- a/kernel/softirq.c +++ b/kernel/softirq.c | |||
@@ -896,9 +896,4 @@ int __init __weak arch_early_irq_init(void) | |||
896 | { | 896 | { |
897 | return 0; | 897 | return 0; |
898 | } | 898 | } |
899 | |||
900 | int __weak arch_init_chip_data(struct irq_desc *desc, int node) | ||
901 | { | ||
902 | return 0; | ||
903 | } | ||
904 | #endif | 899 | #endif |