Sync to mainline for security submaintainers to work against

[karo-tx-linux.git] / security / Kconfig

diff --git a/security/Kconfig b/security/Kconfig
index 823ca1aafd092c376caad0aeb2cade6f364143bd..bdcbb92927abf9fa6b938213bfe8112671a9f106 100644 (file)
--- a/security/Kconfig
+++ b/security/Kconfig
@@ -130,17 +130,8 @@ config HAVE_HARDENED_USERCOPY_ALLOCATOR
          validating memory ranges against heap object sizes in
          support of CONFIG_HARDENED_USERCOPY.
 
-config HAVE_ARCH_HARDENED_USERCOPY
-       bool
-       help
-         The architecture supports CONFIG_HARDENED_USERCOPY by
-         calling check_object_size() just before performing the
-         userspace copies in the low level implementation of
-         copy_to_user() and copy_from_user().
-
 config HARDENED_USERCOPY
        bool "Harden memory copies between kernel and userspace"
-       depends on HAVE_ARCH_HARDENED_USERCOPY
        depends on HAVE_HARDENED_USERCOPY_ALLOCATOR
        select BUG
        help