From 4ecf0bf4895d66d2750a8873549bfd04d45c1017 Mon Sep 17 00:00:00 2001 From: Bruno Premont Date: Wed, 22 Jul 2009 22:22:32 +0200 Subject: [PATCH] --- yaml --- r: 155734 b: refs/heads/master c: 61f3826133dc07142935fb5712fc738e19eb5575 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/fs/pipe.c | 4 ++-- trunk/kernel/irq/manage.c | 5 +++++ 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 17c6ecf7cb08..1f65eec7aad2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 81cbf6d0555d77b2a4235c03f24167e2d792ccf5 +refs/heads/master: 61f3826133dc07142935fb5712fc738e19eb5575 diff --git a/trunk/fs/pipe.c b/trunk/fs/pipe.c index 52c415114838..f7dd21ad85a6 100644 --- a/trunk/fs/pipe.c +++ b/trunk/fs/pipe.c @@ -68,8 +68,8 @@ void pipe_double_lock(struct pipe_inode_info *pipe1, pipe_lock_nested(pipe1, I_MUTEX_PARENT); pipe_lock_nested(pipe2, I_MUTEX_CHILD); } else { - pipe_lock_nested(pipe2, I_MUTEX_PARENT); - pipe_lock_nested(pipe1, I_MUTEX_CHILD); + pipe_lock_nested(pipe2, I_MUTEX_CHILD); + pipe_lock_nested(pipe1, I_MUTEX_PARENT); } } diff --git a/trunk/kernel/irq/manage.c b/trunk/kernel/irq/manage.c index f0de36f13a44..61c679db4687 100644 --- a/trunk/kernel/irq/manage.c +++ b/trunk/kernel/irq/manage.c @@ -451,6 +451,7 @@ static int irq_wait_for_interrupt(struct irqaction *action) return -1; } +#ifdef CONFIG_SMP /* * Check whether we need to change the affinity of the interrupt thread. */ @@ -478,6 +479,10 @@ irq_thread_check_affinity(struct irq_desc *desc, struct irqaction *action) set_cpus_allowed_ptr(current, mask); free_cpumask_var(mask); } +#else +static inline void +irq_thread_check_affinity(struct irq_desc *desc, struct irqaction *action) { } +#endif /* * Interrupt handler thread