Merge branch 'for-3.14-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj...

[~andy/linux] / init / Kconfig

diff --git a/init/Kconfig b/init/Kconfig
index 8d402e33b7fc56323dc6e9080b27d029103d20ca..009a797dd24272afbe761c33f237287c9420be33 100644 (file)
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -284,7 +284,7 @@ config AUDIT
 
 config AUDITSYSCALL
        bool "Enable system-call auditing support"
-       depends on AUDIT && (X86 || PARISC || PPC || S390 || IA64 || UML || SPARC64 || SUPERH || (ARM && AEABI && !OABI_COMPAT))
+       depends on AUDIT && (X86 || PARISC || PPC || S390 || IA64 || UML || SPARC64 || SUPERH || (ARM && AEABI && !OABI_COMPAT) || ALPHA)
        default y if SECURITY_SELINUX
        help
          Enable low-overhead system-call auditing infrastructure that
@@ -1116,8 +1116,6 @@ config IPC_NS
 
 config USER_NS
        bool "User namespace"
-       select UIDGID_STRICT_TYPE_CHECKS
-
        default n
        help
          This allows containers, i.e. vservers, to use user namespaces
@@ -1149,15 +1147,6 @@ config NET_NS
 
 endif # NAMESPACES
 
-config UIDGID_STRICT_TYPE_CHECKS
-       bool "Require conversions between uid/gids and their internal representation"
-       default n
-       help
-        While the nececessary conversions are being added to all subsystems this option allows
-        the code to continue to build for unconverted subsystems.
-
-        Say Y here if you want the strict type checking enabled
-
 config SCHED_AUTOGROUP
        bool "Automatic process group scheduling"
        select CGROUPS