diff options
author | Dan Williams <dan.j.williams@intel.com> | 2017-07-04 01:54:58 +0200 |
---|---|---|
committer | Dan Williams <dan.j.williams@intel.com> | 2017-07-04 01:54:58 +0200 |
commit | 9d92573fff3ec70785ef1815cc80573f70e7a921 (patch) | |
tree | bce6e6bbad56f805d1adcebddabf9dd9e8072ce4 /arch/x86/Kconfig | |
parent | libnvdimm, namespace: record 'lbasize' for pmem namespaces (diff) | |
parent | libnvdimm, pmem: disable dax flushing when pmem is fronting a volatile region (diff) | |
download | linux-9d92573fff3ec70785ef1815cc80573f70e7a921.tar.xz linux-9d92573fff3ec70785ef1815cc80573f70e7a921.zip |
Merge branch 'for-4.13/dax' into libnvdimm-for-next
Diffstat (limited to 'arch/x86/Kconfig')
-rw-r--r-- | arch/x86/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index 4ccfacc7232a..bb273b2f50b5 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -54,6 +54,7 @@ config X86 select ARCH_HAS_KCOV if X86_64 select ARCH_HAS_MMIO_FLUSH select ARCH_HAS_PMEM_API if X86_64 + select ARCH_HAS_UACCESS_FLUSHCACHE if X86_64 select ARCH_HAS_SET_MEMORY select ARCH_HAS_SG_CHAIN select ARCH_HAS_STRICT_KERNEL_RWX |