From 244a67f0e4e77b72ed9688faed8deff2fb7075e3 Mon Sep 17 00:00:00 2001
From: Will Deacon <will.deacon@arm.com>
Date: Thu, 12 Apr 2012 17:16:01 +0100
Subject: [PATCH] --- yaml --- r: 299273 b: refs/heads/master c:
 6b8e5c912f4294611351aba151324764ebbefa1b h: refs/heads/master i:   299271:
 d0fe8f59f44387b662d4eedb806b267af698a457 v: v3

---
 [refs]                    | 2 +-
 trunk/arch/arm/mm/nommu.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index e88d87579910..1d9bf46908ae 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9b7333a9c1c22409f685ff6bb6a9e3638e7ff06f
+refs/heads/master: 6b8e5c912f4294611351aba151324764ebbefa1b
diff --git a/trunk/arch/arm/mm/nommu.c b/trunk/arch/arm/mm/nommu.c
index 6486d2f253cd..d51225f90ae2 100644
--- a/trunk/arch/arm/mm/nommu.c
+++ b/trunk/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();
 }