Revert "CHROMIUM: config: remove lock debug configs from arm64"
This reverts commit f187317cd7dfe4cdb74ebc90fe2e2323868182f3.
BUG=chrome-os-partner:57351
TEST=kevin boots in normal mode
Change-Id: I12252418aeaecb366bb4c32c7432a57e6db833e1
Reviewed-on: https://chromium-review.googlesource.com/384694
Reviewed-by: Stephen Barber <smbarber@chromium.org>
Commit-Queue: Stephen Barber <smbarber@chromium.org>
Tested-by: Stephen Barber <smbarber@chromium.org>
(cherry picked from commit dd31943ad97d643caf055ec68e60a2c9262c6e98)
Reviewed-on: https://chromium-review.googlesource.com/384733
diff --git a/chromeos/config/arm64/common.config b/chromeos/config/arm64/common.config
index 96a9458..91ed98f 100644
--- a/chromeos/config/arm64/common.config
+++ b/chromeos/config/arm64/common.config
@@ -229,6 +229,9 @@
CONFIG_CRYPTO_SHA1_ARM64_CE=y
CONFIG_CRYPTO_SHA2_ARM64_CE=y
CONFIG_DEBUG_ALIGN_RODATA=y
+# CONFIG_DEBUG_LOCKDEP is not set
+CONFIG_DEBUG_LOCK_ALLOC=y
+CONFIG_DEBUG_MUTEXES=y
# CONFIG_DEBUG_PINCTRL is not set
CONFIG_DEFAULT_MMAP_MIN_ADDR=32768
CONFIG_DEVFREQ_GOV_PERFORMANCE=y
@@ -494,6 +497,7 @@
# CONFIG_IXGBEVF is not set
# CONFIG_JFFS2_FS is not set
# CONFIG_JME is not set
+CONFIG_KALLSYMS_ALL=y
# CONFIG_KASAN is not set
# CONFIG_KCOV is not set
CONFIG_KERNEL_MODE_NEON=y
@@ -519,6 +523,7 @@
CONFIG_LIBFDT=y
# CONFIG_LIBNVDIMM is not set
# CONFIG_LIQUIDIO is not set
+CONFIG_LOCKDEP=y
# CONFIG_LPC_ICH is not set
# CONFIG_LPC_SCH is not set
CONFIG_MAILBOX=y
@@ -776,6 +781,9 @@
CONFIG_PPS=m
# CONFIG_PRISM54 is not set
# CONFIG_PROC_KCORE is not set
+CONFIG_PROVE_LOCKING=y
+CONFIG_PROVE_RCU=y
+# CONFIG_PROVE_RCU_REPEATEDLY is not set
CONFIG_PWM=y
CONFIG_PWM_CROS_EC=y
# CONFIG_PWM_FSL_FTM is not set
@@ -1159,6 +1167,7 @@
# CONFIG_TOUCHSCREEN_EGALAX is not set
CONFIG_TOUCHSCREEN_ELAN=y
# CONFIG_TOUCHSCREEN_IMX6UL_TSC is not set
+CONFIG_TRACE_IRQFLAGS=y
# CONFIG_TRANSPARENT_HUGEPAGE is not set
# CONFIG_TYPHOON is not set
# CONFIG_USB_DWC2 is not set
diff --git a/chromeos/config/armel/common.config b/chromeos/config/armel/common.config
index 808773c..d60d117 100644
--- a/chromeos/config/armel/common.config
+++ b/chromeos/config/armel/common.config
@@ -248,6 +248,8 @@
# CONFIG_DEBUG_HIGHMEM is not set
# CONFIG_DEBUG_LL is not set
CONFIG_DEBUG_LL_INCLUDE="mach/debug-macro.S"
+# CONFIG_DEBUG_LOCK_ALLOC is not set
+# CONFIG_DEBUG_MUTEXES is not set
# CONFIG_DEBUG_PINCTRL is not set
# CONFIG_DEBUG_UART_8250 is not set
# CONFIG_DEBUG_USER is not set
@@ -420,6 +422,7 @@
CONFIG_IRQCHIP=y
# CONFIG_IRQ_TIME_ACCOUNTING is not set
# CONFIG_JFFS2_FS is not set
+# CONFIG_KALLSYMS_ALL is not set
CONFIG_KERNEL_GZIP=y
# CONFIG_KERNEL_LZ4 is not set
# CONFIG_KERNEL_LZMA is not set
@@ -542,6 +545,7 @@
# CONFIG_MTD_TESTS is not set
# CONFIG_MTD_UBI is not set
CONFIG_MULTI_IRQ_HANDLER=y
+CONFIG_MUTEX_SPIN_ON_OWNER=y
# CONFIG_MVMDIO is not set
CONFIG_MWIFIEX=m
CONFIG_MWIFIEX_SDIO=m
@@ -625,6 +629,8 @@
# CONFIG_POWER_RESET_SYSCON_POWEROFF is not set
# CONFIG_POWER_RESET_VERSATILE is not set
CONFIG_PPS=y
+# CONFIG_PROVE_LOCKING is not set
+# CONFIG_PROVE_RCU is not set
CONFIG_PWM=y
# CONFIG_PWM_CROS_EC is not set
# CONFIG_PWM_FSL_FTM is not set
diff --git a/chromeos/config/base.config b/chromeos/config/base.config
index 9e643f1..58f79c8 100644
--- a/chromeos/config/base.config
+++ b/chromeos/config/base.config
@@ -441,9 +441,7 @@
# CONFIG_DEBUG_KOBJECT is not set
# CONFIG_DEBUG_LIST is not set
# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
-# CONFIG_DEBUG_LOCK_ALLOC is not set
# CONFIG_DEBUG_MEMORY_INIT is not set
-# CONFIG_DEBUG_MUTEXES is not set
# CONFIG_DEBUG_NOTIFIERS is not set
# CONFIG_DEBUG_OBJECTS is not set
# CONFIG_DEBUG_PAGEALLOC is not set
@@ -1066,7 +1064,6 @@
# CONFIG_JSA1212 is not set
# CONFIG_JUMP_LABEL is not set
CONFIG_KALLSYMS=y
-# CONFIG_KALLSYMS_ALL is not set
# CONFIG_KARMA_PARTITION is not set
CONFIG_KERNFS=y
# CONFIG_KEYBOARD_ADP5588 is not set
@@ -1337,7 +1334,6 @@
CONFIG_MSDOS_PARTITION=y
# CONFIG_MT7601U is not set
CONFIG_MULTIUSER=y
-CONFIG_MUTEX_SPIN_ON_OWNER=y
# CONFIG_MXC4005 is not set
CONFIG_NAMESPACES=y
# CONFIG_NATIONAL_PHY is not set
@@ -1700,8 +1696,6 @@
# CONFIG_PROFILE_ALL_BRANCHES is not set
# CONFIG_PROFILE_ANNOTATED_BRANCHES is not set
CONFIG_PROFILING=y
-# CONFIG_PROVE_LOCKING is not set
-# CONFIG_PROVE_RCU is not set
CONFIG_PSTORE=y
CONFIG_PSTORE_CONSOLE=y
# CONFIG_PSTORE_FTRACE is not set
diff --git a/chromeos/config/i386/common.config b/chromeos/config/i386/common.config
index 11b85f8..f744511 100644
--- a/chromeos/config/i386/common.config
+++ b/chromeos/config/i386/common.config
@@ -234,6 +234,8 @@
# CONFIG_DEBUG_ENTRY is not set
# CONFIG_DEBUG_HIGHMEM is not set
# CONFIG_DEBUG_HOTPLUG_CPU0 is not set
+# CONFIG_DEBUG_LOCK_ALLOC is not set
+# CONFIG_DEBUG_MUTEXES is not set
# CONFIG_DEBUG_NMI_SELFTEST is not set
CONFIG_DEBUG_NX_TEST=m
# CONFIG_DEBUG_RODATA_TEST is not set
@@ -560,6 +562,7 @@
# CONFIG_IXGBE is not set
# CONFIG_IXGBEVF is not set
CONFIG_JME=m
+# CONFIG_KALLSYMS_ALL is not set
# CONFIG_KERNEL_BZIP2 is not set
CONFIG_KERNEL_GZIP=y
# CONFIG_KERNEL_LZ4 is not set
@@ -665,6 +668,7 @@
# CONFIG_MTD is not set
CONFIG_MTRR=y
# CONFIG_MTRR_SANITIZER is not set
+CONFIG_MUTEX_SPIN_ON_OWNER=y
# CONFIG_MVIAC3_2 is not set
# CONFIG_MVIAC7 is not set
# CONFIG_MWAVE is not set
@@ -834,6 +838,8 @@
# CONFIG_PRISM54 is not set
# CONFIG_PROCESSOR_SELECT is not set
CONFIG_PROC_KCORE=y
+# CONFIG_PROVE_LOCKING is not set
+# CONFIG_PROVE_RCU is not set
CONFIG_PROVIDE_OHCI1394_DMA_INIT=y
# CONFIG_PTP_1588_CLOCK_PCH is not set
# CONFIG_PUNIT_ATOM_DEBUG is not set
diff --git a/chromeos/config/x86_64/common.config b/chromeos/config/x86_64/common.config
index 91a7b9c..32ddb06 100644
--- a/chromeos/config/x86_64/common.config
+++ b/chromeos/config/x86_64/common.config
@@ -292,6 +292,8 @@
CONFIG_DEBUG_BOOT_PARAMS=y
# CONFIG_DEBUG_ENTRY is not set
# CONFIG_DEBUG_HOTPLUG_CPU0 is not set
+# CONFIG_DEBUG_LOCK_ALLOC is not set
+# CONFIG_DEBUG_MUTEXES is not set
# CONFIG_DEBUG_NMI_SELFTEST is not set
CONFIG_DEBUG_NX_TEST=m
# CONFIG_DEBUG_PINCTRL is not set
@@ -683,6 +685,7 @@
# CONFIG_IXGBE is not set
# CONFIG_IXGBEVF is not set
CONFIG_JME=m
+# CONFIG_KALLSYMS_ALL is not set
# CONFIG_KASAN is not set
# CONFIG_KCOV is not set
# CONFIG_KERNEL_BZIP2 is not set
@@ -804,6 +807,7 @@
# CONFIG_MTD is not set
CONFIG_MTRR=y
# CONFIG_MTRR_SANITIZER is not set
+CONFIG_MUTEX_SPIN_ON_OWNER=y
# CONFIG_MWAVE is not set
CONFIG_MWIFIEX=m
CONFIG_MWIFIEX_PCIE=m
@@ -979,6 +983,8 @@
# CONFIG_PRISM54 is not set
# CONFIG_PROCESSOR_SELECT is not set
CONFIG_PROC_KCORE=y
+# CONFIG_PROVE_LOCKING is not set
+# CONFIG_PROVE_RCU is not set
CONFIG_PROVIDE_OHCI1394_DMA_INIT=y
CONFIG_PUNIT_ATOM_DEBUG=y
# CONFIG_PVPANIC is not set
