summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2020-11-22 12:14:46 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2020-11-22 12:14:46 -0800
commit4a51c60a11158961f1291c5b95ff7e4cddfb0353 (patch)
tree1750832bdb1becf31c056280d1ca7fe3104ce9dd /drivers
parentd27637ece80f25124e0e6871b7b6cb855e1c670c (diff)
parent66383800df9cbdbf3b0c34d5a51bf35bcdb72fd2 (diff)
downloadlinux-stable-4a51c60a11158961f1291c5b95ff7e4cddfb0353.tar.gz
linux-stable-4a51c60a11158961f1291c5b95ff7e4cddfb0353.tar.bz2
linux-stable-4a51c60a11158961f1291c5b95ff7e4cddfb0353.zip
Merge branch 'akpm' (patches from Andrew)
Merge misc fixes from Andrew Morton: "8 patches. Subsystems affected by this patch series: mm (madvise, pagemap, readahead, memcg, userfaultfd), kbuild, and vfs" * emailed patches from Andrew Morton <akpm@linux-foundation.org>: mm: fix madvise WILLNEED performance problem libfs: fix error cast of negative value in simple_attr_write() mm/userfaultfd: do not access vma->vm_mm after calling handle_userfault() mm: memcg/slab: fix root memcg vmstats mm: fix readahead_page_batch for retry entries mm: fix phys_to_target_node() and memory_add_physaddr_to_nid() exports compiler-clang: remove version check for BPF Tracing mm/madvise: fix memory leak from process_madvise
Diffstat (limited to 'drivers')
-rw-r--r--drivers/dax/Kconfig1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/dax/Kconfig b/drivers/dax/Kconfig
index 567428e10b7b..d2834c2cfa10 100644
--- a/drivers/dax/Kconfig
+++ b/drivers/dax/Kconfig
@@ -50,7 +50,6 @@ config DEV_DAX_HMEM
Say M if unsure.
config DEV_DAX_HMEM_DEVICES
- depends on NUMA_KEEP_MEMINFO # for phys_to_target_node()
depends on DEV_DAX_HMEM && DAX=y
def_bool y