diff options
| author | H. Peter Anvin <hpa@zytor.com> | 2009-09-17 14:40:19 -0700 |
|---|---|---|
| committer | H. Peter Anvin <hpa@zytor.com> | 2009-09-17 14:40:49 -0700 |
| commit | 3bb045f1e2e51124200ef043256df4c7ad86bebd (patch) | |
| tree | 78e4150fc7108bef4d8fa183d7f7dc00beb73a54 /mm | |
| parent | 80938332d8cf652f6b16e0788cf0ca136befe0b5 (diff) | |
| parent | dcb73bf402e0d5b28ce925dbbe4dab3b00b21eee (diff) | |
Merge branch 'x86/pat' into x86/urgent
Merge reason:
Suresh Siddha (1):
x86, pat: don't use rb-tree based lookup in reserve_memtype()
... requires previous x86/pat commits already pushed to Linus.
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Diffstat (limited to 'mm')
| -rw-r--r-- | mm/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mm/Kconfig b/mm/Kconfig index fe5f674d7a7d..3aa519f52e18 100644 --- a/mm/Kconfig +++ b/mm/Kconfig @@ -153,7 +153,7 @@ config MEMORY_HOTREMOVE # config PAGEFLAGS_EXTENDED def_bool y - depends on 64BIT || SPARSEMEM_VMEMMAP || !NUMA || !SPARSEMEM + depends on 64BIT || SPARSEMEM_VMEMMAP || !SPARSEMEM # Heavily threaded applications may benefit from splitting the mm-wide # page_table_lock, so that faults on different parts of the user address |