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

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

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6

parents d81f087f 21dccddf

arch/sparc/include/asm/io.h

+13 −0
Original line number Diff line number Diff line
@@ -5,4 +5,17 @@ 
#else

#include <asm/io_32.h>

#endif



/*

 * Defines used for both SPARC32 and SPARC64

 */



/* Big endian versions of memory read/write routines */

#define readb_be(__addr)	__raw_readb(__addr)

#define readw_be(__addr)	__raw_readw(__addr)

#define readl_be(__addr)	__raw_readl(__addr)

#define writeb_be(__b, __addr)	__raw_writeb(__b, __addr)

#define writel_be(__w, __addr)	__raw_writel(__w, __addr)

#define writew_be(__l, __addr)	__raw_writew(__l, __addr)



#endif

arch/sparc/kernel/apc.c

+1 −1
Original line number Diff line number Diff line
@@ -165,7 +165,7 @@ static int __devinit apc_probe(struct platform_device *op) 
	return 0;

}



static struct of_device_id __initdata apc_match[] = {

static struct of_device_id apc_match[] = {

	{

		.name = APC_OBPNAME,

	},

arch/sparc/kernel/pmc.c

+1 −1
Original line number Diff line number Diff line
@@ -69,7 +69,7 @@ static int __devinit pmc_probe(struct platform_device *op) 
	return 0;

}



static struct of_device_id __initdata pmc_match[] = {

static struct of_device_id pmc_match[] = {

	{

		.name = PMC_OBPNAME,

	},

arch/sparc/kernel/smp_32.c

+7 −3
Original line number Diff line number Diff line
@@ -51,6 +51,7 @@ cpumask_t smp_commenced_mask = CPU_MASK_NONE; 
void __cpuinit smp_store_cpu_info(int id)

{

	int cpu_node;

	int mid;



	cpu_data(id).udelay_val = loops_per_jiffy;
@@ -58,10 +59,13 @@ void __cpuinit smp_store_cpu_info(int id) 
	cpu_data(id).clock_tick = prom_getintdefault(cpu_node,

						     "clock-frequency", 0);

	cpu_data(id).prom_node = cpu_node;

	cpu_data(id).mid = cpu_get_hwmid(cpu_node);

	mid = cpu_get_hwmid(cpu_node);



	if (cpu_data(id).mid < 0)

		panic("No MID found for CPU%d at node 0x%08d", id, cpu_node);

	if (mid < 0) {

		printk(KERN_NOTICE "No MID found for CPU%d at node 0x%08d", id, cpu_node);

		mid = 0;

	}

	cpu_data(id).mid = mid;

}



void __init smp_cpus_done(unsigned int max_cpus)

arch/sparc/kernel/time_32.c

+1 −1
Original line number Diff line number Diff line
@@ -168,7 +168,7 @@ static int __devinit clock_probe(struct platform_device *op) 
	return 0;

}



static struct of_device_id __initdata clock_match[] = {

static struct of_device_id clock_match[] = {

	{

		.name = "eeprom",

	},