diff options
Diffstat (limited to 'ipc/sem.c')
-rw-r--r-- | ipc/sem.c | 10 |
1 files changed, 5 insertions, 5 deletions
@@ -1698,8 +1698,8 @@ SYSCALL_DEFINE4(semctl, int, semid, int, semnum, int, cmd, unsigned long, arg) | |||
1698 | 1698 | ||
1699 | struct compat_semid_ds { | 1699 | struct compat_semid_ds { |
1700 | struct compat_ipc_perm sem_perm; | 1700 | struct compat_ipc_perm sem_perm; |
1701 | compat_time_t sem_otime; | 1701 | old_time32_t sem_otime; |
1702 | compat_time_t sem_ctime; | 1702 | old_time32_t sem_ctime; |
1703 | compat_uptr_t sem_base; | 1703 | compat_uptr_t sem_base; |
1704 | compat_uptr_t sem_pending; | 1704 | compat_uptr_t sem_pending; |
1705 | compat_uptr_t sem_pending_last; | 1705 | compat_uptr_t sem_pending_last; |
@@ -2214,11 +2214,11 @@ SYSCALL_DEFINE4(semtimedop, int, semid, struct sembuf __user *, tsops, | |||
2214 | #ifdef CONFIG_COMPAT_32BIT_TIME | 2214 | #ifdef CONFIG_COMPAT_32BIT_TIME |
2215 | long compat_ksys_semtimedop(int semid, struct sembuf __user *tsems, | 2215 | long compat_ksys_semtimedop(int semid, struct sembuf __user *tsems, |
2216 | unsigned int nsops, | 2216 | unsigned int nsops, |
2217 | const struct compat_timespec __user *timeout) | 2217 | const struct old_timespec32 __user *timeout) |
2218 | { | 2218 | { |
2219 | if (timeout) { | 2219 | if (timeout) { |
2220 | struct timespec64 ts; | 2220 | struct timespec64 ts; |
2221 | if (compat_get_timespec64(&ts, timeout)) | 2221 | if (get_old_timespec32(&ts, timeout)) |
2222 | return -EFAULT; | 2222 | return -EFAULT; |
2223 | return do_semtimedop(semid, tsems, nsops, &ts); | 2223 | return do_semtimedop(semid, tsems, nsops, &ts); |
2224 | } | 2224 | } |
@@ -2227,7 +2227,7 @@ long compat_ksys_semtimedop(int semid, struct sembuf __user *tsems, | |||
2227 | 2227 | ||
2228 | COMPAT_SYSCALL_DEFINE4(semtimedop, int, semid, struct sembuf __user *, tsems, | 2228 | COMPAT_SYSCALL_DEFINE4(semtimedop, int, semid, struct sembuf __user *, tsems, |
2229 | unsigned int, nsops, | 2229 | unsigned int, nsops, |
2230 | const struct compat_timespec __user *, timeout) | 2230 | const struct old_timespec32 __user *, timeout) |
2231 | { | 2231 | { |
2232 | return compat_ksys_semtimedop(semid, tsems, nsops, timeout); | 2232 | return compat_ksys_semtimedop(semid, tsems, nsops, timeout); |
2233 | } | 2233 | } |