Merge tag 'v4.4.51' into linux-linaro-lsk-v4.4

[firefly-linux-kernel-4.4.55.git] / init / Kconfig

diff --git a/init/Kconfig b/init/Kconfig
index 235c7a2c0d2004f1121b7d98f4140683ab45ef53..e1d1d6936f9228ad1580144563c27a8b2d8d2dd1 100644 (file)
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -1719,6 +1719,7 @@ choice
 
 config SLAB
        bool "SLAB"
 
 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
        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)"
 
 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).
        help
           SLUB is a slab allocator that minimizes cache line usage
           instead of managing queues of cached objects (SLAB approach).