From: Randy Dunlap Date: Tue, 31 Jul 2007 07:37:32 +0000 (-0700) Subject: x86-64: Calgary: fix section mismatch warnings in tce X-Git-Tag: v2.6.23-rc2~136 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=e6b33220845d4702590ecbe356787e59c8d914ae;p=linux-2.6-omap-h63xx.git x86-64: Calgary: fix section mismatch warnings in tce Fix section mismatch warnings: these functions are called only from __init functions. WARNING: vmlinux.o(.text+0x1861c): Section mismatch: reference to .init.text:free_bootmem (between 'free_tce_table' and 'build_tce_table') WARNING: vmlinux.o(.text+0x187e5): Section mismatch: reference to .init.text:__alloc_bootmem_low (between 'alloc_tce_table' and 'kretprobe_trampoline_holder') Signed-off-by: Randy Dunlap Signed-off-by: Muli Ben-Yehuda Cc: Andi Kleen Cc: Sam Ravnborg Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- diff --git a/arch/x86_64/kernel/tce.c b/arch/x86_64/kernel/tce.c index 821527e7faa..e3f2569b2c4 100644 --- a/arch/x86_64/kernel/tce.c +++ b/arch/x86_64/kernel/tce.c @@ -131,7 +131,7 @@ done: return ret; } -int build_tce_table(struct pci_dev *dev, void __iomem *bbar) +int __init build_tce_table(struct pci_dev *dev, void __iomem *bbar) { struct iommu_table *tbl; int ret; diff --git a/include/asm-x86_64/tce.h b/include/asm-x86_64/tce.h index dbb047febc5..cd955d3d112 100644 --- a/include/asm-x86_64/tce.h +++ b/include/asm-x86_64/tce.h @@ -41,8 +41,8 @@ struct iommu_table; extern void tce_build(struct iommu_table *tbl, unsigned long index, unsigned int npages, unsigned long uaddr, int direction); extern void tce_free(struct iommu_table *tbl, long index, unsigned int npages); -extern void* alloc_tce_table(void); -extern void free_tce_table(void *tbl); -extern int build_tce_table(struct pci_dev *dev, void __iomem *bbar); +extern void * __init alloc_tce_table(void); +extern void __init free_tce_table(void *tbl); +extern int __init build_tce_table(struct pci_dev *dev, void __iomem *bbar); #endif /* _ASM_X86_64_TCE_H */