diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-05-05 10:13:44 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-05-05 10:13:44 -0700 |
commit | 802d0db827eaa5a34dd655623c71134ec63d8c3f (patch) | |
tree | f5115c13e279f365b94d9508b909a16ef0361abe /drivers/staging/Makefile | |
parent | 1aaf6d3d3d1e95f4be07e32dd84aa1c93855fbbd (diff) | |
parent | 941b0304a74b240c607ff098401fd4ef70c9d1cc (diff) |
Merge branch 'ipc-cleanups'
Merge ipc fixes and cleanups from my IPC branch.
The ipc locking has always been pretty ugly, and the scalability fixes
to some degree made it even less readable. We had two cases of double
unlocks in error paths due to this (one rcu read unlock, one semaphore
unlock), and this fixes the bugs I found while trying to clean things up
a bit so that we are less likely to have more.
* ipc-cleanups:
ipc: simplify rcu_read_lock() in semctl_nolock()
ipc: simplify semtimedop/semctl_main() common error path handling
ipc: move sem_obtain_lock() rcu locking into the only caller
ipc: fix double sem unlock in semctl error path
ipc: move the rcu_read_lock() from sem_lock_and_putref() into callers
ipc: sem_putref() does not need the semaphore lock any more
ipc: move rcu_read_unlock() out of sem_unlock() and into callers
Diffstat (limited to 'drivers/staging/Makefile')
0 files changed, 0 insertions, 0 deletions