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 master.kernel.org:/pub/scm/linux/kernel/git/davej/agpgart
[pandora-kernel.git]
/
arch
/
powerpc
/
kernel
/
head_8xx.S
diff --git
a/arch/powerpc/kernel/head_8xx.S
b/arch/powerpc/kernel/head_8xx.S
index
de09787
..
bc6d1ac
100644
(file)
--- a/
arch/powerpc/kernel/head_8xx.S
+++ b/
arch/powerpc/kernel/head_8xx.S
@@
-175,7
+175,7
@@
label: \
#define EXC_XFER_TEMPLATE(n, hdlr, trap, copyee, tfer, ret) \
li r10,trap; \
- stw r10,
TRAP(r11);
\
+ stw r10,
_TRAP(r11);
\
li r10,MSR_KERNEL; \
copyee(r10, r9); \
bl tfer; \