diff options
author | Dan Williams <dan.j.williams@intel.com> | 2016-05-18 16:59:34 (GMT) |
---|---|---|
committer | Dan Williams <dan.j.williams@intel.com> | 2016-05-18 16:59:34 (GMT) |
commit | 594d6d96ea042366878aa7dc7f5711b8c245db5a (patch) | |
tree | 1b7333bf5b5c1147e136f050d686ab4f888ab85f /drivers/nvdimm/pfn.h | |
parent | 1b8d2afde54fade94339f573c4e05644f9ae9866 (diff) | |
parent | 45a0dac0451136fa7ae34a6fea53ef6a136287ce (diff) | |
download | linux-594d6d96ea042366878aa7dc7f5711b8c245db5a.tar.xz |
Merge branch 'for-4.7/dax' into libnvdimm-for-next
Diffstat (limited to 'drivers/nvdimm/pfn.h')
-rw-r--r-- | drivers/nvdimm/pfn.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/nvdimm/pfn.h b/drivers/nvdimm/pfn.h index 8e343a3..9d2704c 100644 --- a/drivers/nvdimm/pfn.h +++ b/drivers/nvdimm/pfn.h @@ -33,7 +33,9 @@ struct nd_pfn_sb { /* minor-version-1 additions for section alignment */ __le32 start_pad; __le32 end_trunc; - u8 padding[4004]; + /* minor-version-2 record the base alignment of the mapping */ + __le32 align; + u8 padding[4000]; __le64 checksum; }; |