diff for duplicates of <200912192208103123212@usish.com> diff --git a/a/1.txt b/N1/1.txt index eadbe58..05f70e9 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -28,7 +28,8 @@ diff -u -p a/drivers/scsi/pm8001/pm8001_init.c b/drivers/scsi/pm8001/pm8001_init @@ -654,7 +654,7 @@ static int __devinit pm8001_pci_probe(st } chip = &pm8001_chips[ent->driver_data]; - SHOST_TO_SAS_HA(shost) - kcalloc(1, sizeof(struct sas_ha_struct), GFP_KERNEL); + SHOST_TO_SAS_HA(shost) = +- kcalloc(1, sizeof(struct sas_ha_struct), GFP_KERNEL); + kzalloc(sizeof(struct sas_ha_struct), GFP_KERNEL); if (!SHOST_TO_SAS_HA(shost)) { rc = -ENOMEM; diff --git a/a/content_digest b/N1/content_digest index 3822a6a..e57523d 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,7 @@ "ref\0Pine.LNX.4.64.0912190817110.30546@ask.diku.dk\0" "From\0jack_wang <jack_wang@usish.com>\0" "Subject\0Re: [PATCH 5/7] drivers/scsi/pm8001: Use kzalloc for allocating onlyone thing\0" - "Date\0Sat, 19 Dec 2009 14:08:11 +0000\0" + "Date\0Sat, 19 Dec 2009 22:08:11 +0800\0" "To\0Julia Lawall <julia@diku.dk>" lindar_liu <lindar_liu@usish.com> James E.J. Bottomley <James.Bottomley@suse.de> @@ -38,7 +38,8 @@ "@@ -654,7 +654,7 @@ static int __devinit pm8001_pci_probe(st\n" " \t}\n" " \tchip = &pm8001_chips[ent->driver_data];\n" - " \tSHOST_TO_SAS_HA(shost) -\t\tkcalloc(1, sizeof(struct sas_ha_struct), GFP_KERNEL);\n" + " \tSHOST_TO_SAS_HA(shost) =\n" + "-\t\tkcalloc(1, sizeof(struct sas_ha_struct), GFP_KERNEL);\n" "+\t\tkzalloc(sizeof(struct sas_ha_struct), GFP_KERNEL);\n" " \tif (!SHOST_TO_SAS_HA(shost)) {\n" " \t\trc = -ENOMEM;\n" @@ -48,4 +49,4 @@ "[Jack]Acked-by:Jack Wang <jack_wang@usish.com>\n" Thanks, Julia -ecc2042fdf3d495469612eb0820fe9cc10f3ad5c00a12771bec87feddd50c446 +6fb55bf14e45edc217c1d4dbef527cf139225277b3a566a67104db08eaf72aaf
diff --git a/a/1.txt b/N2/1.txt index eadbe58..05f70e9 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -28,7 +28,8 @@ diff -u -p a/drivers/scsi/pm8001/pm8001_init.c b/drivers/scsi/pm8001/pm8001_init @@ -654,7 +654,7 @@ static int __devinit pm8001_pci_probe(st } chip = &pm8001_chips[ent->driver_data]; - SHOST_TO_SAS_HA(shost) - kcalloc(1, sizeof(struct sas_ha_struct), GFP_KERNEL); + SHOST_TO_SAS_HA(shost) = +- kcalloc(1, sizeof(struct sas_ha_struct), GFP_KERNEL); + kzalloc(sizeof(struct sas_ha_struct), GFP_KERNEL); if (!SHOST_TO_SAS_HA(shost)) { rc = -ENOMEM; diff --git a/a/content_digest b/N2/content_digest index 3822a6a..7fdab8d 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,11 +1,13 @@ "ref\0Pine.LNX.4.64.0912190817110.30546@ask.diku.dk\0" "From\0jack_wang <jack_wang@usish.com>\0" "Subject\0Re: [PATCH 5/7] drivers/scsi/pm8001: Use kzalloc for allocating onlyone thing\0" - "Date\0Sat, 19 Dec 2009 14:08:11 +0000\0" + "Date\0Sat, 19 Dec 2009 22:08:11 +0800\0" "To\0Julia Lawall <julia@diku.dk>" lindar_liu <lindar_liu@usish.com> James E.J. Bottomley <James.Bottomley@suse.de> - " linux-scsi <linux-scsi@vger.kernel.org>linux-kernel <linu>\0" + linux-scsi <linux-scsi@vger.kernel.org> + linux-kernel <linux-kernel@vger.kernel.org> + " kernel-janitors <kernel-janitors@vger.kernel.org>\0" "\00:1\0" "b\0" "RE:[PATCH 5/7] drivers/scsi/pm8001: Use kzalloc for allocating onlyone thing\n" @@ -38,7 +40,8 @@ "@@ -654,7 +654,7 @@ static int __devinit pm8001_pci_probe(st\n" " \t}\n" " \tchip = &pm8001_chips[ent->driver_data];\n" - " \tSHOST_TO_SAS_HA(shost) -\t\tkcalloc(1, sizeof(struct sas_ha_struct), GFP_KERNEL);\n" + " \tSHOST_TO_SAS_HA(shost) =\n" + "-\t\tkcalloc(1, sizeof(struct sas_ha_struct), GFP_KERNEL);\n" "+\t\tkzalloc(sizeof(struct sas_ha_struct), GFP_KERNEL);\n" " \tif (!SHOST_TO_SAS_HA(shost)) {\n" " \t\trc = -ENOMEM;\n" @@ -48,4 +51,4 @@ "[Jack]Acked-by:Jack Wang <jack_wang@usish.com>\n" Thanks, Julia -ecc2042fdf3d495469612eb0820fe9cc10f3ad5c00a12771bec87feddd50c446 +64708a0e623b4c69b601042fc189c072458657bc240947aa14c4eea0372b5af3
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.