]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
of/pdt: fix section mismatch warning
authorSam Ravnborg <sam@ravnborg.org>
Tue, 27 Dec 2011 21:58:40 +0000 (22:58 +0100)
committerRob Herring <rob.herring@calxeda.com>
Tue, 27 Dec 2011 22:37:30 +0000 (16:37 -0600)
Fix the following section mismatch warning - seen when building sparc32:

WARNING: vmlinux.o(.text+0x1ff9c0): Section mismatch in reference from the function kernel_tree_alloc() to the function .init.text:prom_early_alloc()
The function kernel_tree_alloc() references
the function __init prom_early_alloc().
This is often because kernel_tree_alloc lacks a __init
annotation or the annotation of prom_early_alloc is wrong.

prom_early_alloc() is annotated __init, and users of
kernel_tree_alloc() is also annotated __init.
So simply match the annoation of these to fix the warning.

Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Cc: Grant Likely <grant.likely@secretlab.ca>
Acked-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Rob Herring <rob.herring@calxeda.com>
drivers/of/pdt.c

index bc5b3990f6ed114f50103c8a8b060dfc69cc6aed..07cc1d678e4d3da7d810c330c8bb4053411bd885 100644 (file)
@@ -229,7 +229,7 @@ static struct device_node * __init of_pdt_build_tree(struct device_node *parent,
        return ret;
 }
 
-static void *kernel_tree_alloc(u64 size, u64 align)
+static void * __init kernel_tree_alloc(u64 size, u64 align)
 {
        return prom_early_alloc(size);
 }