On Sunday 24 May 2009, Ming Lei wrote:> On Sun, 24 May 2009 13:09:13 +0200> "Rafael J. Wysocki" <rjw@xxxxxxx> wrote:> > > On Sunday 24 May 2009, Ming Lei wrote:> > > 于 Sun, 24 May 2009 01:20:29 +0200> > > "Rafael J. Wysocki" <rjw@xxxxxxx> wrote:> > > > [lm@linux-lm linux-2.6]$ patch -p1> > > < ../patch_rx/INFO_possible_circular_locking_dependency_at_cleanup_workqueue_thread.patch> > > patching file kernel/power/disk.c Hunk #1 succeeded at 215 with> > > fuzz 2. Hunk #3 succeeded at 278 with fuzz 1.> > > Hunk #4 FAILED at 343.> > > Hunk #5 succeeded at 396 with fuzz 2 (offset -4 lines).> > > Hunk #6 FAILED at 454.> > > Hunk #7 succeeded at 485 with fuzz 2.> > > 2 out of 7 hunks FAILED -- saving rejects to file> > > kernel/power/disk.c.rej patching file kernel/power/main.c> > > Hunk #1 succeeded at 289 with fuzz 1 (offset 18 lines).> > > patching file drivers/base/power/main.c> > > Hunk #3 succeeded at 616 with fuzz 2.> > > Hunk #4 succeeded at 625 with fuzz 2.> > > patching file kernel/kexec.c> > > Hunk #1 succeeded at 1451 with fuzz 2.> > > Hunk #2 succeeded at 1488 with fuzz 2.> > > > The patch applies to the mainline, since it'll be a 2.6.30 candidate> > if it's confirmed to fix the problem.> > After applying the patch against 2.6.30-rc7, my dell d630 box can resume> from suspend(s2ram) or hibernation successfully, and lockdep does not > complain with the kind of message in> > http://bugzilla.kernel.org/show_bug.cgi?id=13245. OK, great. I'm going to push the patch to Linus. > Another thing, during resume from hibernation, I can find the following> messages:> > [ 1.849584] device: 'network_throughput': device_add> [ 1.849630] PM: Adding info for No Bus:network_throughput> [ 1.849788] PM: Resume from disk failed.> > I do not known if there is really something wrong in PM, No, this only means that there was no hibernation image present on the resumepartition while the kernel was starting. Thanks,Rafael_______________________________________________linux-pm mailing listlinux-pm@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx://lists.linux-foundation.org/mailman/listinfo/linux-pm
