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 'linux-next' of git://git.infradead.org/ubi-2.6
[pandora-kernel.git]
/
arch
/
powerpc
/
kernel
/
traps.c
diff --git
a/arch/powerpc/kernel/traps.c
b/arch/powerpc/kernel/traps.c
index
a45a63c
..
1b2cdc8
100644
(file)
--- a/
arch/powerpc/kernel/traps.c
+++ b/
arch/powerpc/kernel/traps.c
@@
-538,6
+538,11
@@
int machine_check_e500(struct pt_regs *regs)
return 0;
}
+
+int machine_check_generic(struct pt_regs *regs)
+{
+ return 0;
+}
#elif defined(CONFIG_E200)
int machine_check_e200(struct pt_regs *regs)
{