From c9492d9f94052a568cebec13c543e3a03a8e6614 Mon Sep 17 00:00:00 2001 From: Nicolas Pitre Date: Mon, 19 Sep 2011 00:28:45 -0400 Subject: [PATCH] --- yaml --- r: 279885 b: refs/heads/master c: 0af362f8440a78b970d5f215e234420fa87d0f3f h: refs/heads/master i: 279883: a45dbcefaf5489a13e8e4554198c01366e5e8fcd v: v3 --- [refs] | 2 +- trunk/arch/arm/include/asm/pgtable.h | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 022a7d574ba4..875ceb594e8b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d0e6b2236a26711939bfcdd97370fedcd526a191 +refs/heads/master: 0af362f8440a78b970d5f215e234420fa87d0f3f diff --git a/trunk/arch/arm/include/asm/pgtable.h b/trunk/arch/arm/include/asm/pgtable.h index 6cdd55cb0b8c..bcae9b81a6d0 100644 --- a/trunk/arch/arm/include/asm/pgtable.h +++ b/trunk/arch/arm/include/asm/pgtable.h @@ -37,6 +37,13 @@ #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__