> Il giorno gio, 30/11/2006 alle 14.46 -0700, Eric W. Biederman ha > scritto: > [EMAIL PROTECTED] writes: > > > http://bugzilla.kernel.org/show_bug.cgi?id=7505 > > > one. I think this was a better bisection and I got this > > > Bisecting: 1 revisions left to test after this > > [d71374dafbba7ec3f67371d3b7e9f6310a588808] PCI: fix race with pci_walk_bus > > and > > pci_destroy_dev > > d71374dafbba7ec3f67371d3b7e9f6310a588808 is first bad commit > > commit d71374dafbba7ec3f67371d3b7e9f6310a588808 > > Author: Zhang Yanmin <[EMAIL PROTECTED]> > > Date: Fri Jun 2 12:35:43 2006 +0800 > > > > [PATCH] PCI: fix race with pci_walk_bus and pci_destroy_dev > > > > pci_walk_bus has a race with pci_destroy_dev. When cb is called > > in pci_walk_bus, pci_destroy_dev might unlink the dev pointed by next. > > Later on in the next loop, pointer next becomes NULL and cause > > kernel panic. > > > > Below patch against 2.6.17-rc4 fixes it by changing pci_bus_lock > > (spin_lock) > > to pci_bus_sem (rw_semaphore). > > > > Signed-off-by: Zhang Yanmin <[EMAIL PROTECTED]> > > Signed-off-by: Greg Kroah-Hartman <[EMAIL PROTECTED]> > > > > :040000 040000 570ec0423dac5f57a4b7db859e4f502fab422b4d > > 3fbe35bcc512418894e9ae3862f44363b8b0ab4e M drivers > > > > Let's try and discussing this someplace where people are watching. Bugzilla > seems to be a horrible medium for tracking down bugs. > > Does reverting the above commit allow later kernels to boot? Or do you > still get the impossible oops? > > Eric
I tried to revert the commit: $ git revert d71374dafbba7ec3f67371d3b7e9f6310a588808 First trying simple merge strategy to revert. Simple revert fails; trying Automatic revert. Auto-merging drivers/pci/bus.c merge: warning: conflicts during merge ERROR: Merge conflict in drivers/pci/bus.c Auto-merging drivers/pci/pci.h Auto-merging drivers/pci/probe.c Auto-merging drivers/pci/remove.c Auto-merging drivers/pci/search.c fatal: merge program failed Automatic revert failed. After resolving the conflicts, mark the corrected paths with 'git-update-index <paths>' and commit the result. I don't know how to go on. Could someone help me? (I'm leaving tomorrow, I'll be back in 4 days.) -- Stefano Takekawa <[EMAIL PROTECTED]> - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
