From: Will Deacon Date: Tue, 11 Jan 2011 13:04:36 +0000 (+0100) Subject: ARM: 6619/1: nommu: avoid mapping vectors page when !CONFIG_MMU X-Git-Tag: MMI-PSA29.97-13-9~21009^2~10 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=6cde6d4217ff01422c093d3f7ff550b7a324e96e;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git 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 Signed-off-by: Will Deacon Signed-off-by: Russell King --- 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) return randomize_range(mm->brk, range_end, 0) ? : mm->brk; } +#ifdef CONFIG_MMU /* * The vectors page is always readable from user space for the * 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) { return (vma->vm_start == 0xffff0000) ? "[vectors]" : NULL; } +#endif