Index: chromeos/config/i386/config.common.i386 |
diff --git a/chromeos/config/i386/config.common.i386 b/chromeos/config/i386/config.common.i386 |
index fca4905d8e5cc89d431fd37893eb2d330ed914de..e87e24f0d27c04232b6c5f91d01180f3633745c4 100644 |
--- a/chromeos/config/i386/config.common.i386 |
+++ b/chromeos/config/i386/config.common.i386 |
@@ -256,7 +256,6 @@ CONFIG_CRYPTO_WORKQUEUE=y |
CONFIG_DEBUG_BOOT_PARAMS=y |
# CONFIG_DEBUG_BUGVERBOSE is not set |
CONFIG_DEBUG_DEVRES=y |
-CONFIG_DEBUG_FS=y |
CONFIG_DEBUG_GPIO=y |
# CONFIG_DEBUG_INFO is not set |
# CONFIG_DEBUG_MEMORY_INIT is not set |
@@ -324,7 +323,7 @@ CONFIG_DRM_KMS_HELPER=y |
CONFIG_DS1682=m |
# CONFIG_DUMMY is not set |
# CONFIG_DVB_CORE is not set |
-# CONFIG_DYNAMIC_DEBUG is not set |
+CONFIG_DYNAMIC_FTRACE=y |
CONFIG_E100=m |
CONFIG_E1000=m |
CONFIG_E1000E=m |
@@ -348,6 +347,7 @@ CONFIG_EMBEDDED=y |
CONFIG_EPIC100=m |
# CONFIG_ET131X is not set |
CONFIG_ETHOC=m |
+CONFIG_EVENT_PROFILE=y |
CONFIG_EXT2_FS=y |
CONFIG_EXT2_FS_POSIX_ACL=y |
CONFIG_EXT2_FS_SECURITY=y |
@@ -418,18 +418,18 @@ CONFIG_FIX_EARLYCON_MEM=y |
# CONFIG_FLATMEM_MANUAL is not set |
CONFIG_FORCEDETH=m |
CONFIG_FORCEDETH_NAPI=y |
-CONFIG_FRAME_POINTER=y |
CONFIG_FRAME_WARN=2048 |
# CONFIG_FSAM7400 is not set |
CONFIG_FS_MBCACHE=y |
CONFIG_FS_POSIX_ACL=y |
CONFIG_FS_XIP=y |
-# CONFIG_FTRACE is not set |
+CONFIG_FTRACE_MCOUNT_RECORD=y |
+CONFIG_FTRACE_NMI_ENTER=y |
+# CONFIG_FTRACE_SYSCALLS is not set |
CONFIG_FUJITSU_LAPTOP=m |
# CONFIG_FUJITSU_LAPTOP_DEBUG is not set |
CONFIG_FUSE_FS=m |
# CONFIG_FUSION is not set |
-# CONFIG_GCOV_KERNEL is not set |
CONFIG_GENERIC_ACL=y |
CONFIG_GENERIC_BUG=y |
CONFIG_GENERIC_CLOCKEVENTS=y |
@@ -469,6 +469,7 @@ CONFIG_HAVE_DMA_ATTRS=y |
CONFIG_HAVE_DYNAMIC_FTRACE=y |
CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y |
CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y |
+CONFIG_HAVE_FTRACE_NMI_ENTER=y |
CONFIG_HAVE_FUNCTION_GRAPH_FP_TEST=y |
CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y |
CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y |
@@ -681,6 +682,7 @@ CONFIG_IP_PNP_RARP=y |
CONFIG_IP_ROUTE_MULTIPATH=y |
CONFIG_IP_ROUTE_VERBOSE=y |
# CONFIG_IP_VS is not set |
+# CONFIG_IRQSOFF_TRACER is not set |
# CONFIG_ISA is not set |
CONFIG_ISA_DMA_API=y |
# CONFIG_ISCSI_IBFT_FIND is not set |
@@ -808,6 +810,7 @@ CONFIG_MMC_SDHCI_PCI=m |
# CONFIG_MMC_TIFM_SD is not set |
# CONFIG_MMC_VIA_SDMMC is not set |
# CONFIG_MMC_WBSD is not set |
+# CONFIG_MMIOTRACE is not set |
CONFIG_MM_OWNER=y |
CONFIG_MOUSE_APPLETOUCH=m |
CONFIG_MOUSE_BCM5974=m |
@@ -1100,6 +1103,7 @@ CONFIG_POSIX_MQUEUE=y |
CONFIG_POSIX_MQUEUE_SYSCTL=y |
CONFIG_POWER_SUPPLY=y |
# CONFIG_POWER_SUPPLY_DEBUG is not set |
+# CONFIG_POWER_TRACER is not set |
CONFIG_PPP_FILTER=y |
CONFIG_PPP_SYNC_TTY=y |
# CONFIG_PREEMPT is not set |
@@ -1529,6 +1533,7 @@ CONFIG_SUN_PARTITION=y |
# CONFIG_SYNCLINK_GT is not set |
CONFIG_SYN_COOKIES=y |
CONFIG_SYSCTL_SYSCALL_CHECK=y |
+# CONFIG_SYSPROF_TRACER is not set |
# CONFIG_SYSV68_PARTITION is not set |
CONFIG_SYSVIPC=y |
CONFIG_SYSVIPC_SYSCTL=y |