summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-12-15 01:25:19 +0100
committerLinus Torvalds <torvalds@linux-foundation.org>2008-12-15 01:25:19 +0100
commitcefb3d02cad6fae49369cdde24526c4c4806b20f (patch)
tree8d2f8f075d0f63a7425bda781e8a15caf97f876a /arch
parentx86 Fix VMI crash on boot in 2.6.28-rc8 (diff)
parentpowerpc/fsl-booke: Fix problem with _tlbil_va being interrupted (diff)
downloadlinux-cefb3d02cad6fae49369cdde24526c4c4806b20f.tar.xz
linux-cefb3d02cad6fae49369cdde24526c4c4806b20f.zip
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/galak/powerpc
* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/galak/powerpc: powerpc/fsl-booke: Fix problem with _tlbil_va being interrupted
Diffstat (limited to 'arch')
-rw-r--r--arch/powerpc/kernel/misc_32.S3
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/powerpc/kernel/misc_32.S b/arch/powerpc/kernel/misc_32.S
index bdc8b0e860e5..d108715129e2 100644
--- a/arch/powerpc/kernel/misc_32.S
+++ b/arch/powerpc/kernel/misc_32.S
@@ -479,6 +479,8 @@ _GLOBAL(_tlbil_pid)
* (no broadcast)
*/
_GLOBAL(_tlbil_va)
+ mfmsr r10
+ wrteei 0
slwi r4,r4,16
mtspr SPRN_MAS6,r4 /* assume AS=0 for now */
tlbsx 0,r3
@@ -490,6 +492,7 @@ _GLOBAL(_tlbil_va)
tlbwe
msync
isync
+ wrtee r10
blr
#endif /* CONFIG_FSL_BOOKE */