diff options
| author | mattis fjallstrom <mattis@acm.org> | 2015-04-22 16:36:00 -0700 |
|---|---|---|
| committer | mattis fjallstrom <mattis@acm.org> | 2015-04-22 16:36:00 -0700 |
| commit | a1f9532b20bd8938b6a656c4d284d37a53e27a24 (patch) | |
| tree | 1782041c5175bf41734ae8bf8579a42f57d602f6 | |
| parent | 14d51427dc3d3d5c59ea24196d1c8f96cd5659ae (diff) | |
| download | olio-linux-3.10-a1f9532b20bd8938b6a656c4d284d37a53e27a24.tar.xz olio-linux-3.10-a1f9532b20bd8938b6a656c4d284d37a53e27a24.zip | |
Fixed issue that caused a crash when connecting with BT (by changing the SLAB allocator).
Change-Id: I512fdc466d38f0d21743e78806c894decf025a88
| -rw-r--r-- | arch/arm/configs/omap3_h1_defconfig | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/arch/arm/configs/omap3_h1_defconfig b/arch/arm/configs/omap3_h1_defconfig index 49543946ea7..38a6d42ba7f 100644 --- a/arch/arm/configs/omap3_h1_defconfig +++ b/arch/arm/configs/omap3_h1_defconfig @@ -140,10 +140,9 @@ 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 @@ -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 |