diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-06 09:13:53 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-06 09:13:53 -0700 |
| commit | da104a83692cf07434ab3b20bf10093bdbc3f97e (patch) | |
| tree | 6343600c318c600f0dcdf71406bf7d993823afd4 /include/asm-s390 | |
| parent | 96e1a87392293cf895ea99ab70758453897c7bbf (diff) | |
| parent | dc64bef5439c8e1fafea225054da4d8882c9d10c (diff) | |
| download | op-kernel-dev-da104a83692cf07434ab3b20bf10093bdbc3f97e.zip op-kernel-dev-da104a83692cf07434ab3b20bf10093bdbc3f97e.tar.gz | |
Merge branch 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6
* 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6:
[S390] Use CONFIG_GENERIC_TIME and define TOD clock source.
[PATCH] sysrq: irq change build fix.
[S390] irq change build fixes.
[S390] cio: 0 is a valid chpid.
[S390] monwriter buffer limit.
[S390] ap bus poll thread priority.
Diffstat (limited to 'include/asm-s390')
| -rw-r--r-- | include/asm-s390/hardirq.h | 2 | ||||
| -rw-r--r-- | include/asm-s390/irq_regs.h | 1 | ||||
| -rw-r--r-- | include/asm-s390/s390_ext.h | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/include/asm-s390/hardirq.h b/include/asm-s390/hardirq.h index e84b7ef..c2f6a87 100644 --- a/include/asm-s390/hardirq.h +++ b/include/asm-s390/hardirq.h @@ -32,6 +32,6 @@ typedef struct { #define HARDIRQ_BITS 8 -extern void account_ticks(struct pt_regs *); +extern void account_ticks(void); #endif /* __ASM_HARDIRQ_H */ diff --git a/include/asm-s390/irq_regs.h b/include/asm-s390/irq_regs.h new file mode 100644 index 0000000..3dd9c0b --- /dev/null +++ b/include/asm-s390/irq_regs.h @@ -0,0 +1 @@ +#include <asm-generic/irq_regs.h> diff --git a/include/asm-s390/s390_ext.h b/include/asm-s390/s390_ext.h index e9a2862..df9b101 100644 --- a/include/asm-s390/s390_ext.h +++ b/include/asm-s390/s390_ext.h @@ -10,7 +10,7 @@ * Martin Schwidefsky (schwidefsky@de.ibm.com) */ -typedef void (*ext_int_handler_t)(struct pt_regs *regs, __u16 code); +typedef void (*ext_int_handler_t)(__u16 code); /* * Warning: if you change ext_int_info_t you have to change the |
