summaryrefslogtreecommitdiffstats
path: root/ipc/sem.c
diff options
context:
space:
mode:
authorPaul McQuade <paulmcquad@gmail.com>2014-06-06 17:37:37 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2014-06-06 19:08:14 -0400
commit46c0a8ca3e841b14a1d981e2116eaf2d1c7f2235 (patch)
tree44b72ebf4cb7c891f2cb8690aefd506251f49191 /ipc/sem.c
parent7153e402731c3e72331633d1ac15a654768aecac (diff)
ipc, kernel: clear whitespace
trailing whitespace Signed-off-by: Paul McQuade <paulmcquad@gmail.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'ipc/sem.c')
-rw-r--r--ipc/sem.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/ipc/sem.c b/ipc/sem.c
index e8dcc72d5bef..fe0928a3d08b 100644
--- a/ipc/sem.c
+++ b/ipc/sem.c
@@ -160,7 +160,7 @@ static int sysvipc_sem_proc_show(struct seq_file *s, void *it);
160 * sem_array.pending{_alter,_cont}, 160 * sem_array.pending{_alter,_cont},
161 * sem_array.sem_undo: global sem_lock() for read/write 161 * sem_array.sem_undo: global sem_lock() for read/write
162 * sem_undo.proc_next: only "current" is allowed to read/write that field. 162 * sem_undo.proc_next: only "current" is allowed to read/write that field.
163 * 163 *
164 * sem_array.sem_base[i].pending_{const,alter}: 164 * sem_array.sem_base[i].pending_{const,alter}:
165 * global or semaphore sem_lock() for read/write 165 * global or semaphore sem_lock() for read/write
166 */ 166 */
@@ -1161,7 +1161,7 @@ static int semctl_nolock(struct ipc_namespace *ns, int semid,
1161 err = security_sem_semctl(NULL, cmd); 1161 err = security_sem_semctl(NULL, cmd);
1162 if (err) 1162 if (err)
1163 return err; 1163 return err;
1164 1164
1165 memset(&seminfo, 0, sizeof(seminfo)); 1165 memset(&seminfo, 0, sizeof(seminfo));
1166 seminfo.semmni = ns->sc_semmni; 1166 seminfo.semmni = ns->sc_semmni;
1167 seminfo.semmns = ns->sc_semmns; 1167 seminfo.semmns = ns->sc_semmns;
@@ -1181,7 +1181,7 @@ static int semctl_nolock(struct ipc_namespace *ns, int semid,
1181 } 1181 }
1182 max_id = ipc_get_maxid(&sem_ids(ns)); 1182 max_id = ipc_get_maxid(&sem_ids(ns));
1183 up_read(&sem_ids(ns).rwsem); 1183 up_read(&sem_ids(ns).rwsem);
1184 if (copy_to_user(p, &seminfo, sizeof(struct seminfo))) 1184 if (copy_to_user(p, &seminfo, sizeof(struct seminfo)))
1185 return -EFAULT; 1185 return -EFAULT;
1186 return (max_id < 0) ? 0 : max_id; 1186 return (max_id < 0) ? 0 : max_id;
1187 } 1187 }
@@ -1883,7 +1883,7 @@ SYSCALL_DEFINE4(semtimedop, int, semid, struct sembuf __user *, tsops,
1883 /* We need to sleep on this operation, so we put the current 1883 /* We need to sleep on this operation, so we put the current
1884 * task into the pending queue and go to sleep. 1884 * task into the pending queue and go to sleep.
1885 */ 1885 */
1886 1886
1887 queue.sops = sops; 1887 queue.sops = sops;
1888 queue.nsops = nsops; 1888 queue.nsops = nsops;
1889 queue.undo = un; 1889 queue.undo = un;
@@ -2016,7 +2016,7 @@ int copy_semundo(unsigned long clone_flags, struct task_struct *tsk)
2016 return error; 2016 return error;
2017 atomic_inc(&undo_list->refcnt); 2017 atomic_inc(&undo_list->refcnt);
2018 tsk->sysvsem.undo_list = undo_list; 2018 tsk->sysvsem.undo_list = undo_list;
2019 } else 2019 } else
2020 tsk->sysvsem.undo_list = NULL; 2020 tsk->sysvsem.undo_list = NULL;
2021 2021
2022 return 0; 2022 return 0;