From: Mauro Carvalho Chehab <mchehab@redhat.com>
To: Randy Dunlap <rdunlap@xenotime.net>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>,
linux-next@vger.kernel.org, LKML <linux-kernel@vger.kernel.org>,
linux-edac@vger.kernel.org, thayne.l.h@gmail.com
Subject: Re: linux-next: Tree for May 18 (edac)
Date: Sat, 19 May 2012 09:03:52 -0300 [thread overview]
Message-ID: <4FB78C28.2040009@redhat.com> (raw)
In-Reply-To: <4FB70267.9030702@xenotime.net>
Em 18-05-2012 23:16, Randy Dunlap escreveu:
> On 05/18/2012 01:49 AM, Stephen Rothwell wrote:
>
>> Hi all,
>>
>> Changes since 201205017:
>
>
>
> on i386:
>
> lots of build errors for the attached randconfig file.
>
Sorry, this was due to a bad rebase conflict at the edac tree:
https://lkml.org/lkml/2012/5/18/321
changeset 90b40d5cadba20d7fe2fce12d61f97e0870c1ba6 should be, instead:
http://git.infradead.org/users/mchehab/edac.git/commit/d24e447c14c328d0285317e916a0012c73df0d0b
Just updated the tree with the fixed patch merged with
the broken one.
Anyway, the fix patch is enclosed.
Regards,
Mauro
-
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;
}
next prev parent reply other threads:[~2012-05-19 12:04 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-05-18 8:49 linux-next: Tree for May 18 Stephen Rothwell
2012-05-19 0:46 ` [PATCH -next] comedi: fix build when USB is not enabled Randy Dunlap
2012-05-19 0:50 ` Greg Kroah-Hartman
2012-05-19 0:51 ` Randy Dunlap
2012-05-19 2:04 ` [PATCH -next] usb: add usb.h stubs for CONFIG_USB " Randy Dunlap
[not found] ` <4FB6FFBF.6000509-/UHa2rfvQTnk1uMJSBkQmQ@public.gmane.org>
2012-05-19 14:16 ` Sergei Shtylyov
2012-05-19 15:45 ` Randy Dunlap
2012-05-19 16:12 ` Greg Kroah-Hartman
2012-05-19 16:31 ` [PATCH -next v2] " Randy Dunlap
2012-05-21 16:48 ` H Hartley Sweeten
2012-05-19 14:30 ` [PATCH -next] " Alan Stern
2012-05-19 15:48 ` Randy Dunlap
[not found] ` <4FB7C0E4.4000008-/UHa2rfvQTnk1uMJSBkQmQ@public.gmane.org>
2012-06-11 23:07 ` Greg Kroah-Hartman
2012-06-11 23:35 ` [PATCH] staging/comedi: fix build for USB " Randy Dunlap
2012-05-19 1:02 ` linux-next: Tree for May 18 (drm drivers and vgacon) Randy Dunlap
2012-05-19 15:40 ` Dave Airlie
2012-05-19 2:16 ` linux-next: Tree for May 18 (edac) Randy Dunlap
2012-05-19 12:03 ` Mauro Carvalho Chehab [this message]
2012-05-19 15:50 ` Randy Dunlap
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4FB78C28.2040009@redhat.com \
--to=mchehab@redhat.com \
--cc=linux-edac@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=rdunlap@xenotime.net \
--cc=sfr@canb.auug.org.au \
--cc=thayne.l.h@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).