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

Commit e0b58ee8 authored by Russell King's avatar Russell King
Browse files

Merge branch 'vmalloc' of git://git.linaro.org/people/nico/linux into devel-stable

parents cfef0320 9561f4e0

arch/arm/include/asm/pgtable.h

+0 −7
Original line number Diff line number Diff line
@@ -42,13 +42,6 @@ 
#define VMALLOC_START		(((unsigned long)high_memory + VMALLOC_OFFSET) & ~(VMALLOC_OFFSET-1))

#define VMALLOC_END		0xff000000UL



/* This is a temporary hack until shmobile's DMA area size is sorted out */

#ifdef CONFIG_ARCH_SHMOBILE

#warning "SH-Mobile's consistent DMA size conflicts with VMALLOC_END by 144MB"

#undef VMALLOC_END

#define VMALLOC_END		0xF6000000UL

#endif



#define LIBRARY_TEXT_START	0x0c000000



#ifndef __ASSEMBLY__

arch/arm/mach-shmobile/board-ag5evm.c

+0 −2
Original line number Diff line number Diff line
@@ -466,8 +466,6 @@ static struct map_desc ag5evm_io_desc[] __initdata = { 
static void __init ag5evm_map_io(void)

{

	iotable_init(ag5evm_io_desc, ARRAY_SIZE(ag5evm_io_desc));

	/* DMA memory at 0xf6000000 - 0xffdfffff */

	init_consistent_dma_size(158 << 20);



	/* setup early devices and console here as well */

	sh73a0_add_early_devices();

arch/arm/mach-shmobile/board-ap4evb.c

+0 −2
Original line number Diff line number Diff line
@@ -1172,8 +1172,6 @@ static struct map_desc ap4evb_io_desc[] __initdata = { 
static void __init ap4evb_map_io(void)

{

	iotable_init(ap4evb_io_desc, ARRAY_SIZE(ap4evb_io_desc));

	/* DMA memory at 0xf6000000 - 0xffdfffff */

	init_consistent_dma_size(158 << 20);



	/* setup early devices and console here as well */

	sh7372_add_early_devices();

arch/arm/mach-shmobile/board-g3evm.c

+0 −2
Original line number Diff line number Diff line
@@ -261,8 +261,6 @@ static struct map_desc g3evm_io_desc[] __initdata = { 
static void __init g3evm_map_io(void)

{

	iotable_init(g3evm_io_desc, ARRAY_SIZE(g3evm_io_desc));

	/* DMA memory at 0xf6000000 - 0xffdfffff */

	init_consistent_dma_size(158 << 20);



	/* setup early devices and console here as well */

	sh7367_add_early_devices();

arch/arm/mach-shmobile/board-g4evm.c

+0 −2
Original line number Diff line number Diff line
@@ -275,8 +275,6 @@ static struct map_desc g4evm_io_desc[] __initdata = { 
static void __init g4evm_map_io(void)

{

	iotable_init(g4evm_io_desc, ARRAY_SIZE(g4evm_io_desc));

	/* DMA memory at 0xf6000000 - 0xffdfffff */

	init_consistent_dma_size(158 << 20);



	/* setup early devices and console here as well */

	sh7377_add_early_devices();