diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2014-08-05 05:27:25 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2014-08-05 05:27:25 -0400 |
| commit | f15bdfe4fb264ac30d9c176f898cbd52cfd1ffa9 (patch) | |
| tree | d93b59190624c0df80854aff5078c588420c3516 /arch/arm/include/asm/memory.h | |
| parent | c89c3a6acb847b03250a83cecae4f5c9ced2d960 (diff) | |
| parent | c70fbb01b11cecfa13d9e746f462617d3ac0e38c (diff) | |
Merge branch 'devel-stable' into for-next
Conflicts:
arch/arm/kernel/perf_event_cpu.c
Diffstat (limited to 'arch/arm/include/asm/memory.h')
| -rw-r--r-- | arch/arm/include/asm/memory.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/arm/include/asm/memory.h b/arch/arm/include/asm/memory.h index 04ccf1c0a1af..e731018869a7 100644 --- a/arch/arm/include/asm/memory.h +++ b/arch/arm/include/asm/memory.h | |||
| @@ -91,9 +91,7 @@ | |||
| 91 | * of this define that was meant to. | 91 | * of this define that was meant to. |
| 92 | * Fortunately, there is no reference for this in noMMU mode, for now. | 92 | * Fortunately, there is no reference for this in noMMU mode, for now. |
| 93 | */ | 93 | */ |
| 94 | #ifndef TASK_SIZE | 94 | #define TASK_SIZE UL(0xffffffff) |
| 95 | #define TASK_SIZE (CONFIG_DRAM_SIZE) | ||
| 96 | #endif | ||
| 97 | 95 | ||
| 98 | #ifndef TASK_UNMAPPED_BASE | 96 | #ifndef TASK_UNMAPPED_BASE |
| 99 | #define TASK_UNMAPPED_BASE UL(0x00000000) | 97 | #define TASK_UNMAPPED_BASE UL(0x00000000) |