commit aed9d8f991a437f4887ba083bd4393873850fe8a
author Ed James <edjames@google.com> Thu Jan 16 17:59:23 2014 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Jan 16 17:59:23 2014 +0000
tree 4abe7455833883c36daaa6d44af5c523adc3afad
parent 266089714074978a29e4994759ffeb8ae9d5ad82
parent 914d6c369d6211b254c2443a5d49804e23275a73

Merge "optimus: fix boot hang, log buffer overrun"

arch/arm/configs/gfrg200_defconfig

diff --git a/arch/arm/configs/gfrg200_defconfig b/arch/arm/configs/gfrg200_defconfig
index 110ad5a..3f79115 100644
--- a/arch/arm/configs/gfrg200_defconfig
+++ b/arch/arm/configs/gfrg200_defconfig
@@ -284,7 +284,7 @@
 CONFIG_NLS_ISO8859_1=y
 CONFIG_NLS_UTF8=y
 CONFIG_PRINTK_TIME=y
-CONFIG_PRINTK_PERSIST=y
+CONFIG_PRINTK_PERSIST=n
 CONFIG_BOOTLOG_COPY=y
 CONFIG_FRAME_WARN=2048
 CONFIG_MAGIC_SYSRQ=y

init/Kconfig

diff --git a/init/Kconfig b/init/Kconfig
index 7d9b5c7..a846f22 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -1039,6 +1039,7 @@
 
 config BOOTLOG_COPY
 	default n
+	depends on PRINTK_PERSIST
 	bool "copy boot log to printk log" if PRINTK
 	help
 	  This option copies the boot log stored in bootlog memory and save it