diff options
| author | Heiko Carstens | 2011-05-26 09:48:24 +0200 |
|---|---|---|
| committer | Heiko Carstens | 2011-05-26 09:48:24 +0200 |
| commit | d7b250e2a2d7f3cd23cf8d8d6689285e6f51a98d (patch) | |
| tree | 5bfb94fff047818db31613762a8986784241ca8c /arch/s390/include/asm | |
| parent | [S390] irq: fix service signal external interrupt handling (diff) | |
| download | kernel-qcow2-linux-d7b250e2a2d7f3cd23cf8d8d6689285e6f51a98d.tar.gz kernel-qcow2-linux-d7b250e2a2d7f3cd23cf8d8d6689285e6f51a98d.tar.xz kernel-qcow2-linux-d7b250e2a2d7f3cd23cf8d8d6689285e6f51a98d.zip | |
[S390] irq: merge irq.c and s390_ext.c
Merge irq.c and s390_ext.c into irq.c. That way all external interrupt
related functions are together.
Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Diffstat (limited to 'arch/s390/include/asm')
| -rw-r--r-- | arch/s390/include/asm/irq.h | 8 | ||||
| -rw-r--r-- | arch/s390/include/asm/s390_ext.h | 19 |
2 files changed, 8 insertions, 19 deletions
diff --git a/arch/s390/include/asm/irq.h b/arch/s390/include/asm/irq.h index 1544b90bd6d6..ba7b01c726a3 100644 --- a/arch/s390/include/asm/irq.h +++ b/arch/s390/include/asm/irq.h @@ -2,6 +2,7 @@ #define _ASM_IRQ_H #include <linux/hardirq.h> +#include <linux/types.h> enum interruption_class { EXTERNAL_INTERRUPT, @@ -31,4 +32,11 @@ enum interruption_class { NR_IRQS, }; +typedef void (*ext_int_handler_t)(unsigned int, 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); +void service_subclass_irq_register(void); +void service_subclass_irq_unregister(void); + #endif /* _ASM_IRQ_H */ diff --git a/arch/s390/include/asm/s390_ext.h b/arch/s390/include/asm/s390_ext.h deleted file mode 100644 index 85b2154b899f..000000000000 --- a/arch/s390/include/asm/s390_ext.h +++ /dev/null @@ -1,19 +0,0 @@ -/* - * Copyright IBM Corp. 1999,2010 - * Author(s): Holger Smolinski <Holger.Smolinski@de.ibm.com>, - * Martin Schwidefsky <schwidefsky@de.ibm.com>, - */ - -#ifndef _S390_EXTINT_H -#define _S390_EXTINT_H - -#include <linux/types.h> - -typedef void (*ext_int_handler_t)(unsigned int, 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); -void service_subclass_irq_register(void); -void service_subclass_irq_unregister(void); - -#endif /* _S390_EXTINT_H */ |