projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'nds32-for-linus-4.18' of git://git.kernel.org/pub/scm/linux/kernel/git...
[linux-2.6-microblaze.git]
/
arch
/
openrisc
/
kernel
/
traps.c
diff --git
a/arch/openrisc/kernel/traps.c
b/arch/openrisc/kernel/traps.c
index
fac246e
..
d8981cb
100644
(file)
--- a/
arch/openrisc/kernel/traps.c
+++ b/
arch/openrisc/kernel/traps.c
@@
-300,7
+300,7
@@
static inline int in_delay_slot(struct pt_regs *regs)
return 0;
}
#else
- return
regs->sr
& SPR_SR_DSX;
+ return
mfspr(SPR_SR)
& SPR_SR_DSX;
#endif
}