diff options
author | Li Jie <eltshanli@gmail.com> | 2009-11-05 10:29:54 -0500 |
---|---|---|
committer | Nicolas Pitre <nico@fluxnic.net> | 2009-11-05 23:03:21 -0500 |
commit | 6de95c198729d34a85c88f8844f1c3d57fb6da00 (patch) | |
tree | f1fd88d6d092378fc854552a4e0b73fdc4a97463 | |
parent | 5d8965557318fabb1680d1817c2afc2714b6d3ce (diff) |
[ARM] kirkwood: fix section mismatch
kirkwood_timer_init() and kirkwood_pcie_setup() lack of __init which
causes following warnings:
WARNING: vmlinux.o(.text+0x9568): Section mismatch in reference from
the function kirkwood_timer_init() to the function
.init.text:kirkwood_find_tclk()
The function kirkwood_timer_init() references
the function __init kirkwood_find_tclk().
This is often because kirkwood_timer_init lacks a __init
annotation or the annotation of kirkwood_find_tclk is wrong.
WARNING: vmlinux.o(.text+0x979c): Section mismatch in reference from
the function kirkwood_pcie_setup() to the function
.init.text:orion_pcie_setup()
The function kirkwood_pcie_setup() references
the function __init orion_pcie_setup().
This is often because kirkwood_pcie_setup lacks a __init
annotation or the annotation of orion_pcie_setup is wrong.
Signed-off-by: lijie <eltshanli@gmail.com>
Signed-off-by: Nicolas Pitre <nico@fluxnic.net>
-rw-r--r-- | arch/arm/mach-kirkwood/common.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-kirkwood/pcie.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-kirkwood/common.c b/arch/arm/mach-kirkwood/common.c index 0acb61f3c10b..7177c4aa6342 100644 --- a/arch/arm/mach-kirkwood/common.c +++ b/arch/arm/mach-kirkwood/common.c | |||
@@ -845,7 +845,7 @@ int __init kirkwood_find_tclk(void) | |||
845 | return 166666667; | 845 | return 166666667; |
846 | } | 846 | } |
847 | 847 | ||
848 | static void kirkwood_timer_init(void) | 848 | static void __init kirkwood_timer_init(void) |
849 | { | 849 | { |
850 | kirkwood_tclk = kirkwood_find_tclk(); | 850 | kirkwood_tclk = kirkwood_find_tclk(); |
851 | orion_time_init(IRQ_KIRKWOOD_BRIDGE, kirkwood_tclk); | 851 | orion_time_init(IRQ_KIRKWOOD_BRIDGE, kirkwood_tclk); |
diff --git a/arch/arm/mach-kirkwood/pcie.c b/arch/arm/mach-kirkwood/pcie.c index d90b9aae308d..553882033006 100644 --- a/arch/arm/mach-kirkwood/pcie.c +++ b/arch/arm/mach-kirkwood/pcie.c | |||
@@ -93,7 +93,7 @@ static struct pci_ops pcie_ops = { | |||
93 | }; | 93 | }; |
94 | 94 | ||
95 | 95 | ||
96 | static int kirkwood_pcie_setup(int nr, struct pci_sys_data *sys) | 96 | static int __init kirkwood_pcie_setup(int nr, struct pci_sys_data *sys) |
97 | { | 97 | { |
98 | struct resource *res; | 98 | struct resource *res; |
99 | extern unsigned int kirkwood_clk_ctrl; | 99 | extern unsigned int kirkwood_clk_ctrl; |