summaryrefslogtreecommitdiff
path: root/arch/arm/Kconfig
diff options
context:
space:
mode:
authorJohn Stultz <john.stultz@linaro.org>2011-09-14 12:03:58 -0700
committerJohn Stultz <john.stultz@linaro.org>2011-09-14 12:03:58 -0700
commit3f1fc539a29e09d940df1418b36d23621f85d545 (patch)
tree2693bc745b788a753adaebfbb98635436adf55bb /arch/arm/Kconfig
parent3b728cae2f6a04b80c0df33a874b141d14a3d965 (diff)
parent5cb5fb6fef3fd81b55ddc48010e1b520e8473553 (diff)
Merge branch 'upstream/android-3.0' into linaro-android-3.0
Diffstat (limited to 'arch/arm/Kconfig')
-rw-r--r--arch/arm/Kconfig9
1 files changed, 9 insertions, 0 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 3a232545197..cd0c9523496 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -1710,6 +1710,15 @@ config DEPRECATED_PARAM_STRUCT
This was deprecated in 2001 and announced to live on for 5 years.
Some old boot loaders still use this way.
+config ARM_FLUSH_CONSOLE_ON_RESTART
+ bool "Force flush the console on restart"
+ help
+ If the console is locked while the system is rebooted, the messages
+ in the temporary logbuffer would not have propogated to all the
+ console drivers. This option forces the console lock to be
+ released if it failed to be acquired, which will cause all the
+ pending messages to be flushed.
+
endmenu
menu "Boot options"