patch-2.4.25 linux-2.4.25/arch/cris/kernel/sys_cris.c

Next file: linux-2.4.25/arch/cris/kernel/time.c
Previous file: linux-2.4.25/arch/cris/kernel/ptrace.c
Back to the patch index
Back to the overall index

diff -urN linux-2.4.24/arch/cris/kernel/sys_cris.c linux-2.4.25/arch/cris/kernel/sys_cris.c
@@ -109,7 +109,10 @@
 
 	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: {
@@ -163,7 +166,7 @@
 		return sys_shmctl (first, second,
 				   (struct shmid_ds *) ptr);
 	default:
-		return -EINVAL;
+		return -ENOSYS;
 	}
 }
 

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)