aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--include/linux/sem.h2
-rw-r--r--ipc/sem.c2
2 files changed, 0 insertions, 4 deletions
diff --git a/include/linux/sem.h b/include/linux/sem.h
index 6a1af1b49a13..87756ef1198e 100644
--- a/include/linux/sem.h
+++ b/include/linux/sem.h
@@ -107,8 +107,6 @@ struct sem_queue {
107 struct sem_undo * undo; /* undo structure */ 107 struct sem_undo * undo; /* undo structure */
108 int pid; /* process id of requesting process */ 108 int pid; /* process id of requesting process */
109 int status; /* completion status of operation */ 109 int status; /* completion status of operation */
110 struct sem_array * sma; /* semaphore array for operations */
111 int id; /* internal sem id */
112 struct sembuf * sops; /* array of pending operations */ 110 struct sembuf * sops; /* array of pending operations */
113 int nsops; /* number of operations */ 111 int nsops; /* number of operations */
114 int alter; /* does the operation alter the array? */ 112 int alter; /* does the operation alter the array? */
diff --git a/ipc/sem.c b/ipc/sem.c
index 4f26c7157356..d5ce4000ca17 100644
--- a/ipc/sem.c
+++ b/ipc/sem.c
@@ -1160,12 +1160,10 @@ asmlinkage long sys_semtimedop(int semid, struct sembuf __user *tsops,
1160 * task into the pending queue and go to sleep. 1160 * task into the pending queue and go to sleep.
1161 */ 1161 */
1162 1162
1163 queue.sma = sma;
1164 queue.sops = sops; 1163 queue.sops = sops;
1165 queue.nsops = nsops; 1164 queue.nsops = nsops;
1166 queue.undo = un; 1165 queue.undo = un;
1167 queue.pid = task_tgid_vnr(current); 1166 queue.pid = task_tgid_vnr(current);
1168 queue.id = semid;
1169 queue.alter = alter; 1167 queue.alter = alter;
1170 if (alter) 1168 if (alter)
1171 append_to_queue(sma ,&queue); 1169 append_to_queue(sma ,&queue);