Skip to content

L
linux-davinci
Commit 9a2ed5cc authored by David S. Miller's avatar David S. Miller
Browse files
Options

sparc64: Fix section mismatch warnings in PCI controller drivers. 

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 19ab6db6
Hide whitespace changes
Inline Side-by-side
Showing with 20 additions and 20 deletions
arch/sparc/kernel/pci_fire.c
View file @ 9a2ed5cc
...@@ -409,8 +409,8 @@ static void pci_fire_hw_init(struct pci_pbm_info *pbm) ...@@ -409,8 +409,8 @@ static void pci_fire_hw_init(struct pci_pbm_info *pbm)
upa_writeq(~(u64)0, pbm->pbm_regs + FIRE_PEC_IENAB); 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) struct of_device *op, u32 portid)
{ {
const struct linux_prom64_registers *regs; const struct linux_prom64_registers *regs;
struct device_node *dp = op->node; struct device_node *dp = op->node;
......
arch/sparc/kernel/pci_psycho.c
View file @ 9a2ed5cc
...@@ -365,8 +365,8 @@ static void pbm_config_busmastering(struct pci_pbm_info *pbm) ...@@ -365,8 +365,8 @@ static void pbm_config_busmastering(struct pci_pbm_info *pbm)
pci_config_write8(addr, 64); 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) struct device *parent)
{ {
pbm_config_busmastering(pbm); pbm_config_busmastering(pbm);
pbm->is_66mhz_capable = 0; pbm->is_66mhz_capable = 0;
...@@ -482,8 +482,8 @@ static void psycho_pbm_strbuf_init(struct pci_pbm_info *pbm, ...@@ -482,8 +482,8 @@ static void psycho_pbm_strbuf_init(struct pci_pbm_info *pbm,
#define PSYCHO_MEMSPACE_B 0x180000000UL #define PSYCHO_MEMSPACE_B 0x180000000UL
#define PSYCHO_MEMSPACE_SIZE 0x07fffffffUL #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) struct of_device *op, int is_pbm_a)
{ {
psycho_pbm_init_common(pbm, op, "PSYCHO", PBM_CHIP_TYPE_PSYCHO); psycho_pbm_init_common(pbm, op, "PSYCHO", PBM_CHIP_TYPE_PSYCHO);
psycho_pbm_strbuf_init(pbm, is_pbm_a); psycho_pbm_strbuf_init(pbm, is_pbm_a);
......
arch/sparc/kernel/pci_sabre.c
View file @ 9a2ed5cc
...@@ -402,8 +402,8 @@ static void apb_init(struct pci_bus *sabre_bus) ...@@ -402,8 +402,8 @@ 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) struct device *parent)
{ {
static int once; static int once;
...@@ -442,8 +442,8 @@ static void __init sabre_scan_bus(struct pci_pbm_info *pbm, ...@@ -442,8 +442,8 @@ static void __init sabre_scan_bus(struct pci_pbm_info *pbm,
sabre_register_error_handlers(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) struct of_device *op)
{ {
psycho_pbm_init_common(pbm, op, "SABRE", PBM_CHIP_TYPE_SABRE); psycho_pbm_init_common(pbm, op, "SABRE", PBM_CHIP_TYPE_SABRE);
pbm->pci_afsr = pbm->controller_regs + SABRE_PIOAFSR; pbm->pci_afsr = pbm->controller_regs + SABRE_PIOAFSR;
......
arch/sparc/kernel/pci_sun4v.c
View file @ 9a2ed5cc
...@@ -545,8 +545,8 @@ static const struct dma_ops sun4v_dma_ops = { ...@@ -545,8 +545,8 @@ static const struct dma_ops sun4v_dma_ops = {
.sync_sg_for_cpu = dma_4v_sync_sg_for_cpu, .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 device *parent)
{ {
struct property *prop; struct property *prop;
struct device_node *dp; struct device_node *dp;
...@@ -559,8 +559,8 @@ static void __init pci_sun4v_scan_bus(struct pci_pbm_info *pbm, ...@@ -559,8 +559,8 @@ static void __init pci_sun4v_scan_bus(struct pci_pbm_info *pbm,
/* XXX register error interrupt handlers XXX */ /* 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 *iommu)
{ {
struct iommu_arena *arena = &iommu->arena; struct iommu_arena *arena = &iommu->arena;
unsigned long i, cnt = 0; unsigned long i, cnt = 0;
...@@ -587,7 +587,7 @@ static unsigned long __init probe_existing_entries(struct pci_pbm_info *pbm, ...@@ -587,7 +587,7 @@ static unsigned long __init probe_existing_entries(struct pci_pbm_info *pbm,
return cnt; 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 }; static const u32 vdma_default[] = { 0x80000000, 0x80000000 };
struct iommu *iommu = pbm->iommu; struct iommu *iommu = pbm->iommu;
...@@ -889,8 +889,8 @@ static void pci_sun4v_msi_init(struct pci_pbm_info *pbm) ...@@ -889,8 +889,8 @@ static void pci_sun4v_msi_init(struct pci_pbm_info *pbm)
} }
#endif /* !(CONFIG_PCI_MSI) */ #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 of_device *op, u32 devhandle)
{ {
struct device_node *dp = op->node; struct device_node *dp = op->node;
int err; int err;
......
arch/sparc/mm/init_64.c
View file @ 9a2ed5cc
...@@ -70,8 +70,8 @@ extern struct tsb swapper_4m_tsb[KERNEL_TSB4M_NENTRIES]; ...@@ -70,8 +70,8 @@ extern struct tsb swapper_4m_tsb[KERNEL_TSB4M_NENTRIES];
#define MAX_BANKS 32 #define MAX_BANKS 32
static struct linux_prom64_registers pavail[MAX_BANKS] __initdata; static struct linux_prom64_registers pavail[MAX_BANKS] __devinitdata;
static int pavail_ents __initdata; static int pavail_ents __devinitdata;
static int cmp_p64(const void *a, const void *b) static int cmp_p64(const void *a, const void *b)
{ {
...@@ -1841,7 +1841,7 @@ void __init paging_init(void) ...@@ -1841,7 +1841,7 @@ void __init paging_init(void)
printk("Booting Linux...\n"); printk("Booting Linux...\n");
} }
int __init page_in_phys_avail(unsigned long paddr) int __devinit page_in_phys_avail(unsigned long paddr)
{ {
int i; int i;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment