diff options
author | Dan Williams <dan.j.williams@intel.com> | 2016-10-07 16:46:24 -0700 |
---|---|---|
committer | Dan Williams <dan.j.williams@intel.com> | 2016-10-07 16:46:24 -0700 |
commit | 178d6f4be8bf42b298bedf8ea2a00754100e0c4e (patch) | |
tree | a71865455adc31082a4ad21a942286520a7b5da1 /tools/testing/nvdimm/test/nfit_test.h | |
parent | db58028ee4e360430de8e3b48f657dc798ee6591 (diff) | |
parent | 98a29c39dc689298d2f834f40102cba752eb49c0 (diff) | |
download | op-kernel-dev-178d6f4be8bf42b298bedf8ea2a00754100e0c4e.zip op-kernel-dev-178d6f4be8bf42b298bedf8ea2a00754100e0c4e.tar.gz |
Merge branch 'for-4.9/libnvdimm' into libnvdimm-for-next
Diffstat (limited to 'tools/testing/nvdimm/test/nfit_test.h')
-rw-r--r-- | tools/testing/nvdimm/test/nfit_test.h | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/tools/testing/nvdimm/test/nfit_test.h b/tools/testing/nvdimm/test/nfit_test.h index 9f18e2a..c281dd2 100644 --- a/tools/testing/nvdimm/test/nfit_test.h +++ b/tools/testing/nvdimm/test/nfit_test.h @@ -13,11 +13,21 @@ #ifndef __NFIT_TEST_H__ #define __NFIT_TEST_H__ #include <linux/list.h> +#include <linux/ioport.h> +#include <linux/spinlock_types.h> + +struct nfit_test_request { + struct list_head list; + struct resource res; +}; struct nfit_test_resource { + struct list_head requests; struct list_head list; - struct resource *res; + struct resource res; struct device *dev; + spinlock_t lock; + int req_count; void *buf; }; |