Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9a2ed5cc authored by David S. Miller's avatar David S. Miller
Browse files

sparc64: Fix section mismatch warnings in PCI controller drivers. 



Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 19ab6db6

arch/sparc/kernel/pci_fire.c

+2 −2
Original line number Diff line number Diff line
@@ -409,7 +409,7 @@ static void pci_fire_hw_init(struct pci_pbm_info *pbm) 
	upa_writeq(~(u64)0, pbm->pbm_regs + FIRE_PEC_IENAB);

}



static int __init pci_fire_pbm_init(struct pci_pbm_info *pbm,

static int __devinit pci_fire_pbm_init(struct pci_pbm_info *pbm,

				       struct of_device *op, u32 portid)

{

	const struct linux_prom64_registers *regs;

arch/sparc/kernel/pci_psycho.c

+4 −4
Original line number Diff line number Diff line
@@ -365,7 +365,7 @@ static void pbm_config_busmastering(struct pci_pbm_info *pbm) 
	pci_config_write8(addr, 64);

}



static void __init psycho_scan_bus(struct pci_pbm_info *pbm,

static void __devinit psycho_scan_bus(struct pci_pbm_info *pbm,

				      struct device *parent)

{

	pbm_config_busmastering(pbm);
@@ -482,7 +482,7 @@ static void psycho_pbm_strbuf_init(struct pci_pbm_info *pbm, 
#define PSYCHO_MEMSPACE_B	0x180000000UL

#define PSYCHO_MEMSPACE_SIZE	0x07fffffffUL



static void __init psycho_pbm_init(struct pci_pbm_info *pbm,

static void __devinit psycho_pbm_init(struct pci_pbm_info *pbm,

				      struct of_device *op, int is_pbm_a)

{

	psycho_pbm_init_common(pbm, op, "PSYCHO", PBM_CHIP_TYPE_PSYCHO);

arch/sparc/kernel/pci_sabre.c

+4 −4
Original line number Diff line number Diff line
@@ -402,7 +402,7 @@ static void apb_init(struct pci_bus *sabre_bus) 
	}

}



static void __init sabre_scan_bus(struct pci_pbm_info *pbm,

static void __devinit sabre_scan_bus(struct pci_pbm_info *pbm,

				     struct device *parent)

{

	static int once;
@@ -442,7 +442,7 @@ static void __init sabre_scan_bus(struct pci_pbm_info *pbm, 
	sabre_register_error_handlers(pbm);

}



static void __init sabre_pbm_init(struct pci_pbm_info *pbm,

static void __devinit sabre_pbm_init(struct pci_pbm_info *pbm,

				     struct of_device *op)

{

	psycho_pbm_init_common(pbm, op, "SABRE", PBM_CHIP_TYPE_SABRE);

arch/sparc/kernel/pci_sun4v.c

+7 −7
Original line number Diff line number Diff line
@@ -545,7 +545,7 @@ static const struct dma_ops sun4v_dma_ops = { 
	.sync_sg_for_cpu		= dma_4v_sync_sg_for_cpu,

};



static void __init pci_sun4v_scan_bus(struct pci_pbm_info *pbm,

static void __devinit pci_sun4v_scan_bus(struct pci_pbm_info *pbm,

					 struct device *parent)

{

	struct property *prop;
@@ -559,7 +559,7 @@ static void __init pci_sun4v_scan_bus(struct pci_pbm_info *pbm, 
	/* XXX register error interrupt handlers XXX */

}



static unsigned long __init probe_existing_entries(struct pci_pbm_info *pbm,

static unsigned long __devinit probe_existing_entries(struct pci_pbm_info *pbm,

						      struct iommu *iommu)

{

	struct iommu_arena *arena = &iommu->arena;
@@ -587,7 +587,7 @@ static unsigned long __init probe_existing_entries(struct pci_pbm_info *pbm, 
	return cnt;

}



static int __init pci_sun4v_iommu_init(struct pci_pbm_info *pbm)

static int __devinit pci_sun4v_iommu_init(struct pci_pbm_info *pbm)

{

	static const u32 vdma_default[] = { 0x80000000, 0x80000000 };

	struct iommu *iommu = pbm->iommu;
@@ -889,7 +889,7 @@ static void pci_sun4v_msi_init(struct pci_pbm_info *pbm) 
}

#endif /* !(CONFIG_PCI_MSI) */



static int __init pci_sun4v_pbm_init(struct pci_pbm_info *pbm,

static int __devinit pci_sun4v_pbm_init(struct pci_pbm_info *pbm,

					struct of_device *op, u32 devhandle)

{

	struct device_node *dp = op->node;

arch/sparc/mm/init_64.c

+3 −3
Original line number Diff line number Diff line
@@ -70,8 +70,8 @@ extern struct tsb swapper_4m_tsb[KERNEL_TSB4M_NENTRIES]; 


#define MAX_BANKS	32



static struct linux_prom64_registers pavail[MAX_BANKS] __initdata;

static int pavail_ents __initdata;

static struct linux_prom64_registers pavail[MAX_BANKS] __devinitdata;

static int pavail_ents __devinitdata;



static int cmp_p64(const void *a, const void *b)

{
@@ -1841,7 +1841,7 @@ void __init paging_init(void) 
	printk("Booting Linux...\n");

}



int __init page_in_phys_avail(unsigned long paddr)

int __devinit page_in_phys_avail(unsigned long paddr)

{

	int i;