mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-12 13:55:32 +00:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6: [SPARC]: Constify function pointer tables. [SPARC64]: Fix section error in sparcspkr [SPARC64]: Fix of section mismatch warnings.
This commit is contained in:
commit
4784b11c4f
11 changed files with 30 additions and 27 deletions
|
@ -379,7 +379,7 @@ static void c_stop(struct seq_file *m, void *v)
|
|||
{
|
||||
}
|
||||
|
||||
struct seq_operations cpuinfo_op = {
|
||||
const struct seq_operations cpuinfo_op = {
|
||||
.start =c_start,
|
||||
.next = c_next,
|
||||
.stop = c_stop,
|
||||
|
|
|
@ -30,7 +30,7 @@
|
|||
"i" (ASI_PHYS_BYPASS_EC_E) \
|
||||
: "memory")
|
||||
|
||||
static void pci_fire_scan_bus(struct pci_pbm_info *pbm)
|
||||
static void __init pci_fire_scan_bus(struct pci_pbm_info *pbm)
|
||||
{
|
||||
pbm->pci_bus = pci_scan_one_pbm(pbm);
|
||||
|
||||
|
@ -434,8 +434,8 @@ static void pci_fire_hw_init(struct pci_pbm_info *pbm)
|
|||
fire_write(pbm->pbm_regs + FIRE_PEC_IENAB, ~(u64)0);
|
||||
}
|
||||
|
||||
static int pci_fire_pbm_init(struct pci_controller_info *p,
|
||||
struct device_node *dp, u32 portid)
|
||||
static int __init pci_fire_pbm_init(struct pci_controller_info *p,
|
||||
struct device_node *dp, u32 portid)
|
||||
{
|
||||
const struct linux_prom64_registers *regs;
|
||||
struct pci_pbm_info *pbm;
|
||||
|
@ -488,7 +488,7 @@ static inline int portid_compare(u32 x, u32 y)
|
|||
return 0;
|
||||
}
|
||||
|
||||
void fire_pci_init(struct device_node *dp, const char *model_name)
|
||||
void __init fire_pci_init(struct device_node *dp, const char *model_name)
|
||||
{
|
||||
struct pci_controller_info *p;
|
||||
u32 portid = of_getintprop_default(dp, "portid", 0xff);
|
||||
|
|
|
@ -801,7 +801,7 @@ static void pbm_config_busmastering(struct pci_pbm_info *pbm)
|
|||
pci_config_write8(addr, 64);
|
||||
}
|
||||
|
||||
static void psycho_scan_bus(struct pci_pbm_info *pbm)
|
||||
static void __init psycho_scan_bus(struct pci_pbm_info *pbm)
|
||||
{
|
||||
pbm_config_busmastering(pbm);
|
||||
pbm->is_66mhz_capable = 0;
|
||||
|
@ -965,7 +965,7 @@ static void psycho_pbm_strbuf_init(struct pci_pbm_info *pbm,
|
|||
#define PSYCHO_MEMSPACE_B 0x180000000UL
|
||||
#define PSYCHO_MEMSPACE_SIZE 0x07fffffffUL
|
||||
|
||||
static void psycho_pbm_init(struct pci_controller_info *p,
|
||||
static void __init psycho_pbm_init(struct pci_controller_info *p,
|
||||
struct device_node *dp, int is_pbm_a)
|
||||
{
|
||||
struct property *prop;
|
||||
|
@ -1012,7 +1012,7 @@ static void psycho_pbm_init(struct pci_controller_info *p,
|
|||
|
||||
#define PSYCHO_CONFIGSPACE 0x001000000UL
|
||||
|
||||
void psycho_init(struct device_node *dp, char *model_name)
|
||||
void __init psycho_init(struct device_node *dp, char *model_name)
|
||||
{
|
||||
struct linux_prom64_registers *pr_regs;
|
||||
struct pci_controller_info *p;
|
||||
|
|
|
@ -633,7 +633,7 @@ static void apb_init(struct pci_bus *sabre_bus)
|
|||
}
|
||||
}
|
||||
|
||||
static void sabre_scan_bus(struct pci_pbm_info *pbm)
|
||||
static void __init sabre_scan_bus(struct pci_pbm_info *pbm)
|
||||
{
|
||||
static int once;
|
||||
|
||||
|
@ -731,7 +731,8 @@ static int sabre_iommu_init(struct pci_pbm_info *pbm,
|
|||
return 0;
|
||||
}
|
||||
|
||||
static void sabre_pbm_init(struct pci_controller_info *p, struct pci_pbm_info *pbm, struct device_node *dp)
|
||||
static void __init sabre_pbm_init(struct pci_controller_info *p,
|
||||
struct pci_pbm_info *pbm, struct device_node *dp)
|
||||
{
|
||||
pbm->name = dp->full_name;
|
||||
printk("%s: SABRE PCI Bus Module\n", pbm->name);
|
||||
|
@ -750,7 +751,7 @@ static void sabre_pbm_init(struct pci_controller_info *p, struct pci_pbm_info *p
|
|||
pci_determine_mem_io_space(pbm);
|
||||
}
|
||||
|
||||
void sabre_init(struct device_node *dp, char *model_name)
|
||||
void __init sabre_init(struct device_node *dp, char *model_name)
|
||||
{
|
||||
const struct linux_prom64_registers *pr_regs;
|
||||
struct pci_controller_info *p;
|
||||
|
|
|
@ -1084,7 +1084,7 @@ static void pbm_config_busmastering(struct pci_pbm_info *pbm)
|
|||
pci_config_write8(addr, 64);
|
||||
}
|
||||
|
||||
static void schizo_scan_bus(struct pci_pbm_info *pbm)
|
||||
static void __init schizo_scan_bus(struct pci_pbm_info *pbm)
|
||||
{
|
||||
pbm_config_busmastering(pbm);
|
||||
pbm->is_66mhz_capable =
|
||||
|
@ -1333,9 +1333,9 @@ static void schizo_pbm_hw_init(struct pci_pbm_info *pbm)
|
|||
}
|
||||
}
|
||||
|
||||
static int schizo_pbm_init(struct pci_controller_info *p,
|
||||
struct device_node *dp, u32 portid,
|
||||
int chip_type)
|
||||
static int __init schizo_pbm_init(struct pci_controller_info *p,
|
||||
struct device_node *dp, u32 portid,
|
||||
int chip_type)
|
||||
{
|
||||
const struct linux_prom64_registers *regs;
|
||||
struct pci_pbm_info *pbm;
|
||||
|
@ -1430,7 +1430,8 @@ static inline int portid_compare(u32 x, u32 y, int chip_type)
|
|||
return (x == y);
|
||||
}
|
||||
|
||||
static void __schizo_init(struct device_node *dp, char *model_name, int chip_type)
|
||||
static void __init __schizo_init(struct device_node *dp, char *model_name,
|
||||
int chip_type)
|
||||
{
|
||||
struct pci_controller_info *p;
|
||||
struct pci_pbm_info *pbm;
|
||||
|
@ -1474,17 +1475,17 @@ static void __schizo_init(struct device_node *dp, char *model_name, int chip_typ
|
|||
prom_halt();
|
||||
}
|
||||
|
||||
void schizo_init(struct device_node *dp, char *model_name)
|
||||
void __init schizo_init(struct device_node *dp, char *model_name)
|
||||
{
|
||||
__schizo_init(dp, model_name, PBM_CHIP_TYPE_SCHIZO);
|
||||
}
|
||||
|
||||
void schizo_plus_init(struct device_node *dp, char *model_name)
|
||||
void __init schizo_plus_init(struct device_node *dp, char *model_name)
|
||||
{
|
||||
__schizo_init(dp, model_name, PBM_CHIP_TYPE_SCHIZO_PLUS);
|
||||
}
|
||||
|
||||
void tomatillo_init(struct device_node *dp, char *model_name)
|
||||
void __init tomatillo_init(struct device_node *dp, char *model_name)
|
||||
{
|
||||
__schizo_init(dp, model_name, PBM_CHIP_TYPE_TOMATILLO);
|
||||
}
|
||||
|
|
|
@ -612,7 +612,7 @@ const struct dma_ops sun4v_dma_ops = {
|
|||
.sync_sg_for_cpu = dma_4v_sync_sg_for_cpu,
|
||||
};
|
||||
|
||||
static void pci_sun4v_scan_bus(struct pci_pbm_info *pbm)
|
||||
static void __init pci_sun4v_scan_bus(struct pci_pbm_info *pbm)
|
||||
{
|
||||
struct property *prop;
|
||||
struct device_node *dp;
|
||||
|
@ -960,7 +960,8 @@ static void pci_sun4v_msi_init(struct pci_pbm_info *pbm)
|
|||
}
|
||||
#endif /* !(CONFIG_PCI_MSI) */
|
||||
|
||||
static void __init pci_sun4v_pbm_init(struct pci_controller_info *p, struct device_node *dp, u32 devhandle)
|
||||
static void __init pci_sun4v_pbm_init(struct pci_controller_info *p,
|
||||
struct device_node *dp, u32 devhandle)
|
||||
{
|
||||
struct pci_pbm_info *pbm;
|
||||
|
||||
|
|
|
@ -421,7 +421,7 @@ static void c_stop(struct seq_file *m, void *v)
|
|||
{
|
||||
}
|
||||
|
||||
struct seq_operations cpuinfo_op = {
|
||||
const struct seq_operations cpuinfo_op = {
|
||||
.start =c_start,
|
||||
.next = c_next,
|
||||
.stop = c_stop,
|
||||
|
|
|
@ -131,7 +131,7 @@ void vio_unregister_driver(struct vio_driver *viodrv)
|
|||
}
|
||||
EXPORT_SYMBOL(vio_unregister_driver);
|
||||
|
||||
static void __devinit vio_dev_release(struct device *dev)
|
||||
static void vio_dev_release(struct device *dev)
|
||||
{
|
||||
kfree(to_vio_dev(dev));
|
||||
}
|
||||
|
|
|
@ -54,7 +54,7 @@ extern void mykfree(void *);
|
|||
|
||||
static unsigned int (*sock_poll)(struct file *, poll_table *);
|
||||
|
||||
static struct file_operations socksys_file_ops = {
|
||||
static const struct file_operations socksys_file_ops = {
|
||||
/* Currently empty */
|
||||
};
|
||||
|
||||
|
|
|
@ -195,7 +195,7 @@ static struct of_platform_driver ebus_beep_driver = {
|
|||
.name = "beep",
|
||||
.match_table = ebus_beep_match,
|
||||
.probe = ebus_beep_probe,
|
||||
.remove = sparcspkr_remove,
|
||||
.remove = __devexit_p(sparcspkr_remove),
|
||||
.shutdown = sparcspkr_shutdown,
|
||||
};
|
||||
|
||||
|
@ -236,7 +236,7 @@ static struct of_platform_driver isa_beep_driver = {
|
|||
.name = "beep",
|
||||
.match_table = isa_beep_match,
|
||||
.probe = isa_beep_probe,
|
||||
.remove = sparcspkr_remove,
|
||||
.remove = __devexit_p(sparcspkr_remove),
|
||||
.shutdown = sparcspkr_shutdown,
|
||||
};
|
||||
|
||||
|
|
|
@ -131,7 +131,7 @@ static void property_stop(struct seq_file *f, void *v)
|
|||
/* Nothing to do */
|
||||
}
|
||||
|
||||
static struct seq_operations property_op = {
|
||||
static const struct seq_operations property_op = {
|
||||
.start = property_start,
|
||||
.next = property_next,
|
||||
.stop = property_stop,
|
||||
|
|
Loading…
Reference in a new issue