diff options
| author | Colin Cross <ccross@android.com> | 2012-04-19 14:42:22 -0700 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2012-04-19 14:42:22 -0700 |
| commit | ab2965eefef95a2eecfd54c12b0eb243162862e9 (patch) | |
| tree | c947fdc158e144c2d060486b65d10ee67d254039 /arch/arm/mm/nommu.c | |
| parent | a0ec4361e4539e30cf1c5de7ddfd2dadcd8e1595 (diff) | |
| parent | e816b57a337ea3b755de72bec38c10c864f23015 (diff) | |
Merge commit 'v3.4-rc3' into android-3.4
Conflicts:
drivers/staging/android/lowmemorykiller.c
Change-Id: Ia3ffcfc702e28c4fce0e91b363f4afd5f1c40306
Diffstat (limited to 'arch/arm/mm/nommu.c')
| -rw-r--r-- | arch/arm/mm/nommu.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mm/nommu.c b/arch/arm/mm/nommu.c index 6486d2f253c..d51225f90ae 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(); } |