]> Pileus Git - ~andy/linux/commitdiff
Revert "ARM: move VMALLOC_END down temporarily for shmobile"
authorNicolas Pitre <nicolas.pitre@linaro.org>
Tue, 3 Jan 2012 04:00:32 +0000 (23:00 -0500)
committerNicolas Pitre <nico@fluxnic.net>
Tue, 3 Jan 2012 04:14:35 +0000 (23:14 -0500)
This reverts commit 0af362f8440a78b970d5f215e234420fa87d0f3f as shmobile
is not using a non-standard memory layout anymore.

Signed-off-by: Nicolas Pitre <nico@linaro.org>
arch/arm/include/asm/pgtable.h

index bcae9b81a6d08d72876f06ab355d3e9a5ff30816..6cdd55cb0b8c042bccd71384bbc0f6604444e50a 100644 (file)
 #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__