It's called only from an __init function and is the only user
of pcibios_scan_specific_bus which will be marked as __devinit in
the next patch.
Signed-off-by: Jiri Slaby <[email protected]>
Cc: Mauro Carvalho Chehab <[email protected]>
---
drivers/edac/i7core_edac.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/drivers/edac/i7core_edac.c b/drivers/edac/i7core_edac.c
index 4de5a18..c7fc0d5 100644
--- a/drivers/edac/i7core_edac.c
+++ b/drivers/edac/i7core_edac.c
@@ -1141,7 +1141,7 @@ static void i7core_put_all_devices(void)
i7core_put_devices(i7core_dev);
}
-static void i7core_xeon_pci_fixup(int dev_id)
+static void __init i7core_xeon_pci_fixup(int dev_id)
{
struct pci_dev *pdev = NULL;
int i;
--
1.6.5.3
pcibios_scan_specific_bus calls pci_scan_bus_on_node which is __devinit.
Mark it __devinit as well. All users are now __init or __devinit.
Remark update_res from __init to __devinit as it is called also from
__devinit functions.
Signed-off-by: Jiri Slaby <[email protected]>
Cc: Aristeu Sergio <[email protected]>
Cc: Mauro Carvalho Chehab <[email protected]>
Cc: Jesse Barnes <[email protected]>
Cc: [email protected]
Cc: [email protected]
---
arch/x86/pci/amd_bus.c | 2 +-
arch/x86/pci/legacy.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/x86/pci/amd_bus.c b/arch/x86/pci/amd_bus.c
index 995f360..b78ffff 100644
--- a/arch/x86/pci/amd_bus.c
+++ b/arch/x86/pci/amd_bus.c
@@ -119,7 +119,7 @@ static void __init update_range(struct res_range *range, size_t start,
}
}
-void __init update_res(struct pci_root_info *info, size_t start,
+void __devinit update_res(struct pci_root_info *info, size_t start,
size_t end, unsigned long flags, int merge)
{
int i;
diff --git a/arch/x86/pci/legacy.c b/arch/x86/pci/legacy.c
index a8194c8..8cf7835 100644
--- a/arch/x86/pci/legacy.c
+++ b/arch/x86/pci/legacy.c
@@ -39,7 +39,7 @@ static int __init pci_legacy_init(void)
return 0;
}
-void pcibios_scan_specific_bus(int busn)
+void __devinit pcibios_scan_specific_bus(int busn)
{
int devfn;
long node;
--
1.6.5.3
On Mon, 30 Nov 2009 21:19:41 +0100
Jiri Slaby <[email protected]> wrote:
> It's called only from an __init function and is the only user
> of pcibios_scan_specific_bus which will be marked as __devinit in
> the next patch.
>
> Signed-off-by: Jiri Slaby <[email protected]>
> Cc: Mauro Carvalho Chehab <[email protected]>
> ---
> drivers/edac/i7core_edac.c | 2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/drivers/edac/i7core_edac.c b/drivers/edac/i7core_edac.c
> index 4de5a18..c7fc0d5 100644
> --- a/drivers/edac/i7core_edac.c
> +++ b/drivers/edac/i7core_edac.c
> @@ -1141,7 +1141,7 @@ static void i7core_put_all_devices(void)
> i7core_put_devices(i7core_dev);
> }
>
> -static void i7core_xeon_pci_fixup(int dev_id)
> +static void __init i7core_xeon_pci_fixup(int dev_id)
> {
> struct pci_dev *pdev = NULL;
> int i;
I don't know who handles EDAC patches, but I'm pretty sure it's not
me. :) It doesn't apply to my tree anyway, so it probably needs a
refresh.
Thanks,
--
Jesse Barnes, Intel Open Source Technology Center
On Mon, 30 Nov 2009 21:19:42 +0100
Jiri Slaby <[email protected]> wrote:
> pcibios_scan_specific_bus calls pci_scan_bus_on_node which is
> __devinit. Mark it __devinit as well. All users are now __init or
> __devinit.
>
> Remark update_res from __init to __devinit as it is called also from
> __devinit functions.
>
> Signed-off-by: Jiri Slaby <[email protected]>
> Cc: Aristeu Sergio <[email protected]>
> Cc: Mauro Carvalho Chehab <[email protected]>
> Cc: Jesse Barnes <[email protected]>
> Cc: [email protected]
> Cc: [email protected]
> ---
> arch/x86/pci/amd_bus.c | 2 +-
> arch/x86/pci/legacy.c | 2 +-
> 2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/arch/x86/pci/amd_bus.c b/arch/x86/pci/amd_bus.c
> index 995f360..b78ffff 100644
> --- a/arch/x86/pci/amd_bus.c
> +++ b/arch/x86/pci/amd_bus.c
> @@ -119,7 +119,7 @@ static void __init update_range(struct res_range
> *range, size_t start, }
> }
>
> -void __init update_res(struct pci_root_info *info, size_t start,
> +void __devinit update_res(struct pci_root_info *info, size_t start,
> size_t end, unsigned long flags, int
> merge) {
> int i;
> diff --git a/arch/x86/pci/legacy.c b/arch/x86/pci/legacy.c
> index a8194c8..8cf7835 100644
> --- a/arch/x86/pci/legacy.c
> +++ b/arch/x86/pci/legacy.c
> @@ -39,7 +39,7 @@ static int __init pci_legacy_init(void)
> return 0;
> }
>
> -void pcibios_scan_specific_bus(int busn)
> +void __devinit pcibios_scan_specific_bus(int busn)
> {
> int devfn;
> long node;
amd_bus.c got refactored, can you respin?
Thanks,
--
Jesse Barnes, Intel Open Source Technology Center
On 12/05/2009 12:54 AM, Jesse Barnes wrote:
> On Mon, 30 Nov 2009 21:19:41 +0100
> Jiri Slaby <[email protected]> wrote:
>
>> It's called only from an __init function and is the only user
>> of pcibios_scan_specific_bus which will be marked as __devinit in
>> the next patch.
>>
>> Signed-off-by: Jiri Slaby <[email protected]>
>> Cc: Mauro Carvalho Chehab <[email protected]>
>> ---
>> drivers/edac/i7core_edac.c | 2 +-
>> 1 files changed, 1 insertions(+), 1 deletions(-)
>>
>> diff --git a/drivers/edac/i7core_edac.c b/drivers/edac/i7core_edac.c
>> index 4de5a18..c7fc0d5 100644
>> --- a/drivers/edac/i7core_edac.c
>> +++ b/drivers/edac/i7core_edac.c
>> @@ -1141,7 +1141,7 @@ static void i7core_put_all_devices(void)
>> i7core_put_devices(i7core_dev);
>> }
>>
>> -static void i7core_xeon_pci_fixup(int dev_id)
>> +static void __init i7core_xeon_pci_fixup(int dev_id)
>> {
>> struct pci_dev *pdev = NULL;
>> int i;
>
> I don't know who handles EDAC patches, but I'm pretty sure it's not
> me. :)
Yeah, sorry, it was just I wanted you to know about the function user.
The EDAC masters were in CC, I hope.
> It doesn't apply to my tree anyway, so it probably needs a
> refresh.
I'll resend both patches after rebasing them.
thanks,
--
js
suse labs
--- On Fri, 12/4/09, Jesse Barnes <[email protected]> wrote:
> From: Jesse Barnes <[email protected]>
> Subject: Re: [PATCH 1/2] EDAC: add __init to i7core_xeon_pci_fixup
> To: "Jiri Slaby" <[email protected]>
> Cc: [email protected], [email protected], "Mauro Carvalho Chehab" <[email protected]>
> Date: Friday, December 4, 2009, 4:54 PM
> On Mon, 30 Nov 2009 21:19:41 +0100
> Jiri Slaby <[email protected]>
> wrote:
>
> > It's called only from an __init function and is the
> only user
> > of pcibios_scan_specific_bus which will be marked as
> __devinit in
> > the next patch.
> >
> > Signed-off-by: Jiri Slaby <[email protected]>
> > Cc: Mauro Carvalho Chehab <[email protected]>
> > ---
> >? drivers/edac/i7core_edac.c |? ? 2 +-
> >? 1 files changed, 1 insertions(+), 1
> deletions(-)
> >
> > diff --git a/drivers/edac/i7core_edac.c
> b/drivers/edac/i7core_edac.c
> > index 4de5a18..c7fc0d5 100644
> > --- a/drivers/edac/i7core_edac.c
> > +++ b/drivers/edac/i7core_edac.c
> > @@ -1141,7 +1141,7 @@ static void
> i7core_put_all_devices(void)
> >? ??? ???
> i7core_put_devices(i7core_dev);
> >? }
> >?
> > -static void i7core_xeon_pci_fixup(int dev_id)
> > +static void __init i7core_xeon_pci_fixup(int dev_id)
> >? {
> >? ??? struct pci_dev *pdev = NULL;
> >? ??? int i;
>
> I don't know who handles EDAC patches, but I'm pretty sure
> it's not
> me. :)?
Maruo has the i7core tree that he is building on for i7 stuff
boris from AMD has the amd64 tree
I handle the others and send to Andrew Morton
doug thompson
> It doesn't apply to my tree anyway, so it
> probably needs a
> refresh.
>
> Thanks,
> --
> Jesse Barnes, Intel Open Source Technology Center
> --
> To unsubscribe from this list: send the line "unsubscribe
> linux-kernel" in
> the body of a message to [email protected]
> More majordomo info at? http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at? http://www.tux.org/lkml/
>