[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>
This commit is contained in:
committed by
Paul Mackerras
parent
ee983079ce
commit
7b2c3c5b1d
@@ -9,7 +9,6 @@
|
||||
*/
|
||||
|
||||
#include <linux/irq.h>
|
||||
#include <linux/bootmem.h>
|
||||
#include <linux/bitmap.h>
|
||||
#include <linux/msi.h>
|
||||
#include <asm/mpic.h>
|
||||
@@ -152,10 +151,7 @@ int mpic_msi_init_allocator(struct mpic *mpic)
|
||||
size = BITS_TO_LONGS(mpic->irq_count) * sizeof(long);
|
||||
pr_debug("mpic: allocator bitmap size is 0x%x bytes\n", size);
|
||||
|
||||
if (mem_init_done)
|
||||
mpic->hwirq_bitmap = kmalloc(size, GFP_KERNEL);
|
||||
else
|
||||
mpic->hwirq_bitmap = alloc_bootmem(size);
|
||||
mpic->hwirq_bitmap = alloc_maybe_bootmem(size, GFP_KERNEL);
|
||||
|
||||
if (!mpic->hwirq_bitmap) {
|
||||
pr_debug("mpic: ENOMEM allocating allocator bitmap!\n");
|
||||
|
Reference in New Issue
Block a user