- Merge with Linux 2.1.121.

 - Bugfixes.

1 files changed, 5 insertions, 5 deletions

diff --git a/ipc/sem.c b/ipc/sem.c
index 0ab578584..655047cf2 100644
--- a/ipc/sem.c
+++ b/ipc/sem.c
@@ -56,7 +56,7 @@ static int max_semid = 0;
 
 static unsigned short sem_seq = 0;
 
-__initfunc(void sem_init (void))
+void __init sem_init (void)
 {
 	int i;
 
@@ -466,10 +466,10 @@ asmlinkage int sys_semctl (int semid, int semnum, int cmd, union semun arg)
 		if (ipcperms (ipcp, S_IRUGO))
 			goto out;
 		switch (cmd) {
-		case GETVAL : return curr->semval;
-		case GETPID : return curr->sempid;
-		case GETNCNT: return count_semncnt(sma,semnum);
-		case GETZCNT: return count_semzcnt(sma,semnum);
+		case GETVAL : err = curr->semval; goto out;
+		case GETPID : err = curr->sempid; goto out;
+		case GETNCNT: err = count_semncnt(sma,semnum); goto out;
+		case GETZCNT: err = count_semzcnt(sma,semnum); goto out;
 		case GETALL:
 			array = arg.array;
 			break;