system/linux
system/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux synced 2024-09-20 19:17:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse source
This commit is contained in:
Russell King 2012-01-04 09:01:51 +00:00
parent cfef0320ea 9561f4e052
commit e0b58ee8c4
6 changed files with 0 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
arch/arm/include/asm/pgtable.h
View file

@ -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__

2
arch/arm/mach-shmobile/board-ag5evm.c
View file

@ -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();

2
arch/arm/mach-shmobile/board-ap4evb.c
View file

@ -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();

2
arch/arm/mach-shmobile/board-g3evm.c
View file

@ -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();

2
arch/arm/mach-shmobile/board-g4evm.c
View file

@ -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();

2
arch/arm/mach-shmobile/board-mackerel.c
View file

@ -1390,8 +1390,6 @@ static struct map_desc mackerel_io_desc[] __initdata = {
static void __init mackerel_map_io(void)
{
iotable_init(mackerel_io_desc, ARRAY_SIZE(mackerel_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();