diff options
| author | Ingo Molnar <mingo@kernel.org> | 2016-09-15 02:24:53 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2016-09-15 02:24:53 -0400 |
| commit | d4b80afbba49e968623330f1336da8c724da8aad (patch) | |
| tree | a9478bd77d8b001a6a7119328d34e9666d7bfe93 /drivers/dax/dax.c | |
| parent | fcd709ef20a9d83bdb7524d27cd6719dac8690a0 (diff) | |
| parent | 4cea8776571b18db7485930cb422faa739580c8c (diff) | |
Merge branch 'linus' into x86/asm, to pick up recent fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/dax/dax.c')
| -rw-r--r-- | drivers/dax/dax.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/dax/dax.c b/drivers/dax/dax.c index 803f3953b341..29f600f2c447 100644 --- a/drivers/dax/dax.c +++ b/drivers/dax/dax.c | |||
| @@ -459,7 +459,7 @@ static int __dax_dev_pmd_fault(struct dax_dev *dax_dev, | |||
| 459 | } | 459 | } |
| 460 | 460 | ||
| 461 | pgoff = linear_page_index(vma, pmd_addr); | 461 | pgoff = linear_page_index(vma, pmd_addr); |
| 462 | phys = pgoff_to_phys(dax_dev, pgoff, PAGE_SIZE); | 462 | phys = pgoff_to_phys(dax_dev, pgoff, PMD_SIZE); |
| 463 | if (phys == -1) { | 463 | if (phys == -1) { |
| 464 | dev_dbg(dev, "%s: phys_to_pgoff(%#lx) failed\n", __func__, | 464 | dev_dbg(dev, "%s: phys_to_pgoff(%#lx) failed\n", __func__, |
| 465 | pgoff); | 465 | pgoff); |