ACPI / PM: Fix build problems for !CONFIG_ACPI related to NVS rework

The recent rework of the NVS saving/restoring code introduced two
build issues for !CONFIG_ACPI, a warning in drivers/acpi/internal.h
and an error in arch/x86/kernel/e820.c.

Fix them by providing suitable static inline definitions of the
relevant functions.

Signed-off-by: Rafael J. Wysocki <[email protected]>
Acked-by: Randy Dunlap <[email protected]>
Signed-off-by: Len Brown <[email protected]>

diff --git a/drivers/acpi/internal.h b/drivers/acpi/internal.h
index 7c23b76e8eca24b696fa777f24630cf16ba1c0d5..6d69bbedf97a4205da368377989f468e9d7262ce 100644 (file)
--- a/drivers/acpi/internal.h
+++ b/drivers/acpi/internal.h
@@ -90,7 +90,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 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
 
 static inline void suspend_nvs_restore(void) {}
 #endif
 

diff --git a/include/linux/acpi.h b/include/linux/acpi.h
index fa7ed6a983d0b2bbd4367c053eb6b77b0deb5e22..eb176bb1b15b722f8c1f78b1650f38302e85a60f 100644 (file)
--- a/include/linux/acpi.h
+++ b/include/linux/acpi.h
@@ -254,15 +254,6 @@ void __init acpi_old_suspend_ordering(void);
 void __init acpi_nvs_nosave(void);
 #endif /* CONFIG_PM_SLEEP */
 
 void __init acpi_nvs_nosave(void);
 #endif /* CONFIG_PM_SLEEP */
 

-#ifdef CONFIG_ACPI_SLEEP
-int suspend_nvs_register(unsigned long start, unsigned long size);
-#else
-static inline int suspend_nvs_register(unsigned long a, unsigned long b)
-{
-       return 0;
-}
-#endif
-

 struct acpi_osc_context {
        char *uuid_str; /* uuid string */
        int rev;
 struct acpi_osc_context {
        char *uuid_str; /* uuid string */
        int rev;


@@ -361,4 +352,14 @@ static inline int acpi_table_parse(char *id,
        return -1;
 }
 #endif /* !CONFIG_ACPI */
        return -1;
 }
 #endif /* !CONFIG_ACPI */

+
+#ifdef CONFIG_ACPI_SLEEP
+int suspend_nvs_register(unsigned long start, unsigned long size);
+#else
+static inline int suspend_nvs_register(unsigned long a, unsigned long b)
+{
+       return 0;
+}
+#endif
+

 #endif /*_LINUX_ACPI_H*/
 #endif /*_LINUX_ACPI_H*/