summaryrefslogtreecommitdiffstats
path: root/arch/arm/include/asm
diff options
context:
space:
mode:
authorNicolas Pitre <nicolas.pitre@linaro.org>2012-01-02 23:00:32 -0500
committerNicolas Pitre <nico@fluxnic.net>2012-01-02 23:14:35 -0500
commit9561f4e052a06167694e110d76ce3a5e38b59522 (patch)
tree78cb5fc364a27de20a75f98e1b09cc9a00583d49 /arch/arm/include/asm
parent5917bfa4c0c529d7a93323671f2edec7e3d81c07 (diff)
downloadblackbird-op-linux-9561f4e052a06167694e110d76ce3a5e38b59522.tar.gz
blackbird-op-linux-9561f4e052a06167694e110d76ce3a5e38b59522.zip
Revert "ARM: move VMALLOC_END down temporarily for shmobile"
This reverts commit 0af362f8440a78b970d5f215e234420fa87d0f3f as shmobile is not using a non-standard memory layout anymore. Signed-off-by: Nicolas Pitre <nico@linaro.org>
Diffstat (limited to 'arch/arm/include/asm')
-rw-r--r--arch/arm/include/asm/pgtable.h7
1 files changed, 0 insertions, 7 deletions
diff --git a/arch/arm/include/asm/pgtable.h b/arch/arm/include/asm/pgtable.h
index bcae9b81a6d0..6cdd55cb0b8c 100644
--- a/arch/arm/include/asm/pgtable.h
+++ b/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__
OpenPOWER on IntegriCloud