diff options
| -rw-r--r-- | arch/ia64/ia32/ia32priv.h | 2 | ||||
| -rw-r--r-- | arch/s390/kernel/compat_linux.h | 2 | ||||
| -rw-r--r-- | arch/sparc64/kernel/signal32.c | 2 | ||||
| -rw-r--r-- | include/asm-ia64/compat.h | 1 | ||||
| -rw-r--r-- | include/asm-mips/compat.h | 1 | ||||
| -rw-r--r-- | include/asm-parisc/compat.h | 2 | ||||
| -rw-r--r-- | include/asm-ppc64/compat.h | 1 | ||||
| -rw-r--r-- | include/asm-ppc64/ppc32.h | 2 | ||||
| -rw-r--r-- | include/asm-sparc64/compat.h | 1 | ||||
| -rw-r--r-- | include/asm-x86_64/ia32.h | 2 |
10 files changed, 10 insertions, 6 deletions
diff --git a/arch/ia64/ia32/ia32priv.h b/arch/ia64/ia32/ia32priv.h index b2de948bdaea..e3e9290e3ff2 100644 --- a/arch/ia64/ia32/ia32priv.h +++ b/arch/ia64/ia32/ia32priv.h | |||
| @@ -241,7 +241,7 @@ typedef struct compat_siginfo { | |||
| 241 | 241 | ||
| 242 | /* POSIX.1b timers */ | 242 | /* POSIX.1b timers */ |
| 243 | struct { | 243 | struct { |
| 244 | timer_t _tid; /* timer id */ | 244 | compat_timer_t _tid; /* timer id */ |
| 245 | int _overrun; /* overrun count */ | 245 | int _overrun; /* overrun count */ |
| 246 | char _pad[sizeof(unsigned int) - sizeof(int)]; | 246 | char _pad[sizeof(unsigned int) - sizeof(int)]; |
| 247 | compat_sigval_t _sigval; /* same as below */ | 247 | compat_sigval_t _sigval; /* same as below */ |
diff --git a/arch/s390/kernel/compat_linux.h b/arch/s390/kernel/compat_linux.h index bf33dcfec7db..3898f66d0b2f 100644 --- a/arch/s390/kernel/compat_linux.h +++ b/arch/s390/kernel/compat_linux.h | |||
| @@ -45,7 +45,7 @@ typedef struct compat_siginfo { | |||
| 45 | 45 | ||
| 46 | /* POSIX.1b timers */ | 46 | /* POSIX.1b timers */ |
| 47 | struct { | 47 | struct { |
| 48 | timer_t _tid; /* timer id */ | 48 | compat_timer_t _tid; /* timer id */ |
| 49 | int _overrun; /* overrun count */ | 49 | int _overrun; /* overrun count */ |
| 50 | compat_sigval_t _sigval; /* same as below */ | 50 | compat_sigval_t _sigval; /* same as below */ |
| 51 | int _sys_private; /* not to be passed to user */ | 51 | int _sys_private; /* not to be passed to user */ |
diff --git a/arch/sparc64/kernel/signal32.c b/arch/sparc64/kernel/signal32.c index 9a375e975cff..f28428f4170e 100644 --- a/arch/sparc64/kernel/signal32.c +++ b/arch/sparc64/kernel/signal32.c | |||
| @@ -102,7 +102,7 @@ typedef struct compat_siginfo{ | |||
| 102 | 102 | ||
| 103 | /* POSIX.1b timers */ | 103 | /* POSIX.1b timers */ |
| 104 | struct { | 104 | struct { |
| 105 | timer_t _tid; /* timer id */ | 105 | compat_timer_t _tid; /* timer id */ |
| 106 | int _overrun; /* overrun count */ | 106 | int _overrun; /* overrun count */ |
| 107 | compat_sigval_t _sigval; /* same as below */ | 107 | compat_sigval_t _sigval; /* same as below */ |
| 108 | int _sys_private; /* not to be passed to user */ | 108 | int _sys_private; /* not to be passed to user */ |
diff --git a/include/asm-ia64/compat.h b/include/asm-ia64/compat.h index cc0ff0a4bdd0..0c05e5bad8a0 100644 --- a/include/asm-ia64/compat.h +++ b/include/asm-ia64/compat.h | |||
| @@ -27,6 +27,7 @@ typedef u16 compat_ipc_pid_t; | |||
| 27 | typedef s32 compat_daddr_t; | 27 | typedef s32 compat_daddr_t; |
| 28 | typedef u32 compat_caddr_t; | 28 | typedef u32 compat_caddr_t; |
| 29 | typedef __kernel_fsid_t compat_fsid_t; | 29 | typedef __kernel_fsid_t compat_fsid_t; |
| 30 | typedef s32 compat_timer_t; | ||
| 30 | 31 | ||
| 31 | typedef s32 compat_int_t; | 32 | typedef s32 compat_int_t; |
| 32 | typedef s32 compat_long_t; | 33 | typedef s32 compat_long_t; |
diff --git a/include/asm-mips/compat.h b/include/asm-mips/compat.h index dce92079e7fc..d78002afb1e1 100644 --- a/include/asm-mips/compat.h +++ b/include/asm-mips/compat.h | |||
| @@ -29,6 +29,7 @@ typedef s32 compat_caddr_t; | |||
| 29 | typedef struct { | 29 | typedef struct { |
| 30 | s32 val[2]; | 30 | s32 val[2]; |
| 31 | } compat_fsid_t; | 31 | } compat_fsid_t; |
| 32 | typedef s32 compat_timer_t; | ||
| 32 | 33 | ||
| 33 | typedef s32 compat_int_t; | 34 | typedef s32 compat_int_t; |
| 34 | typedef s32 compat_long_t; | 35 | typedef s32 compat_long_t; |
diff --git a/include/asm-parisc/compat.h b/include/asm-parisc/compat.h index ca0eac647a05..7630d1ad2391 100644 --- a/include/asm-parisc/compat.h +++ b/include/asm-parisc/compat.h | |||
| @@ -24,7 +24,7 @@ typedef u16 compat_nlink_t; | |||
| 24 | typedef u16 compat_ipc_pid_t; | 24 | typedef u16 compat_ipc_pid_t; |
| 25 | typedef s32 compat_daddr_t; | 25 | typedef s32 compat_daddr_t; |
| 26 | typedef u32 compat_caddr_t; | 26 | typedef u32 compat_caddr_t; |
| 27 | typedef u32 compat_timer_t; | 27 | typedef s32 compat_timer_t; |
| 28 | 28 | ||
| 29 | typedef s32 compat_int_t; | 29 | typedef s32 compat_int_t; |
| 30 | typedef s32 compat_long_t; | 30 | typedef s32 compat_long_t; |
diff --git a/include/asm-ppc64/compat.h b/include/asm-ppc64/compat.h index 09c28d28ce6c..12414f5fc666 100644 --- a/include/asm-ppc64/compat.h +++ b/include/asm-ppc64/compat.h | |||
| @@ -26,6 +26,7 @@ typedef s32 compat_daddr_t; | |||
| 26 | typedef u32 compat_caddr_t; | 26 | typedef u32 compat_caddr_t; |
| 27 | typedef __kernel_fsid_t compat_fsid_t; | 27 | typedef __kernel_fsid_t compat_fsid_t; |
| 28 | typedef s32 compat_key_t; | 28 | typedef s32 compat_key_t; |
| 29 | typedef s32 compat_timer_t; | ||
| 29 | 30 | ||
| 30 | typedef s32 compat_int_t; | 31 | typedef s32 compat_int_t; |
| 31 | typedef s32 compat_long_t; | 32 | typedef s32 compat_long_t; |
diff --git a/include/asm-ppc64/ppc32.h b/include/asm-ppc64/ppc32.h index 1d0404897550..6b44a8caf395 100644 --- a/include/asm-ppc64/ppc32.h +++ b/include/asm-ppc64/ppc32.h | |||
| @@ -32,7 +32,7 @@ typedef struct compat_siginfo { | |||
| 32 | 32 | ||
| 33 | /* POSIX.1b timers */ | 33 | /* POSIX.1b timers */ |
| 34 | struct { | 34 | struct { |
| 35 | timer_t _tid; /* timer id */ | 35 | compat_timer_t _tid; /* timer id */ |
| 36 | int _overrun; /* overrun count */ | 36 | int _overrun; /* overrun count */ |
| 37 | compat_sigval_t _sigval; /* same as below */ | 37 | compat_sigval_t _sigval; /* same as below */ |
| 38 | int _sys_private; /* not to be passed to user */ | 38 | int _sys_private; /* not to be passed to user */ |
diff --git a/include/asm-sparc64/compat.h b/include/asm-sparc64/compat.h index 22f58055b8ab..b59122dd176d 100644 --- a/include/asm-sparc64/compat.h +++ b/include/asm-sparc64/compat.h | |||
| @@ -25,6 +25,7 @@ typedef s32 compat_daddr_t; | |||
| 25 | typedef u32 compat_caddr_t; | 25 | typedef u32 compat_caddr_t; |
| 26 | typedef __kernel_fsid_t compat_fsid_t; | 26 | typedef __kernel_fsid_t compat_fsid_t; |
| 27 | typedef s32 compat_key_t; | 27 | typedef s32 compat_key_t; |
| 28 | typedef s32 compat_timer_t; | ||
| 28 | 29 | ||
| 29 | typedef s32 compat_int_t; | 30 | typedef s32 compat_int_t; |
| 30 | typedef s32 compat_long_t; | 31 | typedef s32 compat_long_t; |
diff --git a/include/asm-x86_64/ia32.h b/include/asm-x86_64/ia32.h index c0a7717923ed..6efa00fe4e7b 100644 --- a/include/asm-x86_64/ia32.h +++ b/include/asm-x86_64/ia32.h | |||
| @@ -94,7 +94,7 @@ typedef struct compat_siginfo{ | |||
| 94 | 94 | ||
| 95 | /* POSIX.1b timers */ | 95 | /* POSIX.1b timers */ |
| 96 | struct { | 96 | struct { |
| 97 | int _tid; /* timer id */ | 97 | compat_timer_t _tid; /* timer id */ |
| 98 | int _overrun; /* overrun count */ | 98 | int _overrun; /* overrun count */ |
| 99 | compat_sigval_t _sigval; /* same as below */ | 99 | compat_sigval_t _sigval; /* same as below */ |
| 100 | int _sys_private; /* not to be passed to user */ | 100 | int _sys_private; /* not to be passed to user */ |
