Merge branch 'for-4.7/libnvdimm' into libnvdimm-for-next

2016-05-18 10:06:48 -07:00
parent 594d6d96ea 9dec4892ca
commit 2159669f58
6 changed files with 158 additions and 6 deletions
--- a/drivers/nvdimm/bus.c
+++ b/drivers/nvdimm/bus.c
@@ -787,6 +787,9 @@ int __init nvdimm_bus_init(void)
 {
 	int rc;

+	BUILD_BUG_ON(sizeof(struct nd_smart_payload) != 128);
+	BUILD_BUG_ON(sizeof(struct nd_smart_threshold_payload) != 8);
+
 	rc = bus_register(&nvdimm_bus_type);
 	if (rc)
 		return rc;