[PATCH] m68k: Add the generic dma API functions

[powerpc.git] / mm / Kconfig

diff --git a/mm/Kconfig b/mm/Kconfig
index ae9ce6b..66e65ab 100644 (file)
--- a/mm/Kconfig
+++ b/mm/Kconfig
@@ -11,7 +11,7 @@ choice
 
 config FLATMEM_MANUAL
        bool "Flat Memory"
 
 config FLATMEM_MANUAL
        bool "Flat Memory"

-       depends on !ARCH_DISCONTIGMEM_ENABLE || ARCH_FLATMEM_ENABLE
+       depends on !(ARCH_DISCONTIGMEM_ENABLE || ARCH_SPARSEMEM_ENABLE) || ARCH_FLATMEM_ENABLE

        help
          This option allows you to change some of the ways that
          Linux manages its memory internally.  Most users will
        help
          This option allows you to change some of the ways that
          Linux manages its memory internally.  Most users will


@@ -125,12 +125,23 @@ comment "Memory hotplug is currently incompatible with Software Suspend"
 # space can be handled with less contention: split it at this NR_CPUS.
 # Default to 4 for wider testing, though 8 might be more appropriate.
 # ARM's adjust_pte (unused if VIPT) depends on mm-wide page_table_lock.
 # space can be handled with less contention: split it at this NR_CPUS.
 # Default to 4 for wider testing, though 8 might be more appropriate.
 # ARM's adjust_pte (unused if VIPT) depends on mm-wide page_table_lock.

-# PA-RISC's debug spinlock_t is too large for the 32-bit struct page.
-# ARM26 and SPARC32 and PPC64 may use one page for multiple page tables.
+# PA-RISC 7xxx's spinlock_t would enlarge struct page from 32 to 44 bytes.

 #
 config SPLIT_PTLOCK_CPUS
        int
        default "4096" if ARM && !CPU_CACHE_VIPT
 #
 config SPLIT_PTLOCK_CPUS
        int
        default "4096" if ARM && !CPU_CACHE_VIPT

-       default "4096" if PARISC && DEBUG_SPINLOCK && !64BIT
-       default "4096" if ARM26 || SPARC32 || PPC64
+       default "4096" if PARISC && !PA20

        default "4"
        default "4"

+
+#
+# support for page migration
+#
+config MIGRATION
+       bool "Page migration"
+       def_bool y
+       depends on NUMA
+       help
+         Allows the migration of the physical location of pages of processes
+         while the virtual addresses are not changed. This is useful for
+         example on NUMA systems to put pages nearer to the processors accessing
+         the page.