From: Bjorn Helgaas <bhelgaas@google.com>
Date: Mon, 18 Nov 2013 18:00:29 +0000 (-0700)
Subject: Revert "workqueue: allow work_on_cpu() to be called recursively"
X-Git-Tag: v3.13-rc4~5^2~5
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=12997d1a999cd1b22e21a238c96780f2a55e4e13;p=pandora-kernel.git

Revert "workqueue: allow work_on_cpu() to be called recursively"

This reverts commit c2fda509667b0fda4372a237f5a59ea4570b1627.

c2fda509667b removed lockdep annotation from work_on_cpu() to work around
the PCI path that calls work_on_cpu() from within a work_on_cpu() work item
(PF driver .probe() method -> pci_enable_sriov() -> add VFs -> VF driver
.probe method).

961da7fb6b22 ("PCI: Avoid unnecessary CPU switch when calling driver
.probe() method) avoids that recursive work_on_cpu() use in a different
way, so this revert restores the work_on_cpu() lockdep annotation.

Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Acked-by: Tejun Heo <tj@kernel.org>
---

Reading git-diff-tree failed