diff options
| author | mattis fjallstrom <mattis@acm.org> | 2015-04-22 16:36:00 -0700 |
|---|---|---|
| committer | mattis fjallstrom <mattis@acm.org> | 2015-04-22 17:30:27 -0700 |
| commit | dc2be70fdf8fdfaaba8303755615d6d04a330520 (patch) | |
| tree | 499a978c6863b46a205619b924d278200a087029 /arch | |
| parent | 14d51427dc3d3d5c59ea24196d1c8f96cd5659ae (diff) | |
| download | olio-linux-3.10-dc2be70fdf8fdfaaba8303755615d6d04a330520.tar.xz olio-linux-3.10-dc2be70fdf8fdfaaba8303755615d6d04a330520.zip | |
Removed the optimization of likely/unlikely branches, as it seems to crash the kernel from time to time.
Change-Id: I1b4184152e6bc1bf7f8b4aa13b3a0e7a25094bd7
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/configs/omap3_h1_defconfig | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/arch/arm/configs/omap3_h1_defconfig b/arch/arm/configs/omap3_h1_defconfig index 49543946ea7..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 @@ -140,15 +140,14 @@ CONFIG_PERF_USE_VMALLOC=y CONFIG_PERF_EVENTS=y # CONFIG_DEBUG_PERF_USE_VMALLOC is not set CONFIG_VM_EVENT_COUNTERS=y -# CONFIG_SLUB_DEBUG is not set CONFIG_COMPAT_BRK=y -# CONFIG_SLAB is not set -CONFIG_SLUB=y +CONFIG_SLAB=y +# CONFIG_SLUB is not set # CONFIG_SLOB is not set # 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 @@ -177,6 +176,7 @@ CONFIG_OLD_SIGACTION=y # # CONFIG_GCOV_KERNEL is not set CONFIG_HAVE_GENERIC_DMA_COHERENT=y +CONFIG_SLABINFO=y CONFIG_RT_MUTEXES=y CONFIG_BASE_SMALL=0 CONFIG_MODULES=y @@ -2494,6 +2494,7 @@ CONFIG_IIO_CONSUMERS_PER_TRIGGER=2 # # CONFIG_ADJD_S311 is not set # CONFIG_CM32181 is not set +# CONFIG_CM3391 is not set # CONFIG_SENSORS_TSL2563 is not set # CONFIG_VCNL4000 is not set @@ -2685,7 +2686,7 @@ CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=0 # CONFIG_SCHEDSTATS is not set # CONFIG_TIMER_STATS is not set # CONFIG_DEBUG_OBJECTS is not set -# CONFIG_SLUB_STATS is not set +# CONFIG_DEBUG_SLAB is not set CONFIG_HAVE_DEBUG_KMEMLEAK=y # CONFIG_DEBUG_KMEMLEAK is not set # CONFIG_DEBUG_PREEMPT is not set |