projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge remote-tracking branches 'regulator/topic/act8865', 'regulator/topic/act8945a...
[cascardo/linux.git]
/
drivers
/
nvdimm
/
pmem.c
diff --git
a/drivers/nvdimm/pmem.c
b/drivers/nvdimm/pmem.c
index
7edf316
..
8d0b546
100644
(file)
--- a/
drivers/nvdimm/pmem.c
+++ b/
drivers/nvdimm/pmem.c
@@
-41,7
+41,7
@@
struct pmem_device {
phys_addr_t phys_addr;
/* when non-zero this device is hosting a 'pfn' instance */
phys_addr_t data_offset;
- u
nsigned long
pfn_flags;
+ u
64
pfn_flags;
void __pmem *virt_addr;
size_t size;
struct badblocks bb;