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

Commit d5301a0e authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/blackfin-2.6 

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/blackfin-2.6:
  Blackfin serial driver: fix up tty core set_ldisc API change breakage bug
  Blackfin arch: protect only the SPI bus controller with CONFIG_SPI_BFIN
  Blackfin arch: fixup warnings with the new cplb saved values
  Blackfin Serial Driver: Clean up BF54x macro in blackfin UART driver.
parents cc55875e 3b8458a9

arch/blackfin/kernel/traps.c

+3 −5
Original line number Diff line number Diff line
@@ -67,7 +67,7 @@ void __init trap_init(void) 
	CSYNC();

}



void *saved_icplb_fault_addr, *saved_dcplb_fault_addr;

unsigned long saved_icplb_fault_addr, saved_dcplb_fault_addr;



int kstack_depth_to_print = 48;
@@ -366,7 +366,7 @@ asmlinkage void trap_c(struct pt_regs *fp) 
		info.si_code = ILL_CPLB_MULHIT;

		sig = SIGSEGV;

#ifdef CONFIG_DEBUG_HUNT_FOR_ZERO

		if (saved_dcplb_fault_addr < (void *)FIXED_CODE_START)

		if (saved_dcplb_fault_addr < FIXED_CODE_START)

			printk(KERN_NOTICE "NULL pointer access\n");

		else

#endif
@@ -421,7 +421,7 @@ asmlinkage void trap_c(struct pt_regs *fp) 
		info.si_code = ILL_CPLB_MULHIT;

		sig = SIGSEGV;

#ifdef CONFIG_DEBUG_HUNT_FOR_ZERO

		if (saved_icplb_fault_addr < (void *)FIXED_CODE_START)

		if (saved_icplb_fault_addr < FIXED_CODE_START)

			printk(KERN_NOTICE "Jump to NULL address\n");

		else

#endif
@@ -939,8 +939,6 @@ void panic_cplb_error(int cplb_panic, struct pt_regs *fp) 


	oops_in_progress = 1;



	printk(KERN_EMERG "DCPLB_FAULT_ADDR=%p\n", saved_dcplb_fault_addr);

	printk(KERN_EMERG "ICPLB_FAULT_ADDR=%p\n", saved_icplb_fault_addr);

	dump_bfin_process(fp);

	dump_bfin_mem(fp);

	show_regs(fp);

arch/blackfin/mach-bf527/boards/ezkit.c

+2 −7
Original line number Diff line number Diff line
@@ -451,9 +451,6 @@ static struct platform_device net2272_bfin_device = { 
};

#endif



#if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE)

/* all SPI peripherals info goes here */



#if defined(CONFIG_MTD_M25P80) \

	|| defined(CONFIG_MTD_M25P80_MODULE)

static struct mtd_partition bfin_spi_flash_partitions[] = {
@@ -676,6 +673,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = { 
#endif

};



#if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE)

/* SPI controller data */

static struct bfin5xx_spi_master bfin_spi0_info = {

	.num_chipselect = 8,
@@ -1018,10 +1016,7 @@ static int __init stamp_init(void) 
#endif



	platform_add_devices(stamp_devices, ARRAY_SIZE(stamp_devices));

#if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE)

	spi_register_board_info(bfin_spi_board_info,

				ARRAY_SIZE(bfin_spi_board_info));

#endif

	spi_register_board_info(bfin_spi_board_info, ARRAY_SIZE(bfin_spi_board_info));



#if defined(CONFIG_PATA_PLATFORM) || defined(CONFIG_PATA_PLATFORM_MODULE)

	irq_desc[PATA_INT].status |= IRQ_NOAUTOEN;

arch/blackfin/mach-bf533/boards/ezkit.c

+1 −5
Original line number Diff line number Diff line
@@ -87,9 +87,6 @@ static struct platform_device smc91x_device = { 
};

#endif



#if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE)

/* all SPI peripherals info goes here */



#if defined(CONFIG_MTD_M25P80) || defined(CONFIG_MTD_M25P80_MODULE)

static struct mtd_partition bfin_spi_flash_partitions[] = {

	{
@@ -189,6 +186,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = { 
#endif

};



#if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE)

/* SPI (0) */

static struct resource bfin_spi0_resource[] = {

	[0] = {
@@ -425,9 +423,7 @@ static int __init ezkit_init(void) 
{

	printk(KERN_INFO "%s(): registering device resources\n", __func__);

	platform_add_devices(ezkit_devices, ARRAY_SIZE(ezkit_devices));

#if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE)

	spi_register_board_info(bfin_spi_board_info, ARRAY_SIZE(bfin_spi_board_info));

#endif



#if defined(CONFIG_PATA_PLATFORM) || defined(CONFIG_PATA_PLATFORM_MODULE)

	irq_desc[PATA_INT].status |= IRQ_NOAUTOEN;

arch/blackfin/mach-bf533/boards/stamp.c

+3 −7
Original line number Diff line number Diff line
@@ -161,9 +161,6 @@ static struct platform_device stamp_flash_device = { 
};

#endif



#if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE)

/* all SPI peripherals info goes here */



#if defined(CONFIG_MTD_M25P80) || defined(CONFIG_MTD_M25P80_MODULE)

static struct mtd_partition bfin_spi_flash_partitions[] = {

	{
@@ -320,6 +317,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = { 
#endif

};



#if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE)

/* SPI (0) */

static struct resource bfin_spi0_resource[] = {

	[0] = {
@@ -626,10 +624,8 @@ static int __init stamp_init(void) 
	SSYNC();

#endif



#if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE)

	spi_register_board_info(bfin_spi_board_info,

				ARRAY_SIZE(bfin_spi_board_info));

#endif

	spi_register_board_info(bfin_spi_board_info, ARRAY_SIZE(bfin_spi_board_info));



#if defined(CONFIG_PATA_PLATFORM) || defined(CONFIG_PATA_PLATFORM_MODULE)

	irq_desc[PATA_INT].status |= IRQ_NOAUTOEN;

#endif

arch/blackfin/mach-bf537/boards/stamp.c

+2 −7
Original line number Diff line number Diff line
@@ -400,9 +400,6 @@ static struct platform_device stamp_flash_device = { 
};

#endif



#if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE)

/* all SPI peripherals info goes here */



#if defined(CONFIG_MTD_M25P80) \

	|| defined(CONFIG_MTD_M25P80_MODULE)

static struct mtd_partition bfin_spi_flash_partitions[] = {
@@ -629,6 +626,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = { 
#endif

};



#if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE)

/* SPI controller data */

static struct bfin5xx_spi_master bfin_spi0_info = {

	.num_chipselect = 8,
@@ -939,10 +937,7 @@ static int __init stamp_init(void) 
#endif



	platform_add_devices(stamp_devices, ARRAY_SIZE(stamp_devices));

#if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE)

	spi_register_board_info(bfin_spi_board_info,

				ARRAY_SIZE(bfin_spi_board_info));

#endif

	spi_register_board_info(bfin_spi_board_info, ARRAY_SIZE(bfin_spi_board_info));



#if defined(CONFIG_PATA_PLATFORM) || defined(CONFIG_PATA_PLATFORM_MODULE)

	irq_desc[PATA_INT].status |= IRQ_NOAUTOEN;