[POWERPC] Fix section mismatch in PCI code

Create a helper function (alloc_maybe_bootmem) that is marked __init_refok
to limit the chances of mistakenly referring to other __init routines.

WARNING: vmlinux.o(.text+0x2a9c4): Section mismatch: reference to .init.text:.__alloc_bootmem (between '.update_dn_pci_info' and '.pci_dn_reconfig_notifier')
WARNING: vmlinux.o(.text+0x36430): Section mismatch: reference to .init.text:.__alloc_bootmem (between '.mpic_msi_init_allocator' and '.find_ht_magic_addr')
WARNING: vmlinux.o(.text+0x5e804): Section mismatch: reference to .init.text:.__alloc_bootmem (between '.celleb_setup_phb' and '.celleb_fake_pci_write_config')
WARNING: vmlinux.o(.text+0x5e8e8): Section mismatch: reference to .init.text:.__alloc_bootmem (between '.celleb_setup_phb' and '.celleb_fake_pci_write_config')
WARNING: vmlinux.o(.text+0x5e968): Section mismatch: reference to .init.text:.__alloc_bootmem (between '.celleb_setup_phb' and '.celleb_fake_pci_write_config')

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Paul Mackerras <paulus@samba.org>

1 files changed, 5 insertions, 14 deletions

diff --git a/arch/powerpc/platforms/celleb/pci.c b/arch/powerpc/platforms/celleb/pci.c
index 11336b40fec..1348b23cbbc 100644
--- a/arch/powerpc/platforms/celleb/pci.c
+++ b/arch/powerpc/platforms/celleb/pci.c
@@ -327,10 +327,7 @@ static int __init celleb_setup_fake_pci_device(struct device_node *node,
 
         size = 256;
         config = &private->fake_config[devno][fn];
-        if (mem_init_done)
-                *config = kzalloc(size, GFP_KERNEL);
-        else
-                *config = alloc_bootmem(size);
+        *config = alloc_maybe_bootmem(size, GFP_KERNEL);
         if (*config == NULL) {
                 printk(KERN_ERR "PCI: "
                        "not enough memory for fake configuration space\n");
@@ -341,10 +338,7 @@ static int __init celleb_setup_fake_pci_device(struct device_node *node,
 
         size = sizeof(struct celleb_pci_resource);
         res = &private->res[devno][fn];
-        if (mem_init_done)
-                *res = kzalloc(size, GFP_KERNEL);
-        else
-                *res = alloc_bootmem(size);
+        *res = alloc_maybe_bootmem(size, GFP_KERNEL);
         if (*res == NULL) {
                 printk(KERN_ERR
                        "PCI: not enough memory for resource data space\n");
@@ -436,12 +430,9 @@ static int __init phb_set_bus_ranges(struct device_node *dev,
 
 static void __init celleb_alloc_private_mem(struct pci_controller *hose)
 {
-        if (mem_init_done)
-                hose->private_data =
-                        kzalloc(sizeof(struct celleb_pci_private), GFP_KERNEL);
-        else
-                hose->private_data =
-                        alloc_bootmem(sizeof(struct celleb_pci_private));
+        hose->private_data =
+                alloc_maybe_bootmem(sizeof(struct celleb_pci_private),
+                        GFP_KERNEL);
 }
 
 int __init celleb_setup_phb(struct pci_controller *phb)