diff -urNp x-ref/arch/i386/kernel/sys_i386.c x/arch/i386/kernel/sys_i386.c --- x-ref/arch/i386/kernel/sys_i386.c 2001-04-01 01:17:07.000000000 +0200 +++ x/arch/i386/kernel/sys_i386.c 2003-01-14 03:00:45.000000000 +0100 @@ -139,7 +139,11 @@ asmlinkage int sys_ipc (uint call, int f switch (call) { case SEMOP: - return sys_semop (first, (struct sembuf *)ptr, second); + return sys_semtimedop (first, (struct sembuf *)ptr, second, NULL); + case SEMTIMEDOP: + return sys_semtimedop (first, (struct sembuf *)ptr, second, + (const struct timespec *)fifth); + case SEMGET: return sys_semget (first, second, third); case SEMCTL: { diff -urNp x-ref/arch/ia64/ia32/sys_ia32.c x/arch/ia64/ia32/sys_ia32.c --- x-ref/arch/ia64/ia32/sys_ia32.c 2003-01-07 02:10:56.000000000 +0100 +++ x/arch/ia64/ia32/sys_ia32.c 2003-01-14 03:00:59.000000000 +0100 @@ -2125,6 +2125,7 @@ struct ipc_kludge { #define SEMOP 1 #define SEMGET 2 #define SEMCTL 3 +#define SEMTIMEDOP 4 #define MSGSND 11 #define MSGRCV 12 #define MSGGET 13 @@ -2552,6 +2553,17 @@ shmctl32 (int first, int second, void *u return err; } +static long +semtimedop32(int semid, struct sembuf *tsems, int nsems, + const struct timespec32 *timeout32) +{ + struct timespec t; + if (get_user (t.tv_sec, &timeout32->tv_sec) || + get_user (t.tv_nsec, &timeout32->tv_nsec)) + return -EFAULT; + return sys_semtimedop(semid, tsems, nsems, &t); +} + asmlinkage long sys32_ipc (u32 call, int first, int second, int third, u32 ptr, u32 fifth) { @@ -2563,7 +2575,10 @@ sys32_ipc (u32 call, int first, int seco switch (call) { case SEMOP: /* struct sembuf is the same on 32 and 64bit :)) */ - return sys_semop(first, (struct sembuf *)AA(ptr), second); + return sys_semtimedop(first, (struct sembuf *)AA(ptr), second, NULL); + case SEMTIMEDOP: + return semtimedop32(first, (struct sembuf *)AA(ptr), second, + (const struct timespec32 *)AA(fifth)); case SEMGET: return sys_semget(first, second, third); case SEMCTL: diff -urNp x-ref/arch/ia64/kernel/entry.S x/arch/ia64/kernel/entry.S --- x-ref/arch/ia64/kernel/entry.S 2003-01-07 02:10:56.000000000 +0100 +++ x/arch/ia64/kernel/entry.S 2003-01-14 03:00:45.000000000 +0100 @@ -1199,7 +1199,7 @@ sys_call_table: data8 ia64_ni_syscall data8 ia64_ni_syscall data8 ia64_ni_syscall // 1245 - data8 ia64_ni_syscall + data8 sys_semtimedop data8 ia64_ni_syscall data8 ia64_ni_syscall data8 ia64_ni_syscall diff -urNp x-ref/include/asm-i386/ipc.h x/include/asm-i386/ipc.h --- x-ref/include/asm-i386/ipc.h 1998-12-31 21:05:12.000000000 +0100 +++ x/include/asm-i386/ipc.h 2003-01-14 03:00:45.000000000 +0100 @@ -14,6 +14,7 @@ struct ipc_kludge { #define SEMOP 1 #define SEMGET 2 #define SEMCTL 3 +#define SEMTIMEDOP 4 #define MSGSND 11 #define MSGRCV 12 #define MSGGET 13 diff -urNp x-ref/include/asm-ia64/unistd.h x/include/asm-ia64/unistd.h --- x-ref/include/asm-ia64/unistd.h 2003-01-07 02:11:16.000000000 +0100 +++ x/include/asm-ia64/unistd.h 2003-01-14 03:00:45.000000000 +0100 @@ -223,6 +223,7 @@ #define __NR_security 1233 /* 1234-1235: reserved for {alloc,free}_hugepages */ /* 1238-1242: reserved for io_{setup,destroy,getevents,submit,cancel} */ +#define __NR_semtimedop 1246 #if !defined(__ASSEMBLY__) && !defined(ASSEMBLER) diff -urNp x-ref/include/linux/sem.h x/include/linux/sem.h --- x-ref/include/linux/sem.h 2002-12-19 04:55:33.000000000 +0100 +++ x/include/linux/sem.h 2003-01-14 03:00:45.000000000 +0100 @@ -124,6 +124,8 @@ struct sem_undo { asmlinkage long sys_semget (key_t key, int nsems, int semflg); asmlinkage long sys_semop (int semid, struct sembuf *sops, unsigned nsops); asmlinkage long sys_semctl (int semid, int semnum, int cmd, union semun arg); +asmlinkage long sys_semtimedop (int semid, struct sembuf *sops, + unsigned nsops, const struct timespec *timeout); #endif /* __KERNEL__ */ diff -urNp x-ref/ipc/sem.c x/ipc/sem.c --- x-ref/ipc/sem.c 2002-11-29 02:23:18.000000000 +0100 +++ x/ipc/sem.c 2003-01-14 03:00:45.000000000 +0100 @@ -62,6 +62,7 @@ #include #include #include +#include #include #include "util.h" @@ -839,6 +840,12 @@ static int alloc_undo(struct sem_array * asmlinkage long sys_semop (int semid, struct sembuf *tsops, unsigned nsops) { + return sys_semtimedop(semid, tsops, nsops, NULL); +} + +asmlinkage long sys_semtimedop (int semid, struct sembuf *tsops, + unsigned nsops, const struct timespec *timeout) +{ int error = -EINVAL; struct sem_array *sma; struct sembuf fast_sops[SEMOPM_FAST]; @@ -846,6 +853,7 @@ asmlinkage long sys_semop (int semid, st struct sem_undo *un; int undos = 0, decrease = 0, alter = 0; struct sem_queue queue; + unsigned long offset = MAX_SCHEDULE_TIMEOUT; if (nsops < 1 || semid < 0) return -EINVAL; @@ -860,6 +868,19 @@ asmlinkage long sys_semop (int semid, st error=-EFAULT; goto out_free; } + if (timeout) { + struct timespec _timeout; + if (copy_from_user(&_timeout, timeout, sizeof(*timeout))) { + error = -EFAULT; + goto out_free; + } + if (_timeout.tv_sec < 0 || _timeout.tv_nsec < 0 || + _timeout.tv_nsec >= 1000000000L) { + error = -EINVAL; + goto out_free; + } + offset = timespec_to_jiffies(&_timeout); + } sma = sem_lock(semid); error=-EINVAL; if(sma==NULL) @@ -932,7 +953,7 @@ asmlinkage long sys_semop (int semid, st current->state = TASK_INTERRUPTIBLE; sem_unlock(semid); - schedule(); + offset = schedule_timeout(offset); tmp = sem_lock(semid); if(tmp==NULL) { @@ -957,6 +978,8 @@ asmlinkage long sys_semop (int semid, st break; } else { error = queue.status; + if (error == -EINTR && offset == 0) + error = -EAGAIN; if (queue.prev) /* got Interrupt */ break; /* Everything done by update_queue */ diff -urNp x-ref/ipc/util.c x/ipc/util.c --- x-ref/ipc/util.c 2002-11-29 02:23:18.000000000 +0100 +++ x/ipc/util.c 2003-01-14 03:00:45.000000000 +0100 @@ -359,6 +359,13 @@ asmlinkage long sys_semop (int semid, st return -ENOSYS; } +asmlinkage long sys_semtimedop (int semid, struct sembuf *sops, unsigned nsops, + const struct timespec *timeout) +{ + return -ENOSYS; +} + + asmlinkage long sys_semctl (int semid, int semnum, int cmd, union semun arg) { return -ENOSYS;