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

Commit 4784b11c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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.
parents 94f5a00d 872e2be7

arch/sparc/kernel/setup.c

+1 −1
Original line number Diff line number Diff line
@@ -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,

arch/sparc64/kernel/pci_fire.c

+4 −4
Original line number Diff line number Diff line
@@ -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,7 +434,7 @@ 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,

static int __init pci_fire_pbm_init(struct pci_controller_info *p,

				    struct device_node *dp, u32 portid)

{

	const struct linux_prom64_registers *regs;
@@ -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);

arch/sparc64/kernel/pci_psycho.c

+3 −3
Original line number Diff line number Diff line
@@ -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;

arch/sparc64/kernel/pci_sabre.c

+4 −3
Original line number Diff line number Diff line
@@ -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;

arch/sparc64/kernel/pci_schizo.c

+9 −8
Original line number Diff line number Diff line
@@ -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,7 +1333,7 @@ static void schizo_pbm_hw_init(struct pci_pbm_info *pbm) 
	}

}



static int schizo_pbm_init(struct pci_controller_info *p,

static int __init schizo_pbm_init(struct pci_controller_info *p,

				  struct device_node *dp, u32 portid,

				  int chip_type)

{
@@ -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);

}