git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf
[sfrench/cifs-2.6.git]
/
drivers
/
nvdimm
/
pmem.h
diff --git
a/drivers/nvdimm/pmem.h
b/drivers/nvdimm/pmem.h
index 6a3cd2a10db699db2069568d8094d9f1bf8bc319..a64ebc78b5dffbac4072fc722d9961650e681f88 100644
(file)
--- a/
drivers/nvdimm/pmem.h
+++ b/
drivers/nvdimm/pmem.h
@@
-22,6
+22,7
@@
struct pmem_device {
struct badblocks bb;
struct dax_device *dax_dev;
struct gendisk *disk;
+ struct dev_pagemap pgmap;
};
long __pmem_direct_access(struct pmem_device *pmem, pgoff_t pgoff,