import PULS_20160108

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / init / Kconfig

diff --git a/init/Kconfig b/init/Kconfig
index 5d6febaea56d647d91fcd6b1f737be76ceb7a2a8..29d45686f16ffd4c9e6a14311835e0150b9d8cb5 100644 (file)
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -758,6 +758,9 @@ config LOG_BUF_SHIFT
 config HAVE_UNSTABLE_SCHED_CLOCK
        bool
 
+config GENERIC_SCHED_CLOCK
+       bool
+
 #
 # For architectures that want to enable the support for NUMA-affine scheduler
 # balancing logic:
@@ -1251,6 +1254,12 @@ config HOTPLUG
 config HAVE_PCSPKR_PLATFORM
        bool
 
+config PANIC_TIMEOUT
+       int "Default panic timeout"
+       default 0
+       help
+         Set default panic timeout.
+
 menuconfig EXPERT
        bool "Configure standard kernel features (expert users)"
        # Unhide debug options, to make the on-by-default options visible