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 commit 'v2.6.39-rc3' into for-2.6.39
[pandora-kernel.git]
/
arch
/
mips
/
mm
/
cex-sb1.S
diff --git
a/arch/mips/mm/cex-sb1.S
b/arch/mips/mm/cex-sb1.S
index
e54a62f
..
89c412b
100644
(file)
--- a/
arch/mips/mm/cex-sb1.S
+++ b/
arch/mips/mm/cex-sb1.S
@@
-34,8
+34,6
@@
* is changed.
*/
* is changed.
*/
- __INIT
-
.set mips64
.set noreorder
.set noat
.set mips64
.set noreorder
.set noat
@@
-51,6
+49,8
@@
* (0x170-0x17f) are used to preserve k0, k1, and ra.
*/
* (0x170-0x17f) are used to preserve k0, k1, and ra.
*/
+ __CPUINIT
+
LEAF(except_vec2_sb1)
/*
* If this error is recoverable, we need to exit the handler
LEAF(except_vec2_sb1)
/*
* If this error is recoverable, we need to exit the handler
@@
-79,7
+79,7
@@
LEAF(except_vec2_sb1)
recovered_dcache:
/*
* Unlock CacheErr-D (which in turn unlocks CacheErr-DPA).
recovered_dcache:
/*
* Unlock CacheErr-D (which in turn unlocks CacheErr-DPA).
- * Ought to log the occurence of this recovered dcache error.
+ * Ought to log the occur
r
ence of this recovered dcache error.
*/
b recovered
mtc0 $0,C0_CERR_D
*/
b recovered
mtc0 $0,C0_CERR_D