Merge branch 'hash' of git://ftp.sciencehorizons.net/linux

[karo-tx-linux.git] / drivers / nvdimm / pfn.h

diff --git a/drivers/nvdimm/pfn.h b/drivers/nvdimm/pfn.h
index 8e343a3ca873012a7124c46564f9bcc4833c7a67..dde9853453d3c622c42511772ff807bcf1fd70d0 100644 (file)
--- a/drivers/nvdimm/pfn.h
+++ b/drivers/nvdimm/pfn.h
@@ -19,6 +19,7 @@
 
 #define PFN_SIG_LEN 16
 #define PFN_SIG "NVDIMM_PFN_INFO\0"
+#define DAX_SIG "NVDIMM_DAX_INFO\0"
 
 struct nd_pfn_sb {
        u8 signature[PFN_SIG_LEN];
@@ -33,7 +34,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;
 };