The function gets called from __init context only, so it can itself be __init too. Signed-off-by: Jan Beulich <jbeulich@xxxxxxxxxx> --- 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; -- To unsubscribe from this list: send the line "unsubscribe linux-ia64" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
![]() |