| From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 |
| From: Greg Kroah-Hartman <gregkh@google.com> |
| Date: Mon, 9 Dec 2019 12:17:54 +0100 |
| Subject: ANDROID: update gki_defconfig for 5.5-rc1 |
| |
| Signed-off-by: Greg Kroah-Hartman <gregkh@google.com> |
| Change-Id: Iabbf2262e6e7795c2a5c108617d2f59f08819958 |
| --- |
| arch/arm64/configs/gki_defconfig | 2 +- |
| arch/x86/configs/gki_defconfig | 2 +- |
| 2 files changed, 2 insertions(+), 2 deletions(-) |
| |
| diff --git a/arch/arm64/configs/gki_defconfig b/arch/arm64/configs/gki_defconfig |
| --- a/arch/arm64/configs/gki_defconfig |
| +++ b/arch/arm64/configs/gki_defconfig |
| @@ -481,9 +481,9 @@ CONFIG_DEBUG_INFO=y |
| CONFIG_MAGIC_SYSRQ=y |
| CONFIG_DEBUG_STACK_USAGE=y |
| CONFIG_DEBUG_MEMORY_INIT=y |
| +CONFIG_PANIC_TIMEOUT=5 |
| CONFIG_SOFTLOCKUP_DETECTOR=y |
| # CONFIG_DETECT_HUNG_TASK is not set |
| -CONFIG_PANIC_TIMEOUT=5 |
| CONFIG_SCHEDSTATS=y |
| # CONFIG_RUNTIME_TESTING_MENU is not set |
| CONFIG_CORESIGHT=y |
| diff --git a/arch/x86/configs/gki_defconfig b/arch/x86/configs/gki_defconfig |
| --- a/arch/x86/configs/gki_defconfig |
| +++ b/arch/x86/configs/gki_defconfig |
| @@ -414,9 +414,9 @@ CONFIG_DEBUG_INFO=y |
| CONFIG_MAGIC_SYSRQ=y |
| CONFIG_DEBUG_STACK_USAGE=y |
| CONFIG_DEBUG_MEMORY_INIT=y |
| +CONFIG_PANIC_TIMEOUT=5 |
| CONFIG_SOFTLOCKUP_DETECTOR=y |
| # CONFIG_DETECT_HUNG_TASK is not set |
| -CONFIG_PANIC_TIMEOUT=5 |
| CONFIG_SCHEDSTATS=y |
| # CONFIG_RUNTIME_TESTING_MENU is not set |
| CONFIG_UNWINDER_FRAME_POINTER=y |
