Merge branch 'suspend-ioremap-cache' into release

diff --combined drivers/acpi/internal.h
index bc428a9607df7c2da973151dcdc93f2e58b7001d,6d69bbedf97a4205da368377989f468e9d7262ce..b1cc81a0431b600653011a284228424b50ac5e83
--- 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);
@@@ -91,7 -90,7 +91,7 @@@ void suspend_nvs_restore(void)
  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 int suspend_nvs_save(void) { return 0; }
  static inline void suspend_nvs_restore(void) {}
  #endif