commit 1538427efa0880e0ee1bd487b5eeaa572a3d711a
author Linux Build Service Account <lnxbuild@localhost> Mon Jan 02 22:28:35 2012 -0800
committer QuIC Gerrit Code Review <code-review@localhost> Mon Jan 02 22:28:35 2012 -0800
tree 51f77fe90bb21b97dd80b8c07b8175466f997136
parent 15e6cb552eedcec39e6316b45c1591291d959972
parent fb73583ed432becec3897b6e9201f7b0c9c8127c

Merge "defconfig: msm8960: Enable the fault injection framework" into msm-3.0

arch/arm/configs/msm8960_defconfig

diff --git a/arch/arm/configs/msm8960_defconfig b/arch/arm/configs/msm8960_defconfig
index d5ec7e9..83de36e 100644
--- a/arch/arm/configs/msm8960_defconfig
+++ b/arch/arm/configs/msm8960_defconfig
@@ -428,6 +428,11 @@
 CONFIG_DEBUG_INFO=y
 CONFIG_DEBUG_MEMORY_INIT=y
 CONFIG_DEBUG_LIST=y
+CONFIG_FAULT_INJECTION=y
+CONFIG_FAILSLAB=y
+CONFIG_FAIL_PAGE_ALLOC=y
+CONFIG_FAULT_INJECTION_DEBUG_FS=y
+CONFIG_FAULT_INJECTION_STACKTRACE_FILTER=y
 CONFIG_DEBUG_PAGEALLOC=y
 CONFIG_ENABLE_DEFAULT_TRACERS=y
 CONFIG_DYNAMIC_DEBUG=y