Merge branch 'depends/rmk/smp' into tmp

2011-10-20 17:57:46 +02:00
parent bda2487997 5a567d78c4
commit fcd467137e
16 changed files with 298 additions and 13 deletions
--- a/arch/arm/mm/fault.c
+++ b/arch/arm/mm/fault.c
@@ -20,6 +20,7 @@
 #include <linux/highmem.h>
 #include <linux/perf_event.h>

+#include <asm/exception.h>
 #include <asm/system.h>
 #include <asm/pgtable.h>
 #include <asm/tlbflush.h>