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

Commit 8f68abbf authored by Kumar Gala's avatar Kumar Gala
Browse files

Merge branch '85xx' into for_paulus

parents 8500adc7 862a7284

arch/powerpc/mm/pgtable_32.c

+1 −1
Original line number Diff line number Diff line
@@ -295,7 +295,7 @@ void __init mapin_ram(void) 
}



/* is x a power of 4? */

#define is_power_of_4(x)	is_power_of_2(x) && (ffs(x) & 1))

#define is_power_of_4(x)	is_power_of_2(x) && (ffs(x) & 1)



/*

 * Set up a mapping for a block of I/O.

arch/powerpc/platforms/85xx/mpc85xx_ads.c

+3 −4
Original line number Diff line number Diff line
@@ -45,8 +45,7 @@ unsigned long isa_mem_base = 0; 
#endif



#ifdef CONFIG_PCI

int

mpc85xx_exclude_device(u_char bus, u_char devfn)

static int mpc85xx_exclude_device(u_char bus, u_char devfn)

{

	if (bus == 0 && PCI_SLOT(devfn) == 0)

		return PCIBIOS_DEVICE_NOT_FOUND;
@@ -69,7 +68,7 @@ static void cpm2_cascade(unsigned int irq, struct irq_desc *desc) 


#endif /* CONFIG_CPM2 */



void __init mpc85xx_ads_pic_init(void)

static void __init mpc85xx_ads_pic_init(void)

{

	struct mpic *mpic;

	struct resource r;
@@ -254,7 +253,7 @@ static void __init mpc85xx_ads_setup_arch(void) 
#endif

}



void mpc85xx_ads_show_cpuinfo(struct seq_file *m)

static void mpc85xx_ads_show_cpuinfo(struct seq_file *m)

{

	uint pvid, svid, phid1;

	uint memsize = total_memory;

arch/powerpc/platforms/85xx/mpc85xx_cds.c

+5 −12
Original line number Diff line number Diff line
@@ -56,7 +56,6 @@ unsigned long isa_mem_base = 0; 
static int cds_pci_slot = 2;

static volatile u8 *cadmus;





#ifdef CONFIG_PCI



#define ARCADIA_HOST_BRIDGE_IDSEL	17
@@ -64,8 +63,7 @@ static volatile u8 *cadmus; 


extern int mpc85xx_pci2_busno;



int

mpc85xx_exclude_device(u_char bus, u_char devfn)

static int mpc85xx_exclude_device(u_char bus, u_char devfn)

{

	if (bus == 0 && PCI_SLOT(devfn) == 0)

		return PCIBIOS_DEVICE_NOT_FOUND;
@@ -81,8 +79,7 @@ mpc85xx_exclude_device(u_char bus, u_char devfn) 
		return PCIBIOS_SUCCESSFUL;

}



void __init

mpc85xx_cds_pcibios_fixup(void)

static void __init mpc85xx_cds_pcibios_fixup(void)

{

	struct pci_dev *dev;

	u_char		c;
@@ -144,7 +141,7 @@ static void mpc85xx_8259_cascade(unsigned int irq, struct irq_desc *desc) 
#endif /* PPC_I8259 */

#endif /* CONFIG_PCI */



void __init mpc85xx_cds_pic_init(void)

static void __init mpc85xx_cds_pic_init(void)

{

	struct mpic *mpic;

	struct resource r;
@@ -224,12 +221,10 @@ void __init mpc85xx_cds_pic_init(void) 
#endif /* CONFIG_PPC_I8259 */

}





/*

 * Setup the architecture

 */

static void __init

mpc85xx_cds_setup_arch(void)

static void __init mpc85xx_cds_setup_arch(void)

{

	struct device_node *cpu;

#ifdef CONFIG_PCI
@@ -276,9 +271,7 @@ mpc85xx_cds_setup_arch(void) 
#endif

}





void

mpc85xx_cds_show_cpuinfo(struct seq_file *m)

static void mpc85xx_cds_show_cpuinfo(struct seq_file *m)

{

	uint pvid, svid, phid1;

	uint memsize = total_memory;

arch/ppc/kernel/ppc_ksyms.c

+1 −1
Original line number Diff line number Diff line
@@ -271,7 +271,7 @@ EXPORT_SYMBOL(mmu_hash_lock); /* For MOL */ 
extern long *intercept_table;

EXPORT_SYMBOL(intercept_table);

#endif /* CONFIG_PPC_STD_MMU */

#if defined(CONFIG_40x) || defined(CONFIG_BOOKE)

#ifdef CONFIG_PPC_DCR_NATIVE

EXPORT_SYMBOL(__mtdcr);

EXPORT_SYMBOL(__mfdcr);

#endif

arch/ppc/mm/pgtable.c

+1 −1
Original line number Diff line number Diff line
@@ -314,7 +314,7 @@ void __init mapin_ram(void) 
}



/* is x a power of 4? */

#define is_power_of_4(x)	is_power_of_2(x) && (ffs(x) & 1))

#define is_power_of_4(x)	is_power_of_2(x) && (ffs(x) & 1)



/*

 * Set up a mapping for a block of I/O.