diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-01-04 10:01:51 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-01-04 10:01:51 +0100 |
| commit | e0b58ee8c429197c3747b1f03dd1cb9dd082bc0e (patch) | |
| tree | f3527603df92dfb34abfe7fc40968241f1af673e /arch/arm/include | |
| parent | ARM: 7261/1: clocksource/ux500-prcmu: fix sched_clock breakage (diff) | |
| parent | Revert "ARM: move VMALLOC_END down temporarily for shmobile" (diff) | |
| download | linux-e0b58ee8c429197c3747b1f03dd1cb9dd082bc0e.tar.xz linux-e0b58ee8c429197c3747b1f03dd1cb9dd082bc0e.zip | |
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.h | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/arch/arm/include/asm/pgtable.h b/arch/arm/include/asm/pgtable.h index 3f2f0eb76211..111979057e6a 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__ |