aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWill Deacon <will.deacon@arm.com>2012-04-12 17:16:01 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2012-04-13 14:05:42 +0100
commit6b8e5c912f4294611351aba151324764ebbefa1b (patch)
tree85b5c6410b721e8eda13588e4769c49dfc050f48
parent9b7333a9c1c22409f685ff6bb6a9e3638e7ff06f (diff)
downloadlinux-yocto-4.8-6b8e5c912f4294611351aba151324764ebbefa1b.tar.gz
linux-yocto-4.8-6b8e5c912f4294611351aba151324764ebbefa1b.tar.bz2
linux-yocto-4.8-6b8e5c912f4294611351aba151324764ebbefa1b.zip
ARM: 7383/1: nommu: populate vectors page from paging_init
Commit 94e5a85b ("ARM: earlier initialization of vectors page") made it the responsibility of paging_init to initialise the vectors page. This patch adds a call to early_trap_init for the !CONFIG_MMU case, placing the vectors at CONFIG_VECTORS_BASE. Cc: Jonathan Austin <jonathan.austin@arm.com> Signed-off-by: Will Deacon <will.deacon@arm.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
-rw-r--r--arch/arm/mm/nommu.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mm/nommu.c b/arch/arm/mm/nommu.c
index 6486d2f253cd..d51225f90ae2 100644
--- a/arch/arm/mm/nommu.c
+++ b/arch/arm/mm/nommu.c
@@ -13,6 +13,7 @@
#include <asm/sections.h>
#include <asm/page.h>
#include <asm/setup.h>
+#include <asm/traps.h>
#include <asm/mach/arch.h>
#include "mm.h"
@@ -39,6 +40,7 @@ void __init sanity_check_meminfo(void)
*/
void __init paging_init(struct machine_desc *mdesc)
{
+ early_trap_init((void *)CONFIG_VECTORS_BASE);
bootmem_init();
}