commit b600ffaebcc4791add19e04306f0478a963abe71
author Linus Torvalds <torvalds@linux-foundation.org> Wed Jul 22 16:44:33 2009 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> Wed Jul 22 16:44:33 2009 -0700
tree 9ad8a8ec2c6339f0d110de56e5aab742d466ec75
parent 81cbf6d0555d77b2a4235c03f24167e2d792ccf5
parent 61f3826133dc07142935fb5712fc738e19eb5575

Merge branch 'irq-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

* 'irq-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  genirq: Fix UP compile failure caused by irq_thread_check_affinity

fs/pipe.c

diff --git a/fs/pipe.c b/fs/pipe.c
index f7dd21a..52c4151 100644
--- a/fs/pipe.c
+++ b/fs/pipe.c
@@ -68,8 +68,8 @@
 		pipe_lock_nested(pipe1, I_MUTEX_PARENT);
 		pipe_lock_nested(pipe2, I_MUTEX_CHILD);
 	} else {
-		pipe_lock_nested(pipe2, I_MUTEX_CHILD);
-		pipe_lock_nested(pipe1, I_MUTEX_PARENT);
+		pipe_lock_nested(pipe2, I_MUTEX_PARENT);
+		pipe_lock_nested(pipe1, I_MUTEX_CHILD);
 	}
 }