lkml.org 
[lkml]   [2010]   [May]   [18]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [PATCH] Add support for Westmere to i7core_edac driver
Vernon Mauery wrote:
> On 18-May-2010 04:00 PM, Mauro Carvalho Chehab wrote:
>> Vernon Mauery wrote:
>>> Add support for Westmere to i7core_edac driver
>>>
>>> This adds new PCI IDs for the Westmere's memory controller
>>> devices and modifies the i7core_edac driver to be able to
>>> probe both Nehalem and Westmere processors.
>>>
>>> This applies to
>>> git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/i7core.git
>>> linux_next
>>>
>>> Signed-off-by: Vernon Mauery <vernux@us.ibm.com>
>>>
>>> @@ -1170,7 +1213,7 @@ static void i7core_put_all_devices(void)
>>> i7core_put_devices(i7core_dev);
>>> }
>>>
>>> -static void __init i7core_xeon_pci_fixup(int dev_id)
>>> +static void i7core_xeon_pci_fixup(struct pci_id_table *table)
>>> {
>>> struct pci_dev *pdev = NULL;
>>> int i;
>>
>>
>> Hmm... this hunk seems wrong to me. It ir just reverting this patch:
>>
>> http://git.kernel.org/?p=linux/kernel/git/mchehab/i7core.git;a=commit;h=71753e0141a220ecbf9c71a66e0a8acce9705fb5
>>
>>
>> The other changes seem OK on my eyes.
>
> Oops. It looks like my merge was not quite correct. It was not
> intended to revert that patch, but rather change the parameters to the
> function to use a struct pci_id_table instead of an int dev_id.
>
> Here is a correct patch.

Thanks for the fix. Applied at the tree.

Cheers,
Mauro


\
 
 \ /
  Last update: 2010-05-19 01:49    [W:0.036 / U:27.196 seconds]
©2003-2018 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site