On Mon, 25 Jan 2010 08:58:27 +0800 Huang Ying <ying.huang@xxxxxxxxx> wrote: > On Sat, 2010-01-23 at 05:06 +0800, Andrew Patterson wrote: > > pci: fix nested spinlock hang in aer_inject > > > > The aer_inject module hangs in aer_inject() when checking the > > device's error masks. The hang is due to a recursive use of the > > aer_inject lock. The aer_inject() routine grabs the lock while > > processing the error and then calls pci_read_config_dword to read > > the masks. The pci_read_config_dword routine is earlier overridden > > by pci_read_aer, which among other things, grabs the aer_inject > > lock. > > > > Fixed by moving the pci_read_config_dword calls to read the masks > > to before the lock is taken. > > > > Signed-off-by: Andrew Patterson <andrew.patterson@xxxxxx> > > Acked-by: Huang Ying <ying.huang@xxxxxxxxx> Applied to my for-linus branch, thanks. -- Jesse Barnes, Intel Open Source Technology Center -- To unsubscribe from this list: send the line "unsubscribe linux-pci" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html