From d9c5a86520d14a341ddf778e72623d490bf8604f Mon Sep 17 00:00:00 2001 From: Manfred Spraul Date: Fri, 25 Jul 2008 01:48:05 -0700 Subject: [PATCH] --- yaml --- r: 105966 b: refs/heads/master c: 2c0c29d414087f3b021059673c20a7088f5f1fff h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/include/linux/sem.h | 2 -- trunk/ipc/sem.c | 2 -- 3 files changed, 1 insertion(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 9e62fd63d64b..62b4fdc59fb0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4daa28f6d8f5cda8ea0f55048e3c8811c384cbdd +refs/heads/master: 2c0c29d414087f3b021059673c20a7088f5f1fff diff --git a/trunk/include/linux/sem.h b/trunk/include/linux/sem.h index 6a1af1b49a13..87756ef1198e 100644 --- a/trunk/include/linux/sem.h +++ b/trunk/include/linux/sem.h @@ -107,8 +107,6 @@ struct sem_queue { struct sem_undo * undo; /* undo structure */ int pid; /* process id of requesting process */ int status; /* completion status of operation */ - struct sem_array * sma; /* semaphore array for operations */ - int id; /* internal sem id */ struct sembuf * sops; /* array of pending operations */ int nsops; /* number of operations */ int alter; /* does the operation alter the array? */ diff --git a/trunk/ipc/sem.c b/trunk/ipc/sem.c index 4f26c7157356..d5ce4000ca17 100644 --- a/trunk/ipc/sem.c +++ b/trunk/ipc/sem.c @@ -1160,12 +1160,10 @@ asmlinkage long sys_semtimedop(int semid, struct sembuf __user *tsops, * task into the pending queue and go to sleep. */ - queue.sma = sma; queue.sops = sops; queue.nsops = nsops; queue.undo = un; queue.pid = task_tgid_vnr(current); - queue.id = semid; queue.alter = alter; if (alter) append_to_queue(sma ,&queue);