Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelv...

[firefly-linux-kernel-4.4.55.git] / drivers / xen / xen-acpi-processor.c

diff --git a/drivers/xen/xen-acpi-processor.c b/drivers/xen/xen-acpi-processor.c
index 7231859119f1f126ac89e606ecc7c96c1a6a55c3..82358d14ecf18a020f200aa0dc8260d9a6d1807b 100644 (file)
--- a/drivers/xen/xen-acpi-processor.c
+++ b/drivers/xen/xen-acpi-processor.c
@@ -27,10 +27,10 @@
 #include <linux/init.h>
 #include <linux/module.h>
 #include <linux/types.h>
-#include <linux/syscore_ops.h>
 #include <linux/acpi.h>
 #include <acpi/processor.h>
 #include <xen/xen.h>
+#include <xen/xen-ops.h>
 #include <xen/interface/platform.h>
 #include <asm/xen/hypercall.h>
 
@@ -495,14 +495,15 @@ static int xen_upload_processor_pm_data(void)
        return rc;
 }
 
-static void xen_acpi_processor_resume(void)
+static int xen_acpi_processor_resume(struct notifier_block *nb,
+                                    unsigned long action, void *data)
 {
        bitmap_zero(acpi_ids_done, nr_acpi_bits);
-       xen_upload_processor_pm_data();
+       return xen_upload_processor_pm_data();
 }
 
-static struct syscore_ops xap_syscore_ops = {
-       .resume = xen_acpi_processor_resume,
+struct notifier_block xen_acpi_processor_resume_nb = {
+       .notifier_call = xen_acpi_processor_resume,
 };
 
 static int __init xen_acpi_processor_init(void)
@@ -555,7 +556,7 @@ static int __init xen_acpi_processor_init(void)
        if (rc)
                goto err_unregister;
 
-       register_syscore_ops(&xap_syscore_ops);
+       xen_resume_notifier_register(&xen_acpi_processor_resume_nb);
 
        return 0;
 err_unregister:
@@ -574,7 +575,7 @@ static void __exit xen_acpi_processor_exit(void)
 {
        int i;
 
-       unregister_syscore_ops(&xap_syscore_ops);
+       xen_resume_notifier_unregister(&xen_acpi_processor_resume_nb);
        kfree(acpi_ids_done);
        kfree(acpi_id_present);
        kfree(acpi_id_cst_present);