On Monday, January 28, 2013 03:47:04 PM Lan Tianyu wrote: > commit 1bad2f19f7f7 introduces nvs_nosave_s3 flag to just ban > saving nvs in ths s3 rather than both of s3 and s4. This patch > is to add init_nvs_nosave_s3() to set nvs_nosave_s3 to true for > those machines in the nonvs blacklist which only don't need to > saving nvs during s3 rather than both s3 and s4. > > Signed-off-by: Lan Tianyu <tianyu.lan@xxxxxxxxx> Please fold [2/2] into [1/2] and resend. Thanks, Rafael > --- > drivers/acpi/sleep.c | 6 ++++++ > 1 file changed, 6 insertions(+) > > diff --git a/drivers/acpi/sleep.c b/drivers/acpi/sleep.c > index 2fcc67d..405b962 100644 > --- a/drivers/acpi/sleep.c > +++ b/drivers/acpi/sleep.c > @@ -141,6 +141,12 @@ static int __init init_nvs_nosave(const struct dmi_system_id *d) > return 0; > } > > +static int __init init_nvs_nosave_s3(const struct dmi_system_id *d) > +{ > + acpi_nvs_nosave_s3(); > + return 0; > +} > + > static struct dmi_system_id __initdata acpisleep_dmi_table[] = { > { > .callback = init_old_suspend_ordering, > -- I speak only for myself. Rafael J. Wysocki, Intel Open Source Technology Center. -- To unsubscribe from this list: send the line "unsubscribe linux-acpi" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html