diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2009-06-12 09:53:47 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2009-06-12 11:32:58 +0200 |
| commit | 5b02ee3d219f9e01b6e9146e25613822cfc2e5ce (patch) | |
| tree | 7ce9126738c3cf4b37d67170d0e4b34818c057a9 /ipc/sem.c | |
| parent | 26a28fa4fea5b8c65713aa50c124f76a88c7924d (diff) | |
| parent | 8ebf975608aaebd7feb33d77f07ba21a6380e086 (diff) | |
| download | op-kernel-dev-5b02ee3d219f9e01b6e9146e25613822cfc2e5ce.zip op-kernel-dev-5b02ee3d219f9e01b6e9146e25613822cfc2e5ce.tar.gz | |
asm-generic: merge branch 'master' of torvalds/linux-2.6
Fixes a merge conflict against the x86 tree caused by a fix to
atomic.h which I renamed to atomic_long.h.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'ipc/sem.c')
| -rw-r--r-- | ipc/sem.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -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 |
