diff options
| author | Laura Abbott <labbott@fedoraproject.org> | 2016-02-25 17:41:35 -0800 |
|---|---|---|
| committer | Laura Abbott <labbott@fedoraproject.org> | 2016-02-25 17:41:35 -0800 |
| commit | b71532b6ec221fa83ebe66614859e4e8028562d7 (patch) | |
| tree | cf1488773c816ffdb91f6218753f260100d42d58 /config-x86_64-generic | |
| parent | 3ce62e18dde09a42a3d20d82c5d8d9a930de6088 (diff) | |
| download | kernel-b71532b6ec221fa83ebe66614859e4e8028562d7.tar.gz kernel-b71532b6ec221fa83ebe66614859e4e8028562d7.tar.xz kernel-b71532b6ec221fa83ebe66614859e4e8028562d7.zip | |
Re-enable ZONE_DMA (rhbz 1309658)
Diffstat (limited to 'config-x86_64-generic')
| -rw-r--r-- | config-x86_64-generic | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/config-x86_64-generic b/config-x86_64-generic index dd42a8fdd..8d8b27519 100644 --- a/config-x86_64-generic +++ b/config-x86_64-generic @@ -216,7 +216,8 @@ CONFIG_CMA=y CONFIG_CMA_AREAS=7 # Changes for persistent memory devices -# CONFIG_ZONE_DMA is not set +# ZONE_DMA and ZONE_DEVICE can now co-exist +CONFIG_ZONE_DMA=y CONFIG_ZONE_DEVICE=y CONFIG_NVDIMM_PFN=y CONFIG_ND_PFN=m |