Merge branch 'linus' into x86/x2apic

2008-07-18 22:50:34 +02:00
parent 511d9d3418 5b664cb235
commit a208f37a46
3697 changed files with 244003 additions and 275846 deletions
--- a/include/asm-x86/hw_irq.h
+++ b/include/asm-x86/hw_irq.h
@@ -48,6 +48,7 @@ extern void irq_move_cleanup_interrupt(void);
 extern void threshold_interrupt(void);

 extern void call_function_interrupt(void);
+extern void call_function_single_interrupt(void);

 /* PIC specific functions */
 extern void disable_8259A_irq(unsigned int irq);