diff options
Diffstat (limited to 'include/linux/compat.h')
| -rw-r--r-- | include/linux/compat.h | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/include/linux/compat.h b/include/linux/compat.h index 09b28b7369d7..d0ced1011f2f 100644 --- a/include/linux/compat.h +++ b/include/linux/compat.h | |||
| @@ -160,11 +160,6 @@ struct compat_ustat { | |||
| 160 | char f_fpack[6]; | 160 | char f_fpack[6]; |
| 161 | }; | 161 | }; |
| 162 | 162 | ||
| 163 | typedef union compat_sigval { | ||
| 164 | compat_int_t sival_int; | ||
| 165 | compat_uptr_t sival_ptr; | ||
| 166 | } compat_sigval_t; | ||
| 167 | |||
| 168 | #define COMPAT_SIGEV_PAD_SIZE ((SIGEV_MAX_SIZE/sizeof(int)) - 3) | 163 | #define COMPAT_SIGEV_PAD_SIZE ((SIGEV_MAX_SIZE/sizeof(int)) - 3) |
| 169 | 164 | ||
| 170 | typedef struct compat_sigevent { | 165 | typedef struct compat_sigevent { |
| @@ -289,8 +284,12 @@ asmlinkage ssize_t compat_sys_pwritev(unsigned long fd, | |||
| 289 | const struct compat_iovec __user *vec, | 284 | const struct compat_iovec __user *vec, |
| 290 | unsigned long vlen, u32 pos_low, u32 pos_high); | 285 | unsigned long vlen, u32 pos_low, u32 pos_high); |
| 291 | 286 | ||
| 292 | int compat_do_execve(char *filename, compat_uptr_t __user *argv, | 287 | int compat_do_execve(const char *filename, const compat_uptr_t __user *argv, |
| 293 | compat_uptr_t __user *envp, struct pt_regs *regs); | 288 | const compat_uptr_t __user *envp, struct pt_regs *regs); |
| 289 | #ifdef __ARCH_WANT_SYS_EXECVE | ||
| 290 | asmlinkage long compat_sys_execve(const char __user *filename, const compat_uptr_t __user *argv, | ||
| 291 | const compat_uptr_t __user *envp); | ||
| 292 | #endif | ||
| 294 | 293 | ||
| 295 | asmlinkage long compat_sys_select(int n, compat_ulong_t __user *inp, | 294 | asmlinkage long compat_sys_select(int n, compat_ulong_t __user *inp, |
| 296 | compat_ulong_t __user *outp, compat_ulong_t __user *exp, | 295 | compat_ulong_t __user *outp, compat_ulong_t __user *exp, |
| @@ -590,6 +589,9 @@ asmlinkage ssize_t compat_sys_process_vm_writev(compat_pid_t pid, | |||
| 590 | unsigned long liovcnt, const struct compat_iovec __user *rvec, | 589 | unsigned long liovcnt, const struct compat_iovec __user *rvec, |
| 591 | unsigned long riovcnt, unsigned long flags); | 590 | unsigned long riovcnt, unsigned long flags); |
| 592 | 591 | ||
| 592 | asmlinkage long compat_sys_sendfile(int out_fd, int in_fd, | ||
| 593 | compat_off_t __user *offset, compat_size_t count); | ||
| 594 | |||
| 593 | #else | 595 | #else |
| 594 | 596 | ||
| 595 | #define is_compat_task() (0) | 597 | #define is_compat_task() (0) |
