On Monday, 30 April 2007 10:29, Johannes Berg wrote: > On Sun, 2007-04-29 at 14:48 +0200, R. J. Wysocki wrote: > > > + status = acpi_enter_sleep_state(ACPI_STATE_S4); > > + local_irq_restore(flags); > > + > > + /* > > + * Restore processor state > > + * We should only be here if we're coming back from hibernation and > > + * the memory image should have already been loaded from disk. > > That comment doesn't seem right. This is in ->enter so afaict the image > hasn't been loaded yet at this point. I don't know if you just moved > code but if you did then I don't think it was correct before. It was in your patch, so I kept it, but I don't think it's correct too. Moreover, it seems that acpi_save_state_mem() and acpi_restore_state_mem() are only needed by s2ram, so we can safely remove them from the hibernation code path. Pavel, is that correct? > > + */ > > + acpi_restore_state_mem(); > > Maybe that needs to be in ->finish then? Or somewhere in the deeper arch > code? > > Other than that it looks good to me on a cursory look. I'll give it a > try on my G5 on Wednesday or Thursday. I think I'll have an improved version till then. :-) Greetings, Rafael _______________________________________________ linux-pm mailing list linux-pm@xxxxxxxxxxxxxxxxxxxxxxxxxx https://lists.linux-foundation.org/mailman/listinfo/linux-pm
