Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

[linux-2.6-microblaze.git] / arch / Kconfig

diff --git a/arch/Kconfig b/arch/Kconfig
index 8519d9f..56b6ccc 100644 (file)
--- a/arch/Kconfig
+++ b/arch/Kconfig
@@ -24,6 +24,9 @@ config KEXEC_ELF
 config HAVE_IMA_KEXEC
        bool
 
+config SET_FS
+       bool
+
 config HOTPLUG_SMT
        bool
 
@@ -420,6 +423,13 @@ config MMU_GATHER_NO_GATHER
        bool
        depends on MMU_GATHER_TABLE_FREE
 
+config ARCH_WANT_IRQS_OFF_ACTIVATE_MM
+       bool
+       help
+         Temporary select until all architectures can be converted to have
+         irqs disabled over activate_mm. Architectures that do IPI based TLB
+         shootdowns should enable this.
+
 config ARCH_HAVE_NMI_SAFE_CMPXCHG
        bool