Revert "Revert some of the suspicious changes to debug the boot process"

This reverts commit e74b718f36.

Looks like it was a false alarm.
This commit is contained in:
Evgenii Shatokhin 2017-03-22 17:46:14 +03:00
parent b4d85f858b
commit 768a2e6073

View file

@ -115,12 +115,12 @@ CONFIG_RCU_STALL_COMMON=y
# CONFIG_TREE_RCU_TRACE is not set # CONFIG_TREE_RCU_TRACE is not set
# CONFIG_RCU_EXPEDITE_BOOT is not set # CONFIG_RCU_EXPEDITE_BOOT is not set
CONFIG_BUILD_BIN2C=y CONFIG_BUILD_BIN2C=y
CONFIG_IKCONFIG=y # CONFIG_IKCONFIG is not set
CONFIG_IKCONFIG_PROC=y
CONFIG_LOG_BUF_SHIFT=18 CONFIG_LOG_BUF_SHIFT=18
CONFIG_LOG_CPU_MAX_BUF_SHIFT=12 CONFIG_LOG_CPU_MAX_BUF_SHIFT=12
CONFIG_NMI_LOG_BUF_SHIFT=13 CONFIG_NMI_LOG_BUF_SHIFT=13
# CONFIG_NUMA_BALANCING is not set CONFIG_NUMA_BALANCING=y
CONFIG_NUMA_BALANCING_DEFAULT_ENABLED=y
CONFIG_CGROUPS=y CONFIG_CGROUPS=y
CONFIG_PAGE_COUNTER=y CONFIG_PAGE_COUNTER=y
CONFIG_MEMCG=y CONFIG_MEMCG=y
@ -210,7 +210,7 @@ CONFIG_SLUB_DEBUG=y
# CONFIG_SLAB is not set # CONFIG_SLAB is not set
CONFIG_SLUB=y CONFIG_SLUB=y
# CONFIG_SLOB is not set # CONFIG_SLOB is not set
# CONFIG_SLAB_FREELIST_RANDOM is not set CONFIG_SLAB_FREELIST_RANDOM=y
CONFIG_SLUB_CPU_PARTIAL=y CONFIG_SLUB_CPU_PARTIAL=y
# CONFIG_SYSTEM_DATA_VERIFICATION is not set # CONFIG_SYSTEM_DATA_VERIFICATION is not set
CONFIG_PROFILING=y CONFIG_PROFILING=y
@ -592,9 +592,7 @@ CONFIG_ACPI_APEI_EINJ=m
# CONFIG_ACPI_APEI_ERST_DEBUG is not set # CONFIG_ACPI_APEI_ERST_DEBUG is not set
CONFIG_DPTF_POWER=m CONFIG_DPTF_POWER=m
CONFIG_ACPI_EXTLOG=m CONFIG_ACPI_EXTLOG=m
CONFIG_PMIC_OPREGION=y # CONFIG_PMIC_OPREGION is not set
CONFIG_CRC_PMIC_OPREGION=y
# CONFIG_BXT_WC_PMIC_OPREGION is not set
CONFIG_ACPI_CONFIGFS=m CONFIG_ACPI_CONFIGFS=m
CONFIG_SFI=y CONFIG_SFI=y
@ -8022,8 +8020,8 @@ CONFIG_DEBUG_KERNEL=y
# CONFIG_DEBUG_STACK_USAGE is not set # CONFIG_DEBUG_STACK_USAGE is not set
# CONFIG_DEBUG_VM is not set # CONFIG_DEBUG_VM is not set
# CONFIG_DEBUG_VIRTUAL is not set # CONFIG_DEBUG_VIRTUAL is not set
# CONFIG_DEBUG_MEMORY_INIT is not set CONFIG_DEBUG_MEMORY_INIT=y
# CONFIG_MEMORY_NOTIFIER_ERROR_INJECT is not set CONFIG_MEMORY_NOTIFIER_ERROR_INJECT=m
# CONFIG_DEBUG_PER_CPU_MAPS is not set # CONFIG_DEBUG_PER_CPU_MAPS is not set
# CONFIG_DEBUG_STACKOVERFLOW is not set # CONFIG_DEBUG_STACKOVERFLOW is not set
# CONFIG_KASAN is not set # CONFIG_KASAN is not set
@ -8523,7 +8521,7 @@ CONFIG_ZLIB_INFLATE=y
CONFIG_ZLIB_DEFLATE=y CONFIG_ZLIB_DEFLATE=y
CONFIG_LZO_COMPRESS=y CONFIG_LZO_COMPRESS=y
CONFIG_LZO_DECOMPRESS=y CONFIG_LZO_DECOMPRESS=y
CONFIG_LZ4_COMPRESS=y CONFIG_LZ4_COMPRESS=m
CONFIG_LZ4HC_COMPRESS=m CONFIG_LZ4HC_COMPRESS=m
CONFIG_LZ4_DECOMPRESS=y CONFIG_LZ4_DECOMPRESS=y
CONFIG_XZ_DEC=y CONFIG_XZ_DEC=y