]> www.infradead.org Git - users/jedix/linux-maple.git/commit
e1000: convert to private mutex from rtnl
authorJesse Brandeburg <jesse.brandeburg@intel.com>
Wed, 5 Oct 2011 07:24:51 +0000 (07:24 +0000)
committerJoe Jin <joe.jin@oracle.com>
Thu, 17 May 2012 03:10:59 +0000 (11:10 +0800)
commitfb04c13919909e0a6c0eb6122a5ba12d5b555ff1
treed614fa10e97ec2f1ed5c97ecbda37113dd31fab9
parentf8319bf43a031b43bc4702b01436a892ec7ad5a1
e1000: convert to private mutex from rtnl

The e1000 driver when running with lockdep could run into
some possible deadlocks between the work items acquiring
rtnl and the rtnl lock being acquired before work items
were cancelled.

Use a private mutex to make sure lock ordering isn't violated.
The private mutex is only used to protect areas not generally
covered by the rtnl lock already.

(cherry picked from commit 0ef4eedc2e98edd51cd106e1f6a27178622b7e57)
Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com>
CC: Thomas Gleixner <tglx@linutronix.de>
CC: Tushar Dave <tushar.n.dave@intel.com>
Tested-by: Aaron Brown <aaron.f.brown@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: Joe Jin <joe.jin@oracle.com>
drivers/net/e1000/e1000.h
drivers/net/e1000/e1000_main.c