---

yaml --- r: 212219 b: refs/heads/master c: b7d0d82 h: refs/heads/master i: 212217: 36480f2 212215: 7f8a725 v: v3
git-mirror · Oct 12, 2010 · 1d4691c · 1d4691c
1 parent 7bca24e
commit 1d4691c
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 11 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 77dff1c755c3218691e95e7e38ee14323b35dbdb
+refs/heads/master: b7d0d8258a9f71949b810e0f82a3d75088f4d364
diff --git a/trunk/include/linux/interrupt.h b/trunk/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/trunk/kernel/irq/irqdesc.c b/trunk/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/trunk/kernel/softirq.c b/trunk/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