Merge tag 'for-linus' of git://git.armlinux.org.uk/~rmk/linux-arm

[linux.git] / drivers / firmware / psci / psci.c

diff --git a/drivers/firmware/psci/psci.c b/drivers/firmware/psci/psci.c
index e3da38e15c5b6915f7214c8d75e9faa74893a33b..cfb448eabdaa22e367c5f9159cdc9ddfd782332f 100644 (file)
--- a/drivers/firmware/psci/psci.c
+++ b/drivers/firmware/psci/psci.c
@@ -296,7 +296,8 @@ static int get_set_conduit_method(struct device_node *np)
        return 0;
 }
 
-static void psci_sys_reset(enum reboot_mode reboot_mode, const char *cmd)
+static int psci_sys_reset(struct notifier_block *nb, unsigned long action,
+                         void *data)
 {
        if ((reboot_mode == REBOOT_WARM || reboot_mode == REBOOT_SOFT) &&
            psci_system_reset2_supported) {
@@ -309,8 +310,15 @@ static void psci_sys_reset(enum reboot_mode reboot_mode, const char *cmd)
        } else {
                invoke_psci_fn(PSCI_0_2_FN_SYSTEM_RESET, 0, 0, 0);
        }
+
+       return NOTIFY_DONE;
 }
 
+static struct notifier_block psci_sys_reset_nb = {
+       .notifier_call = psci_sys_reset,
+       .priority = 129,
+};
+
 static void psci_sys_poweroff(void)
 {
        invoke_psci_fn(PSCI_0_2_FN_SYSTEM_OFF, 0, 0, 0);
@@ -477,7 +485,7 @@ static void __init psci_0_2_set_functions(void)
                .migrate_info_type = psci_migrate_info_type,
        };
 
-       arm_pm_restart = psci_sys_reset;
+       register_restart_handler(&psci_sys_reset_nb);
 
        pm_power_off = psci_sys_poweroff;
 }