The following commit has been merged in the linux branch: commit 0f6023d5997bf1b5eeae39de42a7e1e26dbe6a90 Author: Heiko Schocher hs@denx.de Date: Thu Sep 24 02:45:14 2009 +0000

powerpc/pci: Fix MODPOST warning

making a powerpc target with PCI support, shows the following warning:

MODPOST vmlinux.o WARNING: vmlinux.o(.text+0x10430): Section mismatch in reference from the function pcibios_allocate_bus_resources() to the function .init.text:reparent_resources()

The function pcibios_allocate_bus_resources() references the function __init reparent_resources().

This is often because pcibios_allocate_bus_resources lacks a __init annotation or the annotation of reparent_resources is wrong.

This patch fix this warning by removing the __init annotation before reparent_resources.

Signed-off-by: Heiko Schocher hs@denx.de Signed-off-by: Benjamin Herrenschmidt benh@kernel.crashing.org

diff --git a/arch/powerpc/kernel/pci-common.c b/arch/powerpc/kernel/pci-common.c index bb8209e..e8dfdbd 100644 --- a/arch/powerpc/kernel/pci-common.c +++ b/arch/powerpc/kernel/pci-common.c @@ -1190,7 +1190,7 @@ EXPORT_SYMBOL(pcibios_align_resource); * Reparent resource children of pr that conflict with res * under res, and make res replace those children. */ -static int __init reparent_resources(struct resource *parent, +static int reparent_resources(struct resource *parent, struct resource *res) { struct resource *p, **pp;