Merge branch 'suspend-ioremap-cache' into release

diff --combined drivers/acpi/internal.h
index 8df5d70,7c23b76..bc428a9
--- 1/drivers/acpi/internal.h
--- 2/drivers/acpi/internal.h
+++ b/drivers/acpi/internal.h
@@@ -41,10 -41,9 +41,10 @@@ static inline int acpi_debugfs_init(voi
  int acpi_power_init(void);
  int acpi_device_sleep_wake(struct acpi_device *dev,
                             int enable, int sleep_state, int dev_state);
 -int acpi_power_get_inferred_state(struct acpi_device *device);
 +int acpi_power_get_inferred_state(struct acpi_device *device, int *state);
 +int acpi_power_on_resources(struct acpi_device *device, int state);
  int acpi_power_transition(struct acpi_device *device, int state);
 -extern int acpi_power_nocheck;
 +int acpi_bus_init_power(struct acpi_device *device);
  
  int acpi_wakeup_device_init(void);
  void acpi_early_processor_set_pdc(void);
@@@ -83,8 -82,16 +83,16 @@@ extern int acpi_sleep_init(void)
  
  #ifdef CONFIG_ACPI_SLEEP
  int acpi_sleep_proc_init(void);
+ int suspend_nvs_alloc(void);
+ void suspend_nvs_free(void);
+ int suspend_nvs_save(void);
+ void suspend_nvs_restore(void);
  #else
  static inline int acpi_sleep_proc_init(void) { return 0; }
+ static inline int suspend_nvs_alloc(void) { return 0; }
+ static inline void suspend_nvs_free(void) {}
+ static inline int suspend_nvs_save(void) {}
+ static inline void suspend_nvs_restore(void) {}
  #endif
  
  #endif /* _ACPI_INTERNAL_H_ */

diff --combined drivers/acpi/sleep.c
index ddc5cce,d8bca6c..75c2320
--- 1/drivers/acpi/sleep.c
--- 2/drivers/acpi/sleep.c
+++ b/drivers/acpi/sleep.c
@@@ -124,8 -124,7 +124,7 @@@ static int acpi_pm_freeze(void
  static int acpi_pm_pre_suspend(void)
  {
        acpi_pm_freeze();
-       suspend_nvs_save();
-       return 0;
+       return suspend_nvs_save();
  }
  
  /**
@@@ -151,7 -150,7 +150,7 @@@ static int acpi_pm_prepare(void
  {
        int error = __acpi_pm_prepare();
        if (!error)
-               acpi_pm_pre_suspend();
+               error = acpi_pm_pre_suspend();
  
        return error;
  }
@@@ -435,14 -434,6 +434,14 @@@ static struct dmi_system_id __initdata 
                DMI_MATCH(DMI_PRODUCT_NAME, "VGN-NW130D"),
                },
        },
 +      {
 +      .callback = init_nvs_nosave,
 +      .ident = "Averatec AV1020-ED2",
 +      .matches = {
 +              DMI_MATCH(DMI_SYS_VENDOR, "AVERATEC"),
 +              DMI_MATCH(DMI_PRODUCT_NAME, "1000 Series"),
 +              },
 +      },
        {},
  };
  #endif /* CONFIG_SUSPEND */