* [PATCH] x86/ia64: adjust section annotation for pcibios_setup()
@ 2009-06-30 11:22 Jan Beulich
2009-06-30 17:31 ` Luck, Tony
0 siblings, 1 reply; 4+ messages in thread
From: Jan Beulich @ 2009-06-30 11:22 UTC (permalink / raw)
To: Ingo Molnar, tony.luck, Thomas Gleixner, hpa; +Cc: linux-ia64, linux-kernel
The function gets called from __init context only, so it can itself be
__init too.
Signed-off-by: Jan Beulich <jbeulich@novell.com>
---
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;
^ permalink raw reply [flat|nested] 4+ messages in thread
* RE: [PATCH] x86/ia64: adjust section annotation for pcibios_setup()
2009-06-30 11:22 [PATCH] x86/ia64: adjust section annotation for pcibios_setup() Jan Beulich
@ 2009-06-30 17:31 ` Luck, Tony
2009-06-30 22:10 ` Ingo Molnar
0 siblings, 1 reply; 4+ messages in thread
From: Luck, Tony @ 2009-06-30 17:31 UTC (permalink / raw)
To: Jan Beulich, Ingo Molnar, Thomas Gleixner, hpa@zytor.com
Cc: linux-ia64@vger.kernel.org, linux-kernel@vger.kernel.org
--- 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 <tony.luck@intel.com>
Ingo/Thomas/Peter: please run this through the tip tree.
Thanks
-Tony
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] x86/ia64: adjust section annotation for pcibios_setup()
2009-06-30 17:31 ` Luck, Tony
@ 2009-06-30 22:10 ` Ingo Molnar
2009-06-30 23:27 ` Jesse Barnes
0 siblings, 1 reply; 4+ messages in thread
From: Ingo Molnar @ 2009-06-30 22:10 UTC (permalink / raw)
To: Luck, Tony, Jesse Barnes
Cc: Jan Beulich, Thomas Gleixner, hpa@zytor.com,
linux-ia64@vger.kernel.org, linux-kernel@vger.kernel.org
* Luck, Tony <tony.luck@intel.com> 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 <tony.luck@intel.com>
>
> Ingo/Thomas/Peter: please run this through the tip tree.
I think this one's for Jesse's PCI tree.
Ingo
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] x86/ia64: adjust section annotation for pcibios_setup()
2009-06-30 22:10 ` Ingo Molnar
@ 2009-06-30 23:27 ` Jesse Barnes
0 siblings, 0 replies; 4+ messages in thread
From: Jesse Barnes @ 2009-06-30 23:27 UTC (permalink / raw)
To: Ingo Molnar
Cc: Luck, Tony, Jesse Barnes, Jan Beulich, Thomas Gleixner,
hpa@zytor.com, linux-ia64@vger.kernel.org,
linux-kernel@vger.kernel.org
On Wed, 1 Jul 2009 00:10:16 +0200
Ingo Molnar <mingo@elte.hu> wrote:
>
> * Luck, Tony <tony.luck@intel.com> 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 <tony.luck@intel.com>
>
> 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
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2009-06-30 23:28 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-06-30 11:22 [PATCH] x86/ia64: adjust section annotation for pcibios_setup() Jan Beulich
2009-06-30 17:31 ` Luck, Tony
2009-06-30 22:10 ` Ingo Molnar
2009-06-30 23:27 ` Jesse Barnes
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox