aboutsummaryrefslogtreecommitdiffstats
path: root/arch/sparc64/kernel/pci_psycho.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_psycho.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_psycho.c')
-rw-r--r--arch/sparc64/kernel/pci_psycho.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/sparc64/kernel/pci_psycho.c b/arch/sparc64/kernel/pci_psycho.c
index d27ee5d528a2..0bad96e5d184 100644
--- a/arch/sparc64/kernel/pci_psycho.c
+++ b/arch/sparc64/kernel/pci_psycho.c
@@ -801,7 +801,7 @@ static void pbm_config_busmastering(struct pci_pbm_info *pbm)
801 pci_config_write8(addr, 64); 801 pci_config_write8(addr, 64);
802} 802}
803 803
804static void psycho_scan_bus(struct pci_pbm_info *pbm) 804static void __init psycho_scan_bus(struct pci_pbm_info *pbm)
805{ 805{
806 pbm_config_busmastering(pbm); 806 pbm_config_busmastering(pbm);
807 pbm->is_66mhz_capable = 0; 807 pbm->is_66mhz_capable = 0;
@@ -965,7 +965,7 @@ static void psycho_pbm_strbuf_init(struct pci_pbm_info *pbm,
965#define PSYCHO_MEMSPACE_B 0x180000000UL 965#define PSYCHO_MEMSPACE_B 0x180000000UL
966#define PSYCHO_MEMSPACE_SIZE 0x07fffffffUL 966#define PSYCHO_MEMSPACE_SIZE 0x07fffffffUL
967 967
968static void psycho_pbm_init(struct pci_controller_info *p, 968static void __init psycho_pbm_init(struct pci_controller_info *p,
969 struct device_node *dp, int is_pbm_a) 969 struct device_node *dp, int is_pbm_a)
970{ 970{
971 struct property *prop; 971 struct property *prop;
@@ -1012,7 +1012,7 @@ static void psycho_pbm_init(struct pci_controller_info *p,
1012 1012
1013#define PSYCHO_CONFIGSPACE 0x001000000UL 1013#define PSYCHO_CONFIGSPACE 0x001000000UL
1014 1014
1015void psycho_init(struct device_node *dp, char *model_name) 1015void __init psycho_init(struct device_node *dp, char *model_name)
1016{ 1016{
1017 struct linux_prom64_registers *pr_regs; 1017 struct linux_prom64_registers *pr_regs;
1018 struct pci_controller_info *p; 1018 struct pci_controller_info *p;