diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-11-11 18:24:31 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-11-11 18:24:31 +0100 |
| commit | e892873c5d7431324d98dfd3ed1572a2948046be (patch) | |
| tree | 05d3785c0a4720c63fa7a7d9372ba24904b5049a /arch/powerpc/kernel/misc_32.S | |
| parent | Merge branch 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/air... (diff) | |
| parent | powerpc: Update desktop/server defconfigs (diff) | |
| download | linux-e892873c5d7431324d98dfd3ed1572a2948046be.tar.xz linux-e892873c5d7431324d98dfd3ed1572a2948046be.zip | |
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc:
powerpc: Update desktop/server defconfigs
powerpc: Fix msr check in compat_sys_swapcontext
powerpc: Repair device bindings documentation
powerpc: Updated Freescale PPC related defconfigs
powerpc: Update QE/CPM2 usb_ctlr structures for USB support
powerpc/86xx: Correct SOC bus-frequency in GE Fanuc SBC610 DTS
powerpc: Fix Book-E watchdog timer interval setting
powerpc/fsl-booke: Fix synchronization bug w/local tlb invalidates
Diffstat (limited to 'arch/powerpc/kernel/misc_32.S')
| -rw-r--r-- | arch/powerpc/kernel/misc_32.S | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/powerpc/kernel/misc_32.S b/arch/powerpc/kernel/misc_32.S index 6a9b4bf0d173..bdc8b0e860e5 100644 --- a/arch/powerpc/kernel/misc_32.S +++ b/arch/powerpc/kernel/misc_32.S @@ -470,6 +470,8 @@ _GLOBAL(_tlbil_pid) mfspr r3,SPRN_MMUCSR0 andi. r3,r3,MMUCSR0_TLBFI@l bne 1b + msync + isync blr /* @@ -486,6 +488,8 @@ _GLOBAL(_tlbil_va) rlwinm r4,r4,0,1,31 mtspr SPRN_MAS1,r4 tlbwe + msync + isync blr #endif /* CONFIG_FSL_BOOKE */ |