projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-4.9/dax' into libnvdimm-for-next
[cascardo/linux.git]
/
drivers
/
dax
/
dax.c
diff --git
a/drivers/dax/dax.c
b/drivers/dax/dax.c
index
b917e4d
..
0e499bf
100644
(file)
--- a/
drivers/dax/dax.c
+++ b/
drivers/dax/dax.c
@@
-406,7
+406,7
@@
static int __dax_dev_pmd_fault(struct dax_dev *dax_dev,
}
pgoff = linear_page_index(vma, pmd_addr);
- phys = pgoff_to_phys(dax_dev, pgoff, P
AGE
_SIZE);
+ phys = pgoff_to_phys(dax_dev, pgoff, P
MD
_SIZE);
if (phys == -1) {
dev_dbg(dev, "%s: phys_to_pgoff(%#lx) failed\n", __func__,
pgoff);