projects
/
platform
/
kernel
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'inka4x0-ng' of /home/m8/git/u-boot/
[platform/kernel/u-boot.git]
/
include
/
ppc_asm.tmpl
diff --git
a/include/ppc_asm.tmpl
b/include/ppc_asm.tmpl
index
9f4029f
..
0019d46
100644
(file)
--- a/
include/ppc_asm.tmpl
+++ b/
include/ppc_asm.tmpl
@@
-235,7
+235,7
@@
stw r22,_CTR(r21); \
mfspr r20,XER; \
stw r20,_XER(r21); \
stw r22,_CTR(r21); \
mfspr r20,XER; \
stw r20,_XER(r21); \
- mfspr r20,
DEAR;
\
+ mfspr r20,
DAR_DEAR;
\
stw r20,_DAR(r21); \
mfspr r22,reg1; \
mfspr r23,reg2; \
stw r20,_DAR(r21); \
mfspr r22,reg1; \
mfspr r23,reg2; \
@@
-285,7
+285,6
@@
label: \
.long hdlr - _start + _START_OFFSET; \
.long crit_return - _start + _START_OFFSET
.long hdlr - _start + _START_OFFSET; \
.long crit_return - _start + _START_OFFSET
-#ifdef CONFIG_440
#define MCK_EXCEPTION(n, label, hdlr) \
. = n; \
label: \
#define MCK_EXCEPTION(n, label, hdlr) \
. = n; \
label: \
@@
-299,6
+298,5
@@
label: \
.L_ ## label : \
.long hdlr - _start + _START_OFFSET; \
.long mck_return - _start + _START_OFFSET
.L_ ## label : \
.long hdlr - _start + _START_OFFSET; \
.long mck_return - _start + _START_OFFSET
-#endif /* CONFIG_440 */
#endif /* __PPC_ASM_TMPL__ */
#endif /* __PPC_ASM_TMPL__ */