diff options
| author | Alex Shi <alex.shi@linaro.org> | 2016-08-30 10:27:13 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2016-08-30 10:27:13 +0800 |
| commit | b56111f481e16510558a892d5d56cb90cadd96c0 (patch) | |
| tree | bfca590ae8c2e8be7a7c44faba15ae3fd548f925 /init | |
| parent | b8060c794f53e364a967ce483cef8e86f4006a61 (diff) | |
| parent | 59e65b4bbfe7d0139ab1ab59cd27a5db95f5bb7b (diff) | |
Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-android
Conflicts:
arch/arm/Kconfig
Diffstat (limited to 'init')
| -rw-r--r-- | init/Kconfig | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/init/Kconfig b/init/Kconfig index 235c7a2c0d20..e1d1d6936f92 100644 --- a/init/Kconfig +++ b/init/Kconfig @@ -1719,6 +1719,7 @@ choice config SLAB bool "SLAB" + select HAVE_HARDENED_USERCOPY_ALLOCATOR help The regular slab allocator that is established and known to work well in all environments. It organizes cache hot objects in @@ -1726,6 +1727,7 @@ config SLAB config SLUB bool "SLUB (Unqueued Allocator)" + select HAVE_HARDENED_USERCOPY_ALLOCATOR help SLUB is a slab allocator that minimizes cache line usage instead of managing queues of cached objects (SLAB approach). |