lkml.org 
[lkml]   [2012]   [May]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    /
    Date
    From
    SubjectRe: linux-next: Tree for May 18 (edac)
    On 05/19/2012 05:03 AM, Mauro Carvalho Chehab wrote:

    > 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>


    Acked-by: Randy Dunlap <rdunlap@xenotime.net>

    Thanks.


    >
    > 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;
    > }
    > --


    --
    ~Randy


    \
     
     \ /
      Last update: 2012-05-19 18:21    [W:0.030 / U:0.124 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site