---

yaml --- r: 279929 b: refs/heads/master c: 9561f4e h: refs/heads/master i: 279927: 110082a v: v3
git-mirror · Jan 3, 2012 · 03430e5 · 03430e5
1 parent 175a5bf
commit 03430e5
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 8 deletions.
diff --git 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
@@ -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__