aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDima Zavin <dima@android.com>2011-08-23 15:56:50 -0700
committerBintian Wang <bintian.wang@linaro.org>2013-10-09 18:53:15 +0800
commit501c9b8d56389c45f3904659bfc2e9969fcfc550 (patch)
treecedacea35c9f3acc60693c70c2bc3c6e3319139e
parentf89b55936e2d4660ecb55a254e60583cdc7a7a4b (diff)
downloadjuice-501c9b8d56389c45f3904659bfc2e9969fcfc550.tar.gz
ARM: add option to flush console before reboot
If the console_lock was held while the system was rebooted, the messages in the temporary logbuffer would not have propogated to all the console drivers. This force releases the console lock if it failed to be acquired. Change-Id: I193dcf7b968be17966833e50b8b8bc70d5d9fe89 Signed-off-by: Dima Zavin <dima@android.com>
-rw-r--r--arch/arm/kernel/process.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/kernel/process.c b/arch/arm/kernel/process.c
index 6bd2ffeb423..ab58aeaecea 100644
--- a/arch/arm/kernel/process.c
+++ b/arch/arm/kernel/process.c
@@ -289,6 +289,10 @@ void machine_restart(char *cmd)
* out to the console drivers */
arm_machine_flush_console();
+ /* Flush the console to make sure all the relevant messages make it
+ * out to the console drivers */
+ arm_machine_flush_console();
+
arm_pm_restart(reboot_mode, cmd);
/* Give a grace period for failure to restart of 1s */