diff options
| author |  Linus Torvalds <torvalds@linux-foundation.org>
| 2008-12-14 16:25:19 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org>
| 2008-12-14 16:25:19 -0800 |
| commit | cefb3d02cad6fae49369cdde24526c4c4806b20f (patch) | |
| tree | 8d2f8f075d0f63a7425bda781e8a15caf97f876a /arch/powerpc | |
| parent | x86 Fix VMI crash on boot in 2.6.28-rc8 (diff) | |
| parent | powerpc/fsl-booke: Fix problem with _tlbil_va being interrupted (diff) | |
| download | linux-cefb3d02cad6fae49369cdde24526c4c4806b20f.tar.gz linux-cefb3d02cad6fae49369cdde24526c4c4806b20f.tar.bz2 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/powerpc')
| -rw-r--r-- | arch/powerpc/kernel/misc_32.S | 3 |
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 */ |