diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-09-06 18:59:27 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-09-06 18:59:27 +0200 |
| commit | 68beef571071014ef34a3beac65fe2af7e8e3cf6 (patch) | |
| tree | 7a6e7b5875e909baf587b947b536512d95d046de /drivers/dax | |
| parent | Merge tags 'auxdisplay-for-linus-v5.9-rc4', 'clang-format-for-linus-v5.9-rc4'... (diff) | |
| parent | xen: add helpers to allocate unpopulated memory (diff) | |
| download | linux-68beef571071014ef34a3beac65fe2af7e8e3cf6.tar.xz linux-68beef571071014ef34a3beac65fe2af7e8e3cf6.zip | |
Merge tag 'for-linus-5.9-rc4-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip
Pull xen updates from Juergen Gross:
"A small series for fixing a problem with Xen PVH guests when running
as backends (e.g. as dom0).
Mapping other guests' memory is now working via ZONE_DEVICE, thus not
requiring to abuse the memory hotplug functionality for that purpose"
* tag 'for-linus-5.9-rc4-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip:
xen: add helpers to allocate unpopulated memory
memremap: rename MEMORY_DEVICE_DEVDAX to MEMORY_DEVICE_GENERIC
xen/balloon: add header guard
Diffstat (limited to 'drivers/dax')
| -rw-r--r-- | drivers/dax/device.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/dax/device.c b/drivers/dax/device.c index 4c0af2eb7e19..1e89513f3c59 100644 --- a/drivers/dax/device.c +++ b/drivers/dax/device.c @@ -429,7 +429,7 @@ int dev_dax_probe(struct device *dev) return -EBUSY; } - dev_dax->pgmap.type = MEMORY_DEVICE_DEVDAX; + dev_dax->pgmap.type = MEMORY_DEVICE_GENERIC; addr = devm_memremap_pages(dev, &dev_dax->pgmap); if (IS_ERR(addr)) return PTR_ERR(addr); |