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

Commit 537a2f88 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'sh/for-2.6.28' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6 

* 'sh/for-2.6.28' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6:
  serial: sh-sci: Reorder the SCxTDR write after the TDxE clear.
  sh: __copy_user function can corrupt the stack in case of exception
  sh: Fixed the TMU0 reload value on resume
  sh: Don't factor in PAGE_OFFSET for valid_phys_addr_range() check.
  sh: early printk port type fix
  i2c: fix i2c-sh_mobile rx underrun
  sh: Provide a sane valid_phys_addr_range() to prevent TLB reset with PMB.
  usb: r8a66597-hcd: fix wrong data access in SuperH on-chip USB
  fix sci type for SH7723
  serial: sh-sci: fix cannot work SH7723 SCIFA
  sh: Handle fixmap TLB eviction more coherently.
parents fab349cc 272966c0

arch/sh/include/asm/io.h

+4 −0
Original line number Diff line number Diff line
@@ -293,6 +293,10 @@ __ioremap_mode(unsigned long offset, unsigned long size, unsigned long flags) 
 */

#define xlate_dev_kmem_ptr(p)	p



#define ARCH_HAS_VALID_PHYS_ADDR_RANGE

int valid_phys_addr_range(unsigned long addr, size_t size);

int valid_mmap_phys_addr_range(unsigned long pfn, size_t size);



#endif /* __KERNEL__ */



#endif /* __ASM_SH_IO_H */

arch/sh/include/asm/pgtable.h

+6 −0
Original line number Diff line number Diff line
@@ -148,6 +148,12 @@ extern void paging_init(void); 
extern void page_table_range_init(unsigned long start, unsigned long end,

				  pgd_t *pgd);



#if !defined(CONFIG_CACHE_OFF) && defined(CONFIG_CPU_SH4) && defined(CONFIG_MMU)

extern void kmap_coherent_init(void);

#else

#define kmap_coherent_init()	do { } while (0)

#endif



#include <asm-generic/pgtable.h>



#endif /* __ASM_SH_PGTABLE_H */

arch/sh/kernel/cpu/sh4a/setup-sh7723.c

+3 −3
Original line number Diff line number Diff line
@@ -119,17 +119,17 @@ static struct plat_sci_port sci_platform_data[] = { 
	},{

		.mapbase	= 0xa4e30000,

		.flags		= UPF_BOOT_AUTOCONF,

		.type		= PORT_SCI,

		.type		= PORT_SCIFA,

		.irqs		= { 56, 56, 56, 56 },

	},{

		.mapbase	= 0xa4e40000,

		.flags		= UPF_BOOT_AUTOCONF,

		.type		= PORT_SCI,

		.type		= PORT_SCIFA,

		.irqs		= { 88, 88, 88, 88 },

	},{

		.mapbase	= 0xa4e50000,

		.flags		= UPF_BOOT_AUTOCONF,

		.type		= PORT_SCI,

		.type		= PORT_SCIFA,

		.irqs		= { 109, 109, 109, 109 },

	}, {

		.flags = 0,

arch/sh/kernel/early_printk.c

+2 −1
Original line number Diff line number Diff line
@@ -75,6 +75,7 @@ static struct console bios_console = { 
#endif



static struct uart_port scif_port = {

	.type		= PORT_SCIF,

	.mapbase	= CONFIG_EARLY_SCIF_CONSOLE_PORT,

	.membase	= (char __iomem *)CONFIG_EARLY_SCIF_CONSOLE_PORT,

};
@@ -84,9 +85,9 @@ static void scif_sercon_putc(int c) 
	while (((sci_in(&scif_port, SCFDR) & EPK_FIFO_BITS) >= EPK_FIFO_SIZE))

		;



	sci_out(&scif_port, SCxTDR, c);

	sci_in(&scif_port, SCxSR);

	sci_out(&scif_port, SCxSR, 0xf3 & ~(0x20 | 0x40));

	sci_out(&scif_port, SCxTDR, c);



	while ((sci_in(&scif_port, SCxSR) & 0x40) == 0)

		;

arch/sh/kernel/timers/timer-tmu.c

+1 −1
Original line number Diff line number Diff line
@@ -120,7 +120,7 @@ static void tmu_set_mode(enum clock_event_mode mode, 
{

	switch (mode) {

	case CLOCK_EVT_MODE_PERIODIC:

		ctrl_outl(ctrl_inl(TMU0_TCNT), TMU0_TCOR);

		ctrl_outl(tmu_latest_interval[TMU0], TMU0_TCOR);

		break;

	case CLOCK_EVT_MODE_ONESHOT:

		ctrl_outl(0, TMU0_TCOR);