From: Dan Williams <dan.j.williams@intel.com>
Date: Sun, 10 Jan 2016 15:53:55 +0000 (-0800)
Subject: Merge branch 'for-4.5/block-dax' into for-4.5/libnvdimm
X-Git-Tag: v4.5-rc1~112^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8b63b6bfc1a551acf154061699028c7032d7890c;p=thirdparty%2Flinux.git

Merge branch 'for-4.5/block-dax' into for-4.5/libnvdimm
---

8b63b6bfc1a551acf154061699028c7032d7890c
diff --cc drivers/nvdimm/nd.h
index e4e9f9ae0cc88,288d96ec72336..ba1633b9da31f
--- a/drivers/nvdimm/nd.h
+++ b/drivers/nvdimm/nd.h
@@@ -29,8 -29,21 +29,14 @@@ enum 
  	ND_MAX_LANES = 256,
  	SECTOR_SHIFT = 9,
  	INT_LBASIZE_ALIGNMENT = 64,
 -#if IS_ENABLED(CONFIG_NVDIMM_PFN)
 -	ND_PFN_ALIGN = PAGES_PER_SECTION * PAGE_SIZE,
 -	ND_PFN_MASK = ND_PFN_ALIGN - 1,
 -#else
 -	ND_PFN_ALIGN = 0,
 -	ND_PFN_MASK = 0,
 -#endif
  };
  
+ struct nd_poison {
+ 	u64 start;
+ 	u64 length;
+ 	struct list_head list;
+ };
+ 
  struct nvdimm_drvdata {
  	struct device *dev;
  	int nsindex_size;