aboutsummaryrefslogtreecommitdiffstats
path: root/arch/sparc
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2009-04-07 04:03:58 -0400
committerDavid S. Miller <davem@davemloft.net>2009-04-08 06:28:15 -0400
commit9a2ed5cc9ef6cb60abd3ea66d7be549d8023581a (patch)
tree564ba2a98b1c032e1d03262fd24e66ead1ab8899 /arch/sparc
parent19ab6db66ce1b32de54ecb474f16ade3247f8323 (diff)
sparc64: Fix section mismatch warnings in PCI controller drivers.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/sparc')
-rw-r--r--arch/sparc/kernel/pci_fire.c4
-rw-r--r--arch/sparc/kernel/pci_psycho.c8
-rw-r--r--arch/sparc/kernel/pci_sabre.c8
-rw-r--r--arch/sparc/kernel/pci_sun4v.c14
-rw-r--r--arch/sparc/mm/init_64.c6
5 files changed, 20 insertions, 20 deletions
diff --git a/arch/sparc/kernel/pci_fire.c b/arch/sparc/kernel/pci_fire.c
index 9462b68f4894..d53f45bc7dda 100644
--- a/arch/sparc/kernel/pci_fire.c
+++ b/arch/sparc/kernel/pci_fire.c
@@ -409,8 +409,8 @@ static void pci_fire_hw_init(struct pci_pbm_info *pbm)
409 upa_writeq(~(u64)0, pbm->pbm_regs + FIRE_PEC_IENAB); 409 upa_writeq(~(u64)0, pbm->pbm_regs + FIRE_PEC_IENAB);
410} 410}
411 411
412static int __init pci_fire_pbm_init(struct pci_pbm_info *pbm, 412static int __devinit pci_fire_pbm_init(struct pci_pbm_info *pbm,
413 struct of_device *op, u32 portid) 413 struct of_device *op, u32 portid)
414{ 414{
415 const struct linux_prom64_registers *regs; 415 const struct linux_prom64_registers *regs;
416 struct device_node *dp = op->node; 416 struct device_node *dp = op->node;
diff --git a/arch/sparc/kernel/pci_psycho.c b/arch/sparc/kernel/pci_psycho.c
index 3b34344082ef..142b9d6984a8 100644
--- a/arch/sparc/kernel/pci_psycho.c
+++ b/arch/sparc/kernel/pci_psycho.c
@@ -365,8 +365,8 @@ static void pbm_config_busmastering(struct pci_pbm_info *pbm)
365 pci_config_write8(addr, 64); 365 pci_config_write8(addr, 64);
366} 366}
367 367
368static void __init psycho_scan_bus(struct pci_pbm_info *pbm, 368static void __devinit psycho_scan_bus(struct pci_pbm_info *pbm,
369 struct device *parent) 369 struct device *parent)
370{ 370{
371 pbm_config_busmastering(pbm); 371 pbm_config_busmastering(pbm);
372 pbm->is_66mhz_capable = 0; 372 pbm->is_66mhz_capable = 0;
@@ -482,8 +482,8 @@ static void psycho_pbm_strbuf_init(struct pci_pbm_info *pbm,
482#define PSYCHO_MEMSPACE_B 0x180000000UL 482#define PSYCHO_MEMSPACE_B 0x180000000UL
483#define PSYCHO_MEMSPACE_SIZE 0x07fffffffUL 483#define PSYCHO_MEMSPACE_SIZE 0x07fffffffUL
484 484
485static void __init psycho_pbm_init(struct pci_pbm_info *pbm, 485static void __devinit psycho_pbm_init(struct pci_pbm_info *pbm,
486 struct of_device *op, int is_pbm_a) 486 struct of_device *op, int is_pbm_a)
487{ 487{
488 psycho_pbm_init_common(pbm, op, "PSYCHO", PBM_CHIP_TYPE_PSYCHO); 488 psycho_pbm_init_common(pbm, op, "PSYCHO", PBM_CHIP_TYPE_PSYCHO);
489 psycho_pbm_strbuf_init(pbm, is_pbm_a); 489 psycho_pbm_strbuf_init(pbm, is_pbm_a);
diff --git a/arch/sparc/kernel/pci_sabre.c b/arch/sparc/kernel/pci_sabre.c
index 713257b6963c..ba6fbeba3e2c 100644
--- a/arch/sparc/kernel/pci_sabre.c
+++ b/arch/sparc/kernel/pci_sabre.c
@@ -402,8 +402,8 @@ static void apb_init(struct pci_bus *sabre_bus)
402 } 402 }
403} 403}
404 404
405static void __init sabre_scan_bus(struct pci_pbm_info *pbm, 405static void __devinit sabre_scan_bus(struct pci_pbm_info *pbm,
406 struct device *parent) 406 struct device *parent)
407{ 407{
408 static int once; 408 static int once;
409 409
@@ -442,8 +442,8 @@ static void __init sabre_scan_bus(struct pci_pbm_info *pbm,
442 sabre_register_error_handlers(pbm); 442 sabre_register_error_handlers(pbm);
443} 443}
444 444
445static void __init sabre_pbm_init(struct pci_pbm_info *pbm, 445static void __devinit sabre_pbm_init(struct pci_pbm_info *pbm,
446 struct of_device *op) 446 struct of_device *op)
447{ 447{
448 psycho_pbm_init_common(pbm, op, "SABRE", PBM_CHIP_TYPE_SABRE); 448 psycho_pbm_init_common(pbm, op, "SABRE", PBM_CHIP_TYPE_SABRE);
449 pbm->pci_afsr = pbm->controller_regs + SABRE_PIOAFSR; 449 pbm->pci_afsr = pbm->controller_regs + SABRE_PIOAFSR;
diff --git a/arch/sparc/kernel/pci_sun4v.c b/arch/sparc/kernel/pci_sun4v.c
index 0ef0ab3d4763..5db5ebed35da 100644
--- a/arch/sparc/kernel/pci_sun4v.c
+++ b/arch/sparc/kernel/pci_sun4v.c
@@ -545,8 +545,8 @@ static const struct dma_ops sun4v_dma_ops = {
545 .sync_sg_for_cpu = dma_4v_sync_sg_for_cpu, 545 .sync_sg_for_cpu = dma_4v_sync_sg_for_cpu,
546}; 546};
547 547
548static void __init pci_sun4v_scan_bus(struct pci_pbm_info *pbm, 548static void __devinit pci_sun4v_scan_bus(struct pci_pbm_info *pbm,
549 struct device *parent) 549 struct device *parent)
550{ 550{
551 struct property *prop; 551 struct property *prop;
552 struct device_node *dp; 552 struct device_node *dp;
@@ -559,8 +559,8 @@ static void __init pci_sun4v_scan_bus(struct pci_pbm_info *pbm,
559 /* XXX register error interrupt handlers XXX */ 559 /* XXX register error interrupt handlers XXX */
560} 560}
561 561
562static unsigned long __init probe_existing_entries(struct pci_pbm_info *pbm, 562static unsigned long __devinit probe_existing_entries(struct pci_pbm_info *pbm,
563 struct iommu *iommu) 563 struct iommu *iommu)
564{ 564{
565 struct iommu_arena *arena = &iommu->arena; 565 struct iommu_arena *arena = &iommu->arena;
566 unsigned long i, cnt = 0; 566 unsigned long i, cnt = 0;
@@ -587,7 +587,7 @@ static unsigned long __init probe_existing_entries(struct pci_pbm_info *pbm,
587 return cnt; 587 return cnt;
588} 588}
589 589
590static int __init pci_sun4v_iommu_init(struct pci_pbm_info *pbm) 590static int __devinit pci_sun4v_iommu_init(struct pci_pbm_info *pbm)
591{ 591{
592 static const u32 vdma_default[] = { 0x80000000, 0x80000000 }; 592 static const u32 vdma_default[] = { 0x80000000, 0x80000000 };
593 struct iommu *iommu = pbm->iommu; 593 struct iommu *iommu = pbm->iommu;
@@ -889,8 +889,8 @@ static void pci_sun4v_msi_init(struct pci_pbm_info *pbm)
889} 889}
890#endif /* !(CONFIG_PCI_MSI) */ 890#endif /* !(CONFIG_PCI_MSI) */
891 891
892static int __init pci_sun4v_pbm_init(struct pci_pbm_info *pbm, 892static int __devinit pci_sun4v_pbm_init(struct pci_pbm_info *pbm,
893 struct of_device *op, u32 devhandle) 893 struct of_device *op, u32 devhandle)
894{ 894{
895 struct device_node *dp = op->node; 895 struct device_node *dp = op->node;
896 int err; 896 int err;
diff --git a/arch/sparc/mm/init_64.c b/arch/sparc/mm/init_64.c
index 2c8dfeb7ab04..c30dc9a3f252 100644
--- a/arch/sparc/mm/init_64.c
+++ b/arch/sparc/mm/init_64.c
@@ -70,8 +70,8 @@ extern struct tsb swapper_4m_tsb[KERNEL_TSB4M_NENTRIES];
70 70
71#define MAX_BANKS 32 71#define MAX_BANKS 32
72 72
73static struct linux_prom64_registers pavail[MAX_BANKS] __initdata; 73static struct linux_prom64_registers pavail[MAX_BANKS] __devinitdata;
74static int pavail_ents __initdata; 74static int pavail_ents __devinitdata;
75 75
76static int cmp_p64(const void *a, const void *b) 76static int cmp_p64(const void *a, const void *b)
77{ 77{
@@ -1841,7 +1841,7 @@ void __init paging_init(void)
1841 printk("Booting Linux...\n"); 1841 printk("Booting Linux...\n");
1842} 1842}
1843 1843
1844int __init page_in_phys_avail(unsigned long paddr) 1844int __devinit page_in_phys_avail(unsigned long paddr)
1845{ 1845{
1846 int i; 1846 int i;
1847 1847