tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Merge branch 'lockdep-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/peterz/linux-2.6-lockdep

* 'lockdep-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/peterz/linux-2.6-lockdep:
lockdep: Fix lockdep annotation for pipe_double_lock()

Linus Torvalds 81cbf6d0 3c330108

+2 -2
+2 -2
fs/pipe.c
··· 68 68 pipe_lock_nested(pipe1, I_MUTEX_PARENT); 69 69 pipe_lock_nested(pipe2, I_MUTEX_CHILD); 70 70 } else { 71 - pipe_lock_nested(pipe2, I_MUTEX_CHILD); 72 - pipe_lock_nested(pipe1, I_MUTEX_PARENT); 71 + pipe_lock_nested(pipe2, I_MUTEX_PARENT); 72 + pipe_lock_nested(pipe1, I_MUTEX_CHILD); 73 73 } 74 74 } 75 75