ARM: 9094/1: Register with kernel restart handler

[sfrench/cifs-2.6.git] / arch / arm / kernel / setup.c

diff --git a/arch/arm/kernel/setup.c b/arch/arm/kernel/setup.c
index 1a5edf562e85efe5f33745548326e4d4a5373b24..08c5676477d707d9e23f53e5ac58682aac89d89c 100644 (file)
--- a/arch/arm/kernel/setup.c
+++ b/arch/arm/kernel/setup.c
@@ -1081,6 +1081,20 @@ void __init hyp_mode_check(void)
 #endif
 }
 
+static void (*__arm_pm_restart)(enum reboot_mode reboot_mode, const char *cmd);
+
+static int arm_restart(struct notifier_block *nb, unsigned long action,
+                      void *data)
+{
+       __arm_pm_restart(action, data);
+       return NOTIFY_DONE;
+}
+
+static struct notifier_block arm_restart_nb = {
+       .notifier_call = arm_restart,
+       .priority = 128,
+};
+
 void __init setup_arch(char **cmdline_p)
 {
        const struct machine_desc *mdesc = NULL;
@@ -1149,8 +1163,10 @@ void __init setup_arch(char **cmdline_p)
        kasan_init();
        request_standard_resources(mdesc);
 
-       if (mdesc->restart)
-               arm_pm_restart = mdesc->restart;
+       if (mdesc->restart) {
+               __arm_pm_restart = mdesc->restart;
+               register_restart_handler(&arm_restart_nb);
+       }
 
        unflatten_device_tree();