From 03430e5affd20e3feb63336964d125c0fad8f942 Mon Sep 17 00:00:00 2001 From: Nicolas Pitre Date: Mon, 2 Jan 2012 23:00:32 -0500 Subject: [PATCH] --- yaml --- r: 279929 b: refs/heads/master c: 9561f4e052a06167694e110d76ce3a5e38b59522 h: refs/heads/master i: 279927: 110082a8799202230b3d14d5311a57c9acd43ecb v: v3 --- [refs] | 2 +- trunk/arch/arm/include/asm/pgtable.h | 7 ------- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/[refs] b/[refs] index 2ea9bb339754..63a24b73caba 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5917bfa4c0c529d7a93323671f2edec7e3d81c07 +refs/heads/master: 9561f4e052a06167694e110d76ce3a5e38b59522 diff --git a/trunk/arch/arm/include/asm/pgtable.h b/trunk/arch/arm/include/asm/pgtable.h index bcae9b81a6d0..6cdd55cb0b8c 100644 --- a/trunk/arch/arm/include/asm/pgtable.h +++ b/trunk/arch/arm/include/asm/pgtable.h @@ -37,13 +37,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__