diff --git a/arch/arm/configs/msm8960_defconfig b/arch/arm/configs/msm8960_defconfig
index 73d9f9d..ab59609 100644
--- a/arch/arm/configs/msm8960_defconfig
+++ b/arch/arm/configs/msm8960_defconfig
@@ -32,6 +32,7 @@
 CONFIG_MODVERSIONS=y
 CONFIG_ARCH_MSM=y
 CONFIG_ARCH_MSM8960=y
+CONFIG_MSM_KRAIT_TBB_ABORT_HANDLER=y
 CONFIG_MACH_MSM8960_SIM=y
 CONFIG_MACH_MSM8960_RUMI3=y
 CONFIG_MACH_MSM8960_CDP=y