Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/signal

[~andy/linux] / arch / Kconfig

diff --git a/arch/Kconfig b/arch/Kconfig
index a62965d057f6d8b5a94baf8bf14ecc11ecef5491..26a28419cafcc400afb7300c702687b8d2dc103e 100644 (file)
--- a/arch/Kconfig
+++ b/arch/Kconfig
@@ -271,6 +271,9 @@ config ARCH_WANT_OLD_COMPAT_IPC
        select ARCH_WANT_COMPAT_IPC_PARSE_VERSION
        bool
 
+config GENERIC_KERNEL_THREAD
+       bool
+
 config HAVE_ARCH_SECCOMP_FILTER
        bool
        help
@@ -313,4 +316,7 @@ config HAVE_IRQ_TIME_ACCOUNTING
          Archs need to ensure they use a high enough resolution clock to
          support irq time accounting and then call enable_sched_clock_irqtime().
 
+config HAVE_ARCH_TRANSPARENT_HUGEPAGE
+       bool
+
 source "kernel/gcov/Kconfig"