some kmalloc/memset ->kzalloc (tree wide)
Transform some calls to kmalloc/memset to a single kzalloc (or kcalloc). Here is a short excerpt of the semantic patch performing this transformation: @@ type T2; expression x; identifier f,fld; expression E; expression E1,E2; expression e1,e2,e3,y; statement S; @@ x = - kmalloc + kzalloc (E1,E2) ... when != \(x->fld=E;\|y=f(...,x,...);\|f(...,x,...);\|x=E;\|while(...) S\|for(e1;e2;e3) S\) - memset((T2)x,0,E1); @@ expression E1,E2,E3; @@ - kzalloc(E1 * E2,E3) + kcalloc(E1,E2,E3) [akpm@linux-foundation.org: get kcalloc args the right way around] Signed-off-by: Yoann Padioleau <padator@wanadoo.fr> Cc: Richard Henderson <rth@twiddle.net> Cc: Ivan Kokshaysky <ink@jurassic.park.msu.ru> Acked-by: Russell King <rmk@arm.linux.org.uk> Cc: Bryan Wu <bryan.wu@analog.com> Acked-by: Jiri Slaby <jirislaby@gmail.com> Cc: Dave Airlie <airlied@linux.ie> Acked-by: Roland Dreier <rolandd@cisco.com> Cc: Jiri Kosina <jkosina@suse.cz> Acked-by: Dmitry Torokhov <dtor@mail.ru> Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org> Acked-by: Mauro Carvalho Chehab <mchehab@infradead.org> Acked-by: Pierre Ossman <drzeus-list@drzeus.cx> Cc: Jeff Garzik <jeff@garzik.org> Cc: "David S. Miller" <davem@davemloft.net> Acked-by: Greg KH <greg@kroah.com> Cc: James Bottomley <James.Bottomley@steeleye.com> Cc: "Antonino A. Daplas" <adaplas@pol.net> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
committed by
Linus Torvalds
parent
3b5ad0797c
commit
dd00cc486a
@@ -822,10 +822,9 @@ static int veth_init_connection(u8 rlp)
|
||||
|| ! HvLpConfig_doLpsCommunicateOnVirtualLan(this_lp, rlp) )
|
||||
return 0;
|
||||
|
||||
cnx = kmalloc(sizeof(*cnx), GFP_KERNEL);
|
||||
cnx = kzalloc(sizeof(*cnx), GFP_KERNEL);
|
||||
if (! cnx)
|
||||
return -ENOMEM;
|
||||
memset(cnx, 0, sizeof(*cnx));
|
||||
|
||||
cnx->remote_lp = rlp;
|
||||
spin_lock_init(&cnx->lock);
|
||||
@@ -852,14 +851,13 @@ static int veth_init_connection(u8 rlp)
|
||||
if (rc != 0)
|
||||
return rc;
|
||||
|
||||
msgs = kmalloc(VETH_NUMBUFFERS * sizeof(struct veth_msg), GFP_KERNEL);
|
||||
msgs = kcalloc(VETH_NUMBUFFERS, sizeof(struct veth_msg), GFP_KERNEL);
|
||||
if (! msgs) {
|
||||
veth_error("Can't allocate buffers for LPAR %d.\n", rlp);
|
||||
return -ENOMEM;
|
||||
}
|
||||
|
||||
cnx->msgs = msgs;
|
||||
memset(msgs, 0, VETH_NUMBUFFERS * sizeof(struct veth_msg));
|
||||
|
||||
for (i = 0; i < VETH_NUMBUFFERS; i++) {
|
||||
msgs[i].token = i;
|
||||
|
Reference in New Issue
Block a user