* Re: [linux-next] "edac: Remove the legacy EDAC ABI"
2012-05-18 16:22 "edac: Remove the legacy EDAC ABI" Paul Gortmaker
@ 2012-05-18 17:40 ` Mauro Carvalho Chehab
0 siblings, 0 replies; 2+ messages in thread
From: Mauro Carvalho Chehab @ 2012-05-18 17:40 UTC (permalink / raw)
To: Paul Gortmaker; +Cc: linux-next, Chris Metcalf, linux-kernel
Em 18-05-2012 13:22, Paul Gortmaker escreveu:
> Hi Guys,
>
> This commit:
>
> -----------
> commit 90b40d5cadba20d7fe2fce12d61f97e0870c1ba6
> Author: Mauro Carvalho Chehab <mchehab@redhat.com>
> Date: Wed May 2 14:37:00 2012 -0300
>
> edac: Remove the legacy EDAC ABI
>
> Now that all drivers got converted to use the new ABI, we can
> drop the old one.
> ----------
>
> breaks linux-next i386 allmodconfig:
>
> drivers/edac/amd76x_edac.c:254:25: error: too few arguments to function
> 'edac_mc_alloc'
> make[3]: *** [drivers/edac/amd76x_edac.o] Error 1
> drivers/edac/i82875p_edac.c:424:3: error: label 'fail0' used but not
> defined
> drivers/edac/i82875p_edac.c:427:2: error: expected identifier or '('
> before 'do'
>
> http://kisskb.ellerman.id.au/kisskb/buildresult/6341714/
>
> Please have a look.
Thanks for it! This was due to a rebase, where one of the arguments for
edac_mc_alloc() got removed.
The enclosed patch should fix it.
I'll merge the fix with the affected patches.
-
edac: Fix compilation breakage on amd76x_edac and i82875p
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
diff --git a/drivers/edac/amd76x_edac.c b/drivers/edac/amd76x_edac.c
index c974da7..a015fba 100644
--- a/drivers/edac/amd76x_edac.c
+++ b/drivers/edac/amd76x_edac.c
@@ -251,7 +251,7 @@ static int amd76x_probe1(struct pci_dev *pdev, int dev_idx)
layers[1].type = EDAC_MC_LAYER_CHANNEL;
layers[1].size = 1;
layers[1].is_virt_csrow = false;
- mci = edac_mc_alloc(0, ARRAY_SIZE(layers), 0);
+ mci = edac_mc_alloc(0, ARRAY_SIZE(layers), layers, 0);
if (mci == NULL)
return -ENOMEM;
diff --git a/drivers/edac/i82875p_edac.c b/drivers/edac/i82875p_edac.c
index ae15359..db64bd7 100644
--- a/drivers/edac/i82875p_edac.c
+++ b/drivers/edac/i82875p_edac.c
@@ -420,6 +420,7 @@ static int i82875p_probe1(struct pci_dev *pdev, int dev_idx)
layers[1].size = nr_chans;
layers[1].is_virt_csrow = false;
mci = edac_mc_alloc(0, ARRAY_SIZE(layers), layers, sizeof(*pvt));
+ if (!mci) {
rc = -ENOMEM;
goto fail0;
}
^ permalink raw reply related [flat|nested] 2+ messages in thread