diff options
| author | Evan Wilson <evan@oliodevices.com> | 2015-05-12 17:15:03 +0000 |
|---|---|---|
| committer | Gerrit Code Review <gerrit2@ip-172-31-25-77.us-west-1.compute.internal> | 2015-04-16 10:08:13 +0000 |
| commit | 04267496f16237081df8f6319b88c1261e29a3f9 (patch) | |
| tree | 499a978c6863b46a205619b924d278200a087029 | |
| parent | a1f9532b20bd8938b6a656c4d284d37a53e27a24 (diff) | |
| parent | dc2be70fdf8fdfaaba8303755615d6d04a330520 (diff) | |
| download | olio-linux-3.10-04267496f16237081df8f6319b88c1261e29a3f9.tar.xz olio-linux-3.10-04267496f16237081df8f6319b88c1261e29a3f9.zip | |
Merge "Removed the optimization of likely/unlikely branches, as it seems to crash the kernel from time to time." into android-3.10-bringup
| -rw-r--r-- | arch/arm/configs/omap3_h1_defconfig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/configs/omap3_h1_defconfig b/arch/arm/configs/omap3_h1_defconfig index 38a6d42ba7f..46d74964197 100644 --- a/arch/arm/configs/omap3_h1_defconfig +++ b/arch/arm/configs/omap3_h1_defconfig @@ -118,7 +118,7 @@ CONFIG_EXPERT=y CONFIG_UID16=y # CONFIG_SYSCTL_SYSCALL is not set CONFIG_KALLSYMS=y -# CONFIG_KALLSYMS_ALL is not set +CONFIG_KALLSYMS_ALL=y CONFIG_PRINTK=y CONFIG_BUG=y CONFIG_ELF_CORE=y @@ -147,7 +147,7 @@ CONFIG_SLAB=y # CONFIG_PROFILING is not set CONFIG_HAVE_OPROFILE=y # CONFIG_KPROBES is not set -CONFIG_JUMP_LABEL=y +# CONFIG_JUMP_LABEL is not set # CONFIG_HAVE_64BIT_ALIGNED_ACCESS is not set CONFIG_HAVE_KPROBES=y CONFIG_HAVE_KRETPROBES=y |