Messages in this thread Patch in this message | | | From | Roland Dreier <> | Subject | Re: swiotlb: Add missing __init annotations | Date | Fri, 02 Jan 2009 14:36:14 -0800 |
| |
> no need - so it wasnt needed to make a section warning go away - i.e. your > patch sans the last hunk is tested to solve the problem, right?
I hadn't tested without that hunk... so I just redid it. For simplicity, here's the exact patch I just tested to solve the warnings:
===
The current kernel build warns:
WARNING: vmlinux.o(.text+0x11458): Section mismatch in reference from the function swiotlb_alloc_boot() to the function .init.text:__alloc_bootmem_low() The function swiotlb_alloc_boot() references the function __init __alloc_bootmem_low(). This is often because swiotlb_alloc_boot lacks a __init annotation or the annotation of __alloc_bootmem_low is wrong.
WARNING: vmlinux.o(.text+0x1011f2): Section mismatch in reference from the function swiotlb_late_init_with_default_size() to the function .init.text:__alloc_bootmem_low() The function swiotlb_late_init_with_default_size() references the function __init __alloc_bootmem_low(). This is often because swiotlb_late_init_with_default_size lacks a __init annotation or the annotation of __alloc_bootmem_low is wrong.
and indeed the functions calling __alloc_bootmem_low() can be marked __init as well.
Signed-off-by: Roland Dreier <rolandd@cisco.com> --- arch/x86/kernel/pci-swiotlb_64.c | 2 +- lib/swiotlb.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/arch/x86/kernel/pci-swiotlb_64.c b/arch/x86/kernel/pci-swiotlb_64.c index 242c344..8cba374 100644 --- a/arch/x86/kernel/pci-swiotlb_64.c +++ b/arch/x86/kernel/pci-swiotlb_64.c @@ -13,7 +13,7 @@ int swiotlb __read_mostly; -void *swiotlb_alloc_boot(size_t size, unsigned long nslabs) +void * __init swiotlb_alloc_boot(size_t size, unsigned long nslabs) { return alloc_bootmem_low_pages(size); } diff --git a/lib/swiotlb.c b/lib/swiotlb.c index fa2dc4e..f684d55 100644 --- a/lib/swiotlb.c +++ b/lib/swiotlb.c @@ -116,7 +116,7 @@ setup_io_tlb_npages(char *str) __setup("swiotlb=", setup_io_tlb_npages); /* make io_tlb_overflow tunable too? */ -void * __weak swiotlb_alloc_boot(size_t size, unsigned long nslabs) +void * __weak __init swiotlb_alloc_boot(size_t size, unsigned long nslabs) { return alloc_bootmem_low_pages(size); } @@ -238,7 +238,7 @@ swiotlb_init(void) * initialize the swiotlb later using the slab allocator if needed. * This should be just like above, but with some error catching. */ -int +int __init swiotlb_late_init_with_default_size(size_t default_size) { unsigned long i, bytes, req_nslabs = io_tlb_nslabs;
| |