git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'linus' into x86/cpu
[pandora-kernel.git]
/
arch
/
arm
/
kernel
/
traps.c
diff --git
a/arch/arm/kernel/traps.c
b/arch/arm/kernel/traps.c
index
5595fdd
..
7277aef
100644
(file)
--- a/
arch/arm/kernel/traps.c
+++ b/
arch/arm/kernel/traps.c
@@
-707,6
+707,11
@@
void abort(void)
EXPORT_SYMBOL(abort);
void __init trap_init(void)
+{
+ return;
+}
+
+void __init early_trap_init(void)
{
unsigned long vectors = CONFIG_VECTORS_BASE;
extern char __stubs_start[], __stubs_end[];