diff options
author | Will Deacon <will.deacon@arm.com> | 2011-01-11 08:04:36 -0500 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-01-11 12:32:24 -0500 |
commit | 6cde6d4217ff01422c093d3f7ff550b7a324e96e (patch) | |
tree | 2542d21d333bbbb1dd1deed655acabc834465c0f /arch/arm/kernel | |
parent | edc4d272551594729f63ca4cde1612608494091f (diff) |
ARM: 6619/1: nommu: avoid mapping vectors page when !CONFIG_MMU
When running without an MMU, we do not need to install a mapping for the
vectors page. Attempting to do so causes a compile-time error because
install_special_mapping is not defined.
This patch adds compile-time guards to the vector mapping functions
so that we can build nommu configurations once more.
Acked-by: Greg Ungerer <gerg@uclinux.org>
Signed-off-by: Will Deacon <will.deacon@arm.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/kernel')
-rw-r--r-- | arch/arm/kernel/process.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/kernel/process.c b/arch/arm/kernel/process.c index e76fcaadce03..94bbedbed639 100644 --- a/arch/arm/kernel/process.c +++ b/arch/arm/kernel/process.c | |||
@@ -483,6 +483,7 @@ unsigned long arch_randomize_brk(struct mm_struct *mm) | |||
483 | return randomize_range(mm->brk, range_end, 0) ? : mm->brk; | 483 | return randomize_range(mm->brk, range_end, 0) ? : mm->brk; |
484 | } | 484 | } |
485 | 485 | ||
486 | #ifdef CONFIG_MMU | ||
486 | /* | 487 | /* |
487 | * The vectors page is always readable from user space for the | 488 | * The vectors page is always readable from user space for the |
488 | * atomic helpers and the signal restart code. Let's declare a mapping | 489 | * atomic helpers and the signal restart code. Let's declare a mapping |
@@ -503,3 +504,4 @@ const char *arch_vma_name(struct vm_area_struct *vma) | |||
503 | { | 504 | { |
504 | return (vma->vm_start == 0xffff0000) ? "[vectors]" : NULL; | 505 | return (vma->vm_start == 0xffff0000) ? "[vectors]" : NULL; |
505 | } | 506 | } |
507 | #endif | ||