summaryrefslogtreecommitdiffstats
path: root/arch/mips/mm/cex-sb1.S
diff options
context:
space:
mode:
authorMichal Marek <mmarek@suse.cz>2011-06-07 15:37:51 +0200
committerMichal Marek <mmarek@suse.cz>2011-06-07 15:37:51 +0200
commit2e483528cebad089d0bb3f9aebb0ada22d968ffa (patch)
treed701405826b271e819a9a8500838cebd37b1364a /arch/mips/mm/cex-sb1.S
parent163d3fe6a2357aba7b18b938d6ae6ce9570324e4 (diff)
parent55922c9d1b84b89cb946c777fddccb3247e7df2c (diff)
downloadblackbird-op-linux-2e483528cebad089d0bb3f9aebb0ada22d968ffa.tar.gz
blackbird-op-linux-2e483528cebad089d0bb3f9aebb0ada22d968ffa.zip
Merge commit 'v3.0-rc1' into kbuild/kbuild
Diffstat (limited to 'arch/mips/mm/cex-sb1.S')
-rw-r--r--arch/mips/mm/cex-sb1.S2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/mm/cex-sb1.S b/arch/mips/mm/cex-sb1.S
index 2d08268bb705..89c412bc4b64 100644
--- a/arch/mips/mm/cex-sb1.S
+++ b/arch/mips/mm/cex-sb1.S
@@ -79,7 +79,7 @@ LEAF(except_vec2_sb1)
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 occurrence of this recovered dcache error.
*/
b recovered
mtc0 $0,C0_CERR_D
OpenPOWER on IntegriCloud