summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2010-09-29 18:44:23 +0200
committerThomas Gleixner <tglx@linutronix.de>2010-10-12 16:53:44 +0200
commitb7d0d8258a9f71949b810e0f82a3d75088f4d364 (patch)
tree1e37a6d3e89816abab898e3646a4e23eeb457021
parent77dff1c755c3218691e95e7e38ee14323b35dbdb (diff)
downloadlinux-stable-b7d0d8258a9f71949b810e0f82a3d75088f4d364.tar.gz
linux-stable-b7d0d8258a9f71949b810e0f82a3d75088f4d364.tar.bz2
linux-stable-b7d0d8258a9f71949b810e0f82a3d75088f4d364.zip
genirq: Remove arch_init_chip_data()
This function should have not been there in the first place. Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Reviewed-by: Ingo Molnar <mingo@elte.hu>
-rw-r--r--include/linux/interrupt.h3
-rw-r--r--kernel/irq/irqdesc.c2
-rw-r--r--kernel/softirq.c5
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)
struct seq_file;
int show_interrupts(struct seq_file *p, void *v);
-struct irq_desc;
-
extern int early_irq_init(void);
extern int arch_probe_nr_irqs(void);
extern int arch_early_irq_init(void);
-extern int arch_init_chip_data(struct irq_desc *desc, int node);
#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)
desc = alloc_desc(start + i, node);
if (!desc)
goto err;
- /* temporary until I fixed x86 madness */
- arch_init_chip_data(desc, node);
raw_spin_lock_irqsave(&sparse_irq_lock, flags);
irq_insert_desc(start + i, desc);
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)
{
return 0;
}
-
-int __weak arch_init_chip_data(struct irq_desc *desc, int node)
-{
- return 0;
-}
#endif