reboot: Introduce thermal_zone_device_critical_reboot()

[sfrench/cifs-2.6.git] / kernel / reboot.c

diff --git a/kernel/reboot.c b/kernel/reboot.c
index b236c4c06bb3c722718337a94724d8e70b231d91..35d5e0b67993dfe34738ee54cef8f5af06e94ef2 100644 (file)
--- a/kernel/reboot.c
+++ b/kernel/reboot.c
@@ -957,19 +957,22 @@ static void hw_failure_emergency_poweroff(int poweroff_delay_ms)
 }
 
 /**
- * __hw_protection_shutdown - Trigger an emergency system poweroff
+ * __hw_protection_shutdown - Trigger an emergency system shutdown or reboot
  *
- * @reason:            Reason of emergency shutdown to be printed.
- * @ms_until_forced:   Time to wait for orderly shutdown before tiggering a
- *                     forced shudown. Negative value disables the forced
- *                     shutdown.
+ * @reason:            Reason of emergency shutdown or reboot to be printed.
+ * @ms_until_forced:   Time to wait for orderly shutdown or reboot before
+ *                     triggering it. Negative value disables the forced
+ *                     shutdown or reboot.
+ * @shutdown:          If true, indicates that a shutdown will happen
+ *                     after the critical tempeature is reached.
+ *                     If false, indicates that a reboot will happen
+ *                     after the critical tempeature is reached.
  *
- * Initiate an emergency system shutdown in order to protect hardware from
- * further damage. Usage examples include a thermal protection or a voltage or
- * current regulator failures.
- * NOTE: The request is ignored if protection shutdown is already pending even
- * if the previous request has given a large timeout for forced shutdown.
- * Can be called from any context.
+ * Initiate an emergency system shutdown or reboot in order to protect
+ * hardware from further damage. Usage examples include a thermal protection.
+ * NOTE: The request is ignored if protection shutdown or reboot is already
+ * pending even if the previous request has given a large timeout for forced
+ * shutdown/reboot.
  */
 void __hw_protection_shutdown(const char *reason, int ms_until_forced, bool shutdown)
 {
@@ -988,7 +991,10 @@ void __hw_protection_shutdown(const char *reason, int ms_until_forced, bool shut
        hw_failure_emergency_poweroff(ms_until_forced);
        if (shutdown)
                orderly_poweroff(true);
+       else
+               orderly_reboot();
 }
+EXPORT_SYMBOL_GPL(__hw_protection_shutdown);
 
 static int __init reboot_setup(char *str)
 {