diff options
| author | Jiri Kosina | 2010-09-24 14:03:37 +0200 |
|---|---|---|
| committer | Jiri Kosina | 2010-09-24 14:03:37 +0200 |
| commit | 73e6d6c6467771838c1fc6949e6768a12ed72464 (patch) | |
| tree | 94dd60891869a0a275cd332c4e675cf0b101fcfa /mm/Kconfig | |
| parent | HID: trivial formatting fix (diff) | |
| parent | hugetlb, rmap: add BUG_ON(!PageLocked) in hugetlb_add_anon_rmap() (diff) | |
| download | kernel-qcow2-linux-73e6d6c6467771838c1fc6949e6768a12ed72464.tar.gz kernel-qcow2-linux-73e6d6c6467771838c1fc6949e6768a12ed72464.tar.xz kernel-qcow2-linux-73e6d6c6467771838c1fc6949e6768a12ed72464.zip | |
Merge branch 'master' into upstream
Diffstat (limited to 'mm/Kconfig')
| -rw-r--r-- | mm/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mm/Kconfig b/mm/Kconfig index f4e516e9c37c..f0fb9124e410 100644 --- a/mm/Kconfig +++ b/mm/Kconfig @@ -189,7 +189,7 @@ config COMPACTION config MIGRATION bool "Page migration" def_bool y - depends on NUMA || ARCH_ENABLE_MEMORY_HOTREMOVE + depends on NUMA || ARCH_ENABLE_MEMORY_HOTREMOVE || COMPACTION help Allows the migration of the physical location of pages of processes while the virtual addresses are not changed. This is useful in |