diff options
| author | Andrew Morton <akpm@osdl.org> | 2004-03-01 07:00:55 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2004-03-01 07:00:55 -0800 |
| commit | df6560baca6256778998f2ba1867eb53afb4c8d2 (patch) | |
| tree | 533bfa12904a752e95847f9aaffd953156b8929f /include | |
| parent | 5ba43334ac33aee2ae1cdb1990b472160c9ec068 (diff) | |
[PATCH] s390: core s390 update
From: Martin Schwidefsky <schwidefsky@de.ibm.com>
s390 bug fixes:
- Add missing i/o controls to compat ioctl translation table.
- Fix some gcc 3.4 warnings.
- Export _sb_findmap.
- Export smp_call_function_on only if CONFIG_SMP=y.
- Add safe-guard to diag10.
- Add type definition for compat_timer_t.
- Fix first argument of signal_processor_ps.
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-s390/compat.h | 1 | ||||
| -rw-r--r-- | include/asm-s390/sigp.h | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/include/asm-s390/compat.h b/include/asm-s390/compat.h index 1b564c562462..40839180883a 100644 --- a/include/asm-s390/compat.h +++ b/include/asm-s390/compat.h @@ -25,6 +25,7 @@ typedef u16 compat_ipc_pid_t; typedef s32 compat_daddr_t; typedef u32 compat_caddr_t; typedef __kernel_fsid_t compat_fsid_t; +typedef s32 compat_timer_t; typedef s32 compat_int_t; typedef s32 compat_long_t; diff --git a/include/asm-s390/sigp.h b/include/asm-s390/sigp.h index fa78e05a19c5..d5583c78dc9b 100644 --- a/include/asm-s390/sigp.h +++ b/include/asm-s390/sigp.h @@ -121,7 +121,7 @@ signal_processor_p(unsigned long parameter,__u16 cpu_addr, * Signal processor with parameter and return status */ extern __inline__ sigp_ccode -signal_processor_ps(__u32 *statusptr, unsigned long parameter, +signal_processor_ps(unsigned long *statusptr, unsigned long parameter, __u16 cpu_addr, sigp_order_code order_code) { sigp_ccode ccode; |