projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-4.9/libnvdimm' into libnvdimm-for-next
[cascardo/linux.git]
/
tools
/
testing
/
nvdimm
/
test
/
nfit.c
diff --git
a/tools/testing/nvdimm/test/nfit.c
b/tools/testing/nvdimm/test/nfit.c
index
0e721c6
..
c9a6458
100644
(file)
--- a/
tools/testing/nvdimm/test/nfit.c
+++ b/
tools/testing/nvdimm/test/nfit.c
@@
-691,7
+691,8
@@
static int nfit_test0_alloc(struct nfit_test *t)
return -ENOMEM;
sprintf(t->label[i], "label%d", i);
- t->flush[i] = test_alloc(t, sizeof(u64) * NUM_HINTS,
+ t->flush[i] = test_alloc(t, max(PAGE_SIZE,
+ sizeof(u64) * NUM_HINTS),
&t->flush_dma[i]);
if (!t->flush[i])
return -ENOMEM;