Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6

[linux-2.6] / mm / Kconfig

diff --git a/mm/Kconfig b/mm/Kconfig
index c4de85285bb43cd2ab9810d42c67c8001d9adb1b..0bd9c2dbb2a0be8d184b4b9f1d75dc03ec2a14ba 100644 (file)
--- a/mm/Kconfig
+++ b/mm/Kconfig
@@ -174,7 +174,7 @@ config SPLIT_PTLOCK_CPUS
 config MIGRATION
        bool "Page migration"
        def_bool y
 config MIGRATION
        bool "Page migration"
        def_bool y

-       depends on NUMA
+       depends on NUMA || ARCH_ENABLE_MEMORY_HOTREMOVE

        help
          Allows the migration of the physical location of pages of processes
          while the virtual addresses are not changed. This is useful for
        help
          Allows the migration of the physical location of pages of processes
          while the virtual addresses are not changed. This is useful for


@@ -205,3 +205,6 @@ config NR_QUICK
 config VIRT_TO_BUS
        def_bool y
        depends on !ARCH_NO_VIRT_TO_BUS
 config VIRT_TO_BUS
        def_bool y
        depends on !ARCH_NO_VIRT_TO_BUS

+
+config MMU_NOTIFIER
+       bool