---

yaml --- r: 99651 b: refs/heads/master c: 22dc12d h: refs/heads/master i: 99649: 6d4c906 99647: 6924be0 v: v3
git-mirror · May 12, 2008 · 76c1d42 · 76c1d42
1 parent 738cf13
commit 76c1d42
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 27 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 97e7b6f54c0d66586a658e985630cd63040311fb
+refs/heads/master: 22dc12d1f694b9af88e616ab758ff90c69d0fc83
diff --git a/trunk/include/asm-x86/hw_irq.h b/trunk/include/asm-x86/hw_irq.h
@@ -89,12 +89,15 @@ extern asmlinkage void qic_reschedule_interrupt(void);
 extern asmlinkage void qic_enable_irq_interrupt(void);
 extern asmlinkage void qic_call_function_interrupt(void);
 
-#endif /* !ASSEMBLY_ */
-
 #ifdef CONFIG_X86_32
-# include "hw_irq_32.h"
+extern void (*const interrupt[NR_IRQS])(void);
 #else
-# include "hw_irq_64.h"
+typedef int vector_irq_t[NR_VECTORS];
+DECLARE_PER_CPU(vector_irq_t, vector_irq);
+extern void __setup_vector_irq(int cpu);
+extern spinlock_t vector_lock;
 #endif
 
+#endif /* !ASSEMBLY_ */
+
 #endif
diff --git a/trunk/include/asm-x86/hw_irq_32.h b/trunk/include/asm-x86/hw_irq_32.h
diff --git a/trunk/include/asm-x86/hw_irq_64.h b/trunk/include/asm-x86/hw_irq_64.h