From f3cfd1a779bc46976766bf668c7aa4d494c47770 Mon Sep 17 00:00:00 2001 From: Tejun Heo Date: Thu, 20 Sep 2012 10:03:19 -0700 Subject: [PATCH] --- yaml --- r: 327196 b: refs/heads/master c: 7c6e72e46c9ea4a88f3f8ba96edce9db4bd48726 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/kernel/workqueue.c | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/[refs] b/[refs] index ea2b2c508215..f8ec19cc9688 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 70369b117a8fc5ac18a635ced23ee49f8e722e7b +refs/heads/master: 7c6e72e46c9ea4a88f3f8ba96edce9db4bd48726 diff --git a/trunk/kernel/workqueue.c b/trunk/kernel/workqueue.c index 4f5c61f8b0e7..143fd8c751f4 100644 --- a/trunk/kernel/workqueue.c +++ b/trunk/kernel/workqueue.c @@ -1070,8 +1070,6 @@ static int try_to_grab_pending(struct work_struct *work, bool is_dwork, { struct global_cwq *gcwq; - WARN_ON_ONCE(in_irq()); - local_irq_save(*flags); /* try to steal the timer if it exists */