2009-06-30 11:22:59

by Jan Beulich

Subject: [PATCH] x86/ia64: adjust section annotation for pcibios_setup()

The function gets called from __init context only, so it can itself be
__init too.

Signed-off-by: Jan Beulich <[email protected]>

---
arch/ia64/pci/pci.c | 2 +-
arch/x86/pci/common.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)

--- linux-2.6.31-rc1/arch/ia64/pci/pci.c 2009-06-26 17:49:37.000000000 +0200
+++ 2.6.31-rc1-pcibios_setup/arch/ia64/pci/pci.c 2009-05-04 11:39:32.000000000 +0200
@@ -537,7 +537,7 @@ pcibios_align_resource (void *data, stru
/*
* PCI BIOS setup, always defaults to SAL interface
*/
-char * __devinit
+char * __init
pcibios_setup (char *str)
{
return str;
--- linux-2.6.31-rc1/arch/x86/pci/common.c 2009-06-10 05:05:27.000000000 +0200
+++ 2.6.31-rc1-pcibios_setup/arch/x86/pci/common.c 2009-05-04 11:39:32.000000000 +0200
@@ -439,7 +439,7 @@ int __init pcibios_init(void)
return 0;
}

-char * __devinit pcibios_setup(char *str)
+char *__init pcibios_setup(char *str)
{
if (!strcmp(str, "off")) {
pci_probe = 0;

2009-06-30 17:31:14

by Tony Luck

Subject: RE: [PATCH] x86/ia64: adjust section annotation for pcibios_setup()

--- linux-2.6.31-rc1/arch/ia64/pci/pci.c 2009-06-26 17:49:37.000000000 +0200
+++ 2.6.31-rc1-pcibios_setup/arch/ia64/pci/pci.c 2009-05-04 11:39:32.000000000 +0200
@@ -537,7 +537,7 @@ pcibios_align_resource (void *data, stru
/*
* PCI BIOS setup, always defaults to SAL interface
*/
-char * __devinit
+char * __init
pcibios_setup (char *str)
{
return str;

ia64 part Acked-by: Tony Luck <[email protected]>

Ingo/Thomas/Peter: please run this through the tip tree.

Thanks

-Tony

2009-06-30 22:10:35

by Ingo Molnar

Subject: Re: [PATCH] x86/ia64: adjust section annotation for pcibios_setup()

* Luck, Tony <[email protected]> wrote:

> --- linux-2.6.31-rc1/arch/ia64/pci/pci.c 2009-06-26 17:49:37.000000000 +0200
> +++ 2.6.31-rc1-pcibios_setup/arch/ia64/pci/pci.c 2009-05-04 11:39:32.000000000 +0200
> @@ -537,7 +537,7 @@ pcibios_align_resource (void *data, stru
> /*
> * PCI BIOS setup, always defaults to SAL interface
> */
> -char * __devinit
> +char * __init
> pcibios_setup (char *str)
> {
> return str;
>
> ia64 part Acked-by: Tony Luck <[email protected]>
>
> Ingo/Thomas/Peter: please run this through the tip tree.

I think this one's for Jesse's PCI tree.

Ingo

2009-06-30 23:28:09

by Jesse Barnes

Subject: Re: [PATCH] x86/ia64: adjust section annotation for pcibios_setup()

On Wed, 1 Jul 2009 00:10:16 +0200
Ingo Molnar <[email protected]> wrote:

>
> * Luck, Tony <[email protected]> wrote:
>
> --- linux-2.6.31-rc1/arch/ia64/pci/pci.c 2009-06-26
> 17:49:37.000000000 +0200 +++
> 2.6.31-rc1-pcibios_setup/arch/ia64/pci/pci.c 2009-05-04
> 11:39:32.000000000 +0200 @@ -537,7 +537,7 @@ pcibios_align_resource
> (void *data, stru /*
> * PCI BIOS setup, always defaults to SAL interface
> */
> -char * __devinit
> +char * __init
> pcibios_setup (char *str)
> {
> return str;
>
> ia64 part Acked-by: Tony Luck <[email protected]>
>
> Ingo/Thomas/Peter: please run this through the tip tree.
>
> I think this one's for Jesse's PCI tree.

Stuffed it into my for-linus branch, thanks.

--
Jesse Barnes, Intel Open Source Technology Center