From f5fb25b5bed5f610e8937e2cf9859e7aab6ef04d Mon Sep 17 00:00:00 2001 From: Thomas Gleixner Date: Thu, 15 Mar 2012 22:55:21 +0100 Subject: [PATCH] --- yaml --- r: 288599 b: refs/heads/master c: e04268b0effc0ceea366c50b3107baad9edadafa h: refs/heads/master i: 288597: 77238d7c16f7a5b9d99f23687a2d27303bed5d5f 288595: 52e44131338f4dc760351d0d8cc4ece24f641f22 288591: d0cdad6bfaf00af8cc48e4a13df7f47f8ddfe86b v: v3 --- [refs] | 2 +- trunk/kernel/irq/manage.c | 14 ++++---------- 2 files changed, 5 insertions(+), 11 deletions(-) diff --git a/[refs] b/[refs] index d06c63ccdc18..c24eb69567ca 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7140ea1980f2fae9c7aaeac5f6b35317e1389ee6 +refs/heads/master: e04268b0effc0ceea366c50b3107baad9edadafa diff --git a/trunk/kernel/irq/manage.c b/trunk/kernel/irq/manage.c index 453feedbb390..b0ccd1ac2d6a 100644 --- a/trunk/kernel/irq/manage.c +++ b/trunk/kernel/irq/manage.c @@ -804,17 +804,11 @@ static int irq_thread(void *data) * This is the regular exit path. __free_irq() is stopping the * thread via kthread_stop() after calling * synchronize_irq(). So neither IRQTF_RUNTHREAD nor the - * oneshot mask bit should be set. + * oneshot mask bit can be set. We cannot verify that as we + * cannot touch the oneshot mask at this point anymore as + * __setup_irq() might have given out currents thread_mask + * again. * - * Verify that this is true. - */ - if (WARN_ON(test_and_clear_bit(IRQTF_RUNTHREAD, &action->thread_flags))) - wake_threads_waitq(desc); - - if (WARN_ON(desc->threads_oneshot & action->thread_mask)) - irq_finalize_oneshot(desc, action, true); - - /* * Clear irq_thread. Otherwise exit_irq_thread() would make * fuzz about an active irq thread going into nirvana. */