projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'stable/for-linus-3.12-rc2-tag' of git://git.kernel.org/pub/scm/linux/kerne...
[firefly-linux-kernel-4.4.55.git]
/
block
/
elevator.c
diff --git
a/block/elevator.c
b/block/elevator.c
index 668394d185885bc3fcc878697878a4cb07be899e..2bcbd8cc14d4b23780a3cfc262857a87f7c5d67e 100644
(file)
--- a/
block/elevator.c
+++ b/
block/elevator.c
@@
-155,7
+155,7
@@
struct elevator_queue *elevator_alloc(struct request_queue *q,
{
struct elevator_queue *eq;
- eq = k
malloc_node(sizeof(*eq), GFP_KERNEL | __GFP_ZERO
, q->node);
+ eq = k
zalloc_node(sizeof(*eq), GFP_KERNEL
, q->node);
if (unlikely(!eq))
goto err;