Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux

[sfrench/cifs-2.6.git] / arch / s390 / include / asm / irq.h

diff --git a/arch/s390/include/asm/irq.h b/arch/s390/include/asm/irq.h
index 5f8bcc5fe423abc27f64064cf1602a2ecff370a3..c4dd400a27917b7fa38a4e6daf66d91b5e88e688 100644 (file)
--- a/arch/s390/include/asm/irq.h
+++ b/arch/s390/include/asm/irq.h
@@ -16,6 +16,20 @@
 /* This number is used when no interrupt has been assigned */
 #define NO_IRQ         0
 
+/* External interruption codes */
+#define EXT_IRQ_INTERRUPT_KEY  0x0040
+#define EXT_IRQ_CLK_COMP       0x1004
+#define EXT_IRQ_CPU_TIMER      0x1005
+#define EXT_IRQ_WARNING_TRACK  0x1007
+#define EXT_IRQ_MALFUNC_ALERT  0x1200
+#define EXT_IRQ_EMERGENCY_SIG  0x1201
+#define EXT_IRQ_EXTERNAL_CALL  0x1202
+#define EXT_IRQ_TIMING_ALERT   0x1406
+#define EXT_IRQ_MEASURE_ALERT  0x1407
+#define EXT_IRQ_SERVICE_SIG    0x2401
+#define EXT_IRQ_CP_SERVICE     0x2603
+#define EXT_IRQ_IUCV           0x4000
+
 #ifndef __ASSEMBLY__
 
 #include <linux/hardirq.h>
@@ -53,6 +67,7 @@ enum interruption_class {
        IRQIO_PCI,
        IRQIO_MSI,
        IRQIO_VIR,
+       IRQIO_VAI,
        NMI_NMI,
        CPU_RST,
        NR_ARCH_IRQS
@@ -76,8 +91,8 @@ struct ext_code {
 
 typedef void (*ext_int_handler_t)(struct ext_code, unsigned int, unsigned long);
 
-int register_external_interrupt(u16 code, ext_int_handler_t handler);
-int unregister_external_interrupt(u16 code, ext_int_handler_t handler);
+int register_external_irq(u16 code, ext_int_handler_t handler);
+int unregister_external_irq(u16 code, ext_int_handler_t handler);
 
 enum irq_subclass {
        IRQ_SUBCLASS_MEASUREMENT_ALERT = 5,