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

Commit 6025974b authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge master.kernel.org:/home/rmk/linux-2.6-arm 

* master.kernel.org:/home/rmk/linux-2.6-arm:
  [ARM] 5543/1: arm: serial amba: add missing declaration in serial.h
  [ARM] pxa: fix pxa27x_udc default pullup GPIO
  [ARM] pxa/imote2: fix UCAM sensor board ADC model number
  mx[23]: don't put clock lookups in __initdata
  fix oops when using console=ttymxcN with N > 0
  [ARM] ARMv7 errata: only apply fixes when running on applicable CPU
  [ARM] 5534/1: kmalloc must return a cache line aligned buffer
parents 33fa108e aa853f85

arch/arm/include/asm/cache.h

+16 −0
Original line number Diff line number Diff line
@@ -7,4 +7,20 @@ 
#define L1_CACHE_SHIFT		5

#define L1_CACHE_BYTES		(1 << L1_CACHE_SHIFT)



/*

 * Memory returned by kmalloc() may be used for DMA, so we must make

 * sure that all such allocations are cache aligned. Otherwise,

 * unrelated code may cause parts of the buffer to be read into the

 * cache before the transfer is done, causing old data to be seen by

 * the CPU.

 */

#define ARCH_KMALLOC_MINALIGN	L1_CACHE_BYTES



/*

 * With EABI on ARMv5 and above we must have 64-bit aligned slab pointers.

 */

#if defined(CONFIG_AEABI) && (__LINUX_ARM_ARCH__ >= 5)

#define ARCH_SLAB_MINALIGN 8

#endif



#endif

arch/arm/include/asm/page.h

+0 −7
Original line number Diff line number Diff line
@@ -202,13 +202,6 @@ typedef struct page *pgtable_t; 
	(((current->personality & READ_IMPLIES_EXEC) ? VM_EXEC : 0) | \

	 VM_READ | VM_WRITE | VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)



/*

 * With EABI on ARMv5 and above we must have 64-bit aligned slab pointers.

 */

#if defined(CONFIG_AEABI) && (__LINUX_ARM_ARCH__ >= 5)

#define ARCH_SLAB_MINALIGN 8

#endif



#include <asm-generic/page.h>



#endif

arch/arm/mach-mx2/clock_imx21.c

+1 −1
Original line number Diff line number Diff line
@@ -890,7 +890,7 @@ static struct clk clko_clk = { 
		.con_id = n, \

		.clk = &c, \

	},

static struct clk_lookup lookups[] __initdata = {

static struct clk_lookup lookups[] = {

/* It's unlikely that any driver wants one of them directly:

	_REGISTER_CLOCK(NULL, "ckih", ckih_clk)

	_REGISTER_CLOCK(NULL, "ckil", ckil_clk)

arch/arm/mach-mx2/clock_imx27.c

+1 −1
Original line number Diff line number Diff line
@@ -621,7 +621,7 @@ DEFINE_CLOCK1(csi_clk, 0, 0, 0, parent, &csi_clk1, &per4_clk); 
		.clk = &c, \

	},



static struct clk_lookup lookups[] __initdata = {

static struct clk_lookup lookups[] = {

	_REGISTER_CLOCK("imx-uart.0", NULL, uart1_clk)

	_REGISTER_CLOCK("imx-uart.1", NULL, uart2_clk)

	_REGISTER_CLOCK("imx-uart.2", NULL, uart3_clk)

arch/arm/mach-mx3/clock-imx35.c

+1 −1
Original line number Diff line number Diff line
@@ -404,7 +404,7 @@ DEFINE_CLOCK(gpu2d_clk, 0, CCM_CGR3, 4, NULL, NULL); 
		.clk = &c,		\

	},



static struct clk_lookup lookups[] __initdata = {

static struct clk_lookup lookups[] = {

	_REGISTER_CLOCK(NULL, "asrc", asrc_clk)

	_REGISTER_CLOCK(NULL, "ata", ata_clk)

	_REGISTER_CLOCK(NULL, "audmux", audmux_clk)