diff options
author | Dan Williams <dan.j.williams@intel.com> | 2018-06-08 15:16:40 -0700 |
---|---|---|
committer | Dan Williams <dan.j.williams@intel.com> | 2018-06-08 15:16:40 -0700 |
commit | b56845794e1e93121acb74ca325db965035d5545 (patch) | |
tree | 3435f4e8de92d5a63fdc15953391cf057ee46642 /mm/Kconfig | |
parent | 808c340be17dc77131fcdf9ad1eb34452d650da1 (diff) | |
parent | cc4a90ac816e00775fbc2a9c018bf2af606abd06 (diff) | |
download | talos-obmc-linux-b56845794e1e93121acb74ca325db965035d5545.tar.gz talos-obmc-linux-b56845794e1e93121acb74ca325db965035d5545.zip |
Merge branch 'for-4.18/dax' into libnvdimm-for-next
Diffstat (limited to 'mm/Kconfig')
-rw-r--r-- | mm/Kconfig | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/mm/Kconfig b/mm/Kconfig index e14c01513bfd..5f39bca5d82b 100644 --- a/mm/Kconfig +++ b/mm/Kconfig @@ -693,6 +693,9 @@ config ARCH_HAS_HMM config MIGRATE_VMA_HELPER bool +config DEV_PAGEMAP_OPS + bool + config HMM bool select MIGRATE_VMA_HELPER @@ -713,6 +716,7 @@ config DEVICE_PRIVATE bool "Unaddressable device memory (GPU memory, ...)" depends on ARCH_HAS_HMM select HMM + select DEV_PAGEMAP_OPS help Allows creation of struct pages to represent unaddressable device @@ -723,6 +727,7 @@ config DEVICE_PUBLIC bool "Addressable device memory (like GPU memory)" depends on ARCH_HAS_HMM select HMM + select DEV_PAGEMAP_OPS help Allows creation of struct pages to represent addressable device |