diff options
| author | Nicolas Pitre <nicolas.pitre@linaro.org> | 2012-01-02 23:00:32 -0500 |
|---|---|---|
| committer | Nicolas Pitre <nico@fluxnic.net> | 2012-01-02 23:14:35 -0500 |
| commit | 9561f4e052a06167694e110d76ce3a5e38b59522 (patch) | |
| tree | 78cb5fc364a27de20a75f98e1b09cc9a00583d49 /arch | |
| parent | 5917bfa4c0c529d7a93323671f2edec7e3d81c07 (diff) | |
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')
| -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 bcae9b81a6d..6cdd55cb0b8 100644 --- a/arch/arm/include/asm/pgtable.h +++ b/arch/arm/include/asm/pgtable.h | |||
| @@ -37,13 +37,6 @@ | |||
| 37 | #define VMALLOC_START (((unsigned long)high_memory + VMALLOC_OFFSET) & ~(VMALLOC_OFFSET-1)) | 37 | #define VMALLOC_START (((unsigned long)high_memory + VMALLOC_OFFSET) & ~(VMALLOC_OFFSET-1)) |
| 38 | #define VMALLOC_END 0xff000000UL | 38 | #define VMALLOC_END 0xff000000UL |
| 39 | 39 | ||
| 40 | /* This is a temporary hack until shmobile's DMA area size is sorted out */ | ||
| 41 | #ifdef CONFIG_ARCH_SHMOBILE | ||
| 42 | #warning "SH-Mobile's consistent DMA size conflicts with VMALLOC_END by 144MB" | ||
| 43 | #undef VMALLOC_END | ||
| 44 | #define VMALLOC_END 0xF6000000UL | ||
| 45 | #endif | ||
| 46 | |||
| 47 | #define LIBRARY_TEXT_START 0x0c000000 | 40 | #define LIBRARY_TEXT_START 0x0c000000 |
| 48 | 41 | ||
| 49 | #ifndef __ASSEMBLY__ | 42 | #ifndef __ASSEMBLY__ |