diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-10 19:50:03 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-10 19:50:03 -0700 |
| commit | 20f3f3ca499d2c211771ba552685398b65d83859 (patch) | |
| tree | 41b460196a0860e11d12e33e3172463973cb0078 /ipc | |
| parent | 769f3e8c384795cc350e2aae27de2a12374d19d4 (diff) | |
| parent | 41c51c98f588edcdf6141cff1895df738e03ddd4 (diff) | |
Merge branch 'rcu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'rcu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
rcu: rcu_sched_grace_period(): kill the bogus flush_signals()
rculist: use list_entry_rcu in places where it's appropriate
rculist.h: introduce list_entry_rcu() and list_first_entry_rcu()
rcu: Update RCU tracing documentation for __rcu_pending
rcu: Add __rcu_pending tracing to hierarchical RCU
RCU: make treercu be default
Diffstat (limited to 'ipc')
| -rw-r--r-- | ipc/sem.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ipc/sem.c b/ipc/sem.c index 16a2189e96f..87c2b641fd7 100644 --- a/ipc/sem.c +++ b/ipc/sem.c @@ -1290,8 +1290,8 @@ void exit_sem(struct task_struct *tsk) int i; rcu_read_lock(); - un = list_entry(rcu_dereference(ulp->list_proc.next), - struct sem_undo, list_proc); + un = list_entry_rcu(ulp->list_proc.next, + struct sem_undo, list_proc); if (&un->list_proc == &ulp->list_proc) semid = -1; else |