diff options
| author | Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> | 2013-01-10 23:17:35 -0500 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2013-01-11 06:52:35 -0500 |
| commit | 30c254ff5c6510877c4fa3c3e87bb6d7172a7fcf (patch) | |
| tree | 59eff0dc845adda8c791710037be8014caa33031 /arch | |
| parent | 254adaa465c40151df11fc1f88f93e6e86eb61d4 (diff) | |
sh: define TASK_UNMAPPED_BASE as a page aligned constant
b4265f12340f809447b9a48055e88c444b480c89
(mm: use vm_unmapped_area() on sh architecture)
broke sh boot. This patch define TASK_UNMAPPED_BASE
as a page aligned constant to solve this issue.
Special thanks to Michel
Acked-by: Michel Lespinasse <walken@google.com>
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/sh/include/asm/processor_32.h | 2 | ||||
| -rw-r--r-- | arch/sh/include/asm/processor_64.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/sh/include/asm/processor_32.h b/arch/sh/include/asm/processor_32.h index b1320d55ca30..e699a12cdcca 100644 --- a/arch/sh/include/asm/processor_32.h +++ b/arch/sh/include/asm/processor_32.h | |||
| @@ -39,7 +39,7 @@ | |||
| 39 | /* This decides where the kernel will search for a free chunk of vm | 39 | /* This decides where the kernel will search for a free chunk of vm |
| 40 | * space during mmap's. | 40 | * space during mmap's. |
| 41 | */ | 41 | */ |
| 42 | #define TASK_UNMAPPED_BASE (TASK_SIZE / 3) | 42 | #define TASK_UNMAPPED_BASE PAGE_ALIGN(TASK_SIZE / 3) |
| 43 | 43 | ||
| 44 | /* | 44 | /* |
| 45 | * Bit of SR register | 45 | * Bit of SR register |
diff --git a/arch/sh/include/asm/processor_64.h b/arch/sh/include/asm/processor_64.h index 1ee8946f0952..1cc7d3197143 100644 --- a/arch/sh/include/asm/processor_64.h +++ b/arch/sh/include/asm/processor_64.h | |||
| @@ -47,7 +47,7 @@ pc; }) | |||
| 47 | /* This decides where the kernel will search for a free chunk of vm | 47 | /* This decides where the kernel will search for a free chunk of vm |
| 48 | * space during mmap's. | 48 | * space during mmap's. |
| 49 | */ | 49 | */ |
| 50 | #define TASK_UNMAPPED_BASE (TASK_SIZE / 3) | 50 | #define TASK_UNMAPPED_BASE PAGE_ALIGN(TASK_SIZE / 3) |
| 51 | 51 | ||
| 52 | /* | 52 | /* |
| 53 | * Bit of SR register | 53 | * Bit of SR register |