summaryrefslogtreecommitdiffstats
path: root/arch/arm/include
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2012-01-04 09:01:51 +0000
committerRussell King <rmk+kernel@arm.linux.org.uk>2012-01-04 09:01:51 +0000
commite0b58ee8c429197c3747b1f03dd1cb9dd082bc0e (patch)
treef3527603df92dfb34abfe7fc40968241f1af673e /arch/arm/include
parentcfef0320ead7d707c363b18bb6f13f6c3bda316a (diff)
parent9561f4e052a06167694e110d76ce3a5e38b59522 (diff)
downloadop-kernel-dev-e0b58ee8c429197c3747b1f03dd1cb9dd082bc0e.zip
op-kernel-dev-e0b58ee8c429197c3747b1f03dd1cb9dd082bc0e.tar.gz
Merge branch 'vmalloc' of git://git.linaro.org/people/nico/linux into devel-stable
Diffstat (limited to 'arch/arm/include')
-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 3f2f0eb..1119790 100644
--- a/arch/arm/include/asm/pgtable.h
+++ b/arch/arm/include/asm/pgtable.h
@@ -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__
OpenPOWER on IntegriCloud