The patch titled
kcalloc: Re-order out-of-order args in kcalloc() calls.
has been removed from the -mm tree. Its filename was
kcalloc-re-order-out-of-order-args-in-kcalloc-calls.patch
This patch was dropped because your larger patch trashed it
------------------------------------------------------
Subject: kcalloc: Re-order out-of-order args in kcalloc() calls.
From: "Robert P. J. Day" <rpjday@xxxxxxxxxxxxxx>
A small number of kcalloc() calls in the source have the first two
arguments in the wrong order. An aesthetic thing.
Signed-off-by: Robert P. J. Day <rpjday@xxxxxxxxxxxxxx>
Cc: Benjamin Herrenschmidt <benh@xxxxxxxxxxxxxxxxxxx>
Cc: Jeff Garzik <jeff@xxxxxxxxxx>
Cc: James Bottomley <James.Bottomley@xxxxxxxxxxxx>
Cc: Greg KH <greg@xxxxxxxxx>
Cc: Trond Myklebust <trond.myklebust@xxxxxxxxxx>
Cc: Neil Brown <neilb@xxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
drivers/macintosh/smu.c | 2 +-
drivers/net/skge.c | 2 +-
drivers/scsi/sym53c8xx_2/sym_hipd.c | 2 +-
drivers/usb/misc/uss720.c | 2 +-
net/sunrpc/svc.c | 2 +-
5 files changed, 5 insertions(+), 5 deletions(-)
diff -puN drivers/macintosh/smu.c~kcalloc-re-order-out-of-order-args-in-kcalloc-calls drivers/macintosh/smu.c
--- a/drivers/macintosh/smu.c~kcalloc-re-order-out-of-order-args-in-kcalloc-calls
+++ a/drivers/macintosh/smu.c
@@ -945,7 +945,7 @@ static struct smu_sdbp_header *smu_creat
*/
tlen = sizeof(struct property) + len + 18;
- prop = kcalloc(tlen, 1, GFP_KERNEL);
+ prop = kcalloc(1, tlen, GFP_KERNEL);
if (prop == NULL)
return NULL;
hdr = (struct smu_sdbp_header *)(prop + 1);
diff -puN drivers/net/skge.c~kcalloc-re-order-out-of-order-args-in-kcalloc-calls drivers/net/skge.c
--- a/drivers/net/skge.c~kcalloc-re-order-out-of-order-args-in-kcalloc-calls
+++ a/drivers/net/skge.c
@@ -749,7 +749,7 @@ static int skge_ring_alloc(struct skge_r
struct skge_element *e;
int i;
- ring->start = kcalloc(sizeof(*e), ring->count, GFP_KERNEL);
+ ring->start = kcalloc(ring->count, sizeof(*e), GFP_KERNEL);
if (!ring->start)
return -ENOMEM;
diff -puN drivers/scsi/sym53c8xx_2/sym_hipd.c~kcalloc-re-order-out-of-order-args-in-kcalloc-calls drivers/scsi/sym53c8xx_2/sym_hipd.c
--- a/drivers/scsi/sym53c8xx_2/sym_hipd.c~kcalloc-re-order-out-of-order-args-in-kcalloc-calls
+++ a/drivers/scsi/sym53c8xx_2/sym_hipd.c
@@ -5545,7 +5545,7 @@ int sym_hcb_attach(struct Scsi_Host *sho
/*
* Allocate the array of lists of CCBs hashed by DSA.
*/
- np->ccbh = kcalloc(sizeof(struct sym_ccb **), CCB_HASH_SIZE, GFP_KERNEL);
+ np->ccbh = kcalloc(CCB_HASH_SIZE, sizeof(struct sym_ccb **), GFP_KERNEL);
if (!np->ccbh)
goto attach_failed;
diff -puN drivers/usb/misc/uss720.c~kcalloc-re-order-out-of-order-args-in-kcalloc-calls drivers/usb/misc/uss720.c
--- a/drivers/usb/misc/uss720.c~kcalloc-re-order-out-of-order-args-in-kcalloc-calls
+++ a/drivers/usb/misc/uss720.c
@@ -705,7 +705,7 @@ static int uss720_probe(struct usb_inter
/*
* Allocate parport interface
*/
- if (!(priv = kcalloc(sizeof(struct parport_uss720_private), 1, GFP_KERNEL))) {
+ if (!(priv = kcalloc(1, sizeof(struct parport_uss720_private), GFP_KERNEL))) {
usb_put_dev(usbdev);
return -ENOMEM;
}
diff -puN net/sunrpc/svc.c~kcalloc-re-order-out-of-order-args-in-kcalloc-calls net/sunrpc/svc.c
--- a/net/sunrpc/svc.c~kcalloc-re-order-out-of-order-args-in-kcalloc-calls
+++ a/net/sunrpc/svc.c
@@ -308,7 +308,7 @@ __svc_create(struct svc_program *prog, u
serv->sv_nrpools = npools;
serv->sv_pools =
- kcalloc(sizeof(struct svc_pool), serv->sv_nrpools,
+ kcalloc(serv->sv_nrpools, sizeof(struct svc_pool),
GFP_KERNEL);
if (!serv->sv_pools) {
kfree(serv);
_
Patches currently in -mm which might be from rpjday@xxxxxxxxxxxxxx are
origin.patch
fix-numerous-kcalloc-calls-convert-to-kzalloc.patch
kcalloc-re-order-out-of-order-args-in-kcalloc-calls.patch
schedc-correct-comment-for-this_rq_lock-routine.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
