aboutsummaryrefslogtreecommitdiffstats
path: root/arch/sparc64/kernel/pci_fire.c
diff options
context:
space:
mode:
authorSam Ravnborg <sam@ravnborg.org>2008-01-21 20:22:46 -0500
committerDavid S. Miller <davem@davemloft.net>2008-01-22 01:34:30 -0500
commita1f35ba374bc421ab33e40163be2b57995b09962 (patch)
tree5df4759a6b6f93f8ec26e16738ee5c19050a8f03 /arch/sparc64/kernel/pci_fire.c
parentd384e35a25445bb60457b7dab8cffe178c6b7ecb (diff)
[SPARC64]: Fix of section mismatch warnings.
Fix following Section mismatch warning in sparc64: WARNING: arch/sparc64/kernel/built-in.o(.text+0x13dec): Section mismatch: reference to .devinit.text:pci_scan_one_pbm (between 'psycho_scan_bus' and 'psycho_pbm_init') WARNING: arch/sparc64/kernel/built-in.o(.text+0x14b58): Section mismatch: reference to .devinit.text:pci_scan_one_pbm (between 'sabre_scan_bus' and 'sabre_init') WARNING: arch/sparc64/kernel/built-in.o(.text+0x15ea4): Section mismatch: reference to .devinit.text:pci_scan_one_pbm (between 'schizo_scan_bus' and 'schizo_pbm_init') WARNING: arch/sparc64/kernel/built-in.o(.text+0x17780): Section mismatch: reference to .devinit.text:pci_scan_one_pbm (between 'pci_sun4v_scan_bus' and 'pci_sun4v_get_head') WARNING: arch/sparc64/kernel/built-in.o(.text+0x17d5c): Section mismatch: reference to .devinit.text:pci_scan_one_pbm (between 'pci_fire_scan_bus' and 'pci_fire_get_head') WARNING: arch/sparc64/kernel/built-in.o(.text+0x23860): Section mismatch: reference to .devinit.text:vio_dev_release (between 'vio_create_one' and 'vio_add') WARNING: arch/sparc64/kernel/built-in.o(.text+0x23868): Section mismatch: reference to .devinit.text:vio_dev_release (between 'vio_create_one' and 'vio_add') The pci_* were all missing __init annotations. For the vio.c case it was a function with a wrong annotation which was removed. Signed-off-by: Sam Ravnborg <sam@ravnborg.org> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/sparc64/kernel/pci_fire.c')
-rw-r--r--arch/sparc64/kernel/pci_fire.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/sparc64/kernel/pci_fire.c b/arch/sparc64/kernel/pci_fire.c
index fef3b37487bf..7571ed563147 100644
--- a/arch/sparc64/kernel/pci_fire.c
+++ b/arch/sparc64/kernel/pci_fire.c
@@ -30,7 +30,7 @@
30 "i" (ASI_PHYS_BYPASS_EC_E) \ 30 "i" (ASI_PHYS_BYPASS_EC_E) \
31 : "memory") 31 : "memory")
32 32
33static void pci_fire_scan_bus(struct pci_pbm_info *pbm) 33static void __init pci_fire_scan_bus(struct pci_pbm_info *pbm)
34{ 34{
35 pbm->pci_bus = pci_scan_one_pbm(pbm); 35 pbm->pci_bus = pci_scan_one_pbm(pbm);
36 36
@@ -434,8 +434,8 @@ static void pci_fire_hw_init(struct pci_pbm_info *pbm)
434 fire_write(pbm->pbm_regs + FIRE_PEC_IENAB, ~(u64)0); 434 fire_write(pbm->pbm_regs + FIRE_PEC_IENAB, ~(u64)0);
435} 435}
436 436
437static int pci_fire_pbm_init(struct pci_controller_info *p, 437static int __init pci_fire_pbm_init(struct pci_controller_info *p,
438 struct device_node *dp, u32 portid) 438 struct device_node *dp, u32 portid)
439{ 439{
440 const struct linux_prom64_registers *regs; 440 const struct linux_prom64_registers *regs;
441 struct pci_pbm_info *pbm; 441 struct pci_pbm_info *pbm;
@@ -488,7 +488,7 @@ static inline int portid_compare(u32 x, u32 y)
488 return 0; 488 return 0;
489} 489}
490 490
491void fire_pci_init(struct device_node *dp, const char *model_name) 491void __init fire_pci_init(struct device_node *dp, const char *model_name)
492{ 492{
493 struct pci_controller_info *p; 493 struct pci_controller_info *p;
494 u32 portid = of_getintprop_default(dp, "portid", 0xff); 494 u32 portid = of_getintprop_default(dp, "portid", 0xff);