projects
/
ceph-client.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'for-linus-5.9-rc4-tag' of git://git.kernel.org/pub/scm/linux/kernel/git...
[ceph-client.git]
/
mm
/
memremap.c
diff --git
a/mm/memremap.c
b/mm/memremap.c
index 03e38b7a38f1a434d5f63294c6675672d9eed227..006dace60b1a9d8e331f34c24dcea9f96036cdb9 100644
(file)
--- a/
mm/memremap.c
+++ b/
mm/memremap.c
@@
-216,7
+216,7
@@
void *memremap_pages(struct dev_pagemap *pgmap, int nid)
return ERR_PTR(-EINVAL);
}
break;
- case MEMORY_DEVICE_
DEVDAX
:
+ case MEMORY_DEVICE_
GENERIC
:
need_devmap_managed = false;
break;
case MEMORY_DEVICE_PCI_P2PDMA: