projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/shli/md
[linux-2.6-microblaze.git]
/
lib
/
interval_tree_test.c
diff --git
a/lib/interval_tree_test.c
b/lib/interval_tree_test.c
index
835242e
..
75509a1
100644
(file)
--- a/
lib/interval_tree_test.c
+++ b/
lib/interval_tree_test.c
@@
-64,11
+64,12
@@
static int interval_tree_test_init(void)
unsigned long results;
cycles_t time1, time2, time;
unsigned long results;
cycles_t time1, time2, time;
- nodes = kmalloc(nnodes * sizeof(struct interval_tree_node), GFP_KERNEL);
+ nodes = kmalloc_array(nnodes, sizeof(struct interval_tree_node),
+ GFP_KERNEL);
if (!nodes)
return -ENOMEM;
if (!nodes)
return -ENOMEM;
- queries = kmalloc
(nsearches *
sizeof(int), GFP_KERNEL);
+ queries = kmalloc
_array(nsearches,
sizeof(int), GFP_KERNEL);
if (!queries) {
kfree(nodes);
return -ENOMEM;
if (!queries) {
kfree(nodes);
return -ENOMEM;