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 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu
[pandora-kernel.git]
/
arch
/
powerpc
/
kernel
/
exceptions-64s.S
diff --git
a/arch/powerpc/kernel/exceptions-64s.S
b/arch/powerpc/kernel/exceptions-64s.S
index
f53029a
..
39b0c48
100644
(file)
--- a/
arch/powerpc/kernel/exceptions-64s.S
+++ b/
arch/powerpc/kernel/exceptions-64s.S
@@
-818,12
+818,12
@@
END_FW_FTR_SECTION_IFCLR(FW_FEATURE_ISERIES)
/*
* hash_page couldn't handle it, set soft interrupt enable back
/*
* hash_page couldn't handle it, set soft interrupt enable back
- * to what it was before the trap. Note that .
raw
_local_irq_restore
+ * to what it was before the trap. Note that .
arch
_local_irq_restore
* handles any interrupts pending at this point.
*/
ld r3,SOFTE(r1)
TRACE_AND_RESTORE_IRQ_PARTIAL(r3, 11f)
* handles any interrupts pending at this point.
*/
ld r3,SOFTE(r1)
TRACE_AND_RESTORE_IRQ_PARTIAL(r3, 11f)
- bl .
raw
_local_irq_restore
+ bl .
arch
_local_irq_restore
b 11f
/* We have a data breakpoint exception - handle it */
b 11f
/* We have a data breakpoint exception - handle it */